c40965f191
Fixed wring merge (Commit:338c6390b2edf72fd38ac6098ee9217aa95bb953).
...
Implemented duplication and copying of strokes - Sankore-857.
12 years ago
ed9c64afba
Merge branch 'master' of github.com:Sankore/Sankore-3.1
12 years ago
239823fdd2
fixed issue 898
12 years ago
481e196a54
Fixed moving items by play tool - Sankore-827,945.
12 years ago
252dc9c42b
Display screen is centered now - fixed Sankore-811.
12 years ago
ced305eccc
Useless code was removed.
12 years ago
9dc74ccafa
Fixed sync of magnifier tool on control and display screens.
12 years ago
d2eff8ebb9
Merge branch 'master' of github.com:Sankore/Sankore-3.1
12 years ago
f5d5a5fa21
MAC: displaying import progress
12 years ago
9244a43a5e
Fixed copy/paste in tool widget and move tool widget to control scene.
...
UBToolWidget.cpp/.h cleaned too.
12 years ago
5e7cd52762
Multiple selection and deselection items implemented.
12 years ago
efc8b7edff
SANKORE-912
...
Import PDF: progress bar is not visible
12 years ago
44c52f5678
Merge branch 'master' of github.com:Sankore/Sankore-3.1
12 years ago
e6be59cea8
MAC warnings fix
12 years ago
312505e5bb
MAC warnings fix
12 years ago
4c565d6841
fixed double release problem
12 years ago
a1f474c793
Merge branch 'master' of github.com:Sankore/Sankore-3.1
12 years ago
aba21c9ee1
Merge branch 'master' of github.com:Sankore/Sankore-3.1
12 years ago
d42b4dfe70
Merge branch 'master' of github.com:Sankore/Sankore-3.1
12 years ago
1d130b3e60
SANKORE-896
...
Impossible to write an ê and an ë using the keyboard
12 years ago
39b023e36f
Fixed API preferences missing in tool widgets.
12 years ago
338c6390b2
Merge remote-tracking branch 'origin/master' into widget_fix_merged
12 years ago
558f2d4789
Merge branch 'master' of https://github.com/Sankore/Sankore-3.1
12 years ago
f25da1f3ec
Fixed issue 633
12 years ago
fbb5d87537
Sankore 874 feature widget create folder twice resolved
13 years ago
11b164ed78
Fixed widgets removing.
13 years ago
d95596506c
Merge conflicts
13 years ago
2b2abcf3d7
Regexp fix
13 years ago
42d1fcb6ec
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
4cdccf4afe
Fixed widget preferences regression.
13 years ago
4cb394ddac
Fixed commit f3496036d5.
13 years ago
f3496036d5
Fixed widget paint when non-scene rendering.
13 years ago
3c0d021b2d
Digital timer fix
13 years ago
7455088e31
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
bda4b91871
second bad fix
13 years ago
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
13 years ago
5f08f98ab6
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
1d7111122b
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
4d6d7e3bf8
bad fixes
13 years ago
394c3d5db6
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
24741f2e1b
Moving action palette to the correct place
13 years ago
81a49e9525
Reworked items copying mechanism.
...
Now coping creates a full copy of already created item. Copy has it's own content (like video, audio or folder) and stores original item properties (like locked, pos, size, freezed e.t.c.).
13 years ago
653201b63a
Windows hotfix
13 years ago
20f5036b7f
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
780e68f7ef
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
5a7c350137
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
48a431547a
GraphicsMediaItem
13 years ago
35e784eb1a
Wait for thread set
13 years ago
c9252acafa
Merge branch 'master' of github.com:Sankore/Sankore-3.1
13 years ago
935389c3ea
update version
13 years ago
Aleksei Kanash
Claudio Valerio
Anatoly Mihalchenko
Yimgo
shibakaneki
Ilia Ryabokon
Claudio Valerio