44 Commits

Author	SHA1	Message	Date
Nick O'Leary	53e3e08d70	Handle cloning a project without package.json	2018-05-02 16:24:58 +01:00
Nick O'Leary	6191a49ed3	Use flow-diff to resolve merge conflicts	2018-02-13 23:09:51 +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	555b7df986	Handle more git 2.1 differences	2018-02-07 13:47:09 +00:00
Nick O'Leary	5fe5db603d	Better error handling/reporting in project creation	2018-02-05 15:59:11 +00:00
Nick O'Leary	1377439bb0	Fix pull/push when no tracked branch	2018-02-01 17:08:22 +00:00
Nick O'Leary	750dd590c8	Handle delete of last remote in project settings	2018-02-01 11:25:56 +00:00
Nick O'Leary	b847e962aa	Handle project first-run without existing flow file	2018-01-31 21:31:45 +00:00
Nick O'Leary	c43647ca86	Handle null profile flow file name	2018-01-25 11:14:16 +00:00
Nick O'Leary	6d02e70025	Ensure existing files are migrated to first project	2018-01-25 10:13:07 +00:00
Nick O'Leary	95589307cd	Better reporting of project-not-found	2018-01-24 21:54:18 +00:00
Nick O'Leary	64607df929	Ensure git username/email are set on project creation	2018-01-24 15:51:11 +00:00
Nick O'Leary	cf34716a57	Tidy up project first-run experience	2018-01-23 11:26:05 +00:00
Nick O'Leary	d93a92c1c8	Rearrange ssh logic to bring it together	2018-01-18 23:13:55 +00:00
Nick O'Leary	f7f795f58a	Fixup SSH key auth for project repos	2018-01-18 22:17:48 +00:00
Nick O'Leary	f95b414d22	First pass of projects test coverage	2018-01-16 23:04:39 +00:00
Nick O'Leary	3306d30094	Get proper path to local keyfile when selected	2018-01-11 11:19:04 +00:00
Nick O'Leary	6516e0dfd2	Allow a user to pick existing sshkeys from ~/.ssh	2018-01-10 17:37:41 +00:00
Nick O'Leary	13356047dc	Better handling of empty projects and lifecycle	2018-01-09 15:06:05 +00:00
Nick O'Leary	1d7ae300e2	Handle cloning a bare repository	2018-01-08 14:46:56 +00:00
Nick O'Leary	9c350311e8	Fix reauthentication of remote repositories	2017-12-21 17:40:24 +00:00
Nick O'Leary	8c87478636	Merge sshkeys	2017-12-20 15:12:10 +00:00
Nick O'Leary	d870b072d7	Tidy up branch/remote list in projectSettings	2017-12-20 14:37:34 +00:00
Hideki Nakamura	2ea2af7d2a	Use a fixed string instead of os.hostname()	2017-12-20 19:44:57 +09:00
Nick O'Leary	33a5b84181	Add first-run dialog to migrate files to project	2017-12-19 00:56:02 +00:00
Hideki Nakamura	9bc41c1709	Merge branch "projects"	2017-12-16 00:33:08 +09:00
Hideki Nakamura	fe10b8650f	Add Git access feature via SSH and Enhance SSH Key management	2017-12-16 00:07:47 +09:00
Nick O'Leary	bb59cd5742	Allow unstaged files to be reverted	2017-12-11 17:05:12 +00:00
Nick O'Leary	27f1d3b704	Add delete local branch option	2017-12-08 16:31:42 +00:00
Hideki Nakamura	3adfe249b0	Support to delete project feature (#1509) ... * First commit to support to delete projects * Add delete project menu & Implement delete project API * Correspond to the PR feedback	2017-12-07 14:28:26 +00:00
Nick O'Leary	304c597a2f	Store repo credentials per-user	2017-12-06 22:39:30 +00:00
Nick O'Leary	1840d15397	Restructure how editor/git settings are saved in userSettings	2017-12-05 23:50:32 +00:00
Nick O'Leary	a7e14f1093	Handle a local branch that does not yet track a remote	2017-12-04 13:26:47 +00:00
Nick O'Leary	94eeaeb8d3	Allow committer details to be set per-user	2017-12-04 11:42:44 +00:00
Nick O'Leary	14c48253f6	Confirm actions that would overwrite dirty workspace	2017-11-24 23:12:35 +00:00
Nick O'Leary	e5ff25b92d	Fix project pull with authentication	2017-11-23 20:52:15 +00:00
Nick O'Leary	5c88888e02	Better auth handling in projects	2017-11-23 00:27:13 +00:00
Nick O'Leary	10057de9b3	A big projects update ... Includes: - change local/remote branches - basic support for username/password handling	2017-11-21 23:31:41 +00:00
Nick O'Leary	57533fd831	Add commit-diff view	2017-10-25 15:26:24 +01:00
Nick O'Leary	3d6468326a	Allow a project's flow file to be changed	2017-10-19 21:38:53 +01:00
Nick O'Leary	5218a3fbac	Add custom project.toJSON to simplify state mangement	2017-10-17 10:14:50 +01:00
Nick O'Leary	4569cb432d	Add Project object in runtime	2017-10-16 23:23:50 +01:00