shibakaneki
572267106c
Reworked the way the UBLibPathViewer is used
14 years ago
Claudio Valerio
ab33697595
Merge remote-tracking branch 'remotes/origin/release-1.30'
...
Conflicts:
resources/sankore.qrc
src/board/UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.h
src/gui/UBTeacherBarWidget.cpp
14 years ago
Claudio Valerio
696ed59ecf
removed a warning
14 years ago
Mario Izquierdo (mariodebian)
019eaec8f1
Update Spanish translation
14 years ago
shibakaneki
0b449cc407
Resolved cache issue 339
14 years ago
Claudio Valerio
757e74d127
imported Maxim changes to persist changes
14 years ago
shibakaneki
bc9a6693aa
Resolved cache issue 336
14 years ago
unknown
698ec0e2c7
upgraded interactivities
14 years ago
Ivan Ilin
023fddb607
resolved merge conflict
14 years ago
Ivan Ilin
6174a7833f
A new step to implement cff support
14 years ago
shibakaneki
50062d9d68
Removing a bad piece of code
14 years ago
shibakaneki
9e4aa8a568
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
shibakaneki
c984888c5f
Adapted some files related to the teacherbar
14 years ago
Anatoly Mihalchenko
b334e96145
Merge branch 'master' of github.com:Sankore/Sankore-3.1
...
Conflicts:
src/board/UBBoardPaletteManager.cpp
14 years ago
Anatoly Mihalchenko
f145ebd288
SANKORE-329 implement correct widget processing mechanism
14 years ago
shibakaneki
6e181605d7
Added the teacherbar
14 years ago
shibakaneki
cc3c31c3a6
merged conflicts (>_<#)
14 years ago
shibakaneki
6a109355c0
Merge branch 'master' of github.com:Sankore/Sankore-3.1
...
Conflicts:
src/gui/UBTeacherBarWidget.cpp
src/gui/UBTeacherBarWidget.h
14 years ago
shibakaneki
18d24f9d37
Finished the teacher bar
14 years ago
Ivan Ilin
8bcabeca95
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
Ivan Ilin
9f4b3f27d3
Cff new functional
14 years ago
Anatoly Mihalchenko
bd5a8a8bde
resolved conflict
14 years ago
Anatoly Mihalchenko
ef7441b5a0
SANKORE-329 half fix. implement single instance of left and right palettes
14 years ago
unknown
f5cff37eff
upgraded AnyEmbed, VideoPicker and WebBrowser apps
14 years ago
shibakaneki
f01bc84042
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
shibakaneki
191e21ee5d
Adding the teacher bar widget
14 years ago
Claudio Valerio
387f754092
fixed translation on dialog
14 years ago
Ivan Ilin
5683ee7a91
Mask offset fixed
14 years ago
Anatoly Mihalchenko
b24a787ebd
SANKORE-334 fix incorrect "Can`t Load Content" message when we add it to Board
14 years ago
Anatoly Mihalchenko
f9b5cc4847
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
Anatoly Mihalchenko
b5bda89005
SANKORE-139 refactoring mouse scroll processing for View and GraphicsItems
14 years ago
shibakaneki
68ffb3f526
updating styles
14 years ago
shibakaneki
bda7ff0bf6
updating language files
14 years ago
shibakaneki
5b35036555
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
shibakaneki
f5c7e0bb70
backup
14 years ago
shibakaneki
f02cb47847
Backup of the teacher bar
14 years ago
Claudio Valerio
8bb8616e12
fixed qt path
14 years ago
Claudio Valerio
f627e52cd6
changed sankore version
14 years ago
Claudio Valerio
3f195abb28
added programs file path variable
14 years ago
shibakaneki
724a0dba36
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
shibakaneki
4e2faac937
Resolved missing french translation on a dialog box
14 years ago
Anatoly Mihalchenko
c19e1f9467
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
Anatoly Mihalchenko
3d0a2bb954
SANKORE-139 minor comment update
14 years ago
Anatoly Mihalchenko
bd0ced234d
SANKORE-139 fix mouse scroll for active wight on scene
14 years ago
shibakaneki
3ad8a10628
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
shibakaneki
8c43e67fdc
Added missing files
14 years ago
shibakaneki
1833713dd7
Implemented move up, move down and delete page in the navigation palette
14 years ago
unknown
2480a33b0f
added new widget
14 years ago
Claudio Valerio
532f9f6c14
Merge branch 'master' of github.com:Sankore/Sankore-3.1
14 years ago
Claudio Valerio
0850098a8f
fixed issue http://188.165.53.52/jira/browse/SANKORE-238
14 years ago