Commits · 4a1e71d3c39ef657a99f3e48b4c1266758da6f5a · lifo / Nicolas Ollinger / OpenBoard

27 Apr, 2012 4 commits
- before handlig the page number · 4a1e71d3
  Claudio Valerio authored Apr 27, 2012
  
  4a1e71d3
- removed software update · 91005972
  Claudio Valerio authored Apr 27, 2012
  
  91005972
- UBTeacherGuideWidget conflict resolved manually · 2b678dd9
  Ivan Ilin authored Apr 27, 2012
  
  2b678dd9
- Disabling grouping items · 09f1c235
  Ivan Ilin authored Apr 27, 2012
  
  09f1c235
26 Apr, 2012 13 commits
- Correction to dragging items. · d6de8439
  Aleksei Kanash authored Apr 26, 2012
  
  d6de8439
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · ad61fdd6
  Aleksei Kanash authored Apr 26, 2012
  
  ad61fdd6
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 28e88c6b
  Claudio Valerio authored Apr 26, 2012
  
  28e88c6b
- fixed crash due to the document metadata · c62c84fb
  Claudio Valerio authored Apr 26, 2012
  
  c62c84fb
- Backup of the lines as object · a77036d6
  shibakaneki authored Apr 26, 2012
  
  a77036d6
- Fix to SANKORE-629. · 2a1ff6ad
  Aleksei Kanash authored Apr 26, 2012
```
D'n'D in widgets works fine now.
```
  2a1ff6ad
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 6f9472ad
  shibakaneki authored Apr 26, 2012
  
  6f9472ad
- fixed teacher guide licence index out of boundaries · bc941dd4
  Claudio Valerio authored Apr 26, 2012
  
  bc941dd4
- Fix to SANKORE-626. · 831765cc
  Aleksei Kanash authored Apr 26, 2012
```
Display widget displaying correctly now.
```
  831765cc
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 22bd3e08
  shibakaneki authored Apr 26, 2012
  
  22bd3e08
- Backup · 0d517aad
  shibakaneki authored Apr 26, 2012
  
  0d517aad
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · b5cfcfd9
  Ivan Ilin authored Apr 26, 2012
  
  b5cfcfd9
- Improved html parser. · 2a1a6ebf
  Aleksei Kanash authored Apr 26, 2012
```
Transformations adjusted to iwb specification.
```
  2a1a6ebf
25 Apr, 2012 5 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 82c155ca
  Claudio Valerio authored Apr 25, 2012
  
  82c155ca
- removed commented code · 20698028
  Claudio Valerio authored Apr 25, 2012
  
  20698028
- Corrected an issue with the compass as objects · f37ba1b3
  shibakaneki authored Apr 25, 2012
  
  f37ba1b3
- merge conflicts resolved · 855142f1
  Ivan Ilin authored Apr 25, 2012
  
  855142f1
- Grouping items available · 9bd20fdb
  Ivan Ilin authored Apr 25, 2012
  
  9bd20fdb
24 Apr, 2012 4 commits
- Adapted the compass to the strokes as objects · ef45f3fc
  shibakaneki authored Apr 24, 2012
  
  ef45f3fc
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 97dc3d90
  Claudio Valerio authored Apr 24, 2012
  
  97dc3d90
- first zero page teacher guide implementation · 0981b138
  Claudio Valerio authored Apr 24, 2012
  
  0981b138
- Adapted the ruler to the strokes as objects · bc875a66
  shibakaneki authored Apr 24, 2012
  
  bc875a66
23 Apr, 2012 2 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 6ab23ce4
  shibakaneki authored Apr 23, 2012
  
  6ab23ce4
- Backup of the lines as objects · 75a7c9ea
  shibakaneki authored Apr 23, 2012
  
  75a7c9ea
20 Apr, 2012 2 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 0eed7eef
  Ivan Ilin authored Apr 20, 2012
  
  0eed7eef
- multiple selection · d44cc5b6
  Ivan Ilin authored Apr 20, 2012
  
  d44cc5b6
18 Apr, 2012 8 commits
- updated build script to handle customizations · 75a1a853
  unknown authored Apr 18, 2012
  
  75a1a853
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 25fe3bf1
  unknown authored Apr 18, 2012
  
  25fe3bf1
- update mac script to handle customizations · 9e723fee
  Claudio Valerio authored Apr 18, 2012
  
  9e723fee
- updated to hide windows ide related files · 60e174ee
  unknown authored Apr 18, 2012
  
  60e174ee
- updated build script. Included custom fonts · 798e2393
  Claudio Valerio authored Apr 18, 2012
  
  798e2393
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 0a1799a5
  Ivan Ilin authored Apr 18, 2012
  
  0a1799a5
- System dependant rubberband created · 26ae8fb2
  Ivan Ilin authored Apr 18, 2012
  
  26ae8fb2
- added custom fonts · c87ec61e
  Claudio Valerio authored Apr 18, 2012
  
  c87ec61e
17 Apr, 2012 2 commits

Merge remote-tracking branch 'origin/Sankore-1.40' · f0d153fe

Claudio Valerio authored Apr 17, 2012

Conflicts:
	Sankore_3.1.pro
	resources/i18n/sankore_ar.ts
	resources/i18n/sankore_da.ts
	resources/i18n/sankore_de.ts
	resources/i18n/sankore_en.ts
	resources/i18n/sankore_en_UK.ts
	resources/i18n/sankore_es.ts
	resources/i18n/sankore_fr.ts
	resources/i18n/sankore_fr_CH.ts
	resources/i18n/sankore_it.ts
	resources/i18n/sankore_iw.ts
	resources/i18n/sankore_ja.ts
	resources/i18n/sankore_ko.ts
	resources/i18n/sankore_nb.ts
	resources/i18n/sankore_nl.ts
	resources/i18n/sankore_pl.ts
	resources/i18n/sankore_pt.ts
	resources/i18n/sankore_rm.ts
	resources/i18n/sankore_ro.ts
	resources/i18n/sankore_ru.ts
	resources/i18n/sankore_sv.ts
	resources/i18n/sankore_zh.ts
	src/core/UBDisplayManager.cpp

f0d153fe

mispelled path · 22e08de3
Claudio Valerio authored Apr 17, 2012

22e08de3