Anatoly Mihalchenko
9bf14340d3
Merge branch 'develop' into anatoly_dev
12 years ago
Anatoly Mihalchenko
15bb522f8c
MAC woning fix
12 years ago
Aleksei Kanash
b255afd269
Merge branch 'aleksei_kanash_dev' into develop
12 years ago
bmagnin
90d08215e5
Changing size of results (frame) in web search app
12 years ago
Aleksei Kanash
a1e9772cb5
Making widget as toll procedure was changed.
...
1st we remove original widget, then we disable undo stack, create a copy of widget and make it a tool. Then undo stack enables back. That widget has tool as parent, so we not need to manage him by scene.
12 years ago
Anatoly Mihalchenko
e12e91180d
MAC compilation warning
12 years ago
Anatoly Mihalchenko
d1880119ea
Compilation error fix
12 years ago
Anatoly Mihalchenko
c916c06668
Merge branch 'anatoly_dev' into develop
12 years ago
Anatoly Mihalchenko
d7429768a4
SANKORE-1102
...
The eraser erases more than it should delete
12 years ago
Aleksei Kanash
5bc2d5d1e8
Fixed imported fro, iwb text size.
...
Corrected imported text position.
Strokes for lines and polygons has the same color as fill color.
12 years ago
Aleksei Kanash
c7107493d4
Fixed svg:a section. Now cff fully compatible with online validator http://validator.imsglobal.org/iwb/index.jsp?validate=package
12 years ago
Anatoly Mihalchenko
ba98d879b4
Merge branch 'anatoly_dev' into develop
12 years ago
bmagnin
c739f52dbd
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
bmagnin
ad81442499
New help for interactivities in French
12 years ago
Anatoly Mihalchenko
869164ca28
SANKORE-1069
...
Show Desktop: "Erase all" button isn't work
12 years ago
Aleksei Kanash
52186edbcf
UBCffAdaptor adapted to current validator to have less errors ( http://validator.imsglobal.org/iwb/index.jsp?validate=package )
12 years ago
Anatoly Mihalchenko
3a2dd1685a
Merge branch 'develop' into anatoly_dev
12 years ago
Anatoly Mihalchenko
a2491be487
Desktop mode: palettes layout (Windows)
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
Anatoly Mihalchenko
a249bcd314
Merge branch 'develop' into anatoly_dev
12 years ago
Anatoly Mihalchenko
44d443f89f
Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev
12 years ago
Anatoly Mihalchenko
2782a7d164
some fixies
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
Anatoly Mihalchenko
46d85623d0
desktop mode: fix
12 years ago
Anatoly Mihalchenko
50d136f8d1
SANKORE-1077
...
Desktop mode is broken
SANKORE-633
Positioning of floating palettes inside layers .
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