38 Commits

Author	SHA1	Message	Date
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	9f7dd7f5d4	Add Project Settings menu option	2018-02-05 10:58:09 +00:00
Nick O'Leary	e6d32aab7b	Refresh vc sidebar on remote add/remove	2018-02-05 10:10:26 +00:00
Nick O'Leary	22d942b705	Fix auth prompt for ssh repos	2018-02-03 23:44:19 +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	fc1436a96d	Fix fetch auth handling on non-default remote	2018-02-02 16:26:55 +00:00
Nick O'Leary	407123a280	Add git_pull_unrelated_history handling	2018-02-01 17:07:46 +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	d0d93d7070	Handle more repo clone error cases	2018-02-01 10:42:14 +00:00
Nick O'Leary	4117961236	Relax validation of git urls	2018-02-01 10:42:04 +00:00
Nick O'Leary	68a3d71ee6	Revalidate project name on return to project-details view	2018-02-01 09:47:29 +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	528db67c34	Add support for file:// git urls	2018-01-31 22:34:18 +00:00
Kazuki-Nakanishi	0bc7702d95	Fix the problem that the project other than the first project does not encrypt a credential file	2018-01-29 15:51:16 +09:00
Nick O'Leary	0dd7bc7fb9	Better default README.md content and edit button	2018-01-25 13:30:27 +00:00
Nick O'Leary	af683835d9	Add optional header to markdown editor	2018-01-25 11:24:30 +00:00
Nick O'Leary	c43647ca86	Handle null profile flow file name	2018-01-25 11:14:16 +00:00
Kazuki Nakanishi	94cb7de79f	Fix the problem when using projects feature without git setting (#1575)	2018-01-25 08:11:46 +00:00
Kazuki-Nakanishi	1c1422e4b5	Enable a project open button when creating a first project	2018-01-25 12:46:37 +09:00
Nick O'Leary	6a9213da64	Add project-exists checks on first-run dialog	2018-01-24 21:21:01 +00:00
Nick O'Leary	7a89e3cf33	Check the global git config to ensure its setup	2018-01-24 21:05:48 +00:00
Nick O'Leary	a9ece5772d	Remove extra editor logging	2018-01-23 11:29:09 +00:00
Nick O'Leary	cf34716a57	Tidy up project first-run experience	2018-01-23 11:26:05 +00:00
Nick O'Leary	1337831061	Better interaction with view-ssh-key list	2018-01-23 10:25:19 +00:00
Nick O'Leary	ad6e55ca17	Allow a user to install missing modules from project settings	2018-01-22 13:46:11 +00:00
Nick O'Leary	a9b50ce6fc	Collapse create/open/delete project dialogs into one	2018-01-19 21:51:29 +00:00
Nick O'Leary	f7f795f58a	Fixup SSH key auth for project repos	2018-01-18 22:17:48 +00:00
Nick O'Leary	1204cf1ba0	Better permission handling in editor	2018-01-12 21:00:11 +00:00
Nick O'Leary	bb168d35a8	Add warning if no sshkeys configured when cloning	2018-01-11 12:56:49 +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	8a6488b067	Move editor project files and add search to open dialog	2018-01-08 23:14:37 +00:00