Ivan Ilin
|
23cd81ca2b
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Ivan Ilin
|
6302664ba6
|
extra mrightpallette deleted
|
13 years ago |
Claudio Valerio
|
5af55898e5
|
fixed after merge issue
|
13 years ago |
|
Ivan Ilin
|
fc593b1ece
|
Have pure virtual function on UBGraphicsItems
|
13 years ago |
|
Claudio Valerio
|
532f5c4cc0
|
Merge remote-tracking branch 'remotes/origin/release-1.30'
|
13 years ago |
|
Ivan Ilin
|
23a1b8b478
|
Sankore 284 fixed
|
13 years ago |
|
Ivan Ilin
|
9aa3027c51
|
implemented delegate() function for graphics objects
|
13 years ago |
|
Ivan Ilin
|
2f34f5e5ff
|
commit berore new branch created
|
13 years ago |
|
Ivan Ilin
|
d7b5c0b637
|
Sankore 329 minor fixes support vkeyboard linux
|
13 years ago |
|
Ivan Ilin
|
96d942c8cc
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Ivan Ilin
|
6f205698d9
|
images for CFF implementation
|
13 years ago |
Anatoly Mihalchenko
|
8e78896b7e
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
Anatoly Mihalchenko
|
7a6776a4a9
|
SANKORE-329 last part of issue - refactoring virtual keyboard. source code still require testing and defect correction for Linux and Mac OS
|
13 years ago |
|
Claudio Valerio
|
14cb47578b
|
fixed audio issue on linux. This is only a ugly workaround
|
13 years ago |
shibakaneki
|
2f9367c39a
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
e4d1a0c4d6
|
Fixed some style issues
|
13 years ago |
|
Claudio Valerio
|
184ffd0e67
|
fixed http://188.165.53.52/jira/browse/SANKORE-358
|
13 years ago |
|
Claudio Valerio
|
efaa976860
|
Merge pull request #1 from mariodebian/master
Updated Spanish translations
|
13 years ago |
|
shibakaneki
|
a6286cea69
|
removed test files
|
13 years ago |
|
shibakaneki
|
c58c7d66fc
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
13 years ago |
|
shibakaneki
|
572267106c
|
Reworked the way the UBLibPathViewer is used
|
13 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
|
13 years ago |
|
Claudio Valerio
|
696ed59ecf
|
removed a warning
|
13 years ago |
Mario Izquierdo (mariodebian)
|
019eaec8f1
|
Update Spanish translation
|
13 years ago |
|
shibakaneki
|
0b449cc407
|
Resolved cache issue 339
|
13 years ago |
|
Claudio Valerio
|
757e74d127
|
imported Maxim changes to persist changes
|
13 years ago |
|
shibakaneki
|
bc9a6693aa
|
Resolved cache issue 336
|
13 years ago |
unknown
|
698ec0e2c7
|
upgraded interactivities
|
13 years ago |
|
Ivan Ilin
|
023fddb607
|
resolved merge conflict
|
13 years ago |
|
Ivan Ilin
|
6174a7833f
|
A new step to implement cff support
|
13 years ago |
|
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 |
