Claudio Valerio
|
ff32e97781
|
Merge remote-tracking branch 'remotes/origin/Sankore-1.40'
Conflicts:
src/board/UBBoardView.cpp
src/domain/UBGraphicsItemDelegate.cpp
src/domain/UBGraphicsItemDelegate.h
src/domain/UBGraphicsPixmapItem.h
src/domain/UBGraphicsVideoItem.cpp
|
13 years ago |
Aleksei Kanash
|
0798539824
|
Fix to SANKORE-534. WebMenu toolbar and keyboard doesn't disappears on mac now.
|
13 years ago |
|
Aleksei Kanash
|
81a2a555c9
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
Anna Udovichenko
|
de0ea916ad
|
Implemented adding selected group of elements to favorite
|
13 years ago |
|
Anna Udovichenko
|
604ea2faea
|
Fixed some DnD bugs
|
13 years ago |
|
Anna Udovichenko
|
b5fd37a9dd
|
added importing images from board to library
|
13 years ago |
|
Aleksei Kanash
|
c904d74fdb
|
Fix to SANKORE-642. Exporting PDF with annotations works fine now.
|
13 years ago |
|
Anna Udovichenko
|
17dd85640b
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Anna Udovichenko
|
922efd33a7
|
implemented downloading pictures to library
|
13 years ago |
|
Anna Udovichenko
|
bfd74d2247
|
added setting element as background
|
13 years ago |
|
Anna Udovichenko
|
56c8bfc3d1
|
changed mPath type in UBFeature class to QUrl
|
13 years ago |
|
Anna Udovichenko
|
dcf9d3bed5
|
Library search fixed
|
13 years ago |
Anatoly Mihalchenko
|
107f2b64fb
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
Conflicts:
src/gui/UBFeaturesWidget.h
|
13 years ago |
|
Anatoly Mihalchenko
|
047be003af
|
Memory leaks detection
|
13 years ago |
bmagnin
|
15bd112139
|
New name for iCell and search : cellule and google images
|
13 years ago |
|
Anna Udovichenko
|
51e9096449
|
Fixed memory leak
|
13 years ago |
|
Anna Udovichenko
|
812c3cafce
|
fixed not worked features widget
|
13 years ago |
|
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 |
|
bmagnin
|
b2b5dc71a9
|
translating Geoinfo part 2
|
13 years ago |
|
Anna Udovichenko
|
f2c608338b
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
bmagnin
|
9371b15790
|
Wording french on Geoinfo pass 1
|
13 years ago |
|
bmagnin
|
ebd8dc9c9b
|
French translation of Applications
|
13 years ago |
|
bmagnin
|
5243e1cf6b
|
removed old version
|
13 years ago |
|
bmagnin
|
4cec6e2662
|
french translation of shapes part 2
|
13 years ago |
|
Claudio Valerio
|
86b479769a
|
first step: rename file using french
|
13 years ago |
|
bmagnin
|
99855db038
|
change name of the shapes
|
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 |
