Commits · 3bfc3ceb0dbdf8e04b93f41c1e1c7942c9067f95 · lifo / Nicolas Ollinger / OpenBoard

06 Feb, 2012 1 commit
- added the ability to delete an image in the media container of the teacherbar · 3bfc3ceb
  shibakaneki authored Feb 06, 2012
  
  3bfc3ceb
02 Feb, 2012 5 commits
- Fixed a signal slot error · 45184923
  shibakaneki authored Feb 02, 2012
  
  45184923
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 897b4b67
  shibakaneki authored Feb 02, 2012
  
  897b4b67
- Fix for SANKORE-490 and SANKORE-491. · 2d102026
  Aleksei Kanash authored Feb 02, 2012
  
  2d102026
- Resolved an issue with the links in the teacherbar · 03fa177d
  shibakaneki authored Feb 02, 2012
  
  03fa177d
- Changed the combobx into a textfield in the teacher bar · 8c5b96b2
  shibakaneki authored Feb 02, 2012
  
  8c5b96b2
01 Feb, 2012 3 commits
- Updated some minor EOU (Ease Of Use) in the teacher bar · c905eb38
  shibakaneki authored Feb 01, 2012
  
  c905eb38
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 40be5027
  shibakaneki authored Feb 01, 2012
  
  40be5027
- Implemented the Teacher Bar Document Preview widget · 01aa493e
  shibakaneki authored Feb 01, 2012
  
  01aa493e
31 Jan, 2012 14 commits
- Improved PDF export. Now it exports in proper size. · 2ea30bf9
  Anatoly Mihalchenko authored Jan 31, 2012
  
  2ea30bf9
- increased version number · 3aaedfa7
  Claudio Valerio authored Jan 31, 2012
  
  3aaedfa7
- Optimizing to SANKORE-493 (and that fix now resolve SANKORE-492). · 0fdc8283
  Aleksei Kanash authored Jan 31, 2012
  
  0fdc8283
- changed paraschool widget · 96107583
  unknown authored Jan 31, 2012
  
  96107583
- changed paraschool widget · 79588b6a
  unknown authored Jan 31, 2012
  
  79588b6a
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · a62e6346
  Claudio Valerio authored Jan 31, 2012
  
  a62e6346
- added execute flag · d2923eb6
  Claudio Valerio authored Jan 31, 2012
  
  d2923eb6
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · c8b054f4
  shibakaneki authored Jan 31, 2012
  
  c8b054f4
- Fix for SANKORE-493. · 32fcd0be
  Aleksei Kanash authored Jan 31, 2012
  
  32fcd0be
- Fixed an issue in the teacherbar V3 · cbbf77f0
  shibakaneki authored Jan 31, 2012
  
  cbbf77f0
- improved debian package · 0c83de71
  Claudio Valerio authored Jan 31, 2012
  
  0c83de71
- new paraschool widget · 736b2589
  unknown authored Jan 31, 2012
  
  736b2589
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 0b587e68
  Claudio Valerio authored Jan 31, 2012
  
  0b587e68
- handlig system where the ',' is used to separate decimals · 58cf72f5
  Claudio Valerio authored Jan 31, 2012
  
  58cf72f5
30 Jan, 2012 9 commits
- Fix for SANKORE-3. · 63d6e6d2
  Aleksei Kanash authored Jan 30, 2012
  
  63d6e6d2
- Fixed crashes on application exiting. · d6f500e0
  Aleksei Kanash authored Jan 30, 2012
```
The trouble has been in the deleting already deleted objects. I remove all code from destructors and modify one member to pointer for assign hem parent.
```
  d6f500e0
- fixed issue of empty document. In this case the metadata.rdf and the *.ubz are not created · 65ffaf9f
  Claudio Valerio authored Jan 30, 2012
  
  65ffaf9f
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · 6d18c193
  Claudio Valerio authored Jan 30, 2012
  
  6d18c193
- The teacher bar should not be visible on the desktop mode · 3f8f90dd
  Claudio Valerio authored Jan 30, 2012
  
  3f8f90dd
- Merge branch 'master' of github.com:Sankore/Sankore-3.1 · d261320e
  Anatoly Mihalchenko authored Jan 30, 2012
  
  d261320e
- Enhancements to raster PDF export · 9e5198fb
  Anatoly Mihalchenko authored Jan 30, 2012
  
  9e5198fb
- fixed some issue due to merge · 7b595aec
  Claudio Valerio authored Jan 30, 2012
  
  7b595aec
- Merge remote-tracking branch 'origin/Bett-2012' · fd3e8ddb
  Claudio Valerio authored Jan 30, 2012
```
Conflicts:
	Sankore_3.1.pro
	src/board/UBBoardPaletteManager.cpp
	src/board/UBBoardView.cpp
	src/document/UBDocumentProxy.cpp
	src/gui/UBDockPaletteWidget.cpp
	src/gui/UBTeacherBarWidget.h
	src/web/UBWebController.h
```
  fd3e8ddb
27 Jan, 2012 5 commits
- Code refactoring: pointers instead of names in Palettes · 927c77ac
  Anatoly Mihalchenko authored Jan 27, 2012
  
  927c77ac
- Added some metadata fields · 07414cf6
  shibakaneki authored Jan 27, 2012
  
  07414cf6
- linux hotfix 6bbecff5 SANKORE-329 Visibility of palette based on children elements · 4a051f2a
  Ivan Ilin authored Jan 27, 2012
  
  4a051f2a
- src/adaptors · d6af845c
  shibakaneki authored Jan 27, 2012
  
  d6af845c
- http://188.165.53.52/jira/browse/SANKORE-329 · 6bbecff5
  Anatoly Mihalchenko authored Jan 27, 2012
```
Visibility of palette based on children elements
```
  6bbecff5
26 Jan, 2012 2 commits
- Implemented the drag and drop from the teacherbar to the board · 5ce549f1
  shibakaneki authored Jan 26, 2012
  
  5ce549f1
- SANKORE-463 (testet for ubuntu 11 x86_64) · aa6a893a
  Aleksei Kanash authored Jan 26, 2012
  
  aa6a893a
25 Jan, 2012 1 commit
- Sankore-456 · 9f898048
  Ivan Ilin authored Jan 25, 2012
  
  9f898048