Commits · 9a80913b3561493ae53fc84fbf4b910e982217e9 · lifo / Nicolas Ollinger / OpenBoard

12 Jan, 2012 2 commits
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 9a80913b
  shibakaneki authored Jan 12, 2012
```
Conflicts:
	src/customWidgets/UBWidgetList.cpp
```
  9a80913b
- partial backup of the ubmediawidget · 955e9289
  shibakaneki authored Jan 12, 2012
  
  955e9289
09 Jan, 2012 9 commits
- last commit · afa89214
  Claudio Valerio authored Jan 09, 2012
  
  afa89214
- fixed player windows on windows · 04dacaa6
  Claudio Valerio authored Jan 09, 2012
  
  04dacaa6
- fixed syntax error · 3c905ba2
  Claudio Valerio authored Jan 09, 2012
  
  3c905ba2
- I don't know · a94f7f63
  Claudio Valerio authored Jan 09, 2012
  
  a94f7f63
- Stylized the teacher bar preview · 81ed0c74
  shibakaneki authored Jan 09, 2012
  
  81ed0c74
- mimimal change · 8cbd8a8a
  Claudio Valerio authored Jan 09, 2012
  
  8cbd8a8a
- fixed ratio and added space between list elements · 5e8a4614
  Claudio Valerio authored Jan 09, 2012
  
  5e8a4614
- Updated the styles · 8b333c21
  shibakaneki authored Jan 09, 2012
  
  8b333c21
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 6b1da4b6
  shibakaneki authored Jan 09, 2012
  
  6b1da4b6
06 Jan, 2012 24 commits
- fixed build issue on mac · c0fefa26
  Claudio Valerio authored Jan 06, 2012
  
  c0fefa26
- fixed build issue on windows · 3b8a5228
  Claudio Valerio authored Jan 06, 2012
  
  3b8a5228
- fixed url issue · c39f5213
  Claudio Valerio authored Jan 06, 2012
  
  c39f5213
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · c3281a2c
  shibakaneki authored Jan 06, 2012
  
  c3281a2c
- backup · e8497337
  shibakaneki authored Jan 06, 2012
  
  e8497337
- fixed last scale issues · 64542002
  Claudio Valerio authored Jan 06, 2012
  
  64542002
- resolved conflict · 92abcddb
  Claudio Valerio authored Jan 06, 2012
  
  92abcddb
- added the action preview in the teacher bar · e114d8ad
  shibakaneki authored Jan 06, 2012
  
  e114d8ad
- added the links in the teacherbar preview · c7c931b9
  shibakaneki authored Jan 06, 2012
  
  c7c931b9
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 07241990
  shibakaneki authored Jan 06, 2012
```
Conflicts:
	src/gui/UBTeacherBarWidget.cpp
```
  07241990
- backup of the teacher bar preview · abdea843
  shibakaneki authored Jan 06, 2012
  
  abdea843
- fixed widget to load on page change regarding the stored information · ef2e24c0
  Claudio Valerio authored Jan 06, 2012
  
  ef2e24c0
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · a7f3ff3d
  shibakaneki authored Jan 06, 2012
  
  a7f3ff3d
- backup · e584c2cf
  shibakaneki authored Jan 06, 2012
  
  e584c2cf
- added method to load widgets · 12a77f0a
  Claudio Valerio authored Jan 06, 2012
  
  12a77f0a
- fixed duplicated widgets · b5dc5d1d
  Claudio Valerio authored Jan 06, 2012
  
  b5dc5d1d
- resolved issue · e93410f1
  Claudio Valerio authored Jan 06, 2012
  
  e93410f1
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · f7cd5b2b
  Claudio Valerio authored Jan 06, 2012
  
  f7cd5b2b
- updated stylesheet · fb2f09de
  shibakaneki authored Jan 06, 2012
  
  fb2f09de
- merged · 1eba2bb0
  Claudio Valerio authored Jan 06, 2012
  
  1eba2bb0
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 86f30482
  shibakaneki authored Jan 06, 2012
  
  86f30482
- Backup · 03fef88c
  shibakaneki authored Jan 06, 2012
  
  03fef88c
- restored good version · 91621dbb
  Claudio Valerio authored Jan 06, 2012
  
  91621dbb
- handling drop from preview mode · 08f9384b
  Claudio Valerio authored Jan 06, 2012
  
  08f9384b
05 Jan, 2012 5 commits
- dnd try and first media viewer widget · afab4879
  Claudio Valerio authored Jan 05, 2012
  
  afab4879
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · f2948758
  shibakaneki authored Jan 05, 2012
  
  f2948758
- First backup of the teacherbar preview widget · 079f7534
  shibakaneki authored Jan 05, 2012
  
  079f7534
- fixed start on laod media player issue · 3e7e2d81
  Claudio Valerio authored Jan 05, 2012
  
  3e7e2d81
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 8a27f4b6
  shibakaneki authored Jan 05, 2012
  
  8a27f4b6