shibakaneki
|
47844ccf93
|
Merge branch 'release-candidate' of https://github.com/Sankore/Sankore-3.1 into release-candidate
Conflicts:
src/tools/UBGraphicsRuler.cpp
|
12 years ago |
|
shibakaneki
|
e37b3ac7a3
|
Merge branch 'release-candidate' into shiba-dev
|
12 years ago |
|
shibakaneki
|
bfb6bcec7f
|
Adapted the cross size to rulers
|
12 years ago |
|
shibakaneki
|
3b0cae959a
|
Reworked the tools architecture
|
12 years ago |
Claudio Valerio
|
9e44b36d19
|
commented aristo
|
12 years ago |
|
Claudio Valerio
|
b98e2afc0c
|
removed unused brush
|
12 years ago |
|
Claudio Valerio
|
012517ac24
|
Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate
|
12 years ago |
|
Claudio Valerio
|
b84294dfc0
|
fixed issue with ruler and compass. They show now the correct radius information
|
12 years ago |
Aleksei Kanash
|
646da9d255
|
Fixed crash at adding new page after conversion item as tool.
|
12 years ago |
|
Claudio Valerio
|
c57d086ed7
|
fixed issue 1188
|
12 years ago |
|
Claudio Valerio
|
cb2608fd0d
|
zero warning build on linux
|
12 years ago |
|
Claudio Valerio
|
9aa114857a
|
some fixes on mac for issue 1164
|
12 years ago |
|
Claudio Valerio
|
241e770f7e
|
Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate
|
12 years ago |
|
Claudio Valerio
|
233415d24a
|
fixed issue 1164
|
12 years ago |
|
Aleksei Kanash
|
9b4fb53bbe
|
Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate
|
12 years ago |
|
Aleksei Kanash
|
5e16802b16
|
Enabled AsyncDownloading media for content.
Fixed working on mac.
|
12 years ago |
|
Claudio Valerio
|
0aec9cc4ae
|
fixed issue 765
|
12 years ago |
Ilia Ryabokon
|
65dfcec73d
|
Names of downloaded content
|
12 years ago |
|
Claudio Valerio
|
00f87f8530
|
updated version
|
12 years ago |
maximXbs
|
68e73e6a89
|
improved interactivities font
|
12 years ago |
|
maximXbs
|
40210796b2
|
fixed Sankre-867 issue (some troubles with sound)
|
12 years ago |
|
Claudio Valerio
|
ae8dcde816
|
removed fix from Aleksei for big copying file because doesn't work with audio/video/flash element on mac
|
12 years ago |
|
Claudio Valerio
|
e8f05c99bb
|
fixed url issue
|
12 years ago |
|
Claudio Valerio
|
3146be4c29
|
fixed issue with xwiki widgets
|
12 years ago |
|
maximXbs
|
d4cb4b2b01
|
fixed Sankore-1167 issue
|
12 years ago |
|
Claudio Valerio
|
8154be2730
|
updated releases notes
|
12 years ago |
|
Claudio Valerio
|
9efb26953f
|
bad fix for b9. to be reworked
|
12 years ago |
|
Claudio Valerio
|
6b262cd8d4
|
updated language
|
12 years ago |
|
Ilia Ryabokon
|
6cff371484
|
Merge branch 'develop' into Ilia_dev
|
12 years ago |
bmagnin
|
252ff6d8de
|
wording for interactivities
|
12 years ago |
|
Ilia Ryabokon
|
0a2def83bf
|
Features widget preview downloader fix
|
12 years ago |
|
Claudio Valerio
|
1deb0b1a33
|
fixed widget wording
|
12 years ago |
|
Claudio Valerio
|
7a00228536
|
fixed the widgets sizes
|
12 years ago |
|
Claudio Valerio
|
bb761e04ea
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
3adc47399c
|
moved njin widgets that doesn't work
|
12 years ago |
|
Claudio Valerio
|
5bdfc49640
|
moved njin widgets that doesn't work
|
12 years ago |
|
Claudio Valerio
|
84291e1f96
|
removed old ones
|
12 years ago |
|
Claudio Valerio
|
c254bf9ef9
|
Merge branch 'claudio-dev' into develop
|
12 years ago |
|
Claudio Valerio
|
25272ebe71
|
fixed issue 1216
|
12 years ago |
|
Aleksei Kanash
|
581e344b7f
|
Fixed errors compilation debug version of Sankore on windows.
|
12 years ago |
|
Claudio Valerio
|
0a84f1e6a4
|
fixed issue 1233
|
12 years ago |
|
Claudio Valerio
|
dc272ce305
|
fixed issue 1131 and 1161
|
12 years ago |
|
Claudio Valerio
|
3607318f83
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
76a43c9fd9
|
Merge branch 'claudio-dev' of github.com:Sankore/Sankore-3.1 into claudio-dev
|
12 years ago |
|
Aleksei Kanash
|
9a6bc50a73
|
Merge last changes from aleksei_kanash_dev
|
12 years ago |
|
Aleksei Kanash
|
0875008392
|
Windows installation script fixed - QtMultimedia installs in correct directory.
|
12 years ago |
|
bmagnin
|
a8b75f0418
|
Wording in interactivities
|
12 years ago |
Didier Bathily
|
0613df1a3f
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Didier Bathily
|
064e0b8dbc
|
Missing files
Signed-off-by: Didier Bathily <didier.bathily@njin.fr>
|
12 years ago |
|
shibakaneki
|
22ec82a89a
|
Merge branch 'develop' into shiba-dev
|
12 years ago |
