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 pull request +11723 from c9/sdk

Browse Source 
Merge sdk pull requests
This commit is contained in:
Harutyun Amirjanyan 2016-01-22 17:24:58 +04:00
commit 0211850d89
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -84,4 +84,4 @@ foo.js
hello.js
plugins/c9.docker/containers/ci/files/github_c9_newclient
plugins/c9.docker/containers/shared/files/plugins/salesforce*
security-audit.log
security-audit.log

14
package.json
View File

@ -56,7 +56,7 @@
"c9"
],
"c9plugins": {
"c9.ide.language": "#88ba1f4aa8",
"c9.ide.language": "#017de3e5a4",
"c9.ide.language.css": "#be07d72209",
"c9.ide.language.generic": "#847eb66a89",
"c9.ide.language.html": "#9be847c0ce",
@ -72,7 +72,7 @@
"c9.ide.find": "#e33fbaed2f",
"c9.ide.find.infiles": "#c3bf17286d",
"c9.ide.find.replace": "#8cbce45290",
"c9.ide.run.debug": "#8b77a8379d",
"c9.ide.run.debug": "#7dfe32f721",
"c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#a8ff07c8f4",
@ -83,7 +83,7 @@
"c9.ide.ace.stripws": "#cf0f42ac59",
"c9.ide.behaviors": "#db32109ebc",
"c9.ide.closeconfirmation": "#cee4674141",
"c9.ide.configuration": "#a9066299a2",
"c9.ide.configuration": "#e3c90dcd96",
"c9.ide.dialog.wizard": "#7667ec79a8",
"c9.ide.fontawesome": "#781602c5d8",
"c9.ide.format": "#5ec97fb083",
@ -94,7 +94,7 @@
"c9.ide.language.python": "#82e4e924a5",
"c9.ide.language.go": "#3d81cc4a70",
"c9.ide.mount": "#86c8985f34",
"c9.ide.navigate": "#38ae100ea1",
"c9.ide.navigate": "#1fbb7cd53b",
"c9.ide.newresource": "#981a408a7b",
"c9.ide.openfiles": "#2ae85a9e33",
"c9.ide.preview": "#8f87ff2f6a",
@ -107,11 +107,11 @@
"c9.ide.processlist": "#2b12cd1bdd",
"c9.ide.run": "#453aa5f604",
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#5553240abe",
"c9.ide.run.debug.xdebug": "#a1b39e0ac4",
"c9.ide.save": "#83d759562a",
"c9.ide.scm": "#930a9e6f00",
"c9.ide.scm": "#ca3c94b84f",
"c9.ide.terminal.monitor": "#a0d1f02991",
"c9.ide.test": "#8f21f662d3",
"c9.ide.test": "#a282ec1619",
"c9.ide.test.mocha": "#fc053b23d2",
"c9.ide.theme.flat": "#81dadeee55",
"c9.ide.threewaymerge": "#229382aa0b",

1
plugins/c9.ide.keys/panel.js
View File

@ -26,6 +26,7 @@ define(function(require, exports, module) {
var plugin = new Panel("Ajax.org", main.consumes, {
index: options.index || 300,
caption: "Commands",
buttonCSSClass: "commands",
minWidth: 150,
autohide: true,
where: options.where || "left"

2
plugins/c9.ide.layout.classic/themes/default-flat-dark.less
View File

@ -798,7 +798,7 @@
@gutter-tooltip-dark-shadow: 1px 1px 6px darken(rgba(0, 0, 0, 0.8), @darken-chrome);
@gutter-tooltip-dark-background: darken(#FFF399, @darken-chrome);
@gutter-tooltip-dark-border: black;
@gutter-tooltip-dark-color: darken(#e0e3e8, @darken-chrome);
@gutter-tooltip-dark-color: darken(#333, @darken-chrome);
@gutter-tooltip-dark-font-smoothing: true;
// Splitter

3
plugins/c9.ide.tree/tree.js
View File

@ -46,6 +46,7 @@ define(function(require, exports, module) {
index: options.index || 100,
caption: "Workspace",
panelCSSClass: "workspace_files",
buttonCSSClass: "workspace",
minWidth: 130,
where: options.where || "left"
});
@ -1586,4 +1587,4 @@ define(function(require, exports, module) {
tree: plugin
});
}
});
});

2
plugins/c9.vfs.server/vfs.server.js
View File

@ -331,7 +331,7 @@ function plugin(options, imports, register) {
.end(function() {});
user.lastVfsAccess = Date.now();
user.save(function() {});
user.save && user.save(function() {});
}
}

5
scripts/install-sdk.sh
View File

@ -110,8 +110,9 @@ updateCore() {
fi
# without this git merge fails on windows
mv ./scripts/install-sdk.sh ./scripts/.install-sdk-tmp.sh
cp ./scripts/.install-sdk-tmp.sh ./scripts/install-sdk.sh
mv ./scripts/install-sdk.sh './scripts/.#install-sdk-tmp.sh'
rm ./scripts/.install-sdk-tmp.sh
cp './scripts/.#install-sdk-tmp.sh' ./scripts/install-sdk.sh
git checkout -- ./scripts/install-sdk.sh
git remote add c9 https://github.com/c9/core 2> /dev/null || true