Commits · 5af55898e5ecf3956fc9fcfa65acde408f276bd4 · lifo / Nicolas Ollinger / OpenBoard

01 Nov, 2011 2 commits
- fixed after merge issue · 5af55898
  Claudio Valerio authored Nov 01, 2011
  
  5af55898
- Merge remote-tracking branch 'remotes/origin/release-1.30' · 532f5c4c
  Claudio Valerio authored Nov 01, 2011
  
  532f5c4c
31 Oct, 2011 2 commits
- Sankore 284 fixed · 23a1b8b4
  Ivan Ilin authored Oct 31, 2011
  
  23a1b8b4
- commit berore new branch created · 2f34f5e5
  Ivan Ilin authored Oct 31, 2011
  
  2f34f5e5
27 Oct, 2011 8 commits
- Sankore 329 minor fixes support vkeyboard linux · d7b5c0b6
  Ivan Ilin authored Oct 27, 2011
  
  d7b5c0b6
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 96d942c8
  Ivan Ilin authored Oct 27, 2011
  
  96d942c8
- images for CFF implementation · 6f205698
  Ivan Ilin authored Oct 27, 2011
  
  6f205698
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 8e78896b
  Anatoly Mihalchenko authored Oct 27, 2011
  
  8e78896b
- SANKORE-329 last part of issue - refactoring virtual keyboard. source code... · 7a6776a4
  Anatoly Mihalchenko authored Oct 27, 2011
```
SANKORE-329 last part of issue - refactoring virtual keyboard. source code still require testing and defect correction for Linux and Mac OS
```
  7a6776a4
- fixed audio issue on linux. This is only a ugly workaround · 14cb4757
  Claudio Valerio authored Oct 27, 2011
  
  14cb4757
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 2f9367c3
  shibakaneki authored Oct 27, 2011
  
  2f9367c3
- Fixed some style issues · e4d1a0c4
  shibakaneki authored Oct 27, 2011
  
  e4d1a0c4
26 Oct, 2011 7 commits
- fixed http://188.165.53.52/jira/browse/SANKORE-358 · 184ffd0e
  Claudio Valerio authored Oct 26, 2011
  
  184ffd0e
- Merge pull request #1 from mariodebian/master · efaa9768
  Claudio Valerio authored Oct 26, 2011
```
Updated Spanish translations
```
  efaa9768
- removed test files · a6286cea
  shibakaneki authored Oct 26, 2011
  
  a6286cea
- 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
- removed a warning · 696ed59e
  Claudio Valerio authored Oct 26, 2011
  
  696ed59e
24 Oct, 2011 1 commit
- Update Spanish translation · 019eaec8
  Mario Izquierdo (mariodebian) authored Oct 24, 2011
  
  019eaec8
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 12 commits
- upgraded interactivities · 698ec0e2
  unknown authored Oct 20, 2011
  
  698ec0e2
- resolved merge conflict · 023fddb6
  Ivan Ilin authored Oct 20, 2011
  
  023fddb6
- A new step to implement cff support · 6174a783
  Ivan Ilin authored Oct 20, 2011
  
  6174a783
- 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 5 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 8bcabeca
  Ivan Ilin authored Oct 19, 2011
  
  8bcabeca
- Cff new functional · 9f4b3f27
  Ivan Ilin authored Oct 19, 2011
  
  9f4b3f27
- 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