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 |
Claudio Valerio
|
e2e3dc0f24
|
fixed issue 1203
|
12 years ago |
Aleksei Kanash
|
49ee9868f1
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
maximXbs
|
313ed171e3
|
updated 'Syllabes' app
|
12 years ago |
maximXbs
|
9c37f727dc
|
updated 'Separe texte' app
|
12 years ago |
maximXbs
|
15af0a8b58
|
updated 'Separe phrase' app
|
12 years ago |
maximXbs
|
1face4b0a3
|
updated 'selectionner' app
|
12 years ago |
Aleksei Kanash
|
ef262fdc82
|
Preview picture gathering adapted to new onDownloadFinished events.
|
12 years ago |
maximXbs
|
d7be7c26ce
|
updated 'Ordre phrases' app
|
12 years ago |
Ilia Ryabokon
|
6d66258441
|
Merge branch 'develop' into Ilia_dev
|
12 years ago |
Ilia Ryabokon
|
63c3567ec8
|
Sankore 1196 - Taking snapshot of item on download finished
|
12 years ago |
Aleksei Kanash
|
112d1dc9d7
|
Add to library action works fine.
Added items has icons.
|
12 years ago |
Claudio Valerio
|
9f387849a8
|
removed debug infos
|
12 years ago |
Aleksei Kanash
|
9ae7c579ef
|
Merged Import from CFF and export to CFF fixes.
|
12 years ago |
Didier Bathily
|
5872c0930a
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
Didier Bathily
|
987fc8042e
|
Fixes & Updates for njin widgets
CSS Animation removed for thoses widgets:
- http://bugs.open-sankore.org/jira/browse/SANKORE-1139
- http://bugs.open-sankore.org/jira/browse/SANKORE-1136
- http://bugs.open-sankore.org/jira/browse/SANKORE-1172
Add default data to "Balance": http://bugs.open-sankore.org/jira/browse/SANKORE-1175
Remove anchor in pagination list from "Calcul" :http://bugs.open-sankore.org/jira/browse/SANKORE-1176
Signed-off-by: Didier Bathily <didier.bathily@njin.fr>
|
12 years ago |
Guillaume Burel
|
5e07ba4ac0
|
Modified Ariso's default orientation.
Now oriented to Top.
|
12 years ago |
Guillaume Burel
|
15ba2c4ab1
|
Fixed SANKORE-1177.
|
12 years ago |
maximXbs
|
f2f7e94777
|
updated 'Ordre mots' app
|
12 years ago |
maximXbs
|
ec97931e2e
|
updated 'Ordre lettres' app
|
12 years ago |
Aleksei Kanash
|
b49a01d981
|
Fixed export images to CFF.
Added UUIDs for each imported item.
Supported groups.
|
12 years ago |
Claudio Valerio
|
0f2640efde
|
Merge remote-tracking branch 'origin/claudio-dev' into develop
|
12 years ago |
maximXbs
|
862bb62cff
|
updated 'Ordre images' app
|
12 years ago |