frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,315 Commits 119 Branches 156 Tags 55 MiB
Commit Graph

760 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 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 b4c8bf21d5
Ensure projects are created as logged in user 2018-02-06 10:38:41 +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
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 42b5635485
Merge pull request #1603 from Kroderia/master 
Fix and Add some Chinese translations
 2018-02-01 22:42:19 +00:00
Nick O'Leary 67d7930aef
Remember to disable projects in editor when git not found 2018-02-01 20:35:18 +00:00
Kroderia 05252fa239 Fix and Add some Chinese translations 2018-02-02 02:57:11 +08:00
Nick O'Leary 1377439bb0
Fix pull/push when no tracked branch 2018-02-01 17:08:22 +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 b847e962aa
Handle project first-run without existing flow file 2018-01-31 21:31:45 +00:00
Kazuhito Yokoi 322cebc48c Update messages in jsonata.json 2018-01-31 10:45:31 +00:00
Nick O'Leary 05dc0bfa1d
Merge pull request #1590 from camlow325/allow-at-sign-in-module-examples-path 
Allow at sign in module examples path
 2018-01-30 10:33:24 +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 8672fcd2bb
Fix authServer on Windows path 
Fixes #1588
 2018-01-29 21:47:20 +00: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
Nick O'Leary 0dd7bc7fb9
Better default README.md content and edit button 2018-01-25 13:30:27 +00:00
Nick O'Leary c43647ca86
Handle null profile flow file name 2018-01-25 11:14:16 +00:00
Nick O'Leary 6d02e70025
Ensure existing files are migrated to first project 2018-01-25 10:13:07 +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 b7a0a9d7c2
Merge branch 'master' into 0.18 2018-01-24 23:08:14 +00:00
Nick O'Leary e250a91f09
Merge branch '0.18' into projects 2018-01-24 23:06:27 +00:00
Nick O'Leary 4b129d94e4
Move node install to spawn to allow for big stdout 
Fixes #1488
 2018-01-24 22:41:26 +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 64607df929
Ensure git username/email are set on project creation 2018-01-24 15:51:11 +00:00
Nick O'Leary a62a1012fa
Handle scoped modules via palette editor 2018-01-24 15:07:43 +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 cf34716a57
Tidy up project first-run experience 2018-01-23 11:26:05 +00:00
Nick O'Leary cf40497e6e
Flip logic for opt-in to projects 2018-01-22 23:14:38 +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 7e27dd7678
Don't rely on ssh-keygen output to prevent known errors 2018-01-19 22:31:41 +00:00
Nick O'Leary c2508296a5
Add debug to sshkeygen 2018-01-19 22:10:29 +00:00