Ivan Ilin
|
2b678dd99f
|
UBTeacherGuideWidget conflict resolved manually
|
13 years ago |
|
Ivan Ilin
|
09f1c235e5
|
Disabling grouping items
|
13 years ago |
Aleksei Kanash
|
d6de843945
|
Correction to dragging items.
|
13 years ago |
|
Aleksei Kanash
|
ad61fdd6ec
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
Anna Udovichenko
|
0cf7b075b3
|
implemented deleting from favorite folder
|
13 years ago |
Claudio Valerio
|
28e88c6bf5
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Claudio Valerio
|
c62c84fbfb
|
fixed crash due to the document metadata
|
13 years ago |
shibakaneki
|
a77036d6fb
|
Backup of the lines as object
|
13 years ago |
|
Aleksei Kanash
|
2a1ff6ad51
|
Fix to SANKORE-629.
D'n'D in widgets works fine now.
|
13 years ago |
|
shibakaneki
|
6f9472ad91
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Claudio Valerio
|
bc941dd41a
|
fixed teacher guide licence index out of boundaries
|
13 years ago |
|
Aleksei Kanash
|
831765ccfe
|
Fix to SANKORE-626.
Display widget displaying correctly now.
|
13 years ago |
|
shibakaneki
|
22bd3e08df
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
0d517aadfe
|
Backup
|
13 years ago |
|
Ivan Ilin
|
b5cfcfd9ee
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Aleksei Kanash
|
2a1a6ebf46
|
Improved html parser.
Transformations adjusted to iwb specification.
|
13 years ago |
|
Anna Udovichenko
|
fe0c8ab2e4
|
Favorite functionality partially implemented
|
13 years ago |
|
Ivan Ilin
|
973e1df2c7
|
CFF import fixes
|
13 years ago |
|
Claudio Valerio
|
82c155ca28
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Claudio Valerio
|
20698028c7
|
removed commented code
|
13 years ago |
|
Claudio Valerio
|
0e7ba26796
|
fixed relativePath
|
13 years ago |
|
Ivan Ilin
|
833bead797
|
Dnd pictures is available again
|
13 years ago |
|
shibakaneki
|
f37ba1b39f
|
Corrected an issue with the compass as objects
|
13 years ago |
|
Ivan Ilin
|
855142f16f
|
merge conflicts resolved
|
13 years ago |
|
Ivan Ilin
|
9bd20fdba6
|
Grouping items available
|
13 years ago |
|
shibakaneki
|
ef45f3fce3
|
Adapted the compass to the strokes as objects
|
13 years ago |
|
Claudio Valerio
|
97dc3d90bf
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Claudio Valerio
|
0981b138b6
|
first zero page teacher guide implementation
|
13 years ago |
|
shibakaneki
|
bc875a6672
|
Adapted the ruler to the strokes as objects
|
13 years ago |
|
Anna Udovichenko
|
512fd41554
|
Implemented deleting items
|
13 years ago |
|
shibakaneki
|
6ab23ce43a
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
75a7c9ea24
|
Backup of the lines as objects
|
13 years ago |
|
Anna Udovichenko
|
addc1fe130
|
Implemented new folder creating
|
13 years ago |
|
Ivan Ilin
|
0eed7eef6b
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Ivan Ilin
|
d44cc5b68f
|
multiple selection
|
13 years ago |
|
Anna Udovichenko
|
b7ceb4d3d5
|
Fixed some DnD bugs, added action bar class
|
13 years ago |
unknown
|
75a1a85350
|
updated build script to handle customizations
|
13 years ago |
|
unknown
|
25fe3bf1e9
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
Claudio Valerio
|
9e723fee83
|
update mac script to handle customizations
|
13 years ago |
|
unknown
|
60e174eed2
|
updated to hide windows ide related files
|
13 years ago |
|
Claudio Valerio
|
798e2393bd
|
updated build script. Included custom fonts
|
13 years ago |
|
Ivan Ilin
|
4b182e733f
|
linux gcc fixes
|
13 years ago |
|
Anna Udovichenko
|
14e326effe
|
Some bugs fixed and more DnD functionality implemented
|
13 years ago |
|
Ivan Ilin
|
0a1799a514
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Ivan Ilin
|
26ae8fb2d6
|
System dependant rubberband created
|
13 years ago |
|
Claudio Valerio
|
c87ec61e4a
|
added custom fonts
|
13 years ago |
|
Ivan Ilin
|
cc9ddea6ae
|
Floating background and doubleclick selection fixed
|
13 years ago |
|
Claudio Valerio
|
f0d153fedf
|
Merge remote-tracking branch 'origin/Sankore-1.40'
Conflicts:
Sankore_3.1.pro
resources/i18n/sankore_ar.ts
resources/i18n/sankore_da.ts
resources/i18n/sankore_de.ts
resources/i18n/sankore_en.ts
resources/i18n/sankore_en_UK.ts
resources/i18n/sankore_es.ts
resources/i18n/sankore_fr.ts
resources/i18n/sankore_fr_CH.ts
resources/i18n/sankore_it.ts
resources/i18n/sankore_iw.ts
resources/i18n/sankore_ja.ts
resources/i18n/sankore_ko.ts
resources/i18n/sankore_nb.ts
resources/i18n/sankore_nl.ts
resources/i18n/sankore_pl.ts
resources/i18n/sankore_pt.ts
resources/i18n/sankore_rm.ts
resources/i18n/sankore_ro.ts
resources/i18n/sankore_ru.ts
resources/i18n/sankore_sv.ts
resources/i18n/sankore_zh.ts
src/core/UBDisplayManager.cpp
|
13 years ago |
|
Claudio Valerio
|
22e08de31b
|
mispelled path
|
13 years ago |
|
Claudio Valerio
|
d4750f01b3
|
updated
|
13 years ago |
