rebase with master

Authored by asagtani on Jun 24 2018, 10:47 AM.

Description

rebase with master

Details

Committed
asagtaniJun 24 2018, 10:47 AM
Parents
R2:abd83d34037b: drawing, improved text tool
R2:108cbd6ce6a9: drawing, improved text tool
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
108cbd6ce6a9asagtani
drawing, improved text tool 
Jun 21 2018
9fe054f07d8aasagtani
drawing, fixed minor issues and responsiveness 
Jun 20 2018
0ee362818811asagtani
drawing, code cleanup for phase-1 
Jun 17 2018
0ef7b359c721asagtani
drawing, improved export to png tool 
Jun 17 2018
4cf010fe90e6asagtani
drawing, removed Expand.qml 
Jun 16 2018
648c845a2cc6asagtani
drawing, renamed paint.js --> drawing.js 
Jun 16 2018
39aa7afc0bb0asagtani
drawing, added export ot png support 
Jun 16 2018
063acddd8122asagtani
drawing, removed ColorPalette.qml 
Jun 11 2018
2fa66f817355asagtani
drawing, changed activity name to 'Drawing' 
Jun 9 2018
abc094e9e462asagtani
drawing, code cleaning 
Jun 9 2018
3137e8ff99b6asagtani
drawing, improved color panel 
Jun 6 2018
2b548ba310f2asagtani
drawing, improved panel UI 
Jun 3 2018
c6d8c6d3c549asagtani
drawing, initilized new UI 
Jun 2 2018
ab569492daaaasagtani
drawing, fixed toolsSize pop-up dimensions 
May 28 2018
9ad27545d9edasagtani
drawing, improved color palette UI 
May 27 2018
bb9a2d221a40asagtani
drawing, code cleanup 
May 26 2018
8f7926f0dfe6asagtani
drawing, added geometric modes 
May 25 2018
9bfb6159a440asagtani
drawing, improved size settings and added Erase all functionality 
May 25 2018
67fff549dc65asagtani
drawing, refactored tools size settings 
May 24 2018
4b7e20a61675asagtani
drawing, implemented tools mode setting window 
May 23 2018
38d941c1c7f8asagtani
drawing, set text font-family to ApplicationSettings.font 
May 17 2018
cf6a240576ffasagtani
drawing, code refactoring - 2 
May 17 2018
6dcae5f5d821asagtani
Merge branch 'gsoc_asagtani_paint' of git://anongit.kde.org/gcompris into… 
May 17 2018
36704b678c44timotheegiet
paint add some base icons 
May 16 2018
f42a368a03c9asagtani
drawing, replaced file name in camelCase 
May 16 2018
79457d5a629basagtani
drawing, implementing new UI and refactoring - 1 
May 16 2018
3f91add61ab6asagtani
drawing, updated import versions 
May 14 2018
2177ae19af03jjazeix/asagtani
paint, code cleanup 
Apr 27 2018
2be0590ac9b1stefant/asagtani
tuxPaint, select brush icon completed 
Apr 27 2018
4fa62258efd7stefant/asagtani
tuxPaint, changed brush icons 
Apr 27 2018
7aee05194114stefant/asagtani
tuxPaint, fix blur tool 
Apr 27 2018
20ade3545fc9stefant/asagtani
tuxPaint, adapt the color of the select brush tool 
Apr 27 2018
00929449cb59stefant/asagtani
tuxPaint, base version 
Apr 27 2018

Empty Commit

This commit is empty and does not affect any paths.