mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge remote-tracking branch 'origin/master' into b9 

Conflicts:
	b9/lib/_npm.sh
	b9/lib/package_storage_docker.sh
pull/248/head
Fabian Jakobs 2016-02-09 16:40:27 +00:00
rodzic 0cc8b9678d 6193c4fdb6
commit d635a484f7
13 zmienionych plików z 39 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.nakignore
Wyświetl plik

@ -7,4 +7,4 @@ build/win32*
build/Cloud9
build/sdk
node_modules/logicblox/build/logicblox/static
plugins/c9/profile/dist/bundle.js
plugins/c9.profile/dist/bundle.js

4
b9/lib/_init.sh
Wyświetl plik

@ -52,7 +52,7 @@ _b9_init_nodejs() {
local NODEJS
. ~/.nvm/nvm.sh &> /dev/null || :
for NODEJS in $(which node) $(which nodejs) /usr/local/bin/node /usr/bin/nodejs; do
for NODEJS in $(which node 2>/dev/null) $(which nodejs 2>/dev/null) /usr/local/bin/node /usr/bin/nodejs; do
[ -x $NODEJS ] && break
NODEJS=""
done
@ -92,4 +92,4 @@ _b9_init_node_helper() {
rm -rf node_modules
$NPM install
popd &> /dev/null
}
}

2
b9/lib/_npm.sh
Wyświetl plik

@ -18,7 +18,7 @@ _b9_npm() {
"
else
pushd $WORKDIR &> /dev/null
npm "$@"
$NPM "$@"
popd &> /dev/null
fi
}

3
b9/lib/deploy.sh
Wyświetl plik

@ -175,7 +175,8 @@ _b9_deploy_update_services() {
done
~/supervisord_start_script.sh || ~/supervisord_start_script.sh -f || ~/supervisord_start_script.sh -f;
cd /home/ubuntu/versions;
ls -t 2>/dev/null | grep $BUILD_NAME | tail -n +$TOTAL_VERSIONS_TO_KEEP | xargs sudo rm -rf;"
USED_VERSIONS=\$(ls -l /home/ubuntu | grep -F -- '-> /home/ubuntu/versions' | awk -F'-> ' '{print \$2}' | awk -F/ '{print \$(NF)}');
ls -t 2>/dev/null | grep $BUILD_NAME | grep -v -F \"\$USED_VERSIONS\" | tail -n +$TOTAL_VERSIONS_TO_KEEP | xargs sudo rm -rf;"
}
_b9_deploy_check() {

2
b9/lib/package_storage_docker.sh
Wyświetl plik

@ -71,4 +71,4 @@ _b9_dockerize_has_tag() {
local TAG=$2
gsutil ls $B9_DOCKER_BUCKET/containers/repositories/library/${REPO}/tag_${TAG}
}
}

1
configs/client-default-local.js
Wyświetl plik

@ -19,6 +19,7 @@ module.exports.makeLocal = function(config, options) {
options.projectName = root.substr(root.lastIndexOf("/") + 1);
options.debug = 2;
options.env = "local";
options.defaultTheme = "dark";
}
for (var i = config.length - 1; i >= 0; i--) {

2
configs/client-default.js
Wyświetl plik

@ -545,7 +545,7 @@ module.exports = function(options) {
{
packagePath: "plugins/c9.ide.layout.classic/preload",
themePrefix: options.themePrefix,
defaultTheme: options.defaultTheme || "dark"
defaultTheme: options.defaultTheme || "flat-light"
},
{
packagePath: "plugins/c9.ide.tree/tree",

18
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.1320",
"version": "3.1.1343",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -56,21 +56,21 @@
"c9"
],
"c9plugins": {
"c9.ide.language": "#ad77e2cbd6",
"c9.ide.language": "#9ecb087000",
"c9.ide.language.css": "#be07d72209",
"c9.ide.language.generic": "#a4023db7f6",
"c9.ide.language.html": "#22fdc74869",
"c9.ide.language.html.diff": "#24f3608d26",
"c9.ide.language.javascript": "#c6d102471f",
"c9.ide.language.javascript.immediate": "#c8b1e5767a",
"c9.ide.language.javascript.eslint": "#3127e1eba1",
"c9.ide.language.javascript.eslint": "#08f092da2a",
"c9.ide.language.javascript.tern": "#bf1072b11a",
"c9.ide.language.javascript.infer": "#0561c69d67",
"c9.ide.language.jsonalyzer": "#bf12af3d0a",
"c9.ide.collab": "#550ee7894a",
"c9.ide.local": "#a6e689e33b",
"c9.ide.collab": "#a1a13c5943",
"c9.ide.local": "#ded0db8949",
"c9.ide.find": "#e33fbaed2f",
"c9.ide.find.infiles": "#c3bf17286d",
"c9.ide.find.infiles": "#f0149b05ff",
"c9.ide.find.replace": "#8cbce45290",
"c9.ide.run.debug": "#7406555669",
"c9.automate": "#47e2c429c9",
@ -101,14 +101,14 @@
"c9.ide.preview.browser": "#04760484d1",
"c9.ide.preview.markdown": "#bc846e1562",
"c9.ide.pubsub": "#a85fb27eca",
"c9.ide.readonly": "#e67bb593bd",
"c9.ide.readonly": "#f5121c3a57",
"c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#301d2ab519",
"c9.ide.processlist": "#2b12cd1bdd",
"c9.ide.run": "#1a5a660c44",
"c9.ide.run": "#aa78804818",
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#9956689819",
"c9.ide.save": "#2de9fd7c2d",
"c9.ide.save": "#262a41aedc",
"c9.ide.scm": "#ca3c94b84f",
"c9.ide.terminal.monitor": "#1ccac33b0d",
"c9.ide.test": "#a282ec1619",

3
plugins/c9.ide.dialog.common/confirm.js
Wyświetl plik

@ -27,6 +27,9 @@ define(function(require, module, exports) {
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
plugin.getElement("ok").setCaption(options.yes || options.ok || "OK");
plugin.getElement("cancel").setCaption(options.no || options.cancel || "Cancel");
plugin.update([
{ id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } },
{ id: "cancel", onclick: function(){ plugin.hide(); oncancel && oncancel(); } },

5
plugins/c9.ide.dialog.common/question.js
Wyświetl plik

@ -40,6 +40,11 @@ define(function(require, module, exports) {
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
plugin.getElement("yes").setCaption(options.yes || options.ok || "Yes");
plugin.getElement("no").setCaption(options.no || options.cancel || "No");
plugin.getElement("yestoall").setCaption(options.yestoall || "Yes to All");
plugin.getElement("notoall").setCaption(options.notoall || "No to All");
plugin.allowClose = cancel;
var gotYesNo = false;

7
plugins/c9.ide.keys/editor.js
Wyświetl plik

@ -186,7 +186,12 @@ define(function(require, exports, module) {
settings.set("user/ace/@keyboardmode", "default");
settings.set("user/key-bindings/@platform", "auto");
commands.reset(false, true);
}, function(){});
},
function(){},
{
yes: "Reset Settings",
no: "Cancel"
});
},
position: 90
},

3
plugins/c9.ide.preferences/general.js
Wyświetl plik

@ -68,7 +68,8 @@ define(function(require, exports, module) {
+ "Cloud9 will return to it's original configuration",
function(){
settings.reset();
}, function(){});
}, function(){},
{ yes: "Reset settings", no: "Cancel" });
}
}
},

6
plugins/c9.ide.terminal/terminal.js
Wyświetl plik

@ -808,6 +808,10 @@ define(function(require, exports, module) {
},
function(){ // No
// Do nothing
},
{
yes: "Update",
no: "Not now",
});
}
}
@ -1002,7 +1006,7 @@ define(function(require, exports, module) {
if (question.dontAsk)
settings.set("user/terminal/noclosequestion", "true");
},
{ showDontAsk: true });
{ showDontAsk: true, yes: "Close", no: "Cancel" });
return false;
}
}, session);