Skip to content

Commit

Permalink
Merge pull request #64 from pylonide/development
Browse files Browse the repository at this point in the history
v2.4.0
  • Loading branch information
exsilium authored Dec 28, 2018
2 parents 93e127a + 8f154b3 commit 4da77e1
Show file tree
Hide file tree
Showing 247 changed files with 341 additions and 445 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "node"
- "10"
- "9"
- "8"
- "7"
Expand Down
11 changes: 11 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
v2.4.0
======
* Further namespace changes to Pylon
* appCache capability check #57
* appCache has been disabled on non-secure connections in modern browsers
* Fix for startup directory creation #59
* Fix for memory leak and improvements to file upload cancellation #61
* Support upload of large files (< 1.5GB) #63
* Upgrade to ACE v1.4.2
* Drop Firefox Quantum starting from v64.0 due to broken experience #65

v2.3.1
======
* Make it possible to install Pylon via NPM (intended for further testing)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Build Status](https://travis-ci.org/pylonide/pylon.svg?branch=master)](https://travis-ci.org/pylonide/pylon)
[![Master Dependency Status](https://snyk.io/test/github/pylonide/pylon/badge.svg)](https://snyk.io/test/github/pylonide/pylon)
[![Development Dependency Status](https://snyk.io/test/github/pylonide/pylon/development/badge.svg)](https://snyk.io/test/github/pylonide/pylon)
[![Development Dependency Status](https://snyk.io/test/github/pylonide/pylon/development/badge.svg)](https://snyk.io/test/github/pylonide/pylon/development)
[![Bitcoin donate button](https://img.shields.io/badge/bitcoin-donate-yellow.svg)](https://www.coinbase.com/checkouts/9f4183a5164f2c4bd53d6afc74068ec4 "One-time donation to keep this fork alive")

# Pylon IDE
Expand All @@ -26,7 +26,7 @@ Pylon is built entirely on a web stack, making it the most hacker-friendly IDE t

## Browser Support

We support the newer versions of Chrome, Firefox and Safari.
Moderns versions of Chrome and Safari are supported. Firefox, altough functional, no longer works as intended as of version 64.0 - future efforts will be made to restore compatibility.

### Basic iPad Pro support with keyboard

Expand Down
94 changes: 48 additions & 46 deletions configs/default.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*global require process module __dirname*/
/**
* Default/vanilla Cloud9 ("OS") configuration.
* Default/vanilla Pylon configuration.
*
* @license GPLv3 <http://www.gnu.org/licenses/gpl.txt>
*/
"use strict";

Expand Down Expand Up @@ -39,32 +41,32 @@ var config = [
packagePath: "./connect.static",
prefix: "/static"
},
"./cloud9.alive",
"./cloud9.debug",
"./pylon.alive",
"./pylon.debug",

// Client libraries
"./../plugins-client/cloud9.core",
"./../plugins-client/pylon.core",
"./../plugins-client/lib.ace",
"./../plugins-client/lib.apf",
"./../plugins-client/lib.treehugger",
"./../plugins-client/lib.v8debug",
"./../plugins-client/lib.requirejs",
"./../plugins-client/lib.xterm",
"./c9.smith.io",
"./pylon.smith.io",
{
packagePath: "./c9.smith.io.ide",
packagePath: "./pylon.ide.smith.io",
messageRegex: /(\/smith.io-ide)/
},
// server plugins
{
packagePath: "./cloud9.sandbox",
packagePath: "./pylon.sandbox",
projectDir: projectDir,
workspaceId: "Cloud9",
workspaceId: "Pylon",
userDir: null, // is this always there??
unixId: null,
host: host
}, {
packagePath: "./cloud9.core",
packagePath: "./pylon.core",
version: require('../package.json').version,
c9debug: false,
fsUrl: fsUrl,
Expand Down Expand Up @@ -163,11 +165,11 @@ var config = [
mount: vfsUrl,
httpRoot: "http://localhost:" + port + vfsUrl
}, {
packagePath: "./cloud9.fs",
packagePath: "./pylon.fs",
urlPrefix: fsUrl
},
{
packagePath: "./cloud9.socket",
packagePath: "./pylon.socket",
socketPath: "/smith.io-ide"
},
{
Expand All @@ -181,65 +183,65 @@ var config = [
sessionsPath: __dirname + "/../.sessions",
maxAge: 7 * 24 * 60 * 60 * 1000
},
"./cloud9.permissions",
"./pylon.permissions",
{
packagePath: "./cloud9.client-plugins",
packagePath: "./pylon.client-plugins",
plugins: clientExtensions
},
"./cloud9.eventbus",
"./cloud9.process-manager",
"./cloud9.routes",
"./cloud9.run.shell",
"./pylon.eventbus",
"./pylon.process-manager",
"./pylon.routes",
"./pylon.run.shell",
{
packagePath: "./cloud9.run.node",
packagePath: "./pylon.run.node",
listenHint: "Important: in your scripts, use 'process.env.PORT' as port and '0.0.0.0' as host."
},
{
packagePath: "./cloud9.run.node-debug",
packagePath: "./pylon.run.node-debug",
listenHint: "Important: in your scripts, use 'process.env.PORT' as port and '0.0.0.0' as host.",
debugPort: debugPort
},
"./cloud9.run.npm",
"./cloud9.run.npmnode",
"./cloud9.run.ruby",
"./cloud9.run.python",
"./cloud9.run.apache",
"./cloud9.run.php",
"./pylon.run.npm",
"./pylon.run.npmnode",
"./pylon.run.ruby",
"./pylon.run.python",
"./pylon.run.apache",
"./pylon.run.php",
"architect/plugins/architect.log",
"./cloud9.ide.auth",
"./cloud9.ide.git",
"./cloud9.ide.gittools",
"./cloud9.ide.hg",
"./cloud9.ide.npm",
"./cloud9.ide.filelist",
"./cloud9.ide.search",
"./cloud9.ide.run-node",
"./pylon.ide.auth",
"./pylon.ide.git",
"./pylon.ide.gittools",
"./pylon.ide.hg",
"./pylon.ide.npm",
"./pylon.ide.filelist",
"./pylon.ide.search",
"./pylon.ide.run-node",
{
packagePath: "./cloud9.ide.run-npm-module",
packagePath: "./pylon.ide.run-npm-module",
allowShell: true
},
"./cloud9.ide.run-python",
"./cloud9.ide.run-apache",
"./cloud9.ide.run-ruby",
"./cloud9.ide.run-php",
"./cloud9.run.python",
"./cloud9.ide.revisions",
"./pylon.ide.run-python",
"./pylon.ide.run-apache",
"./pylon.ide.run-ruby",
"./pylon.ide.run-php",
"./pylon.run.python",
"./pylon.ide.revisions",
{
packagePath: "./cloud9.ide.settings",
packagePath: "./pylon.ide.settings",
settingsPath: ".settings"
},
"./cloud9.ide.shell",
"./cloud9.ide.state",
"./cloud9.ide.watcher",
"./pylon.ide.shell",
"./pylon.ide.state",
"./pylon.ide.watcher",
{
packagePath: "./cloud9.ide.terminal",
packagePath: "./pylon.ide.terminal",
localOnly: termLocal
}
];

if (useAuth) {
config.push({
packagePath: "./cloud9.connect.basic-auth",
packagePath: "./pylon.connect.basic-auth",
username: argv.username,
password: argv.password
});
Expand Down
2 changes: 1 addition & 1 deletion doc/ext.extension_template/extension_template.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:window
id = "winExtensionTemplate"
title = "Extension Template Window"
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pln",
"description": "Pylon IDE",
"version": "2.3.1",
"version": "2.4.0",
"homepage": "http://github.com/pylonide/pylon",
"engines": {
"node": ">= 4.9.1"
Expand Down Expand Up @@ -43,7 +43,7 @@
"architect": "~0.1.13",
"node-pty": "~0.7.4",
"xterm": "~3.1.0",
"ace": "https://github.com/ajaxorg/ace/tarball/v1.3.3",
"ace": "https://github.com/ajaxorg/ace/tarball/v1.4.2",
"smith": "https://github.com/pylonide/smith/tarball/4d0f096553a47160330f5dd9bac8bf77cc27e8ab",
"architect-build": "https://github.com/pylonide/architect-build/tarball/299d7cf718c9a66192faf18cf85680b98ee3ac86",
"vfs-architect": "https://github.com/pylonide/vfs-architect/tarball/6a729efb9ba8241aab0c354f098caf1b0f7c18db",
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.autosave/settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:checkbox
class="underlined" label="Enable Auto-Save"
value="[general/@autosaveenabled]"
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.beautify/settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:checkbox class="underlined" label="Preserve Empty Lines" value="[beautify/jsbeautify/@preserveempty]" skin="checkbox_grey" position="1000"/>
<a:checkbox class="underlined" label="Keep Array Indentation" value="[beautify/jsbeautify/@keeparrayindentation]" skin="checkbox_grey" position="2000"/>
<a:checkbox class="underlined" label="JSLint Strict Whitespace" value="[beautify/jsbeautify/@jslinthappy]" skin="checkbox_grey" position="3000"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.closeconfirmation/settings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:checkbox class="underlined" label="Warn Before Exiting" value="[general/@confirmexit]" skin="checkbox_grey" position="18000" />
</a:application>
2 changes: 1 addition & 1 deletion plugins-client/ext.code/code.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:codeeditor id="codeEditor_dontEverUseThisVariable"
flex = "1"
anchors = "6 0 0 0"
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.code/settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:checkbox position="1000" class="underlined" label="Auto-pair Brackets, Quotes, etc." value="[editors/code/@behaviors]" skin="checkbox_grey" />
<a:checkbox position="1001" class="underlined" label="Wrap Selection with Brackets, Quotes, etc." value="[editors/code/@wrapbehaviors]" skin="checkbox_grey" />
<a:checkbox position="2000" class="underlined" label="Code Folding" value="[editors/code/@folding]" skin="checkbox_grey" />
Expand Down
1 change: 0 additions & 1 deletion plugins-client/ext.colorpicker/colorpicker.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@

.codetools_colorpicker_tools span.color_hover {
-webkit-box-shadow: 0px 0px 6px #ffffff;
-moz-box-shadow: 0px 0px 6px #ffffff;
box-shadow: 0px 0px 6px #ffffff;
}
2 changes: 1 addition & 1 deletion plugins-client/ext.colorpicker/colorpicker.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:menu id="mnuColorPicker" skin="dockwindowblack" class="left" width="366" height="205" animate="false" pinned="true" resizable="false" visible="false">
<a:colorpicker id="clrCodeTools" skinset="colorpicker" />
<div class="codetools_colorpicker_tools"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.colorpicker/settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:checkbox class="underlined" label="Enable Color Picker"
value="[editors/codewidget/@colorpicker]" skin="checkbox_grey" position="1000"
onclick="require('ext/colorpicker/colorpicker').updateSetting(); require('ext/codetools/codetools').register(require('ext/colorpicker/colorpicker'));"/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.colorpicker/skin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0'?>
<a:skin xmlns:a="http://ajax.org/2005/aml" xmlns="http://www.w3.org/1999/xhtml">
<a:skin xmlns:a="https://github.com/pylonide/pylon" xmlns="http://www.w3.org/1999/xhtml">
<a:colorpicker name="colorpicker">
<a:style><![CDATA[
.colorpicker {
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.commands/settings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:hbox edge="2 5 2 5" align="center" position="20000" class="underlined">
<a:label flex="1">Keybindings: </a:label>
<a:dropdown id="ddKeyBind"
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.connect/connect.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:window
id = "winReconnect"
title = "Connection Lost"
Expand Down
1 change: 0 additions & 1 deletion plugins-client/ext.console/console.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
margin: 0;
overflow: hidden;
border-top: 1px solid #1f1f1f;
-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.06) inset;
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.06) inset;
position: relative;
z-index: 999;
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.console/console.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:bar id="winDbgConsole" height="0" zindex="1000">
<a:vsplitbox anchors="0 0 0 0">
<a:tab id="tabConsole" skin="tab_console" visible="false" render2="runtime" buttons="scale,order"
Expand Down
1 change: 0 additions & 1 deletion plugins-client/ext.consolehints/consolehints.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
overflow: auto;

-webkit-box-shadow: inset 0px 1px 0px 0px #3e4041;
-moz-box-shadow: inset 0px 1px 0px 0px #3e4041;
box-shadow: inset 0px 1px 0px 0px #3e4041;
}

Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.consolehints/consolehints.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<div id="barConsoleHints" class="barConsoleHints">
<div id="consoleHintsContent" class="consoleHintsContent"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.debugger/debugger.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:tab id="tabDebugButtons" skin="dockbar" visible="false">
<a:page id="pgDebugNav" render="runtime">
<a:hbox padding="3" edge="4 3 5">
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.dockpanel/docktest.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:a="http://ajax.org/2005/aml" >
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:a="https://github.com/pylonide/pylon" >
<head profile="http://www.w3.org/2005/10/profile">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="description" content=""/>
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.docs/docs.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:model id="mdlDocs" src="ext/docs/example.xml" />

<a:window id="winDocViewer" skin="dockwin" title="Documentation" modal="false" flex="1" buttons="close" visible="false">
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.extmgr/extmgr.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:window
id = "winExt"
title = "Extension Manager"
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.formatjson/formatjson.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:window
id = "winFormat"
title = "Format JSON"
Expand Down
2 changes: 1 addition & 1 deletion plugins-client/ext.ftp/ftp.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0'?>
<a:application xmlns:a="http://ajax.org/2005/aml">
<a:application xmlns:a="https://github.com/pylonide/pylon">
<a:hbox id="ftpConsoleHbox" anchors="0 0 0 0" visible="false">
<a:text id="txtFtpConsole"
margin = "3 0 0 0"
Expand Down
1 change: 0 additions & 1 deletion plugins-client/ext.gitblame/blame_gutter.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ dom.importCssString("\
word-wrap: break-word;\
white-space: pre-wrap;\
box-sizing: border-box;\
-moz-box-sizing: border-box;\
overflow: hidden !important;\
padding: 0 8px;\
}\
Expand Down
Loading

0 comments on commit 4da77e1

Please sign in to comment.