Merge remote-tracking branch 'origin/master' into language-library-ui

pull/242/head
Lennart Kats 2016-01-14 15:38:12 +00:00
commit 75087a3e24
5 zmienionych plików z 11 dodań i 8 usunięć

Wyświetl plik

@ -401,8 +401,9 @@ module.exports = function(options) {
"plugins/c9.ide.language.javascript.eslint/eslint", "plugins/c9.ide.language.javascript.eslint/eslint",
{ {
packagePath: "plugins/c9.ide.language.python/python", packagePath: "plugins/c9.ide.language.python/python",
pythonPath: "/usr/local/lib/python2.7/dist-packages:/usr/local/lib/python3.4/dist-packages", pythonPath: "/usr/local/lib/python2.7/dist-packages:/usr/local/lib/python3.4/dist-packages:/usr/local/lib/python3.5/dist-packages",
}, },
"plugins/c9.ide.language.go/go",
{ {
packagePath: "plugins/c9.ide.language.jsonalyzer/jsonalyzer", packagePath: "plugins/c9.ide.language.jsonalyzer/jsonalyzer",
extendToken: extendToken, extendToken: extendToken,

Wyświetl plik

@ -20,6 +20,7 @@ define(function(require, exports, module) {
lastName: getLastName(user), lastName: getLastName(user),
name: user.fullname || user.name, name: user.fullname || user.name,
pricingPlan: user.premium ? "Premium" : "Free", pricingPlan: user.premium ? "Premium" : "Free",
referredBy: user.referrer,
region: user.region region: user.region
}; };

2
node_modules/kaefer/lib/version.js wygenerowano vendored
Wyświetl plik

@ -2,6 +2,6 @@ define(function(require, exports, module) {
// on each backwards incompatible protocol change the version number must be // on each backwards incompatible protocol change the version number must be
// increased // increased
exports.protocol = 11; exports.protocol = 12;
}); });

Wyświetl plik

@ -1,7 +1,7 @@
{ {
"name": "c9", "name": "c9",
"description": "New Cloud9 Client", "description": "New Cloud9 Client",
"version": "3.1.1007", "version": "3.1.1033",
"author": "Ajax.org B.V. <info@ajax.org>", "author": "Ajax.org B.V. <info@ajax.org>",
"private": true, "private": true,
"main": "bin/c9", "main": "bin/c9",
@ -56,17 +56,17 @@
"c9" "c9"
], ],
"c9plugins": { "c9plugins": {
"c9.ide.language": "#9953b57ae9", "c9.ide.language": "#8d81473a3a",
"c9.ide.language.css": "#be07d72209", "c9.ide.language.css": "#be07d72209",
"c9.ide.language.generic": "#3771ac5199", "c9.ide.language.generic": "#3771ac5199",
"c9.ide.language.html": "#9be847c0ce", "c9.ide.language.html": "#9be847c0ce",
"c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.html.diff": "#24f3608d26",
"c9.ide.language.javascript": "#1a0b1584c2", "c9.ide.language.javascript": "#1a0b1584c2",
"c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.immediate": "#c8b1e5767a",
"c9.ide.language.javascript.eslint": "#8d35953ff4", "c9.ide.language.javascript.eslint": "#d7b067e838",
"c9.ide.language.javascript.tern": "#805d77e206", "c9.ide.language.javascript.tern": "#805d77e206",
"c9.ide.language.javascript.infer": "#fd5cd9e3d9", "c9.ide.language.javascript.infer": "#fd5cd9e3d9",
"c9.ide.language.jsonalyzer": "#0a130ac606", "c9.ide.language.jsonalyzer": "#ef0ea1d28f",
"c9.ide.collab": "#10c224f9b8", "c9.ide.collab": "#10c224f9b8",
"c9.ide.local": "#a6e689e33b", "c9.ide.local": "#a6e689e33b",
"c9.ide.find": "#e33fbaed2f", "c9.ide.find": "#e33fbaed2f",
@ -91,8 +91,8 @@
"c9.ide.imgeditor": "#612e75ef4f", "c9.ide.imgeditor": "#612e75ef4f",
"c9.ide.immediate": "#a962119bec", "c9.ide.immediate": "#a962119bec",
"c9.ide.installer": "#0fde9f0067", "c9.ide.installer": "#0fde9f0067",
"c9.ide.language.python": "#7b6460bab3", "c9.ide.language.python": "#03b2523dc7",
"c9.ide.language.go": "#undefined", "c9.ide.language.go": "#267378d2f3",
"c9.ide.mount": "#e1b9ccf731", "c9.ide.mount": "#e1b9ccf731",
"c9.ide.navigate": "#38ae100ea1", "c9.ide.navigate": "#38ae100ea1",
"c9.ide.newresource": "#981a408a7b", "c9.ide.newresource": "#981a408a7b",

Wyświetl plik

@ -267,6 +267,7 @@ function main(options, imports, register) {
"plugins/c9.ide.language.python/worker/python_linter", "plugins/c9.ide.language.python/worker/python_linter",
"plugins/c9.ide.language.python/worker/python_completer", "plugins/c9.ide.language.python/worker/python_completer",
"plugins/c9.ide.language.python/worker/python_jsonalyzer", "plugins/c9.ide.language.python/worker/python_jsonalyzer",
"plugins/c9.ide.language.go/worker/go_completer",
"plugins/c9.ide.language.html/html_completer", "plugins/c9.ide.language.html/html_completer",
"plugins/c9.ide.language.css/css_handler", "plugins/c9.ide.language.css/css_handler",
"plugins/c9.ide.language.javascript.tern/worker/tern_worker", "plugins/c9.ide.language.javascript.tern/worker/tern_worker",