summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix windows builds with filename in symbols dialogMartin Owens2017-07-021-1/+1
* Remove duplicate error messageMartin Owens2017-07-021-8/+1
* Merge https://gitlab.com/inkscape/inkscape into selectable-knotsJabier Arraiza2017-07-0212-351/+122
|\
| * Move directory scanners to new get_filenames(...) callsMartin Owens2017-07-0211-351/+121
| * pyc files are generated when testing modules, ignore themMartin Owens2017-07-021-0/+1
* | Merge https://gitlab.com/inkscape/inkscape into selectable-knotsJabier Arraiza2017-07-021-2/+5
|\|
| * Specify CI test stage platform dependenciesTim Sheridan2017-07-021-2/+5
* | Merge https://gitlab.com/inkscape/inkscape into selectable-knotsJabier Arraiza2017-07-01303-8136/+179158
|\|
| * When running without installing, extensions will spawn correct InkscapeMaren Hachmann2017-07-011-0/+1
| * Hackfest: Tidy and test for file exists in output.Martin Owens2017-07-011-3/+6
| * Update .gitlab-ci.ymlMarc Jeanmougin2017-07-011-1/+1
| * Merge branch 'master' of gitlab.com:Frigory33/inkscapeMarc Jeanmougin2017-07-01292-8038/+178966
| |\
| | * Merge branch 'master' of gitlab.com:inkscape/inkscapeSylvain Chiron2017-07-01129-918/+7009
| | |\
| | * | Updated libs from the Adaptagrams project: libavoid, libcola and libvspc; cha...Sylvain Chiron2017-07-01292-8038/+178966
| * | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-07-014-63/+93
| |\ \ \
| | * | | Introduce get_filenames which scans paths for all filenames.Martin Owens2017-07-014-63/+93
| * | | | Merge branch 'speed_up_drawing' of gitlab.com:psychon/inkscapeMarc Jeanmougin2017-07-012-16/+72
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SPCanvas::paintSingleBuffer: Draw directly to _backing_storeUli Schlachter2017-07-011-12/+18
| | * | | SPCanvas: Use a similar image for _backing_storeUli Schlachter2017-07-012-4/+51
| | * | | Fix a small memory leak in SPCanvas::paintUli Schlachter2017-07-011-0/+3
| * | | | allows mac os build to fail as we have no mac runners yetMarc Jeanmougin2017-07-011-1/+1
| * | | | Runtime check for primary acceleratorMarc Jeanmougin2017-07-011-5/+11
| * | | | Fix version strings to work on windows & unixsu-v2017-07-012-12/+10
| | |_|/ | |/| |
| * | | Fix a compiling error on debian testingJabier Arraiza2017-07-011-1/+1
| |/ /
* | | Improving CR feedback. thanks!Jabier Arraiza2017-07-018-56/+68
* | | Finish add selectable knot shapesJabier Arraiza2017-07-016-15/+23
* | | Merge https://gitlab.com/inkscape/inkscape into selectable-knotsJabier Arraiza2017-07-018-82/+5645
|\| |
| * | Add Mac CI build configTim Sheridan2017-07-011-6/+35
| * | Merge branch 'master' of gitlab.com:walterbender/inkscapeMarc Jeanmougin2017-06-301-0/+5418
| |\ \
| | * | add Munsell palette formated to show hue pagesWalter Bender2017-06-231-0/+5418
| | * | Revert "add Munsell palette"Walter Bender2017-06-231-3204/+0
| | * | add Munsell paletteWalter Bender2017-06-231-0/+3204
| * | | Merge branch 'hacking' of gitlab.com:__chr__/inkscapeMarc Jeanmougin2017-06-303-1/+79
| |\ \ \
| | * | | jemalloc cmake modulechr[]2017-06-302-0/+75
| | * | | Replace ImageMagic with GraphicsMagicchr[]2017-06-302-1/+4
| * | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-301-35/+73
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:inkscape/inkscapeMartin Owens2017-06-3010-396/+364
| | |\ \ \ \
| | * | | | | Hackfest: Add start of dropping toolMartin Owens2017-06-301-35/+73
| * | | | | | Replace cursor-dropping-s.xpmcajhne@gmail.com2017-06-301-1/+1
| * | | | | | Replace cursor-dropping-s.xpmcajhne@gmail.com2017-06-301-25/+25
| * | | | | | Replace cursor-dropper-s.xpmcajhne@gmail.com2017-06-301-16/+16
| | |/ / / / | |/| | | |
* | | | | | working on knots selectionJabier Arraiza2017-07-0110-22/+74
* | | | | | Merge branch 'master' of https://gitlab.com/jabiertxof/inkscape into selectab...Jabier Arraiza2017-06-3013-407/+453
|\| | | | |
| * | | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-306-200/+151
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://gitlab.com/inkscape/inkscapeTavmjong Bah2017-06-302-13/+22
| | |\ \ \ \ \
| | * | | | | | Fix and clean clean some icons.Tavmjong Bah2017-06-306-200/+151
| | | |/ / / / | | |/| | | |
| * | | | | | Use Meta for shortcuts on Mac OSMarc Jeanmougin2017-06-302-183/+191
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-303-11/+89
| |\| | | |
| | * | | | Replace cursor-dropper-s.xpm with thicker border for doctormo's real-time col...cajhne@gmail.com2017-06-301-11/+11
| | * | | | Upload New Filecajhne@gmail.com2017-06-301-0/+39