Commits · 56eceb6605a33cdaf658f664c8953c79cfed4080 · lifo / Nicolas Ollinger / OpenBoard

07 May, 2012 3 commits
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 56eceb66
  Ivan Ilyin authored May 07, 2012
  
  56eceb66
- unstable but fresh changes multiple selection and grouping · f4fffe47
  Ivan Ilyin authored May 07, 2012
  
  f4fffe47
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 17dd8564
  Anna Udovichenko authored May 07, 2012
  
  17dd8564
04 May, 2012 6 commits
- implemented downloading pictures to library · 922efd33
  Anna Udovichenko authored May 04, 2012
  
  922efd33
- added setting element as background · bfd74d22
  Anna Udovichenko authored May 04, 2012
  
  bfd74d22
- changed mPath type in UBFeature class to QUrl · 56c8bfc3
  Anna Udovichenko authored May 04, 2012
  
  56c8bfc3
- Library search fixed · dcf9d3be
  Anna Udovichenko authored May 04, 2012
  
  dcf9d3be
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 107f2b64
  Anatoly Mihalchenko authored May 04, 2012
```
Conflicts:
	src/gui/UBFeaturesWidget.h
```
  107f2b64
- Memory leaks detection · 047be003
  Anatoly Mihalchenko authored May 04, 2012
  
  047be003
03 May, 2012 6 commits
- Fixed memory leak · 51e90964
  Anna Udovichenko authored May 03, 2012
  
  51e90964
- fixed not worked features widget · 812c3caf
  Anna Udovichenko authored May 03, 2012
  
  812c3caf
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 82bc6590
  Anna Udovichenko authored May 03, 2012
```
Conflicts:
	src/board/UBFeaturesController.cpp
	src/gui/UBFeaturesWidget.cpp
```
  82bc6590
- Web search partially implemented · ffc9b5c3
  Anna Udovichenko authored May 03, 2012
  
  ffc9b5c3
- Some memory-leaks problems detected and fixed · 214e0711
  Anatoly Mihalchenko authored May 03, 2012
  
  214e0711
- SANKORE-613 · 83212cc4
  Anatoly Mihalchenko authored May 03, 2012
```
Frame buttons
Part 1: changes in toolbars
```
  83212cc4
02 May, 2012 5 commits
- fixed deleting default widget · 62a82e1d
  Anna Udovichenko authored May 02, 2012
  
  62a82e1d
- some DnD bugs fixed · e130379b
  Anna Udovichenko authored May 02, 2012
  
  e130379b
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · f2c60833
  Anna Udovichenko authored May 02, 2012
  
  f2c60833
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · eb83f272
  Ivan Ilyin authored May 02, 2012
  
  eb83f272
- Sankore smart button · a6043930
  Ivan Ilyin authored May 02, 2012
  
  a6043930
30 Apr, 2012 3 commits
- Added elements selection · c2b9c6a4
  Anna Udovichenko authored Apr 30, 2012
  
  c2b9c6a4
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · a909eafd
  shibakaneki authored Apr 30, 2012
  
  a909eafd
- Backup of the strokes as objects · 5ffb64de
  shibakaneki authored Apr 30, 2012
  
  5ffb64de
28 Apr, 2012 3 commits
- FeatureWidget is in master now · 8be4c32b
  Ivan Ilyin authored Apr 28, 2012
  
  8be4c32b
- Merge branch 'FeatureWidget' · eaff36a9
  Ivan Ilyin authored Apr 28, 2012
  
  eaff36a9
- Some warnings disabled · c6e8b92d
  Ivan Ilyin authored Apr 28, 2012
  
  c6e8b92d
27 Apr, 2012 4 commits
- added slider size and position updating · 0bed9fad
  Anna Udovichenko authored Apr 27, 2012
  
  0bed9fad
- slider for thumbnail size added · 254d1acc
  Anna Udovichenko authored Apr 27, 2012
  
  254d1acc
- 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 10 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
- implemented deleting from favorite folder · 0cf7b075
  Anna Udovichenko authored Apr 26, 2012
  
  0cf7b075
- 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