Commits · 92abcddbbe6f7f945d6213cf4411f9f35c051afe · lifo / Nicolas Ollinger / OpenBoard · GitLab

06 Jan, 2012 18 commits
- 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 19 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
- backup · f6087277
  shibakaneki authored Jan 05, 2012
  
  f6087277
- saved media infos into svg file · 15ea3abd
  Claudio Valerio authored Jan 05, 2012
  
  15ea3abd
- updated the parents in the teacher bar · 17f0fa9b
  shibakaneki authored Jan 05, 2012
  
  17f0fa9b
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · e954a077
  shibakaneki authored Jan 05, 2012
  
  e954a077
- fixed UBWidgetList resize issue · b731b302
  Claudio Valerio authored Jan 05, 2012
  
  b731b302
- Fixed an issue in the teacherbar · 84abba1f
  shibakaneki authored Jan 05, 2012
  
  84abba1f
- Added the ability to save the values of the teacher bar in the UBZ file · ca29e0d5
  shibakaneki authored Jan 05, 2012
  
  ca29e0d5
- Added some logic in the teacher bar · 0fb7cad9
  shibakaneki authored Jan 05, 2012
  
  0fb7cad9
- first draft for fixing resize problem · bac4c4ca
  Claudio Valerio authored Jan 05, 2012
  
  bac4c4ca
- Stylized the widgets · 0aab9a99
  shibakaneki authored Jan 05, 2012
  
  0aab9a99
- Corrected a problem · 883d22be
  shibakaneki authored Jan 05, 2012
  
  883d22be
- Added the Links widgets · 80e9b93a
  shibakaneki authored Jan 05, 2012
  
  80e9b93a
- Added the actions · 9b470227
  shibakaneki authored Jan 05, 2012
  
  9b470227
- Added some minor changes on the GUI · 89e16fde
  shibakaneki authored Jan 05, 2012
  
  89e16fde
04 Jan, 2012 3 commits
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 44a06538
  Claudio Valerio authored Jan 04, 2012
  
  44a06538
- changed to have a correct the wrong resize behaviour · 453debb2
  Claudio Valerio authored Jan 04, 2012
  
  453debb2
- backup · 38ee9bf8
  shibakaneki authored Jan 04, 2012
  
  38ee9bf8