1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Commit Graph

360 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
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
e250a91f09
Merge branch '0.18' into projects 2018-01-24 23:06:27 +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
3cb5cbd8d5
Allow adminAuth.user to be a Function
Fixes #1461
2018-01-23 23:08:11 +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
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
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
6a06142e1e
Allow credSecret to be managed via project settings 2017-09-26 22:51:08 +01:00
Nick O'Leary
d8fd218409
Allow project dependencies to be edited in dialog 2017-09-21 11:19:24 +01:00
Nick O'Leary
edc2310599
Move project sidebar to project settings dialog 2017-09-20 22:51:28 +01:00
Nick O'Leary
b1cd13d629
Initial projects implementation 2017-09-20 10:30:07 +01:00
Jeston Tigchon
29cae9975e Upgrade JSONata to v1.3.0 (#1386) 2017-09-07 21:58:29 +01:00
Nick O'Leary
9a8b404054
Split localfilesystem storage plugin into component parts 2017-08-23 17:31:33 +01:00
Nick O'Leary
41af5187aa
Reorganise red/api layout to better componentise 2017-08-22 22:26:29 +01:00
Kazuhito Yokoi
d7d13c12fe Modify messages to refer to language files (#1361) 2017-08-07 10:00:28 +01:00
Nick O'Leary
7de1bf9d95
Better node properties layout in diff table 2017-08-03 23:04:39 +01:00
Nick O'Leary
f9769a73fe
Retry auto-install of modules that fail
- introduces autoInstallModulesRetry - default 30000
 - backs off interval if repeated failures
 - fixes notification to the editor of an auto-reinstall
2017-07-08 17:30:17 +01:00
Nick O'Leary
1542f73fa5
Fix global leaks in theme.js 2017-07-04 09:43:16 +01:00
Nick O'Leary
70a22187f7
editorTheme not setting custom css/scripts properly 2017-07-04 09:33:27 +01:00
Nguyen Thai Vinh
6db2c04585 Fix Bug: Can not display node icon when npm package has scope (#1305) (#1309) 2017-06-30 21:49:35 +01:00
Nick O'Leary
78076122ba
Remove console.log 2017-06-30 10:39:28 +01:00
Kazuhito Yokoi
dfc4e99560 Add Chinese translation file (editor.json) (#1303) 2017-06-29 11:38:21 +01:00
Kazuhito Yokoi
283d5c64cb Update Japanese translation files (jsonata.json and messages.json) (#1300)
* Update Japanese translation file(jsonata.json)

* Update Japanese translation file(messages.json)
2017-06-28 09:26:07 +01:00
Kazuhito Yokoi
3134bc432b Improve editor messages (jsonata.json and messages.json) (#1299)
* Modify typo and improve messages in jsonata.json

* Change csv to CSV(messages.json)
2017-06-28 09:25:35 +01:00
Nick O'Leary
b63d243e33
Update JSONata to 1.2.4
Closes #1275
2017-06-26 13:55:22 +01:00
Kazuhito Yokoi
61339face6 Add and improve Japanese translation file(editor.json, infotips.json and messages.json) (#1284)
* Update Japanese translation(editor.json)

* Add Japanese translation file(infotips.json)

* Add Japanese translation file(messages.json)
2017-06-26 10:08:05 +01:00
Kazuhito Yokoi
7aa08ff885 Add Japanese translation file(jsonata.json) (#1271) 2017-06-26 09:41:16 +01:00
Nick O'Leary
d9dc171c28
Add buffer mode to typedInput 2017-06-13 21:01:27 +01:00
Nick O'Leary
7e35c9c754
Return flow rev on reload api when api v2 enabled
Closes #1273
2017-06-05 15:16:26 +01:00
Kazuhito Yokoi
21d3a3dd1e Modify typo in jsonata.json (#1270) 2017-05-31 08:44:44 +01:00
Nick O'Leary
00460d856b
Add copy path/value buttons to debug messages 2017-05-10 15:49:56 +01:00
Nick O'Leary
401d386812
Add force-deploy option when conflict detected 2017-05-05 15:52:37 +01:00