shibakaneki
|
50062d9d68
|
Removing a bad piece of code
|
13 years ago |
|
shibakaneki
|
9e4aa8a568
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
c984888c5f
|
Adapted some files related to the teacherbar
|
13 years ago |
Anatoly Mihalchenko
|
b334e96145
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
Conflicts:
src/board/UBBoardPaletteManager.cpp
|
13 years ago |
|
Anatoly Mihalchenko
|
f145ebd288
|
SANKORE-329 implement correct widget processing mechanism
|
13 years ago |
|
shibakaneki
|
6e181605d7
|
Added the teacherbar
|
13 years ago |
|
shibakaneki
|
cc3c31c3a6
|
merged conflicts (>_<#)
|
13 years ago |
|
shibakaneki
|
6a109355c0
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
Conflicts:
src/gui/UBTeacherBarWidget.cpp
src/gui/UBTeacherBarWidget.h
|
13 years ago |
|
shibakaneki
|
18d24f9d37
|
Finished the teacher bar
|
13 years ago |
Ivan Ilin
|
8bcabeca95
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Ivan Ilin
|
9f4b3f27d3
|
Cff new functional
|
13 years ago |
|
Anatoly Mihalchenko
|
bd5a8a8bde
|
resolved conflict
|
13 years ago |
|
Anatoly Mihalchenko
|
ef7441b5a0
|
SANKORE-329 half fix. implement single instance of left and right palettes
|
13 years ago |
unknown
|
f5cff37eff
|
upgraded AnyEmbed, VideoPicker and WebBrowser apps
|
13 years ago |
|
shibakaneki
|
f01bc84042
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
191e21ee5d
|
Adding the teacher bar widget
|
13 years ago |
Claudio Valerio
|
387f754092
|
fixed translation on dialog
|
13 years ago |
|
Ivan Ilin
|
5683ee7a91
|
Mask offset fixed
|
13 years ago |
|
Anatoly Mihalchenko
|
b24a787ebd
|
SANKORE-334 fix incorrect "Can`t Load Content" message when we add it to Board
|
13 years ago |
|
Anatoly Mihalchenko
|
f9b5cc4847
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Anatoly Mihalchenko
|
b5bda89005
|
SANKORE-139 refactoring mouse scroll processing for View and GraphicsItems
|
13 years ago |
|
shibakaneki
|
68ffb3f526
|
updating styles
|
13 years ago |
|
shibakaneki
|
bda7ff0bf6
|
updating language files
|
13 years ago |
|
shibakaneki
|
5b35036555
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
f5c7e0bb70
|
backup
|
13 years ago |
|
shibakaneki
|
f02cb47847
|
Backup of the teacher bar
|
13 years ago |
|
Claudio Valerio
|
8bb8616e12
|
fixed qt path
|
13 years ago |
|
Claudio Valerio
|
f627e52cd6
|
changed sankore version
|
13 years ago |
|
Claudio Valerio
|
3f195abb28
|
added programs file path variable
|
13 years ago |
|
shibakaneki
|
724a0dba36
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
4e2faac937
|
Resolved missing french translation on a dialog box
|
13 years ago |
|
Anatoly Mihalchenko
|
c19e1f9467
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Anatoly Mihalchenko
|
3d0a2bb954
|
SANKORE-139 minor comment update
|
13 years ago |
|
Anatoly Mihalchenko
|
bd0ced234d
|
SANKORE-139 fix mouse scroll for active wight on scene
|
13 years ago |
|
shibakaneki
|
3ad8a10628
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
8c43e67fdc
|
Added missing files
|
13 years ago |
|
shibakaneki
|
1833713dd7
|
Implemented move up, move down and delete page in the navigation palette
|
13 years ago |
|
unknown
|
2480a33b0f
|
added new widget
|
13 years ago |
|
Claudio Valerio
|
532f9f6c14
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Claudio Valerio
|
0850098a8f
|
fixed issue http://188.165.53.52/jira/browse/SANKORE-238
|
13 years ago |
|
Anatoly Mihalchenko
|
0d8350e5f7
|
SANKORE-321 refactroing main html create from trap widgets
|
13 years ago |
|
Anatoly Mihalchenko
|
39211e361f
|
SANKORE-320 automatically remove all invalid characters from application name, and show correspond popup messagebox when user try add it manually
|
13 years ago |
|
Anatoly Mihalchenko
|
d7be307005
|
SANKORE-305 add required object initialize to constructor
|
13 years ago |
|
Ivan Ilin
|
41b0e183f7
|
video picker deletion bug fixed
|
13 years ago |
|
Anatoly Mihalchenko
|
7f92409fb5
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Anatoly Mihalchenko
|
15cfae37eb
|
SANKORE-283 fix cursor switching
|
13 years ago |
|
Ivan Ilin
|
0ac61a5e43
|
static foreground and background for tool tips
|
13 years ago |
|
shibakaneki
|
2f245a94fa
|
Removed a debug string
|
13 years ago |
|
shibakaneki
|
d84003e09d
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
cd976fef77
|
Resolved issue 255
|
13 years ago |
