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 |
unknown
|
02a515b399
|
VideoSearch.wgs was added
|
13 years ago |
|
unknown
|
1d8d0a42a4
|
Changed AnyEmbed and VideoPicker
|
13 years ago |
Claudio Valerio
|
e037fc1d73
|
removed file wrongly commited
|
13 years ago |
|
Claudio Valerio
|
90d2d42cb9
|
increased version
|
13 years ago |
Anatoly Mihalchenko
|
ccfdb66033
|
http://188.165.53.52/jira/browse/SANKORE-442
Incorrect .iss file used for release. Old one deleted.
|
13 years ago |
|
Anatoly Mihalchenko
|
164af2bccf
|
Installer build under windows7 x64 platform
|
13 years ago |
|
Anatoly Mihalchenko
|
ce8c7bee2f
|
http://188.165.53.52/jira/browse/SANKORE-450
|
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 |
Ivan Ilin
|
21e57fbc83
|
git conflict fixes
|
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 |
|
Ivan Ilin
|
dee67aa44e
|
dnd fixes, Sankore-397, 448, 365
|
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 |
|
Claudio Valerio
|
1eba2bb0f4
|
merged
|
13 years ago |
|
shibakaneki
|
86f30482d7
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
03fef88c4f
|
Backup
|
13 years ago |
|
Claudio Valerio
|
91621dbb9b
|
restored good version
|
13 years ago |
|
Claudio Valerio
|
08f9384b43
|
handling drop from preview mode
|
13 years ago |
|
Claudio Valerio
|
0e0a308da8
|
Changed wrong description
|
13 years ago |
|
Claudio Valerio
|
afab4879e1
|
dnd try and first media viewer widget
|
13 years ago |
|
shibakaneki
|
f2948758c6
|
Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012
|
13 years ago |
|
shibakaneki
|
079f7534c8
|
First backup of the teacherbar preview widget
|
13 years ago |
|
Claudio Valerio
|
3e7e2d8170
|
fixed start on laod media player issue
|
13 years ago |
