frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1 from node-red/master

Browse Source 
Merge from fork source
This commit is contained in:
Kroderia 2018-02-02 14:24:14 +08:00 committed by GitHub
commit ca9ada4c58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -8,12 +8,18 @@ Projects
- Avoid unnecessary project refresh on branch-switch Fixes #1597 - Avoid unnecessary project refresh on branch-switch Fixes #1597
- Add support for file:// git urls - Add support for file:// git urls
- Handle project first-run without existing flow file - Handle project first-run without existing flow file
- Handle delete of last remote in project settings
- Add git_pull_unrelated_history handling
- Fix pull/push when no tracked branch
- Remember to disable projects in editor when git not found
Node Fixes Node Fixes
- Trigger node migration - ensure bytopic not blank - Trigger node migration - ensure bytopic not blank
- Add HEAD to list of methods with no body in http req node #1598 - Add HEAD to list of methods with no body in http req node #1598
- Do not include payload in GET requests Fixes #1598 - Do not include payload in GET requests Fixes #1598
- Update sort/batch docs Fixes #1601
- Don't assume node has defaults when exporting icon property
#### 0.18: Milestone Release #### 0.18: Milestone Release

2
editor/js/nodes.js
View File

@ -501,7 +501,7 @@ RED.nodes = (function() {
if (n.outputs > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) { if (n.outputs > 0 && n.outputLabels && !/^\s*$/.test(n.outputLabels.join(""))) {
node.outputLabels = n.outputLabels.slice(); node.outputLabels = n.outputLabels.slice();
} }
if (!n._def.defaults.hasOwnProperty("icon") && n.icon) { if ((!n._def.defaults || !n._def.defaults.hasOwnProperty("icon")) && n.icon) {
var defIcon = RED.utils.getDefaultNodeIcon(n._def, n); var defIcon = RED.utils.getDefaultNodeIcon(n._def, n);
if (n.icon !== defIcon.module+"/"+defIcon.file) { if (n.icon !== defIcon.module+"/"+defIcon.file) {
node.icon = n.icon; node.icon = n.icon;

6
nodes/core/logic/18-sort.html
View File

@ -14,8 +14,6 @@
limitations under the License. limitations under the License.
--> -->
<!DOCTYPE html>
<script type="text/x-red" data-template-name="sort"> <script type="text/x-red" data-template-name="sort">
<div class="form-row"> <div class="form-row">
@ -31,7 +29,7 @@
<input type="hidden" id="node-input-msgKeyType"> <input type="hidden" id="node-input-msgKeyType">
</div> </div>
</div> </div>
<div class="node-row-sort-seq-key"> <div class="node-row-sort-seq-key">
<div class="form-row"> <div class="form-row">
<label for="node-input-seqKey"><i class="fa fa-filter"></i> <span data-i18n="sort.key"></span></label> <label for="node-input-seqKey"><i class="fa fa-filter"></i> <span data-i18n="sort.key"></span></label>
@ -39,7 +37,7 @@
<input type="hidden" id="node-input-seqKeyType"> <input type="hidden" id="node-input-seqKeyType">
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<label><i class="fa fa-random"></i> <span data-i18n="sort.order"></span></label> <label><i class="fa fa-random"></i> <span data-i18n="sort.order"></span></label>
<select id="node-input-order" style="width:200px;"> <select id="node-input-order" style="width:200px;">

10
nodes/core/logic/19-batch.html
View File

@ -14,8 +14,6 @@
limitations under the License. limitations under the License.
--> -->
<!DOCTYPE html>
<script type="text/x-red" data-template-name="batch"> <script type="text/x-red" data-template-name="batch">
<div class="form-row"> <div class="form-row">
<label for="node-input-mode"><span data-i18n="batch.mode.label"></span></label> <label for="node-input-mode"><span data-i18n="batch.mode.label"></span></label>
@ -83,10 +81,10 @@
arrive within the interval, the node can optionally send on an empty message.</dd> arrive within the interval, the node can optionally send on an empty message.</dd>
<dt>Concatenate Sequences</dt> <dt>Concatenate Sequences</dt>
<dd>creates a message sequence by concatenating incoming sequences. Each sequence <dd>creates a message sequence by concatenating incoming sequences. Each message
must have a <code>msg.topic</code> property to identify it. The node is must have a <code>msg.topic</code> property and a <code>msg.parts</code> property
configured with a list of <code>topic</code> values to identify the order identifying its sequence. The node is configured with a list of <code>topic</code>
sequences are concatenated. values to identify the order sequences are concatenated.
</dd> </dd>
</dd> </dd>
</dl> </dl>

8
red/runtime/storage/localfilesystem/projects/index.js
View File

@ -95,6 +95,14 @@ function init(_settings, _runtime) {
if (!gitConfig) { if (!gitConfig) {
projectLogMessages.push(log._("storage.localfilesystem.projects.git-not-found")) projectLogMessages.push(log._("storage.localfilesystem.projects.git-not-found"))
projectsEnabled = false; projectsEnabled = false;
try {
// As projects have to be turned on, we know this property
// must exist at this point, so turn it off.
// TODO: when on-by-default, this will need to do more
// work to disable.
settings.editorTheme.projects.enabled = false;
} catch(err) {
}
} else { } else {
globalGitUser = gitConfig.user; globalGitUser = gitConfig.user;
Projects.init(settings,runtime); Projects.init(settings,runtime);