Commits · ed6f6c48e263536ebe7db3731d0a06b2f7bb9b6f · lifo / Nicolas Ollinger / OpenBoard

11 Sep, 2012 3 commits
- fixed issue with inverted fields · ed6f6c48
  Claudio Valerio authored Sep 11, 2012
  
  ed6f6c48
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 757dc96a
  Claudio Valerio authored Sep 11, 2012
  
  757dc96a
- added qt-mobility library on installer · 7ed98043
  Claudio Valerio authored Sep 11, 2012
  
  7ed98043
10 Sep, 2012 8 commits
- Merge branch 'develop' into shiba-dev · 69fec641
  shibakaneki authored Sep 10, 2012
  
  69fec641
- 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 15 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
- Removed dirty code · 22f36bed
  shibakaneki authored Sep 06, 2012
  
  22f36bed
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 9d0dcde2
  Claudio Valerio authored Sep 06, 2012
  
  9d0dcde2
- Fixed issue 862 · 667be75e
  shibakaneki authored Sep 06, 2012
  
  667be75e
- Replace inter activities in the right folder and git ignore update to ignore .ds_store · 782036c3
  bmagnin authored Sep 06, 2012
  
  782036c3
- French wording new inter activities · 203614ae
  bmagnin authored Sep 06, 2012
  
  203614ae
05 Sep, 2012 4 commits
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 47413272
  bmagnin authored Sep 05, 2012
  
  47413272
- Wording in french for inter activities · 938fb11e
  bmagnin authored Sep 05, 2012
  
  938fb11e
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into aleksei_kanash_dev · 807f83a6
  Aleksei Kanash authored Sep 05, 2012
  
  807f83a6
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 794b41ce
  Claudio Valerio authored Sep 05, 2012
  
  794b41ce