Commit Graph

  • 46b81abe15 typedef for QMultiMap specified Ilia Ryabokon 2012-09-10 11:41:34 +0300
  • 47dd119c76 Modified placeholder management in teacherguide shibakaneki 2012-09-10 09:37:26 +0200
  • dc492cb245 Merge git conflicts Ilia Ryabokon 2012-09-07 20:03:25 +0300
  • f6693f4e85 Undo-redo stack for eraising operations and Sankore 834 Ilia Ryabokon 2012-09-07 19:36:50 +0300
  • e0c2fdc3e2 Fixed some cases for resizing items. Aleksei Kanash 2012-09-07 15:42:42 +0300
  • 9d21875c07 fixed issue 1115 Claudio Valerio 2012-09-07 14:41:34 +0200
  • cd010590ed fixed issue 1115 Claudio Valerio 2012-09-07 14:40:19 +0200
  • 571109e386 fixed issue 1083 Claudio Valerio 2012-09-07 13:19:48 +0200
  • e4b0d8e3c7 Merge remote-tracking branch 'origin/develop' into claudio-dev Claudio Valerio 2012-09-07 11:26:41 +0200
  • 2519df805b fixed issue 880 Claudio Valerio 2012-09-07 11:26:12 +0200
  • 62e5308fd4 Merge remote-tracking branch 'origin/claudio-dev' into develop Claudio Valerio 2012-09-07 09:18:17 +0200
  • dabc747b4d Merge remote-tracking branch 'origin/develop' into claudio-dev Claudio Valerio 2012-09-07 09:10:44 +0200
  • a0ee46503f Minor changes Anatoly Mihalchenko 2012-09-06 19:37:44 +0300
  • 0d429342ef Merge branch 'anatoly_dev' into develop Anatoly Mihalchenko 2012-09-06 17:12:56 +0300
  • db5c7ce732 Correct deletion of delegate instance (error with Vido on MAC OS) Anatoly Mihalchenko 2012-09-06 16:21:18 +0300
  • a726171f1b add the possibility to set maximum number of character Claudio Valerio 2012-09-06 15:03:23 +0200
  • c556535e67 Math apps updates Didier Bathily 2012-09-01 14:34:03 +0200
  • 6ead8e7d84 fixed Nuancier maximXbs 2012-09-06 14:35:52 +0200
  • 8f1f0d9cbb SANKORE-1026 Anatoly Mihalchenko 2012-09-06 13:07:49 +0300
  • 7addaddc72 Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop bmagnin 2012-09-06 11:41:00 +0200
  • ca7be931c2 Wording in Ordre lettres bmagnin 2012-09-06 11:40:42 +0200
  • 7668c955eb Merge branch 'develop' into shiba-dev shibakaneki 2012-09-06 11:26:47 +0200
  • 22f36bed9d Removed dirty code shibakaneki 2012-09-06 11:08:17 +0200
  • 9d0dcde212 Merge remote-tracking branch 'origin/develop' into claudio-dev Claudio Valerio 2012-09-06 10:34:50 +0200
  • 4ab1f31637 Fixed aristo tool mouse press. Yimgo 2012-09-06 09:33:55 +0200
  • 87c04b92b5 Merge remote-tracking branch 'upstream/develop' into aristo_tool Yimgo 2012-09-06 09:33:31 +0200
  • d82486b484 Merge remote-tracking branch 'upstream/master' into aristo_tool Yimgo 2012-09-06 09:33:08 +0200
  • d64c87a920 Filled aristo tool brush. Yimgo 2012-09-06 09:32:23 +0200
  • 667be75e61 Fixed issue 862 shibakaneki 2012-09-06 09:24:30 +0200
  • 782036c322 Replace inter activities in the right folder and git ignore update to ignore .ds_store bmagnin 2012-09-06 08:50:17 +0200
  • 203614ae47 French wording new inter activities bmagnin 2012-09-06 08:42:31 +0200
  • 47413272da Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop bmagnin 2012-09-05 14:53:04 +0200
  • 938fb11ec8 Wording in french for inter activities bmagnin 2012-09-05 14:52:50 +0200
  • 807f83a606 Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into aleksei_kanash_dev Aleksei Kanash 2012-09-05 12:20:52 +0300
  • 794b41ce32 Merge remote-tracking branch 'origin/develop' into claudio-dev Claudio Valerio 2012-09-05 11:14:20 +0200
  • 931e099e5d added toque on page thumbnail depending if the teacherguide is filled out or not Claudio Valerio 2012-09-05 11:13:54 +0200
  • 89ca4c4018 Merge branch 'anatoly_dev' into develop Anatoly Mihalchenko 2012-09-05 11:23:19 +0300
  • ff6332a66f Virtual Keyboard under Mac OS 10.7: switching locales Anatoly Mihalchenko 2012-09-05 12:34:04 +0300
  • 34c6aa28a9 Reversed changed... Anatoly Mihalchenko 2012-09-04 19:58:18 +0300
  • b5d26ab5e5 SANKORE-523 Anatoly Mihalchenko 2012-09-04 18:04:18 +0300
  • 5f30e45d97 SANKORE-523 Anatoly Mihalchenko 2012-09-04 17:53:33 +0300
  • 8b0e41ea91 Sankore 1107 Crashes fixed Undo command left Ilia Ryabokon 2012-09-04 17:10:45 +0300
  • 1596b37896 Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev Ilia Ryabokon 2012-09-04 15:29:29 +0300
  • eb53715d6c Eraising elements Ilia Ryabokon 2012-09-04 15:28:41 +0300
  • 5bb5444b61 fixed issue for resizing on title page Claudio Valerio 2012-09-04 13:23:52 +0200
  • a8fadf639e Frame shows rotation angle at mouse press to rotation area. Aleksei Kanash 2012-09-04 13:29:08 +0300
  • a3be61c15b Keyboard under MAX 10.7 Anatoly Mihalchenko 2012-09-04 13:00:35 +0300
  • e232bbc900 Some changes crash related Ilia Ryabokon 2012-09-03 21:49:05 +0300
  • 4ec54ee3a8 Delete group after deletion of last member Anatoly Mihalchenko 2012-09-03 20:31:51 +0300
  • 4406082dc8 Merge branch 'develop' into Ilia_dev Ilia Ryabokon 2012-09-03 19:58:41 +0300
  • 678633094d Sankore-861 using recolorAllItemsFunction Ilia Ryabokon 2012-09-03 19:48:05 +0300
  • 4b6bb08b9b Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop Anatoly Mihalchenko 2012-09-03 19:29:13 +0300
  • 02528620b1 Merge branch 'aleksei_kanash_dev' into develop Aleksei Kanash 2012-09-03 19:31:25 +0300
  • 3a21e07283 SANKORE-1063 Anatoly Mihalchenko 2012-09-03 19:27:15 +0300
  • 05f6cc364f Additional fix to Sankore-979 - improved cleaning mechanism for items on board. Aleksei Kanash 2012-09-03 19:25:42 +0300
  • 0d1e848f4f Merge remote-tracking branch 'remotes/origin/anatoly_dev' into develop Anatoly Mihalchenko 2012-09-03 17:56:52 +0300
  • 687b65658c Sankore-861 Only standard created annotations change their color Ilia Ryabokon 2012-09-03 17:01:27 +0300
  • 218071207c resizable title page first draft achieved Claudio Valerio 2012-09-03 15:59:49 +0200
  • 5816a17f57 SANKORE-98 shutdown after emptying the trashbin Anatoly Mihalchenko 2012-09-03 16:55:23 +0300
  • b21e009108 Delegate buttons takes mouse press and mouse release events immediately. Fix to Sankore-772. Aleksei Kanash 2012-09-03 16:39:26 +0300
  • 2a443e618d Fixed crash on removing fastAccessItems. Aleksei Kanash 2012-09-03 16:33:05 +0300
  • b3c198706f Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop Aleksei Kanash 2012-09-03 15:59:19 +0300
  • 98b639bc42 Merge branch 'aleksei_kanash_dev' into develop Aleksei Kanash 2012-09-03 15:59:02 +0300
  • 9b133fa4bc fixed issue 1084 Claudio Valerio 2012-09-03 14:55:58 +0200
  • 2c31bd7999 Merge remote-tracking branch 'origin/claudio-dev' into develop Claudio Valerio 2012-09-03 14:38:56 +0200
  • a07b09ec7a Merge remote-tracking branch 'origin/claudio-dev' into develop Claudio Valerio 2012-09-03 14:25:09 +0200
  • 0bf197a3f4 Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop Aleksei Kanash 2012-09-03 15:13:45 +0300
  • e441f2c2f8 SANKORE-1063 The annotations are erased when you select the Erase items Anatoly Mihalchenko 2012-09-03 15:10:39 +0300
  • a83c916888 Merge remote-tracking branch 'origin/develop' into claudio-dev Claudio Valerio 2012-09-03 14:09:51 +0200
  • a495f5f1ec fixed the algorithm Claudio Valerio 2012-09-03 14:01:56 +0200
  • aa54bed95b Copied items with unknown type is selected. Aleksei Kanash 2012-09-03 14:59:03 +0300
  • 0b484e2a16 Item deselected before duplication. Aleksei Kanash 2012-09-03 14:45:41 +0300
  • 8a6b3e3fa6 issue on language Claudio Valerio 2012-09-03 13:30:21 +0200
  • 5cec06a62a Duplication of Strokes was implemented. Aleksei Kanash 2012-09-03 13:00:40 +0300
  • 5a8b650caf Merge branch 'develop' into anatoly_dev Anatoly Mihalchenko 2012-09-03 12:27:01 +0300
  • 1ce5763adc SANKORE-1063 Anatoly Mihalchenko 2012-09-03 12:25:54 +0300
  • 98fe675b65 Math apps updates Didier Bathily 2012-09-01 14:34:03 +0200
  • 81c42f539d fixed Sankore-588 bug maximXbs 2012-08-31 16:40:40 +0200
  • c0d9f87812 fixed Sankore-1089 bug maximXbs 2012-08-31 15:54:48 +0200
  • 278668b500 Another fix for SANKORE-972. Aleksei Kanash 2012-08-31 14:51:58 +0300
  • 477dc3d15e Fixed SANKORE-850 Problem Importing Exporting to iwb. Also fixed too many memory leaks and fixed behavior for strokes and groups. Aleksei Kanash 2012-08-31 13:02:13 +0300
  • 29ef687d41 Useless code removed. Aleksei Kanash 2012-08-31 13:00:30 +0300
  • 8b19847c11 Fixed deletion removed groups. Code was cleaned. Corrections in removing strokes. Aleksei Kanash 2012-08-31 12:18:50 +0300
  • 4b7939b6c3 Grouped items doesn't manages by mFastAccessItems now. Aleksei Kanash 2012-08-31 11:47:14 +0300
  • e69ffc40e9 Merge branch 'develop' into shiba-dev shibakaneki 2012-08-31 10:16:42 +0200
  • 3d3dee28d2 Fixed issue 984 shibakaneki 2012-08-31 10:15:34 +0200
  • 0b108d466a Fixed adding items from <g> section to group. Aleksei Kanash 2012-08-31 10:11:43 +0300
  • 990458d187 Removed memory leaks at deletion of UBGraphicsGroupContainerItem. Corrected adding items to group. Corrected group creation. Corrected adding items to scene - items shouldn't be added to itemsToRemove list because that list needs for cleaning undo stack. Improved mechanism of removing "itemsToRemove". Removed wrong deletion of mButtons list from UBGraphicsItemDelegate destructor because that buttons has Frame as parent. Removed possible memory leak in UBBoardController::clearUndoStack. Some items was able not deleted. tmpScene in cffReader not deletes now because ithas a proxy as parent. Aleksei Kanash 2012-08-30 18:30:49 +0300
  • 4a7cd59250 fixed Sankore-704 bug maximXbs 2012-08-30 16:40:19 +0200
  • ef77c53e70 Merge branch 'develop' into shiba-dev shibakaneki 2012-08-30 14:01:07 +0200
  • d12a2a80e1 Fixed issue 633 again shibakaneki 2012-08-30 13:59:20 +0200
  • 19d31ccc55 Rubber band in play mode disabled Ilia Ryabokon 2012-08-30 12:35:22 +0300
  • a55b01c962 Merge branch 'develop' into Ilia_dev Ilia Ryabokon 2012-08-30 11:44:27 +0300
  • 59abea3576 removed logs Claudio Valerio 2012-08-30 08:54:36 +0200
  • b6ae996903 Merge branch 'develop' into claudio-dev Claudio Valerio 2012-08-30 08:47:12 +0200
  • 15080783f7 Progressbar translations. Checked on Linux Ilia Ryabokon 2012-08-29 17:28:16 +0300
  • 986c6eb051 Merge branch 'develop' of https://github.com/Sankore/Sankore-3.1 into develop shibakaneki 2012-08-29 16:09:03 +0200
  • a725bc8053 Fixed issue 1033 shibakaneki 2012-08-29 15:20:06 +0200
  • 96d2756370 updated Claudio Valerio 2012-08-29 14:41:09 +0200
  • 639383f76f Fixed merge conflict Ilia Ryabokon 2012-08-29 15:39:32 +0300