Commit Graph

3300 Commits

Author SHA1 Message Date
Nick O'Leary fdaa5ce1da
Merge pull request #1624 from node-red/library-extra-element
let library createUi accept elements other than node-input-name
2018-02-14 13:16:39 +00:00
Nick O'Leary 09d9936aed
Change remote-diff shortcut and add it to keymap
Fixes #1628
2018-02-14 09:54:07 +00:00
Nick O'Leary b3f6109b1c
Update changelog and bump package 2018-02-13 23:51:16 +00:00
Nick O'Leary 5fb3ffc240
Merge pull request #1627 from node-red-hitachi/fix-batch-concat-mode-msg-modification
fixed message modificcation of concat mode of BATCH node
2018-02-13 23:45:19 +00:00
Nick O'Leary 360db252bb
Merge pull request #1626 from node-red-hitachi/fix-typo-in-jp-message-catalog
fix typo in Japanese message catalog
2018-02-13 23:44:48 +00:00
Nick O'Leary 0b6e290271
Merge pull request #1625 from node-red-hitachi/fix-typo-in-info-text
Fix typo in info text
2018-02-13 23:44:35 +00:00
Nick O'Leary 7f0174e6db
Merge pull request #1617 from node-red-hitachi/fix-backquote-in-info
Fix backquote in info text
2018-02-13 23:43:56 +00:00
Nick O'Leary a25dad6c2e
Ensure debug tools show for 'complete msg object' 2018-02-13 23:42:22 +00:00
Nick O'Leary 6191a49ed3
Use flow-diff to resolve merge conflicts 2018-02-13 23:09:51 +00:00
Hiroyasu Nishiyama 6252b075bc fixed message modificcation of concat mode of BATCH node 2018-02-13 20:55:03 +09:00
Hiroyasu Nishiyama b9e256adfa fix typo in Japanese message catalog 2018-02-11 02:11:29 +09:00
Hiroyasu Nishiyama 3b7bf04e22 fix typo in info text of DELAY node 2018-02-11 02:07:51 +09:00
Hiroyasu Nishiyama 43408a724c fix unmatched tag in info text of BATCH node 2018-02-11 02:06:28 +09:00
Dave Conway-Jones 5fbd5bf9e2
handle other fields in library - by only changing prefix
(rather than whole property  - so ...-name is still the name required)
2018-02-10 16:49:47 +00:00
Dave Conway-Jones 5e87828b29
let library createUi accept elements other than node-input-name 2018-02-10 16:16:49 +00:00
Nick O'Leary 9066cedc29
Better merge-conflict commit button layout 2018-02-09 09:35:47 +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 2f6ac42efe
Add comment blocks to GitHub templates to reduce clutter 2018-02-08 14:39:58 +00:00
Hiroyasu Nishiyama 0bba3dd83d merge upstream/master 2018-02-08 23:22:00 +09:00
Hiroyasu Nishiyama abe60b62e6 change backquote in info text to <code>...</code> 2018-02-08 23:20:53 +09: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 8d98b228ab
Bump 0.18.2 2018-02-06 15:28:43 +00:00
Nick O'Leary 5b4c42ff05
Update changelog 2018-02-06 14:30:31 +00:00
Dave Conway-Jones a596a4551a
undo exec node change (investigate test fail) 2018-02-06 11:42:33 +00:00
Dave Conway-Jones 0968f96982
add a default keepalive to tcp client mode
to address #1469
2018-02-06 11:36:14 +00:00
Dave Conway-Jones 5931e13b9c
move node.send in exec and httprequest nodes
just in case
2018-02-06 11:36:13 +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 9f7dd7f5d4
Add Project Settings menu option 2018-02-05 10:58:09 +00:00
Nick O'Leary e6d32aab7b
Refresh vc sidebar on remote add/remove 2018-02-05 10:10:26 +00:00
Dave Conway-Jones 08bd6d963c
Ensure send is last thing trigger does 2018-02-04 21:25:25 +00:00
Dave Conway-Jones ff05fb14a6
ensure trigger doesn't set two simultaneous timeouts 2018-02-04 20:17:43 +00:00
Nick O'Leary 22d942b705
Fix auth prompt for ssh repos 2018-02-03 23:44:19 +00:00
Nick O'Leary 0526372f28
Bump rbe dependency 2018-02-03 20:48:43 +00:00
Dave Conway-Jones f99051906a
add missing property select var to HTML node 2018-02-02 23:40:01 +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
Dave Conway-Jones a52f195d41
undo dumb non-fix to trigger. 2018-02-02 10:28:22 +00:00
Dave Conway-Jones 419019a656
add check for property to trigger (temporary fix for debug) 2018-02-02 10:23:28 +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 a8fc5b01f3
Don't assume node has defaults when exporting icon property 2018-02-01 22:28:05 +00:00