Commits · ea81899384af926718691084672751dc0034a708 · lifo / Nicolas Ollinger / OpenBoard

23 Jan, 2012 9 commits
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · ea818993
  shibakaneki authored Jan 23, 2012
  
  ea818993
- Added some logic for the Document description datas in the teacherbar · 6e81d74d
  shibakaneki authored Jan 23, 2012
  
  6e81d74d
- fixed video issue on linux · 95380fc8
  Claudio Valerio authored Jan 23, 2012
  
  95380fc8
- fixed video issue on linux · 2fcf8431
  Claudio Valerio authored Jan 23, 2012
  
  2fcf8431
- Added the save / load media in the teacherbar · 4e6a17b6
  shibakaneki authored Jan 23, 2012
  
  4e6a17b6
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · ce73e503
  shibakaneki authored Jan 23, 2012
  
  ce73e503
- backup · 17be2c00
  shibakaneki authored Jan 23, 2012
  
  17be2c00
- removed double layer warning · 247964f2
  Claudio Valerio authored Jan 23, 2012
  
  247964f2
- Partial backup of the teacherbar rework · b9949772
  shibakaneki authored Jan 23, 2012
  
  b9949772
20 Jan, 2012 2 commits
- backup of the teacherbar rework · 9ec91284
  shibakaneki authored Jan 20, 2012
  
  9ec91284
- backup while reworking the teacher bar · 3dd07bb4
  shibakaneki authored Jan 20, 2012
  
  3dd07bb4
18 Jan, 2012 1 commit
- Partial commit · 15f89fc7
  shibakaneki authored Jan 18, 2012
  
  15f89fc7
13 Jan, 2012 6 commits
- Added some comments in the code · f5f1f835
  shibakaneki authored Jan 13, 2012
  
  f5f1f835
- Modified the audio midget · af1e875a
  shibakaneki authored Jan 13, 2012
  
  af1e875a
- Enabled UBMediaMidget · 4c4d569b
  shibakaneki authored Jan 13, 2012
  
  4c4d569b
- hiding not finished implementation for backup reasons · 78562cd4
  shibakaneki authored Jan 13, 2012
  
  78562cd4
- Merge branch 'Bett-2012' of github.com:Sankore/Sankore-3.1 into Bett-2012 · 60f485f9
  shibakaneki authored Jan 13, 2012
  
  60f485f9
- Updated the video widget rendering · ff7fe04f
  shibakaneki authored Jan 13, 2012
  
  ff7fe04f
12 Jan, 2012 4 commits
- fixed horizontal widgetlist · f8cbf421
  Claudio Valerio authored Jan 12, 2012
  
  f8cbf421
- resolved a conflict · 432af59c
  shibakaneki authored Jan 12, 2012
  
  432af59c
- 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 9 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