search

evolus / pencil

The Pencil Project's unique mission is to build a free and opensource tool for making diagrams and GUI prototyping that everyone can use.
http://pencil.evolus.vn
GNU General Public License v2.0
9.04k stars 717 forks source link

merge development branch into master #699

Open Elia-Sh opened 3 years ago

Elia-Sh commented 3 years ago

master is stale, and can be merged with the latest accumulated changes in development branch.

Elia-Sh commented 3 years ago

In addition, there are some commits that exist in master, but missing from development branch, thus creating additional discrepancy, see: https://aur.archlinux.org/packages/pencil-git/#comment-821910

commits that exit in master but does not exit in development branch - 

$ git cherry -v  --abbrev=8 remotes/origin/development remotes/origin/master
+ 71b5f19f Fix #332: Hotkeys don't work in inputs anymore
+ e5ad2530 Revert "Make hotkeys don't work on inputs anymore"
+ 536dc3e0 Create RELEASE-NOTE-310.md
+ 460b5c49 Update RELEASE-NOTE-310.md
+ c4cb7afd Update RELEASE-NOTE-310.md
+ 185a5e9e Update RELEASE-NOTE-310.md
+ 769c3751 Update RELEASE-NOTE-310.md
+ f1309bc1 Update RELEASE-NOTE-310.md

commits that exist in development but not in master branch -

[elia@arch-book evolus_pencil]$ git cherry -v  --abbrev=8 remotes/origin/master remotes/origin/development                              
+ bca591b1 Fix #577 - v3.1.0 break search bar                                                                                           
+ b8903481 Add configuration to enable hardware acceleration in Linux
+ f9ab262c Add support for specifying custom UI font
+ e1c98b07 Remove error log when no private collection was found
+ c1ae766c Fix clickable prototype export template
+ 917cda7b Fix wrong image size when pasting from clipboard in hidpi screens
+ 34f08868 Adding support for property change mask to partially change a property in a group of targets
+ 2c29b4b2 Disable dev tool auto open in dev mode
+ 80eb31de Implement partial property changes for all remaining types
+ 57b5e26a Refactor how snapping was calculated and handled
+ a4ea2136 fix snapping and prototype export
+ 70fd2809 Fix: changing shadow dx has no effect
+ 031951b3 Fix error during save if document contains font which is not installed
+ fb9d6a76 Migrate to electron 9.3.0
+ 89e88ce8 New gesture and experimental clipart search
+ a98fa283 Fix file dialog API when saving and loading
+ d331951e Additional API fix for electron 9.3.0 that affects export 
+ 3502abaa Improve recent document and page thumbnail views
+ a611761e Add xml syntax for code editor
+ 22a090d1 Add xml syntax for code editor
+ 98f09659 Upgrade to Electron 10.1.3
+ fa2a8698 Fix progress dialog annoying text jump
+ 8a7a96b1 Allow external editor for unlisted extensions
+ 5a3d2749 Show error message when editor quits to fast
+ 92c545de Fix collection installer open dialog API changes caused by Electron 10
+ d7c9948b Add delay to renderer
+ 205761a6 Fixed load file for image data prompt
+ 9687bd07 Add support for generic external commandline-based screenshooter
+ ee45a1af Update to electron 11.4.4
+ 043ca48d Explicitly use .png for screenshot tmp file
v3ss0n commented 2 years ago

just use draw.io , this project is dead. https://github.com/jgraph/drawio