Ilia Ryabokon
|
22b68c8a35
|
Merge conflict resolved
|
12 years ago |
|
Ilia Ryabokon
|
f6ac9f82ee
|
Progress bar favorites fix
|
12 years ago |
bmagnin
|
ef62f59341
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
bmagnin
|
07397aba55
|
Rescaling of images on Image planete
New resizing
height 180 to 150
Remove forced width in js (index.html)
Add ImgContainer img {max-width:150px; max-height:150px} in css
|
12 years ago |
Aleksei Kanash
|
fecd1f95c7
|
Useless comment removed.
|
12 years ago |
|
Aleksei Kanash
|
92c44dc05f
|
Fixed some merge errors.
Fixed SANKORE-902 - undo and redo works fine for deleted Media Items.
|
12 years ago |
|
Aleksei Kanash
|
41d8e4e459
|
Reworked painting of rotation angle for UBGraphicsDelegateFrame. Now angle showed as mouse cursor.
|
12 years ago |
shibakaneki
|
0707f90aed
|
Fixed issue 558
|
12 years ago |
Claudio Valerio
|
5bdeae56c6
|
fixed issue 901
|
12 years ago |
|
Claudio Valerio
|
0aa621269d
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Claudio Valerio
|
3a4b4e79b6
|
fixed issue 900
|
12 years ago |
|
Aleksei Kanash
|
c40965f191
|
Fixed wring merge (Commit:338c6390b2edf72fd38ac6098ee9217aa95bb953).
Implemented duplication and copying of strokes - Sankore-857.
|
12 years ago |
|
Claudio Valerio
|
ed9c64afba
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Claudio Valerio
|
239823fdd2
|
fixed issue 898
|
12 years ago |
|
Aleksei Kanash
|
481e196a54
|
Fixed moving items by play tool - Sankore-827,945.
|
12 years ago |
|
Aleksei Kanash
|
252dc9c42b
|
Display screen is centered now - fixed Sankore-811.
|
12 years ago |
|
Aleksei Kanash
|
ced305eccc
|
Useless code was removed.
|
12 years ago |
|
Aleksei Kanash
|
9dc74ccafa
|
Fixed sync of magnifier tool on control and display screens.
|
12 years ago |
Anatoly Mihalchenko
|
d2eff8ebb9
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Anatoly Mihalchenko
|
f5d5a5fa21
|
MAC: displaying import progress
|
12 years ago |
Yimgo
|
9244a43a5e
|
Fixed copy/paste in tool widget and move tool widget to control scene.
UBToolWidget.cpp/.h cleaned too.
|
12 years ago |
|
Aleksei Kanash
|
5e7cd52762
|
Multiple selection and deselection items implemented.
|
12 years ago |
|
Anatoly Mihalchenko
|
efc8b7edff
|
SANKORE-912
Import PDF: progress bar is not visible
|
12 years ago |
|
Anatoly Mihalchenko
|
44c52f5678
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Anatoly Mihalchenko
|
e6be59cea8
|
MAC warnings fix
|
12 years ago |
|
Anatoly Mihalchenko
|
312505e5bb
|
MAC warnings fix
|
12 years ago |
|
Claudio Valerio
|
4c565d6841
|
fixed double release problem
|
12 years ago |
|
Claudio Valerio
|
a1f474c793
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Claudio Valerio
|
aba21c9ee1
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Anatoly Mihalchenko
|
d42b4dfe70
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Anatoly Mihalchenko
|
1d130b3e60
|
SANKORE-896
Impossible to write an ê and an ë using the keyboard
|
12 years ago |
|
Yimgo
|
39b023e36f
|
Fixed API preferences missing in tool widgets.
|
12 years ago |
|
Yimgo
|
338c6390b2
|
Merge remote-tracking branch 'origin/master' into widget_fix_merged
|
12 years ago |
|
shibakaneki
|
558f2d4789
|
Merge branch 'master' of https://github.com/Sankore/Sankore-3.1
|
12 years ago |
|
shibakaneki
|
f25da1f3ec
|
Fixed issue 633
|
12 years ago |
|
Ilia Ryabokon
|
fbb5d87537
|
Sankore 874 feature widget create folder twice resolved
|
12 years ago |
|
Yimgo
|
11b164ed78
|
Fixed widgets removing.
|
12 years ago |
|
Ilia Ryabokon
|
d95596506c
|
Merge conflicts
|
12 years ago |
|
Ilia Ryabokon
|
2b2abcf3d7
|
Regexp fix
|
12 years ago |
|
Anatoly Mihalchenko
|
42d1fcb6ec
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Yimgo
|
4cdccf4afe
|
Fixed widget preferences regression.
|
12 years ago |
|
Yimgo
|
4cb394ddac
|
Fixed commit f3496036d5.
|
12 years ago |
|
Yimgo
|
f3496036d5
|
Fixed widget paint when non-scene rendering.
|
12 years ago |
|
Anatoly Mihalchenko
|
3c0d021b2d
|
Digital timer fix
|
12 years ago |
|
Claudio Valerio
|
7455088e31
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Claudio Valerio
|
bda4b91871
|
second bad fix
|
12 years ago |
|
Yimgo
|
fccd9de46f
|
Merged widget_fix into master.
Conflicts:
src/board/UBBoardController.cpp
src/board/UBFeaturesController.cpp
src/domain/UBAbstractWidget.cpp
src/domain/UBGraphicsWidgetItem.cpp
src/domain/UBGraphicsWidgetItem.h
src/domain/UBW3CWidget.cpp
src/domain/UBW3CWidget.h
|
12 years ago |
|
Claudio Valerio
|
5f08f98ab6
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
Claudio Valerio
|
1d7111122b
|
Merge branch 'master' of github.com:Sankore/Sankore-3.1
|
12 years ago |
|
Claudio Valerio
|
4d6d7e3bf8
|
bad fixes
|
12 years ago |
