Commits · edc11104e79e23719523e20cc2cf44db5968b79d · lifo / Nicolas Ollinger / OpenBoard

12 Apr, 2012 17 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · edc11104
  Aleksei Kanash authored Apr 12, 2012
  
  edc11104
- gui hack · d1f7f5f8
  Claudio Valerio authored Apr 12, 2012
  
  d1f7f5f8
- UBTGAdaptableText handling the resize event · a3582234
  Claudio Valerio authored Apr 12, 2012
  
  a3582234
- fixed issue of multiple lines on the teacher bar on the presentation mode · c4a694e7
  Claudio Valerio authored Apr 12, 2012
  
  c4a694e7
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 232730e3
  Claudio Valerio authored Apr 12, 2012
  
  232730e3
- reworked the QTextEdit placeholder · e36c0c8e
  Claudio Valerio authored Apr 12, 2012
  
  e36c0c8e
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 33d2bfab
  shibakaneki authored Apr 12, 2012
  
  33d2bfab
- Fixed the rotation issue · 368a4dc5
  shibakaneki authored Apr 12, 2012
  
  368a4dc5
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 8238b22e
  Anatoly Mihalchenko authored Apr 12, 2012
  
  8238b22e
- SANKORE-429 · 71e8585b
  Anatoly Mihalchenko authored Apr 12, 2012
```
Document explorer(navigator): Imported ubz files are always imported into "Untitled Documents" folder
```
  71e8585b
- missing images · 35467c4e
  Claudio Valerio authored Apr 12, 2012
  
  35467c4e
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 86602150
  Claudio Valerio authored Apr 12, 2012
  
  86602150
- new littles gui improvements on teacher guide · edb3fd50
  Claudio Valerio authored Apr 12, 2012
  
  edb3fd50
- PDF view: performance fix · 921953e0
  Anatoly Mihalchenko authored Apr 12, 2012
  
  921953e0
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 20d6e93e
  Claudio Valerio authored Apr 12, 2012
  
  20d6e93e
- firsts guid improvements for the teacher guide · 3af42770
  Claudio Valerio authored Apr 12, 2012
  
  3af42770
- PDF view performance:multiple pages selection · e6f84716
  Anatoly Mihalchenko authored Apr 12, 2012
  
  e6f84716
11 Apr, 2012 5 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · faef4407
  Claudio Valerio authored Apr 11, 2012
  
  faef4407
- remove UBWidgetList class · 9444787b
  Claudio Valerio authored Apr 11, 2012
  
  9444787b
- removed globalStyleSheet() · a9ba75ac
  Claudio Valerio authored Apr 11, 2012
  
  a9ba75ac
- CffAdaptor builds separately for debug and for release. · 1613ca0a
  Aleksei Kanash authored Apr 11, 2012
```
Sankore is adapted to use cffadaptor builds separately.
```
  1613ca0a
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · e870c310
  Aleksei Kanash authored Apr 11, 2012
  
  e870c310
10 Apr, 2012 10 commits
- teacher bar behaves correctly · 5a6de660
  Claudio Valerio authored Apr 10, 2012
  
  5a6de660
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 896383fd
  shibakaneki authored Apr 10, 2012
  
  896383fd
- Backup of the mirroring implementation · 4d2990a9
  shibakaneki authored Apr 10, 2012
  
  4d2990a9
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 20a787f1
  Claudio Valerio authored Apr 10, 2012
```
Conflicts:
	src/board/UBBoardView.cpp
	src/domain/UBGraphicsItemDelegate.cpp
```
  20a787f1
- first new teacher guide implementation · 93f69f80
  Claudio Valerio authored Apr 10, 2012
  
  93f69f80
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 05564470
  Anatoly Mihalchenko authored Apr 10, 2012
  
  05564470
- SANKORE-483 · 39fcd97b
  Anatoly Mihalchenko authored Apr 10, 2012
```
Web History
```
  39fcd97b
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 26dad723
  Ivan Ilin authored Apr 10, 2012
  
  26dad723
- Delete button is now available · d8bc5839
  Ivan Ilin authored Apr 10, 2012
  
  d8bc5839
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 856f3257
  Aleksei Kanash authored Apr 10, 2012
  
  856f3257
09 Apr, 2012 3 commits
- Wording icell · 087bb098
  bmagnin authored Apr 09, 2012
```
French wording for iCell
```
  087bb098
- Wording · 9f9299a7
  bmagnin authored Apr 09, 2012
```
wording
```
  9f9299a7
- Permanent Z-layer order changes, click bugs with pictures · da61ebad
  Ivan Ilin authored Apr 09, 2012
  
  da61ebad
05 Apr, 2012 5 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 80bfc86a
  Anatoly Mihalchenko authored Apr 05, 2012
  
  80bfc86a
- Missed files · fea77f49
  Anatoly Mihalchenko authored Apr 05, 2012
  
  fea77f49
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · ed2996c9
  Aleksei Kanash authored Apr 05, 2012
  
  ed2996c9
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · c29832a5
  Aleksei Kanash authored Apr 05, 2012
  
  c29832a5
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 18bedfca
  bmagnin authored Apr 05, 2012
  
  18bedfca