Claudio Valerio
|
fd3e8ddbd1
|
Merge remote-tracking branch 'origin/Bett-2012'
Conflicts:
Sankore_3.1.pro
src/board/UBBoardPaletteManager.cpp
src/board/UBBoardView.cpp
src/document/UBDocumentProxy.cpp
src/gui/UBDockPaletteWidget.cpp
src/gui/UBTeacherBarWidget.h
src/web/UBWebController.h
|
13 years ago |
Anatoly Mihalchenko
|
927c77ac25
|
Code refactoring: pointers instead of names in Palettes
|
13 years ago |
shibakaneki
|
07414cf607
|
Added some metadata fields
|
13 years ago |
Ivan Ilin
|
4a051f2ac4
|
linux hotfix 6bbecff SANKORE-329 Visibility of palette based on children elements
|
13 years ago |
|
shibakaneki
|
d6af845cf0
|
src/adaptors
|
13 years ago |
|
Anatoly Mihalchenko
|
6bbecff5de
|
http://188.165.53.52/jira/browse/SANKORE-329
Visibility of palette based on children elements
|
13 years ago |
|
shibakaneki
|
5ce549f174
|
Implemented the drag and drop from the teacherbar to the board
|
13 years ago |
Aleksei Kanash
|
aa6a893ad5
|
SANKORE-463 (testet for ubuntu 11 x86_64)
|
13 years ago |
|
Ivan Ilin
|
9f89804899
|
Sankore-456
|
13 years ago |
|
shibakaneki
|
d461e3a786
|
Enabled the display of the media in the teacher bar page preview
|
13 years ago |
|
shibakaneki
|
628f213f1b
|
Progressing with the medias into the new teacherbar
|
13 years ago |
|
shibakaneki
|
b8e1516698
|
Backuping some rework on the teacherbar
|
13 years ago |
|
Anatoly Mihalchenko
|
c5155aee56
|
Fix for a document's page duplication. Teacher bar's info wasn't quite correct. This is also related to ticket #409 part 2.
|
13 years ago |
|
shibakaneki
|
81e493ecce
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
a375322955
|
Backup
|
13 years ago |
|
Claudio Valerio
|
e3b51cc19e
|
persisted session parameters
|
13 years ago |
|
Anatoly Mihalchenko
|
525e706fda
|
Part of fix for ticket 409.
|
13 years ago |
|
shibakaneki
|
ea81899384
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
6e81d74d41
|
Added some logic for the Document description datas in the teacherbar
|
13 years ago |
|
Claudio Valerio
|
95380fc881
|
fixed video issue on linux
|
13 years ago |
|
Claudio Valerio
|
2fcf84315b
|
fixed video issue on linux
|
13 years ago |
|
Anatoly Mihalchenko
|
71d9a71a26
|
Fix for losing content mentioned in the ticket 228. The problem was actually in page deletion algorithm which has been flooding cache with invalid data, and that data was a object to return when loadDocumentScene was called.
|
13 years ago |
|
shibakaneki
|
4e6a17b6b9
|
Added the save / load media in the teacherbar
|
13 years ago |
|
shibakaneki
|
ce73e5035d
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
17be2c0050
|
backup
|
13 years ago |
|
Claudio Valerio
|
247964f20b
|
removed double layer warning
|
13 years ago |
|
shibakaneki
|
b994977227
|
Partial backup of the teacherbar rework
|
13 years ago |
|
shibakaneki
|
9ec9128412
|
backup of the teacherbar rework
|
13 years ago |
|
shibakaneki
|
3dd07bb46d
|
backup while reworking the teacher bar
|
13 years ago |
|
Aleksei Kanash
|
0d2565c25d
|
SANKORE-466. Mechanism of text resizing improvement.
|
13 years ago |
|
Aleksei Kanash
|
484968fea2
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
unknown
|
c0dd9b83bd
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
unknown
|
3d25f59179
|
deleting video search widget
|
13 years ago |
|
unknown
|
36e024d9a3
|
removed the voting system
|
13 years ago |
|
Aleksei Kanash
|
70e3b539ec
|
Added clearing sources of any UBGraphicsWidget.
Added new system util method: deleteFile.
|
13 years ago |
|
Ivan Ilin
|
93e08950bc
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Ivan Ilin
|
28d04e54ff
|
Sankore dnd copying widgets on placing w3cwidget on the scene cleaning needed
|
13 years ago |
Claudio Valerio
|
ffb0f934a7
|
Merge pull request #2 from mariodebian/master
Update Spanish translation
|
13 years ago |
|
Aleksei Kanash
|
2608ba9d9d
|
Fix to 223
|
13 years ago |
|
Aleksei Kanash
|
b891c42a4d
|
Fixed Mask (curtain item) posision after exporting and importing. (a part of SANKPRE-223?)
|
13 years ago |
|
shibakaneki
|
15f89fc7a2
|
Partial commit
|
13 years ago |
|
Aleksei Kanash
|
650346f715
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Aleksei Kanash
|
e0d1c8ce8a
|
Final fix for SANKORE-363
|
13 years ago |
|
Aleksei Kanash
|
912561c229
|
Fixs to SANKORE-363.
|
13 years ago |
|
Anatoly Mihalchenko
|
39cade6922
|
Enhancements for zooming of PDF document (related to 204).
|
13 years ago |
Mario Izquierdo (mariodebian)
|
fd322cdf43
|
Merge remote-tracking branch 'upstream/master'
|
13 years ago |
|
Mario Izquierdo (mariodebian)
|
658a1c8895
|
Update Spanish translation
|
13 years ago |
|
Ivan Ilin
|
fd9fc41990
|
Sankore-341 Sankore-363 Sankore-365
|
13 years ago |
|
Ivan Ilin
|
cca8ac7fab
|
copyFile(...) function fixed for win
|
13 years ago |
|
Ivan Ilin
|
29f7cb5d19
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
