Commits · c58c7d66fc5d9ee60566f99086ac12c09d95362c · lifo / Nicolas Ollinger / OpenBoard

26 Oct, 2011 3 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · c58c7d66
  shibakaneki authored Oct 26, 2011
  
  c58c7d66
- Reworked the way the UBLibPathViewer is used · 57226710
  shibakaneki authored Oct 26, 2011
  
  57226710
- Merge remote-tracking branch 'remotes/origin/release-1.30' · ab336975
  Claudio Valerio authored Oct 26, 2011
```
Conflicts:
	resources/sankore.qrc
	src/board/UBBoardPaletteManager.cpp
	src/board/UBBoardPaletteManager.h
	src/gui/UBTeacherBarWidget.cpp
```
  ab336975
21 Oct, 2011 3 commits
- Resolved cache issue 339 · 0b449cc4
  shibakaneki authored Oct 21, 2011
  
  0b449cc4
- imported Maxim changes to persist changes · 757e74d1
  Claudio Valerio authored Oct 21, 2011
  
  757e74d1
- Resolved cache issue 336 · bc9a6693
  shibakaneki authored Oct 21, 2011
  
  bc9a6693
20 Oct, 2011 10 commits
- upgraded interactivities · 698ec0e2
  unknown authored Oct 20, 2011
  
  698ec0e2
- Removing a bad piece of code · 50062d9d
  shibakaneki authored Oct 20, 2011
  
  50062d9d
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 9e4aa8a5
  shibakaneki authored Oct 20, 2011
  
  9e4aa8a5
- Adapted some files related to the teacherbar · c984888c
  shibakaneki authored Oct 20, 2011
  
  c984888c
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · b334e961
  Anatoly Mihalchenko authored Oct 20, 2011
```
Conflicts:
	src/board/UBBoardPaletteManager.cpp
```
  b334e961
- SANKORE-329 implement correct widget processing mechanism · f145ebd2
  Anatoly Mihalchenko authored Oct 20, 2011
  
  f145ebd2
- Added the teacherbar · 6e181605
  shibakaneki authored Oct 20, 2011
  
  6e181605
- merged conflicts (>_<#) · cc3c31c3
  shibakaneki authored Oct 20, 2011
  
  cc3c31c3
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 6a109355
  shibakaneki authored Oct 20, 2011
```
Conflicts:
	src/gui/UBTeacherBarWidget.cpp
	src/gui/UBTeacherBarWidget.h
```
  6a109355
- Finished the teacher bar · 18d24f9d
  shibakaneki authored Oct 20, 2011
  
  18d24f9d
19 Oct, 2011 6 commits
- resolved conflict · bd5a8a8b
  Anatoly Mihalchenko authored Oct 19, 2011
  
  bd5a8a8b
- SANKORE-329 half fix. implement single instance of left and right palettes · ef7441b5
  Anatoly Mihalchenko authored Oct 19, 2011
  
  ef7441b5
- upgraded AnyEmbed, VideoPicker and WebBrowser apps · f5cff37e
  unknown authored Oct 19, 2011
  
  f5cff37e
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · f01bc840
  shibakaneki authored Oct 19, 2011
  
  f01bc840
- Adding the teacher bar widget · 191e21ee
  shibakaneki authored Oct 19, 2011
  
  191e21ee
- fixed translation on dialog · 387f7540
  Claudio Valerio authored Oct 19, 2011
  
  387f7540
18 Oct, 2011 1 commit
- Mask offset fixed · 5683ee7a
  Ivan Ilin authored Oct 18, 2011
  
  5683ee7a
17 Oct, 2011 8 commits
- SANKORE-334 fix incorrect "Can`t Load Content" message when we add it to Board · b24a787e
  Anatoly Mihalchenko authored Oct 17, 2011
  
  b24a787e
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · f9b5cc48
  Anatoly Mihalchenko authored Oct 17, 2011
  
  f9b5cc48
- SANKORE-139 refactoring mouse scroll processing for View and GraphicsItems · b5bda890
  Anatoly Mihalchenko authored Oct 17, 2011
  
  b5bda890
- updating styles · 68ffb3f5
  shibakaneki authored Oct 17, 2011
  
  68ffb3f5
- updating language files · bda7ff0b
  shibakaneki authored Oct 17, 2011
  
  bda7ff0b
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 5b350365
  shibakaneki authored Oct 17, 2011
  
  5b350365
- backup · f5c7e0bb
  shibakaneki authored Oct 17, 2011
  
  f5c7e0bb
- Backup of the teacher bar · f02cb478
  shibakaneki authored Oct 17, 2011
  
  f02cb478
14 Oct, 2011 2 commits
- fixed qt path · 8bb8616e
  Claudio Valerio authored Oct 14, 2011
  
  8bb8616e
- changed sankore version · f627e52c
  Claudio Valerio authored Oct 14, 2011
  
  f627e52c
13 Oct, 2011 7 commits
- added programs file path variable · 3f195abb
  Claudio Valerio authored Oct 13, 2011
  
  3f195abb
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 724a0dba
  shibakaneki authored Oct 13, 2011
  
  724a0dba
- Resolved missing french translation on a dialog box · 4e2faac9
  shibakaneki authored Oct 13, 2011
  
  4e2faac9
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · c19e1f94
  Anatoly Mihalchenko authored Oct 13, 2011
  
  c19e1f94
- SANKORE-139 minor comment update · 3d0a2bb9
  Anatoly Mihalchenko authored Oct 13, 2011
  
  3d0a2bb9
- SANKORE-139 fix mouse scroll for active wight on scene · bd0ced23
  Anatoly Mihalchenko authored Oct 13, 2011
  
  bd0ced23
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 3ad8a106
  shibakaneki authored Oct 13, 2011
  
  3ad8a106