12 Commits

Author	SHA1	Message	Date
Nick O'Leary	f953612695	Mark deploy inflight when reverting a file change	2018-02-18 16:30:47 +00:00
Nick O'Leary	6191a49ed3	Use flow-diff to resolve merge conflicts	2018-02-13 23:09:51 +00:00
Nick O'Leary	9066cedc29	Better merge-conflict commit button layout	2018-02-09 09:35:47 +00:00
Nick O'Leary	aa1cf0b228	Avoid git fetch when refreshing local status	2018-02-08 23:30:07 +00:00
Nick O'Leary	06a6a4408f	Handle allow-unrelated-histories option on pull	2018-02-08 23:21:14 +00:00
Nick O'Leary	d5619d2b9d	Fix up merge conflict handling	2018-02-08 22:22:58 +00:00
Nick O'Leary	5fe5db603d	Better error handling/reporting in project creation	2018-02-05 15:59:11 +00:00
Nick O'Leary	d1f7fd8bfd	Prevent http git urls from including username/pword	2018-02-02 22:43:29 +00:00
Nick O'Leary	407123a280	Add git_pull_unrelated_history handling	2018-02-01 17:07:46 +00:00
Nick O'Leary	3d8d6953ec	Avoid unecessary project refresh on branch-switch ... Fixes #1597	2018-01-31 23:16:38 +00:00
Nick O'Leary	1204cf1ba0	Better permission handling in editor	2018-01-12 21:00:11 +00:00
Nick O'Leary	8a6488b067	Move editor project files and add search to open dialog	2018-01-08 23:14:37 +00:00