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 |
|
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 |
|
shibakaneki
|
15f89fc7a2
|
Partial commit
|
13 years ago |
|
shibakaneki
|
f5f1f835fd
|
Added some comments in the code
|
13 years ago |
|
shibakaneki
|
af1e875a71
|
Modified the audio midget
|
13 years ago |
|
shibakaneki
|
4c4d569b35
|
Enabled UBMediaMidget
|
13 years ago |
|
shibakaneki
|
78562cd421
|
hiding not finished implementation for backup reasons
|
13 years ago |
|
shibakaneki
|
60f485f90f
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
ff7fe04fe1
|
Updated the video widget rendering
|
13 years ago |
|
Claudio Valerio
|
f8cbf42134
|
fixed horizontal widgetlist
|
13 years ago |
|
shibakaneki
|
432af59ca3
|
resolved a conflict
|
13 years ago |
|
shibakaneki
|
9a80913b35
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
Conflicts:
src/customWidgets/UBWidgetList.cpp
|
13 years ago |
|
shibakaneki
|
955e928930
|
partial backup of the ubmediawidget
|
13 years ago |
|
Claudio Valerio
|
afa89214a8
|
last commit
|
13 years ago |
Claudio Valerio
|
04dacaa607
|
fixed player windows on windows
|
13 years ago |
Claudio Valerio
|
3c905ba233
|
fixed syntax error
|
13 years ago |
|
Claudio Valerio
|
a94f7f63de
|
I don't know
|
13 years ago |
|
shibakaneki
|
81ed0c74c2
|
Stylized the teacher bar preview
|
13 years ago |
|
Claudio Valerio
|
8cbd8a8a73
|
mimimal change
|
13 years ago |
|
Claudio Valerio
|
5e8a461474
|
fixed ratio and added space between list elements
|
13 years ago |
|
shibakaneki
|
8b333c21b9
|
Updated the styles
|
13 years ago |
|
shibakaneki
|
6b1da4b6c5
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
Claudio Valerio
|
c0fefa26a0
|
fixed build issue on mac
|
13 years ago |
|
Claudio Valerio
|
3b8a522873
|
fixed build issue on windows
|
13 years ago |
|
Claudio Valerio
|
c39f521349
|
fixed url issue
|
13 years ago |
|
shibakaneki
|
c3281a2c9e
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
e849733736
|
backup
|
13 years ago |
|
Claudio Valerio
|
64542002d6
|
fixed last scale issues
|
13 years ago |
|
Claudio Valerio
|
92abcddbbe
|
resolved conflict
|
13 years ago |
|
shibakaneki
|
e114d8adf0
|
added the action preview in the teacher bar
|
13 years ago |
|
shibakaneki
|
c7c931b92a
|
added the links in the teacherbar preview
|
13 years ago |
|
shibakaneki
|
07241990f5
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
Conflicts:
src/gui/UBTeacherBarWidget.cpp
|
13 years ago |
|
shibakaneki
|
abdea843ff
|
backup of the teacher bar preview
|
13 years ago |
|
Claudio Valerio
|
ef2e24c0d8
|
fixed widget to load on page change regarding the stored information
|
13 years ago |
|
shibakaneki
|
a7f3ff3d9f
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
e584c2cfd0
|
backup
|
13 years ago |
|
Claudio Valerio
|
12a77f0ab9
|
added method to load widgets
|
13 years ago |
|
Claudio Valerio
|
b5dc5d1d46
|
fixed duplicated widgets
|
13 years ago |
|
Claudio Valerio
|
e93410f137
|
resolved issue
|
13 years ago |
|
Claudio Valerio
|
f7cd5b2bac
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
fb2f09deed
|
updated stylesheet
|
13 years ago |
