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 |
|
maximXbs
|
664f1fbc43
|
updated 'Etudier' app
|
12 years ago |
|
Aleksei Kanash
|
ae900677bd
|
Reimported cff reads fine.
Groups reads fine for strokes.
|
12 years ago |
|
Claudio Valerio
|
7688ab7e88
|
Merge branch 'develop' into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
5a434ba667
|
fixed issue related to translation loading
|
12 years ago |
|
Claudio Valerio
|
c72b6dc69b
|
fixed background on preview widget for task items
|
12 years ago |
|
Aleksei Kanash
|
2666115b19
|
Finished import cff and export to cff.
Import ubz works bad with groups.
|
12 years ago |
shibakaneki
|
2773998713
|
Merge branch 'develop' into shiba-dev
|
12 years ago |
|
Claudio Valerio
|
b67edcf505
|
fixed issue of focus on title page
|
12 years ago |
|
shibakaneki
|
3d28de7539
|
Fixed issue 1112
|
12 years ago |
|
Claudio Valerio
|
0c0f9e15a6
|
added a check to verify is the focus is already there when the widget it appears
|
12 years ago |
|
maximXbs
|
7892e0e53d
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
maximXbs
|
4dad29344d
|
updated 'choisir' app
|
12 years ago |
|
Ilia Ryabokon
|
82259683c4
|
New parent attrib in ubz
|
12 years ago |
|
maximXbs
|
520a7ecfce
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
maximXbs
|
6586fb08d0
|
updated 'Cat text' app
|
12 years ago |
|
Claudio Valerio
|
8d2cc5fec5
|
Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop
|
12 years ago |
|
maximXbs
|
f34611982b
|
updated 'Cat images' app
|
12 years ago |
|
Claudio Valerio
|
6a1e6b6268
|
Merge remote-tracking branch 'origin/develop' into claudio-dev
|
12 years ago |
|
Claudio Valerio
|
7bfb635a4d
|
removed widgets that crash the application
|
12 years ago |
|
Claudio Valerio
|
14c6e396cb
|
fixed translations issue
|
12 years ago |
|
maximXbs
|
3bec5c8452
|
updated 'Ass images' app
|
12 years ago |
