Commits · 62e5308fd4dd10f54ffe5ae4bb7d8c34e76ab031 · lifo / Nicolas Ollinger / OpenBoard

07 Sep, 2012 1 commit
- Merge remote-tracking branch 'origin/claudio-dev' into develop · 62e5308f
  Claudio Valerio authored Sep 07, 2012
  
  62e5308f
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 7 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
- added toque on page thumbnail depending if the teacherguide is filled out or not · 931e099e
  Claudio Valerio authored Sep 05, 2012
  
  931e099e
- Merge branch 'anatoly_dev' into develop · 89ca4c40
  Anatoly Mihalchenko authored Sep 05, 2012
  
  89ca4c40
- Virtual Keyboard under Mac OS 10.7: switching locales · ff6332a6
  Anatoly Mihalchenko authored Sep 05, 2012
  
  ff6332a6
04 Sep, 2012 8 commits
- Reversed changed... · 34c6aa28
  Anatoly Mihalchenko authored Sep 04, 2012
  
  34c6aa28
- SANKORE-523 · b5d26ab5
  Anatoly Mihalchenko authored Sep 04, 2012
```
Changing the languages of the virtual keyboard crashes the software
```
  b5d26ab5
- SANKORE-523 · 5f30e45d
  Anatoly Mihalchenko authored Sep 04, 2012
```
Changing the languages of the virtual keyboard crashes the software
```
  5f30e45d
- Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev · 1596b378
  Ilia Ryabokon authored Sep 04, 2012
  
  1596b378
- Eraising elements · eb53715d
  Ilia Ryabokon authored Sep 04, 2012
  
  eb53715d
- fixed issue for resizing on title page · 5bb5444b
  Claudio Valerio authored Sep 04, 2012
  
  5bb5444b
- Frame shows rotation angle at mouse press to rotation area. · a8fadf63
  Aleksei Kanash authored Sep 04, 2012
  
  a8fadf63
- Keyboard under MAX 10.7 · a3be61c1
  Anatoly Mihalchenko authored Sep 04, 2012
  
  a3be61c1
03 Sep, 2012 9 commits
- Some changes crash related · e232bbc9
  Ilia Ryabokon authored Sep 03, 2012
  
  e232bbc9
- Delete group after deletion of last member · 4ec54ee3
  Anatoly Mihalchenko authored Sep 03, 2012
  
  4ec54ee3
- Merge branch 'develop' into Ilia_dev · 4406082d
  Ilia Ryabokon authored Sep 03, 2012
  
  4406082d
- Sankore-861 using recolorAllItemsFunction · 67863309
  Ilia Ryabokon authored Sep 03, 2012
  
  67863309
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 4b6bb08b
  Anatoly Mihalchenko authored Sep 03, 2012
  
  4b6bb08b
- Merge branch 'aleksei_kanash_dev' into develop · 02528620
  Aleksei Kanash authored Sep 03, 2012
  
  02528620
- SANKORE-1063 · 3a21e072
  Anatoly Mihalchenko authored Sep 03, 2012
```
The annotations are erased when you select the Erase items
```
  3a21e072
- Additional fix to Sankore-979 - improved cleaning mechanism for items on board. · 05f6cc36
  Aleksei Kanash authored Sep 03, 2012
  
  05f6cc36
- Merge remote-tracking branch 'remotes/origin/anatoly_dev' into develop · 0d1e848f
  Anatoly Mihalchenko authored Sep 03, 2012
  
  0d1e848f