LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into revert-11776-revert-php-completion

Browse Source 
Conflicts:
	plugins/c9.ide.language.python/worker/python_completer.js
This commit is contained in:
Lennart Kats 2016-01-25 10:00:05 +00:00
commit 2ff2c60a45
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node_modules/c9/format-user-analytics.js generated vendored
View File

@ -1,7 +1,7 @@
if (define === undefined) {
var define = function(fn) {
fn(require, exports, module);
};
if (typeof define === "undefined") {
var define = function(fn) {
fn(require, exports, module);
};
}
define(function(require, exports, module) {

8
node_modules/c9/has-internal-domain.js generated vendored
View File

@ -1,7 +1,7 @@
if (define === undefined) {
var define = function(fn) {
fn(require, exports, module);
};
if (typeof define === "undefined") {
var define = function(fn) {
fn(require, exports, module);
};
}
define(function(require, exports, module) {

8
node_modules/c9/has-internal-test-name.js generated vendored
View File

@ -1,7 +1,7 @@
if (define === undefined) {
var define = function(fn) {
fn(require, exports, module);
};
if (typeof define === "undefined") {
var define = function(fn) {
fn(require, exports, module);
};
}
define(function(require, exports, module) {

8
node_modules/c9/scm_url_parse.js generated vendored
View File

@ -1,7 +1,7 @@
if (define === undefined) {
var define = function(fn) {
fn(require, exports, module);
};
if (typeof define === "undefined") {
var define = function(fn) {
fn(require, exports, module);
};
}
define(function(require, exports, module) {

8
node_modules/c9/skip-analytics.js generated vendored
View File

@ -1,7 +1,7 @@
if (define === undefined) {
var define = function(fn) {
fn(require, exports, module);
};
if (typeof define === "undefined") {
var define = function(fn) {
fn(require, exports, module);
};
}
define(function(require, exports, module) {

2
node_modules/vfs-local/localfs.js generated vendored
View File

@ -1293,7 +1293,7 @@ module.exports = function setup(fsOptions) {
function done() {
// Ignore if files is tmp file
if (latest && latest.name.substr(-1) == "~"
if (latest && (latest.name.substr(-1) == "~" || latest.name[1] === "~")
&& latest.name.charAt(0) == ".")
return;

8
package.json
View File

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.1159",
"version": "3.1.1168",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -56,7 +56,7 @@
"c9"
],
"c9plugins": {
"c9.ide.language": "#b945b30d00",
"c9.ide.language": "#76ce872cdc",
"c9.ide.language.css": "#be07d72209",
"c9.ide.language.generic": "#a4023db7f6",
"c9.ide.language.html": "#9be847c0ce",
@ -66,7 +66,7 @@
"c9.ide.language.javascript.eslint": "#3127e1eba1",
"c9.ide.language.javascript.tern": "#45e5f5b0e5",
"c9.ide.language.javascript.infer": "#0561c69d67",
"c9.ide.language.jsonalyzer": "#47a64de05d",
"c9.ide.language.jsonalyzer": "#243e11bd42",
"c9.ide.collab": "#e2411fc12b",
"c9.ide.local": "#a6e689e33b",
"c9.ide.find": "#e33fbaed2f",
@ -91,7 +91,7 @@
"c9.ide.imgeditor": "#612e75ef4f",
"c9.ide.immediate": "#a962119bec",
"c9.ide.installer": "#0fde9f0067",
"c9.ide.language.python": "#1cc8204145",
"c9.ide.language.python": "#8b32ae6355",
"c9.ide.language.go": "#db4860eca9",
"c9.ide.mount": "#86c8985f34",
"c9.ide.navigate": "#1fbb7cd53b",