Commit Graph

2948 Commits (8bbb3384a2a73b6ca93efb7ba68f70d123b6c3c2)
 

Author SHA1 Message Date
shibakaneki 69fec641b2 Merge branch 'develop' into shiba-dev 12 years ago
Aleksei Kanash 197ba3a5f4 Fixed undo stack for background objects. 12 years ago
shibakaneki 77aa2783a2 Fixed some little things 12 years ago
Aleksei Kanash 1a799632ab Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into aleksei_kanash_dev 12 years ago
Aleksei Kanash 304591d1d8 Resizing of items works fine in all cases. 12 years ago
Aleksei Kanash e68336e1e3 Resizing of items fixed for all resizers instead of bottom right resizer. 12 years ago
shibakaneki 1d06110b5e Resolved the placeholder issue in the new ubtgadaptabletext implementation 12 years ago
Ilia Ryabokon 46b81abe15 typedef for QMultiMap specified 12 years ago
shibakaneki 47dd119c76 Modified placeholder management in teacherguide 12 years ago
Ilia Ryabokon dc492cb245 Merge git conflicts 12 years ago
Ilia Ryabokon f6693f4e85 Undo-redo stack for eraising operations and Sankore 834 12 years ago
Aleksei Kanash e0c2fdc3e2 Fixed some cases for resizing items. 12 years ago
Claudio Valerio 9d21875c07 fixed issue 1115 12 years ago
Claudio Valerio cd010590ed fixed issue 1115 12 years ago
Claudio Valerio 571109e386 fixed issue 1083 12 years ago
Claudio Valerio e4b0d8e3c7 Merge remote-tracking branch 'origin/develop' into claudio-dev 12 years ago
Claudio Valerio 2519df805b fixed issue 880 12 years ago
Claudio Valerio 62e5308fd4 Merge remote-tracking branch 'origin/claudio-dev' into develop 12 years ago
Claudio Valerio dabc747b4d Merge remote-tracking branch 'origin/develop' into claudio-dev 12 years ago
Anatoly Mihalchenko a0ee46503f Minor changes 12 years ago
Anatoly Mihalchenko 0d429342ef Merge branch 'anatoly_dev' into develop 12 years ago
Anatoly Mihalchenko db5c7ce732 Correct deletion of delegate instance (error with Vido on MAC OS) 12 years ago
Claudio Valerio a726171f1b add the possibility to set maximum number of character 12 years ago
Didier Bathily c556535e67 Math apps updates 12 years ago
maximXbs 6ead8e7d84 fixed Nuancier 12 years ago
Anatoly Mihalchenko 8f1f0d9cbb SANKORE-1026 12 years ago
bmagnin 7addaddc72 Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop 12 years ago
bmagnin ca7be931c2 Wording in Ordre lettres 12 years ago
shibakaneki 7668c955eb Merge branch 'develop' into shiba-dev 12 years ago
shibakaneki 22f36bed9d Removed dirty code 12 years ago
Claudio Valerio 9d0dcde212 Merge remote-tracking branch 'origin/develop' into claudio-dev 12 years ago
Yimgo 4ab1f31637 Fixed aristo tool mouse press. 12 years ago
Yimgo 87c04b92b5 Merge remote-tracking branch 'upstream/develop' into aristo_tool 12 years ago
Yimgo d82486b484 Merge remote-tracking branch 'upstream/master' into aristo_tool 12 years ago
Yimgo d64c87a920 Filled aristo tool brush. 12 years ago
shibakaneki 667be75e61 Fixed issue 862 12 years ago
bmagnin 782036c322 Replace inter activities in the right folder and git ignore update to ignore .ds_store 12 years ago
bmagnin 203614ae47 French wording new inter activities 12 years ago
bmagnin 47413272da Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop 12 years ago
bmagnin 938fb11ec8 Wording in french for inter activities 12 years ago
Aleksei Kanash 807f83a606 Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into aleksei_kanash_dev 12 years ago
Claudio Valerio 794b41ce32 Merge remote-tracking branch 'origin/develop' into claudio-dev 12 years ago
Claudio Valerio 931e099e5d added toque on page thumbnail depending if the teacherguide is filled out or not 12 years ago
Anatoly Mihalchenko 89ca4c4018 Merge branch 'anatoly_dev' into develop 12 years ago
Anatoly Mihalchenko ff6332a66f Virtual Keyboard under Mac OS 10.7: switching locales 12 years ago
Anatoly Mihalchenko 34c6aa28a9 Reversed changed... 12 years ago
Anatoly Mihalchenko b5d26ab5e5 SANKORE-523 12 years ago
Anatoly Mihalchenko 5f30e45d97 SANKORE-523 12 years ago
Ilia Ryabokon 8b0e41ea91 Sankore 1107 Crashes fixed Undo command left 12 years ago
Ilia Ryabokon 1596b37896 Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev 12 years ago