48 Commits

Author	SHA1	Message	Date
Nick O'Leary	dba195b396	Add detection of connection timeout in git communication ... Fixes #1770	2018-07-11 13:26:45 +01:00
Nick O'Leary	e3520309fc	Add clone project to welcome screen	2018-05-02 13:38:50 +01:00
Nick O'Leary	6191a49ed3	Use flow-diff to resolve merge conflicts	2018-02-13 23:09:51 +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	b3786700e6	Handle changing case of git error messages between versions	2018-02-07 13:10:04 +00:00
Nick O'Leary	4a5cb7f2f5	Ensure commit list has a refs object even if empty	2018-02-07 11:33:07 +00:00
Nick O'Leary	42a7e902e6	Handle host key verification as auth error	2018-02-07 11:32:50 +00:00
Nick O'Leary	aebe080e85	Add support for GIT_SSH on older levels of git	2018-02-07 10:50:32 +00:00
Nick O'Leary	415c768ae4	Filter out %D from git log command for older git versions	2018-02-06 11:00:11 +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	d21568497b	Avoid exception if git not installed	2018-02-02 13:46:22 +00:00
Nick O'Leary	df4beef060	Check version of git client on startup	2018-02-02 11:37:18 +00:00
Nick O'Leary	407123a280	Add git_pull_unrelated_history handling	2018-02-01 17:07:46 +00:00
Nick O'Leary	d0d93d7070	Handle more repo clone error cases	2018-02-01 10:42:14 +00:00
Nick O'Leary	8672fcd2bb	Fix authServer on Windows path ... Fixes #1588	2018-01-29 21:47:20 +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	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	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	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	bf57cb209f	Delete unnecessary logs	2017-12-16 00:46:05 +09: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	a3a1bba5ef	Add projects editorTheme flag to disable the feature	2017-12-13 09:44:48 +00: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
Nick O'Leary	d007623347	Return more detailed information on /project/branches api	2017-12-07 22:24:57 +00:00
Nick O'Leary	304c597a2f	Store repo credentials per-user	2017-12-06 22:39:30 +00:00
Nick O'Leary	91352e855a	Handle overwrite warning on local branch change	2017-12-05 16:12:07 +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	4569cb432d	Add Project object in runtime	2017-10-16 23:23:50 +01:00
Nick O'Leary	19c84eb694	Add commit history view in sidebar	2017-10-09 23:37:19 +01:00
Nick O'Leary	10567afbb9	Add unified diff view to version control tab	2017-10-09 00:11:07 +01:00
Nick O'Leary	9a2fd0e2b2	Add initial version control sidebar with commit function	2017-10-07 00:18:20 +01:00
Nick O'Leary	b1cd13d629	Initial projects implementation	2017-09-20 10:30:07 +01:00