Commits · 578b46443dc8cb2a3a9d2266053b7b49504f5b21 · lifo / Nicolas Ollinger / OpenBoard

12 Sep, 2012 2 commits

Merge remote-tracking branch 'upstream/develop' into aristo_tool · 578b4644

Yimgo authored Sep 12, 2012

Conflicts:
	resources/inDevelopmentWidgets/Balance.wgt/css/images/delete.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/graduations.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/pivot.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/scale.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/scales.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/weight-add.png
	resources/inDevelopmentWidgets/Balance.wgt/css/images/weight.png

578b4644

Typo in comment. · 2e58fcae
Yimgo authored Sep 12, 2012

2e58fcae

11 Sep, 2012 16 commits
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 9c4ddbb5
  bmagnin authored Sep 11, 2012
  
  9c4ddbb5
- French wording on interactivities · c3adfbfe
  bmagnin authored Sep 11, 2012
```
Ass images an calcul
```
  c3adfbfe
- Merge branch 'aleksei_kanash_dev' into develop · 0197ee41
  Aleksei Kanash authored Sep 11, 2012
  
  0197ee41
- Fixed sankore crash on exit after clearing annotations. · 026c6c0f
  Aleksei Kanash authored Sep 11, 2012
  
  026c6c0f
- Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · c711c230
  Claudio Valerio authored Sep 11, 2012
  
  c711c230
- Sankore-946 issue · c60b3feb
  maximXbs authored Sep 11, 2012
  
  c60b3feb
- Merge remote-tracking branch 'origin/claudio-dev' into develop · c89eb864
  Claudio Valerio authored Sep 11, 2012
  
  c89eb864
- better fix · 29fc2f45
  Claudio Valerio authored Sep 11, 2012
  
  29fc2f45
- bad workaround for issue 1125 · 947149ea
  Claudio Valerio authored Sep 11, 2012
  
  947149ea
- 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 issue with inverted fields · ed6f6c48
  Claudio Valerio authored Sep 11, 2012
  
  ed6f6c48
- Fixed writing a lines with Marker. · 1f83f351
  Aleksei Kanash authored Sep 11, 2012
  
  1f83f351
- Merge remote-tracking branch 'origin/develop' into claudio-dev · 757dc96a
  Claudio Valerio authored Sep 11, 2012
  
  757dc96a
- Fixed adding lines to stroke groups. · 76b2d83b
  Aleksei Kanash authored Sep 11, 2012
  
  76b2d83b
- added qt-mobility library on installer · 7ed98043
  Claudio Valerio authored Sep 11, 2012
  
  7ed98043
10 Sep, 2012 10 commits
- 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 2 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