65 Commits

Author	SHA1	Message	Date
Nick O'Leary	9a5139f452	Detect if there are no existing flows to migrate into a project	2018-02-20 14:30:37 -08: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	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	fc1436a96d	Fix fetch auth handling on non-default remote	2018-02-02 16:26:55 +00:00
Kroderia	05252fa239	Fix and Add some Chinese translations	2018-02-02 02:57:11 +08:00
Kazuhito Yokoi	322cebc48c	Update messages in jsonata.json	2018-01-31 10:45:31 +00:00
Jeremy Barlow	3938550ea8	Support at sign in module examples path for flows endpoint ... This commit allows an example from an npm package that has an org scoped name (which includes an @ character) to be retrieved and loaded properly through the flows endpoint.	2018-01-29 15:23:19 -08:00
Nick O'Leary	519edce0ed	Replace when.otherwise() with Promise.catch() ... Fixes #1584	2018-01-29 09:51:38 +00:00
Nick O'Leary	dd7bb28b6a	Fix debug comms batching with multiple connections	2018-01-28 10:44:02 +00:00
Kazuhito Yokoi	5498c6f87d	Update Japanese translations in editor.json (#1573) ... * Update Japanese translations in editor.json * Update Japanese translations in editor.json	2018-01-25 08:12:28 +00:00
Kazuhito Yokoi	11f59bc3ac	Move Chinese language files to correct path (#1574)	2018-01-25 08:12:15 +00:00
Nick O'Leary	95589307cd	Better reporting of project-not-found	2018-01-24 21:54:18 +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	dfebc4b78d	Migrate deploy confirmations to notifications	2018-01-22 23:04:05 +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	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	52475df783	Fix various tests due to projects rework	2018-01-16 16:18:18 +00:00
Nick O'Leary	3f5ba10354	Fix up merge	2018-01-16 11:25:13 +00:00
Nick O'Leary	25f4a018d9	Merge branch '0.18' into projects	2018-01-16 11:21:54 +00:00
Nick O'Leary	1204cf1ba0	Better permission handling in editor	2018-01-12 21:00:11 +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	3b51d18ce7	Change default user filename prefix for sshkeys	2017-12-20 16:08:57 +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
Hideki Nakamura	c24b0c6bb4	Change "generateSSHKey" function signature	2017-12-19 22:57:40 +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	2a9d0a5e7d	Merge branch 'projects' into sshkey-management	2017-12-17 23:54:44 +09:00
Nick O'Leary	474f4572f2	Fix conditional initialisation of projects	2017-12-16 23:43:08 +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	d1106f53e0	Pass email data into the SSH Key generation API	2017-12-15 21:41:14 +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
Hideki Nakamura	6a5cf7a1fa	Merge branch 'projects' into sshkey-management	2017-12-07 23:29:58 +09: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
Hideki Nakamura	923893e160	Add SSH key management API	2017-12-07 23:11:24 +09: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	fff0b15ae5	Add /settings/user end point	2017-12-04 17:15:17 +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