Anna Udovichenko
|
82bc659026
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
Conflicts:
src/board/UBFeaturesController.cpp
src/gui/UBFeaturesWidget.cpp
|
13 years ago |
|
Anna Udovichenko
|
ffc9b5c346
|
Web search partially implemented
|
13 years ago |
Anatoly Mihalchenko
|
214e0711ba
|
Some memory-leaks problems detected and fixed
|
13 years ago |
|
Anatoly Mihalchenko
|
83212cc494
|
SANKORE-613
Frame buttons
Part 1: changes in toolbars
|
13 years ago |
|
Anna Udovichenko
|
62a82e1daa
|
fixed deleting default widget
|
13 years ago |
|
Anna Udovichenko
|
e130379b3e
|
some DnD bugs fixed
|
13 years ago |
|
Anna Udovichenko
|
f2c608338b
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Anna Udovichenko
|
c2b9c6a412
|
Added elements selection
|
13 years ago |
shibakaneki
|
a909eafd0a
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
5ffb64de43
|
Backup of the strokes as objects
|
13 years ago |
Ivan Ilyin
|
8be4c32bd8
|
FeatureWidget is in master now
|
13 years ago |
|
Ivan Ilyin
|
eaff36a953
|
Merge branch 'FeatureWidget'
|
13 years ago |
|
Ivan Ilyin
|
c6e8b92d36
|
Some warnings disabled
|
13 years ago |
|
Anna Udovichenko
|
0bed9fad8e
|
added slider size and position updating
|
13 years ago |
|
Anna Udovichenko
|
254d1acc9d
|
slider for thumbnail size added
|
13 years ago |
|
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 |
|
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 |
|
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 |
