summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Prevent crash when get_primary_monitor() returns nullptr.Tavmjong Bah2017-07-041-1/+4
* Merge branch 'ccrb/inkscape-save-document-as-template'Martin Owens2017-07-028-21/+276
|\
| * Skip empty template informationChristophe Lebras2017-07-022-18/+25
| * Manage template informationsChristophe Lebras2017-07-023-24/+83
| * Add function to save templateChristophe Lebras2017-07-025-23/+46
| * Add Save Template DialogChristophe Lebras2017-07-023-0/+158
| * Add new verb "save template"Christophe Lebras2017-07-023-12/+20
* | 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-0211-351/+121
|\ \
| * | Move directory scanners to new get_filenames(...) callsMartin Owens2017-07-0211-351/+121
| |/
* | Merge https://gitlab.com/inkscape/inkscape into selectable-knotsJabier Arraiza2017-07-01298-8105/+179127
|\|
| * Hackfest: Tidy and test for file exists in output.Martin Owens2017-07-011-3/+6
| * Merge branch 'master' of gitlab.com:Frigory33/inkscapeMarc Jeanmougin2017-07-01291-8021/+178948
| |\
| | * Merge branch 'master' of gitlab.com:inkscape/inkscapeSylvain Chiron2017-07-01112-514/+709
| | |\
| | * | Updated libs from the Adaptagrams project: libavoid, libcola and libvspc; cha...Sylvain Chiron2017-07-01291-8021/+178948
| * | | 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
| * | | | Runtime check for primary acceleratorMarc Jeanmougin2017-07-011-5/+11
| | |_|/ | |/| |
| * | | 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-014-75/+116
|\| |
| * | Merge branch 'hacking' of gitlab.com:__chr__/inkscapeMarc Jeanmougin2017-06-301-0/+3
| |\ \
| | * | Replace ImageMagic with GraphicsMagicchr[]2017-06-301-0/+3
| * | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-301-35/+73
| |\ \ \
| | * \ \ Merge branch 'master' of gitlab.com:inkscape/inkscapeMartin Owens2017-06-301-0/+6
| | |\ \ \
| | * | | | 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-304-11/+95
|\| | | |
| * | | | Use Meta for shortcuts on Mac OSMarc Jeanmougin2017-06-301-0/+6
| |/ / /
| * | | 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
| * | | Upload New Filecajhne@gmail.com2017-06-301-0/+39
| |/ /
* / / Starting selectable knotsJabier Arraiza2017-06-308-33/+65
|/ /
* | Hackfest: Show dropper color in cursor, while moving the mouse.Martin Owens2017-06-304-60/+54
* | Hackfest: Refactor cursors so the hot spot is inside the xpmMartin Owens2017-06-3081-303/+165
* | Merge branch 'master' of gitlab.com:inkscape/inkscapeAlexander Valavanis2017-06-298-12/+222
|\ \
| * | Filter editor fix for gcc 5Martin Owens2017-06-291-2/+6
| * | Disable "new" filter editorMarc Jeanmougin2017-06-292-2/+1
| * | Merge commit 'd79cc2caf6'Marc Jeanmougin2017-06-293-4/+36
| |\ \
| | * | Allows one to use Super, Hyper and Meta key modifiers in shortcutsMarc Jeanmougin2017-06-293-4/+36
| * | | Merge branch 'master' of gitlab.com:inkscape/inkscapeMarc Jeanmougin2017-06-2918-115/+92
| |\ \ \