Commit Graph

288 Commits

Author SHA1 Message Date
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 fd9e3fc03a
Update jsonata to 1.4.1 2018-01-13 20:42:23 +00:00
Dave Conway-Jones 7b1787fdbb Debug to status option (#1499)
* Let debug optionally target the status line (32 chars only)

* Add batching of messages to debug ws comms

* let Debug handle simple case of NaN

would also close #1530

* Fixup debug tests for batch comms (no new tests yet)

* mixup comms/api test to match new batch mode (no new tests)

* Add test for NaN being sent OK.

* redo original fix to padding / labels for new debug options

* fix debug test (re-add fix from #1444)

* Fix up merge issues in debug tests
2018-01-13 16:14:03 +00:00
Nick O'Leary 1204cf1ba0
Better permission handling in editor 2018-01-12 21:00:11 +00:00
Rocco Musolino 2c4d5fa38d add express-session memorystore without leaks (#1435)
* add express-session memorystore without leaks

* Bump memorystore to v1.6.0
2018-01-11 22:51:05 +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
Qi Xiu 8bb9b594cf Add Chinese translation of jsonata.json (#1504) 2017-12-05 15:58:11 +00:00
Dave Conway-Jones 3988a648d6
Merge branch 'master' into 0.18 2017-12-05 12:22:20 +00:00
Nick O'Leary 5e128f89f6
Ensure strategy login button uses relative URL
Fixes #1481
2017-12-04 21:13:07 +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 64191e8303
Merge master to 0.18 2017-12-03 22:32:28 +00:00
Kazuki Nakanishi 6d2389945b allow a node's icon to be set dynamically (#1490)
* create a proto type

* Fixed some problems after reviewing
2017-11-30 13:13:35 +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
jmikerq dba6ff1d51 added chinese messages.json locale file (#1452)
* modified the wording in the chinese editor.json 

change the wording closer to their meanings in chinese

* added chinese messages.json
2017-10-23 11:55:26 +02:00
Qi Xiu 40146dedaf Add Chinese version of infotips.json (#1449) 2017-10-23 11:55:08 +02:00
jmikerq 387b822f53 clean up naming for chinese software naming convention (#1453) 2017-10-23 11:54:49 +02: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
Henri Bouvier 140ea683a6 [fix] github oauth strategy when Root is not / (#1430) 2017-10-10 21:24:44 +01:00
Kazuhito Yokoi 3479c794de Modify JSONata Expression editor to refer to language files (#1433) 2017-10-10 20:21:41 +01:00
Kazuhito Yokoi 89cad116f7 Update translation file for JSONata (jsonata.json) (#1432) 2017-10-10 20:21:19 +01:00