summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-03conflict resolutionBlaine
2020-06-03conflict resolutionBlaine
2020-06-02Merge branch 'merge'Blaine
2020-06-02bring upstream branch up to date.Blaine
2020-05-28Merge branch 'master' of https://github.com/Blakeinstein/Chemical-PFDBlaine
2020-05-28test codeBlaine
2020-05-28customScene collision boilerplateBlaine
2020-05-28Merge branch 'master' into masterBlaine
2020-05-28add ellipseBlaine
2020-05-28upstream undoBlaine
2020-05-27commit undo modificationBlaine
2020-05-27merge-commit 2Blaine
2020-05-27update drag and drop for streamlined mergeBlaine
2020-05-25week 5 refactorBlaine
2020-05-22rename funcs to app, and fix toolbar resizingBlaine
2020-05-22migrate to json in data.py and use custom iconsBlaine
2020-05-21migrate to jsonBlaine
2020-05-21Merge pull request #3 from Sumit-Sahu/masterpravindalve
2020-05-21Update .gitignoreSumit-Sahu
2020-05-21add .idea/sumit
2020-05-21svg origin at center and size grip as childsumit
2020-05-21Merge remote-tracking branch 'upstream/master'sumit
2020-05-21add class for pfd-symbolssumit
2020-05-20undo stack, form layout to boxBlaine
2020-05-20cleanupsumit
2020-05-19clean up'sumit
2020-05-19Merge branch 'master' of https://github.com/Sumit-Sahu/Chemical-PFDsumit
2020-05-19remove svg filessumit
2020-05-19Delete svghandler.pySumit-Sahu
2020-05-19clean up and add commentssumit
2020-05-19undo redo completeBlaine
2020-05-19Merge pull request #2 from Blakeinstein/masterpravindalve
2020-05-19helper commit to merge shapesBlaine
2020-05-18Rename shapes.py to src/main/python/shapes/shapes.pySumit-Sahu
2020-05-18Rename svghandler.py to src/main/python/shapes/svghandler.pySumit-Sahu
2020-05-18Rename line.py to src/main/python/shapes/line.pySumit-Sahu
2020-05-18syncing forksumit
2020-05-18Undo Framework implementedBlaine
2020-05-18Merge pull request #1 from Blakeinstein/masterpravindalve
2020-05-16minor clean up and commentsBlaine
2020-05-16QDragLeaveEvent + Generator functionsBlaine
2020-05-15minor cleanupBlaine
2020-05-15implement search boxBlaine
2020-05-15working fixBlaine
2020-05-14enable drag and dropBlaine
2020-05-13fixed toolbar issuesBlaine
2020-05-12toolbar sectioningBlaine
2020-05-12try to change view boxsumit
2020-05-11refactoring and toolbarBlaine
2020-05-10add svg handlersumit
generated by cgit (git 2.34.1) at 2024-12-20 16:59:08 +0000