shibakaneki
|
7668c955eb
|
Merge branch 'develop' into shiba-dev
Conflicts:
src/board/UBBoardController.cpp
src/domain/UBGraphicsStrokesGroup.cpp
|
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
Changing the languages of the virtual keyboard crashes the software
|
12 years ago |
|
Anatoly Mihalchenko
|
5f30e45d97
|
SANKORE-523
Changing the languages of the virtual keyboard crashes the software
|
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 |
|
Ilia Ryabokon
|
eb53715d6c
|
Eraising elements
|
12 years ago |
|
Claudio Valerio
|
5bb5444b61
|
fixed issue for resizing on title page
|
12 years ago |
|
Aleksei Kanash
|
a8fadf639e
|
Frame shows rotation angle at mouse press to rotation area.
|
12 years ago |
|
Anatoly Mihalchenko
|
a3be61c15b
|
Keyboard under MAX 10.7
|
12 years ago |
|
Ilia Ryabokon
|
e232bbc900
|
Some changes crash related
|
12 years ago |
|
Anatoly Mihalchenko
|
4ec54ee3a8
|
Delete group after deletion of last member
|
12 years ago |
|
Ilia Ryabokon
|
4406082dc8
|
Merge branch 'develop' into Ilia_dev
|
12 years ago |
|
Ilia Ryabokon
|
678633094d
|
Sankore-861 using recolorAllItemsFunction
|
12 years ago |
|
Anatoly Mihalchenko
|
4b6bb08b9b
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Aleksei Kanash
|
02528620b1
|
Merge branch 'aleksei_kanash_dev' into develop
|
12 years ago |
|
Anatoly Mihalchenko
|
3a21e07283
|
SANKORE-1063
The annotations are erased when you select the Erase items
|
12 years ago |
|
Aleksei Kanash
|
05f6cc364f
|
Additional fix to Sankore-979 - improved cleaning mechanism for items on board.
|
12 years ago |
|
Anatoly Mihalchenko
|
0d1e848f4f
|
Merge remote-tracking branch 'remotes/origin/anatoly_dev' into develop
|
12 years ago |
|
Ilia Ryabokon
|
687b65658c
|
Sankore-861 Only standard created annotations change their color
|
12 years ago |
|
Claudio Valerio
|
218071207c
|
resizable title page first draft achieved
|
12 years ago |
|
Anatoly Mihalchenko
|
5816a17f57
|
SANKORE-98
shutdown after emptying the trashbin
|
12 years ago |
|
Aleksei Kanash
|
b21e009108
|
Delegate buttons takes mouse press and mouse release events immediately. Fix to Sankore-772.
|
12 years ago |
|
Aleksei Kanash
|
2a443e618d
|
Fixed crash on removing fastAccessItems.
|
12 years ago |
|
Aleksei Kanash
|
b3c198706f
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Aleksei Kanash
|
98b639bc42
|
Merge branch 'aleksei_kanash_dev' into develop
|
12 years ago |
|
Claudio Valerio
|
9b133fa4bc
|
fixed issue 1084
|
12 years ago |
|
Claudio Valerio
|
2c31bd7999
|
Merge remote-tracking branch 'origin/claudio-dev' into develop
|
12 years ago |
|
Claudio Valerio
|
a07b09ec7a
|
Merge remote-tracking branch 'origin/claudio-dev' into develop
|
12 years ago |
|
Aleksei Kanash
|
0bf197a3f4
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Anatoly Mihalchenko
|
e441f2c2f8
|
SANKORE-1063
The annotations are erased when you select the Erase items
|
12 years ago |
|
Claudio Valerio
|
a83c916888
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
a495f5f1ec
|
fixed the algorithm
|
12 years ago |
|
Aleksei Kanash
|
aa54bed95b
|
Copied items with unknown type is selected.
|
12 years ago |
