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 |
|
shibakaneki
|
7eacdb62fd
|
Fixed issue 1147
|
12 years ago |
|
Claudio Valerio
|
17c3184b4e
|
fixed issue 1225
|
12 years ago |
|
Aleksei Kanash
|
828ae2272f
|
Deletion from library is more stable.
Imported to library pictures has unique names.
|
12 years ago |
|
Claudio Valerio
|
0c555c9ccb
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
41d46485dd
|
fixed issue 1178
|
12 years ago |
|
Aleksei Kanash
|
6c5dcd6696
|
Corrected moving features to trash.
|
12 years ago |
|
Claudio Valerio
|
163c29aa05
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
fc278c192a
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
|
Aleksei Kanash
|
70b0ea9459
|
Fixed appearing of display view upper control view at mode changing from web to board.
|
12 years ago |
maximXbs
|
ba1a392cad
|
fixed 'Separe phrase' app
|
12 years ago |
Didier Clerc
|
31b1ba0a77
|
prefix pdf dpi issue
|
12 years ago |
|
Aleksei Kanash
|
c55f57477b
|
Merge branch 'aleksei_kanash_dev' into develop
|
12 years ago |
|
Aleksei Kanash
|
d6db82331d
|
Fixed strokes duplication.
|
12 years ago |
|
Aleksei Kanash
|
3de730a75d
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Aleksei Kanash
|
f027788b8e
|
<Auto Generated by Git>
|
12 years ago |
|
Aleksei Kanash
|
9888b99a01
|
Fixed items scaling.
|
12 years ago |
|
Claudio Valerio
|
2466f5f8a3
|
update version
|
12 years ago |
|
Claudio Valerio
|
8182c39bf8
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
|
bmagnin
|
2698fca25c
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
maximXbs
|
1e8c94befc
|
updated 'Contraste' app
|
12 years ago |
|
bmagnin
|
bfff57a3a4
|
Wording in French interactivities
|
12 years ago |
Claudio Valerio
|
a7e95315a1
|
fixed issue 912
|
12 years ago |
|
bmagnin
|
94d91bb489
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
bmagnin
|
543495507d
|
Wording in french
|
12 years ago |
Ilia Ryabokon
|
8045f15dc3
|
Merge branch 'develop' into Ilia_dev
|
12 years ago |
|
Ilia Ryabokon
|
e36a58a201
|
Sankore 1189 - loading message
|
12 years ago |
|
Claudio Valerio
|
a2b8d78209
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Claudio Valerio
|
c9fa341902
|
Merge remote-tracking branch 'origin/claudio-dev' into develop
|
12 years ago |
|
Claudio Valerio
|
4ac3845de3
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
48714f86a6
|
fixed issue 1208
|
12 years ago |
|
Aleksei Kanash
|
923f1a574d
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
Aleksei Kanash
|
cbe8469b70
|
Fixed fall on assertion if svg writer.
|
12 years ago |
|
bmagnin
|
e26bd33a0b
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
bmagnin
|
df59b2e9ac
|
Wording in interactivities
|
12 years ago |
|
bmagnin
|
9c5cbb58b2
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
Conflicts:
resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
|
12 years ago |
|
Aleksei Kanash
|
b9c26504ea
|
Fixed duplication of groups.
|
12 years ago |
|
Aleksei Kanash
|
0ed0540d3e
|
Fixed creation duplicated groups - used scene mechanism.
Excluded case of trying to determine mime type for empty string.
|
12 years ago |
|
bmagnin
|
d0a24fd30a
|
Wording in help for interactivities
|
12 years ago |
|
Claudio Valerio
|
ce0aebad51
|
fixed issue 658
|
12 years ago |
|
Aleksei Kanash
|
8ee8b59ba8
|
Fixed duplication of groups.
|
12 years ago |
|
Claudio Valerio
|
986e8e8f34
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
