Yimgo
578b46443d
Merge remote-tracking branch 'upstream/develop' into aristo_tool
...
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
12 years ago
Yimgo
2e58fcae97
Typo in comment.
12 years ago
bmagnin
9c4ddbb57b
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
bmagnin
c3adfbfe38
French wording on interactivities
...
Ass images an calcul
12 years ago
Aleksei Kanash
0197ee4185
Merge branch 'aleksei_kanash_dev' into develop
12 years ago
Aleksei Kanash
026c6c0fc4
Fixed sankore crash on exit after clearing annotations.
12 years ago
Claudio Valerio
c711c2303f
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
maximXbs
c60b3feb08
Sankore-946 issue
12 years ago
Claudio Valerio
c89eb86479
Merge remote-tracking branch 'origin/claudio-dev' into develop
12 years ago
Claudio Valerio
29fc2f45da
better fix
12 years ago
Claudio Valerio
947149eacd
bad workaround for issue 1125
12 years ago
Aleksei Kanash
93e8d9506b
Merge branch 'aleksei_kanash_dev' into develop
12 years ago
Aleksei Kanash
373f2af074
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
Claudio Valerio
ed6f6c48e2
fixed issue with inverted fields
12 years ago
Aleksei Kanash
1f83f35176
Fixed writing a lines with Marker.
12 years ago
Claudio Valerio
757dc96ae3
Merge remote-tracking branch 'origin/develop' into claudio-dev
12 years ago
Aleksei Kanash
76b2d83bc2
Fixed adding lines to stroke groups.
12 years ago
Claudio Valerio
7ed98043e5
added qt-mobility library on installer
12 years ago
Aleksei Kanash
816bfaa428
Fixed changing mode from desktop to board.
12 years ago
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
...
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>
12 years ago
maximXbs
6ead8e7d84
fixed Nuancier
12 years ago
Anatoly Mihalchenko
8f1f0d9cbb
SANKORE-1026
...
Navigation palette: thumbnails isn't refeshed after application added to the page
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
...
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