Commits · a2491be487985e58d4e167951a2dc3f5ad19753f · lifo / Nicolas Ollinger / OpenBoard

11 Sep, 2012 8 commits
- Desktop mode: palettes layout (Windows) · a2491be4
  Anatoly Mihalchenko authored Sep 11, 2012
  
  a2491be4
- Merge branch 'develop' into anatoly_dev · a249bcd3
  Anatoly Mihalchenko authored Sep 11, 2012
  
  a249bcd3
- Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev · 44d443f8
  Anatoly Mihalchenko authored Sep 11, 2012
  
  44d443f8
- some fixies · 2782a7d1
  Anatoly Mihalchenko authored Sep 11, 2012
  
  2782a7d1
- Merge branch 'aleksei_kanash_dev' into develop · 93e8d950
  Aleksei Kanash authored Sep 11, 2012
  
  93e8d950
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 373f2af0
  Aleksei Kanash authored Sep 11, 2012
  
  373f2af0
- Fixed writing a lines with Marker. · 1f83f351
  Aleksei Kanash authored Sep 11, 2012
  
  1f83f351
- Fixed adding lines to stroke groups. · 76b2d83b
  Aleksei Kanash authored Sep 11, 2012
  
  76b2d83b
10 Sep, 2012 12 commits
- desktop mode: fix · 46d85623
  Anatoly Mihalchenko authored Sep 10, 2012
  
  46d85623
- SANKORE-1077 · 50d136f8
  Anatoly Mihalchenko authored Sep 10, 2012
```
Desktop mode is broken
SANKORE-633
Positioning of floating palettes inside layers .
```
  50d136f8
- Fixed changing mode from desktop to board. · 816bfaa4
  Aleksei Kanash authored Sep 10, 2012
  
  816bfaa4
- Merge branch 'develop' into shiba-dev · 69fec641
  shibakaneki authored Sep 10, 2012
  
  69fec641
- Fixed undo stack for background objects. · 197ba3a5
  Aleksei Kanash authored Sep 10, 2012
  
  197ba3a5
- Fixed some little things · 77aa2783
  shibakaneki authored Sep 10, 2012
  
  77aa2783
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into aleksei_kanash_dev · 1a799632
  Aleksei Kanash authored Sep 10, 2012
  
  1a799632
- Resizing of items works fine in all cases. · 304591d1
  Aleksei Kanash authored Sep 10, 2012
  
  304591d1
- Resizing of items fixed for all resizers instead of bottom right resizer. · e68336e1
  Aleksei Kanash authored Sep 10, 2012
  
  e68336e1
- Resolved the placeholder issue in the new ubtgadaptabletext implementation · 1d06110b
  shibakaneki authored Sep 10, 2012
  
  1d06110b
- typedef for QMultiMap specified · 46b81abe
  Ilia Ryabokon authored Sep 10, 2012
  
  46b81abe
- Modified placeholder management in teacherguide · 47dd119c
  shibakaneki authored Sep 10, 2012
  
  47dd119c
07 Sep, 2012 10 commits
- Merge git conflicts · dc492cb2
  Ilia Ryabokon authored Sep 07, 2012
  
  dc492cb2
- Undo-redo stack for eraising operations and Sankore 834 · f6693f4e
  Ilia Ryabokon authored Sep 07, 2012
  
  f6693f4e
- Fixed some cases for resizing items. · e0c2fdc3
  Aleksei Kanash authored Sep 07, 2012
  
  e0c2fdc3
- fixed issue 1115 · 9d21875c
  Claudio Valerio authored Sep 07, 2012
  
  9d21875c
- fixed issue 1115 · cd010590
  Claudio Valerio authored Sep 07, 2012
  
  cd010590
- fixed issue 1083 · 571109e3
  Claudio Valerio authored Sep 07, 2012
  
  571109e3
- Merge remote-tracking branch 'origin/develop' into claudio-dev · e4b0d8e3
  Claudio Valerio authored Sep 07, 2012
  
  e4b0d8e3
- fixed issue 880 · 2519df80
  Claudio Valerio authored Sep 07, 2012
  
  2519df80
- Merge remote-tracking branch 'origin/claudio-dev' into develop · 62e5308f
  Claudio Valerio authored Sep 07, 2012
  
  62e5308f
- Merge remote-tracking branch 'origin/develop' into claudio-dev · dabc747b
  Claudio Valerio authored Sep 07, 2012
  
  dabc747b
06 Sep, 2012 10 commits
- Minor changes · a0ee4650
  Anatoly Mihalchenko authored Sep 06, 2012
  
  a0ee4650
- Merge branch 'anatoly_dev' into develop · 0d429342
  Anatoly Mihalchenko authored Sep 06, 2012
  
  0d429342
- Correct deletion of delegate instance (error with Vido on MAC OS) · db5c7ce7
  Anatoly Mihalchenko authored Sep 06, 2012
  
  db5c7ce7
- add the possibility to set maximum number of character · a726171f
  Claudio Valerio authored Sep 06, 2012
  
  a726171f
- Math apps updates · c556535e
  Didier Bathily authored Sep 01, 2012
```
Brings improvements

Balance
- No more empty weight
- Left weight should not go to right scale
- Reducing the size of half

Morpion
- Correction de l'évaluation des lignes

Train
- Add <1 and <0.1 options
Signed-off-by: Didier Bathily <didier.bathily@njin.fr>
```
  c556535e
- fixed Nuancier · 6ead8e7d
  maximXbs authored Sep 06, 2012
  
  6ead8e7d
- SANKORE-1026 · 8f1f0d9c
  Anatoly Mihalchenko authored Sep 06, 2012
```
Navigation palette: thumbnails isn't refeshed after application added to the page
```
  8f1f0d9c
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 7addaddc
  bmagnin authored Sep 06, 2012
  
  7addaddc
- Wording in Ordre lettres · ca7be931
  bmagnin authored Sep 06, 2012
  
  ca7be931
- Merge branch 'develop' into shiba-dev · 7668c955
  shibakaneki authored Sep 06, 2012
```
Conflicts:
	src/board/UBBoardController.cpp
	src/domain/UBGraphicsStrokesGroup.cpp
```
  7668c955