7317ff9303
update translations
12 years ago
e181f05439
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
302579cdbe
fixed sizes
12 years ago
19432ccf39
Merge branch 'anatoly_dev' into develop
12 years ago
1130a8aa7e
SANKORE-1074
...
Document navigator: "Add pages from file" isn't work with old UBZ
12 years ago
58b994ed07
fixed issue with erase background when the is no background
12 years ago
2c7eda9c02
Merge remote-tracking branch 'origin/develop' into claudio-dev
12 years ago
5f9f9ea6b5
SANKORE-570
...
Triangle: Resizing of the tool is broken
12 years ago
9bf14340d3
Merge branch 'develop' into anatoly_dev
12 years ago
15bb522f8c
MAC woning fix
12 years ago
5a47080303
Fixed UBMediaItem creation.
12 years ago
b255afd269
Merge branch 'aleksei_kanash_dev' into develop
12 years ago
90d08215e5
Changing size of results (frame) in web search app
12 years ago
fe543da590
Merge remote-tracking branch 'origin/develop' into claudio-dev
12 years ago
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
e12e91180d
MAC compilation warning
12 years ago
24b310b782
Merge remote-tracking branch 'origin/develop' into claudio-dev
12 years ago
d1880119ea
Compilation error fix
12 years ago
52103dde55
Merge remote-tracking branch 'origin/develop' into claudio-dev
12 years ago
472905d047
fixed (workaround) issue on deleting working page
12 years ago
c916c06668
Merge branch 'anatoly_dev' into develop
12 years ago
d7429768a4
SANKORE-1102
...
The eraser erases more than it should delete
12 years ago
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
af82e62a0b
improved gui for teacherguide
12 years ago
0462d1751b
Merge remote-tracking branch 'origin/develop' into claudio-dev
12 years ago
e7eefbf5b6
reorganized the export list
12 years ago
c7107493d4
Fixed svg:a section. Now cff fully compatible with online validator http://validator.imsglobal.org/iwb/index.jsp?validate=package
12 years ago
588f4551a6
changed teacher action color on presentation mode
12 years ago
ba98d879b4
Merge branch 'anatoly_dev' into develop
12 years ago
c739f52dbd
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
ad81442499
New help for interactivities in French
12 years ago
869164ca28
SANKORE-1069
...
Show Desktop: "Erase all" button isn't work
12 years ago
52186edbcf
UBCffAdaptor adapted to current validator to have less errors ( http://validator.imsglobal.org/iwb/index.jsp?validate=package )
12 years ago
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
3a2dd1685a
Merge branch 'develop' into anatoly_dev
12 years ago
2e58fcae97
Typo in comment.
12 years ago
a2491be487
Desktop mode: palettes layout (Windows)
12 years ago
9c4ddbb57b
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
c3adfbfe38
French wording on interactivities
...
Ass images an calcul
12 years ago
0197ee4185
Merge branch 'aleksei_kanash_dev' into develop
12 years ago
026c6c0fc4
Fixed sankore crash on exit after clearing annotations.
12 years ago
c711c2303f
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
12 years ago
c60b3feb08
Sankore-946 issue
12 years ago
c89eb86479
Merge remote-tracking branch 'origin/claudio-dev' into develop
12 years ago
29fc2f45da
better fix
12 years ago
a249bcd314
Merge branch 'develop' into anatoly_dev
12 years ago
44d443f89f
Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev
12 years ago
2782a7d164
some fixies
12 years ago
947149eacd
bad workaround for issue 1125
12 years ago
93e8d9506b
Merge branch 'aleksei_kanash_dev' into develop
12 years ago
Claudio Valerio
Anatoly Mihalchenko
Aleksei Kanash
bmagnin
Yimgo
maximXbs
Claudio Valerio