Merged all changes from 'development' branch

f3268c2 Fixed some styling issues in applications
65fc706 server-node: Updated logging for proxy request
a801015 Updated package.json dependencies
1795be7 Fixed a typo in the authenticator documentation
ee81aff CoreWM: No Widgets by default
72c3f1f build: Fixed a problem with dist-file copy on windows
d57fd9a Updated linting rules, and fixed appropriate files
69d2e9b Connection: Add client-side subscription (for WS)
9114fa3 Updated AUTHORS
ed01e0d Removed deprecated edison startup script
466f0ee Updated README badges
ccbed0a Updated eslintrc
1aef9f9 Linting use before define in some cases
78b5a9d Updated README link section
7d2bd14 build: Updated package listing task
611fb30 build: Added PHP api templates
d6be196 build: Fixed autostart config error
5c9710b package-manager: Removed deprecated way of loading extensions
eb19e76 build: Extensions now uses 'preload' as other packages
c4fe142 server-php: Now supports extensions just as Node server
1b2eb2e Settings: Added PHP api test method
24200b9 Broadway: Updated PHP extension
406c0ac server-node: Correction of a log message typo
488de6d build: Removed deprecated 'extensions' in config
ec428f9 build: Rewrote build system to enter the promise land
1245e79 Removed some deprecated server setting in conf
a7b0f11 Updated README.md
0d35b1b Added new instructions to INSTALL.md
7ecc9e2 Updated package.json and travis.yml
2f8713f Added help to the 'osjs' command
f3ab407 Removed Grunt from Windows installer
354f62b Removed tasks from Gruntfile
33d7e98 Removed Grunt from NIX installer
9ee8b01 Grunt no longer a main dependency
20aae5b connection: Better handling of requests
3dda99c connection: Finalized some HTTP methods
05c2387 connection: Improved some of the method names
69549eb connection: Some updates to HTTP and WS handling
f0af69f server-node: Added 'broadcastMessage' API
2c472cc server-node: Added 'services' directory
2c4a5d8 Merge branch 'master' into development
b81c20d server-node: Added server-side VFS watching (WebSocket)
97c3db2 connection: WS connection now supports server-side watching
679acf6 server-node: Added watch method to VFS module abstract
52edcb3 connection: Now houses VFS watching handling
57a84de Merge branch 'master' into development
f1388ee build: Updated 'osjs run' command after server changes
a41a27f Updated documentation links in client code
aa4ff80 Window: Added '_create()' shortcut method
8ca0aff Fixed some typos in documentation
0490809 Updated linting rules
96a8c49 client: Finished phasing out 'Handler'
917de15 Utils: Removed deprecated checkdir() function
3aa7721 client: Better handling of path resolution in some places (standalone)
1974359 build: Now possible to pick out login screen by config
7e5ad83 build: Updated some NW paths
1ea546f build: Updated settings template
3b6d570 Utils: Preloader now checks if absolute/relative path properly after changes
8b5b33f server-php: Fixed a broken preg match
de5d6b6 Settings: Better Mountpoint management
4def515 mount-manager: Some bugfixes after recent changes
55a0199 mount-manager: Make sure add-methods does not mutate objects
37ef692 server-php: Added HTTP VFS module, bugfixes
c772584 mount-manager: Cleanups
9d4e84a server-node: Added HTTP VFS module
489c61a Settings: VFS Mounting now has templates
78960f4 Updated client-side mocha test
b9d41ee utils: pathJoin should now flatten given path
486dfa7 window: Correction of a event emission
a819500 server-node: Better error handling in static responses
650062a server-node: Prevent exception on stream ENOENT
b86e1c2 Added client-side Mocha to grunt
743c584 Better client-side testing
fee2cfd build: Give warning on config parsing error
9cb2626 server-node: Moved http arg in storage as the first
94eb583 server-node: Pass 'http' along for storage module methods
d75f1b2 server-node: Linting
ccb830b Settings: Removed unused scheme include
18f8a97 server-node: Added back user management
d8f8dcf server-node: Use normalize instead of resolve for paths
b514de9 GUI: Some cleanups
7b8e3b4 GUI: Moved some element/scheme stuff around, better creation of els
7d69ff6 server-node: Fixed a problem with parsing of certain virtual paths
feb70d3 server-node: Some fixes for previous commits
5d2aedb server-node: Better naming of some instance stuff
346b194 server-node: Updated backward compability and packages
4f4daf6 server-php: api.php now sets correct path constant
b748d8d server-php: Cleanups
7980f6b server-node: Solved remaining TODOs
14d0531 server-php: Improved VFS permission check
b8bd49f server-node: Improved VFS permission check
10b77fc Updated unit tests
99962a5 server-node: Make sure destination read-only mounts are checked
3913249 server-node: Updated unit testing
ac31e4d server-php: Removed 'group' session entry
72f2736 server-node: Removed 'group' session entry
5785d9a server-node: Cleanups
1c88f24 server-node: Renamed 'lib' to 'core' for consistency
ecd0fd5 server-php: Make sure new server runs under webhotel conditions
c07933b build: Prevent error on invalid config task
a3f0649 Removed a unused grunt module
79834a9 Application: Removed deprecated argument in _setSettings
18a2f9f build: Added support for build file overlays
47ad225 Merged in entirely new server codebase
a89ef7a CoreWM: IconView now supports multiple identical shortcuts
4f00b9f VFS: File now has internal 'shortcut' state
88efc55 CoreWM: Removed debug message from Search panel item
954e991 VFS: Removed deprecated icon code from internal transport
d31166e SearchEngine: Now uses native method for resolving icons
72e8eb4 CoreWM: IconView now uses native method for resolving icons
3e7332e API: getFileIcon() now supports 'application' VFS Files
1a85673 CoreWM: IconView now uses readdir()'s shortcuts functionality
69748e0 server-php: VFS scandir() now supports .shortcuts.json file
b5d5521 server-node: VFS scandir() now supports .shortcuts.json file
60d5680 VFS: Internal transport now passes along certain options in scandir
e03d81b VFS: Avoid mutation of options in filterScandir()
5db42ae Utils: Added deep-clone alternative
decefbd VFS: Added watch() and unwatch() methods
666e916 Settings: Added watch for panel changes
b966bd2 CoreWM: Widgets now restore locks properly (#479)
65eab1b CoreWM: Widget support (#479)

.bithoundrc

@@ -7,14 +7,15 @@
   "ignore": [
     "src/client/stylesheets/**",
     "src/client/themes/**",
+    "src/server/node/modules/*/example.js",
+    "src/server/node/modules/*/test.js",
     "src/server/test/**",
     "src/client/test/**",
     "src/templates/**",
     "src/installer/**",
     "src/packages/**",
     "src/locales/**",
     "src/server/php",
-    "src/build/**",
     "src/conf/**",
     "src/x11/**",
     "vendor/*",

.eslintrc

@@ -13,7 +13,8 @@
     "unescape": true,
     "EventTarget": true,
     "Uint8Array": true,
-    "ArrayBuffer": true
+    "ArrayBuffer": true,
+    "Promise": true
   },
   "rules": {
     "brace-style": 2,
@@ -33,7 +34,7 @@
     ],
     "no-new": 2,
     "dot-notation": 1,
-    "no-undef": 1,
+    "no-undef": 2,
     "no-unused-vars": [2, {
       "args": "none"
     }],
@@ -44,7 +45,7 @@
     ],
     "no-eq-null": 2,
     "strict": [
-      2,
+      1,
       "function"
     ],
     "no-unused-expressions": 2,
@@ -65,11 +66,8 @@
       "never"
     ],
     "array-bracket-spacing": [
-      0,
-      "never",
-      {
-        "singleValue": true
-      }
+      2,
+      "never"
     ],
     "space-unary-ops": [
       2,
@@ -104,10 +102,17 @@
       "last"
     ],
     "space-infix-ops": 2,
+    "object-curly-spacing": [
+      2,
+      "never"
+    ],
     "eol-last": 2,
     "keyword-spacing": [
       2,
-      {}
+      {
+        "before": true,
+        "after": true
+      }
     ],
     "consistent-this": [
       2,

.gitignore

@@ -27,6 +27,7 @@ src/installer/installer.exe
 # Builds
 dist/*
 dist-dev/*
+!dist-dev/vendor
 doc/jsdoc
 
 # Vendor

.travis.yml

@@ -5,6 +5,6 @@ node_js:
 before_script:
   - npm install mocha
   - npm install grunt-cli -g
-  - grunt build:config build:manifest build:core
+  - node osjs build:config build:manifest build:core
 after_success:
-  - grunt all
+  - node osjs build

AUTHORS

@@ -3,7 +3,7 @@ Anders Evenrud <[email protected]>
 
 For a full list of contributions, see:
 * https://github.com/os-js/OS.js/graphs/contributors
-* https://github.com/os-js/OS.js/wiki/Hall-of-Fame
+* https://os.js.org/hall-of-fame/
 
 I'm using the following resources from outside sources:
 * Gnome - Icon theme

CONTRIBUTING.md

@@ -17,12 +17,12 @@ You can also submit patches and questions directly to me via [email](mailto:ande
 
 ## Information
 
-Please read http://os.js.org/doc/manuals/man-development.html before you start making and submitting contributions to the repository.
+You can find information about development here: https://os.js.org/manual/development/
 
 ## Resources
 
 * [Homepage](https://os.js.org/)
-* [Documentation](https://os.js.org/doc/)
+* [Manual](https://os.js.org/manual/)
 * [FAQ and discussion](https://github.com/os-js/OS.js/issues/49)
 * [Chat room](https://gitter.im/os-js/OS.js)
 * [Subreddit](https://www.reddit.com/r/osjs)

Gruntfile.js

@@ -41,21 +41,17 @@
     //
     // Load plugins
     //
-    try {
-      require('time-grunt')(grunt);
-    } catch (e) { }
-
     if ( grunt.option('nw') ) {
       grunt.loadNpmTasks('grunt-nw-builder');
     }
 
     // Make sure we only load required modules (ignore warnings)
-    var checks = ['test', 'eslint', 'csslint', 'validate_xml', 'mochaTest'];
+    var checks = ['test', 'eslint', 'csslint', 'validate_xml', 'mochaTest', 'mocha'];
     checks.forEach(function(k) {
       if ( grunt.cli.tasks.indexOf(k) >= 0 ) {
         grunt.loadNpmTasks('grunt-eslint');
         grunt.loadNpmTasks('grunt-mocha-test');
-        //grunt.loadNpmTasks('grunt-mocha');
+        grunt.loadNpmTasks('grunt-mocha');
         grunt.loadNpmTasks('grunt-contrib-csslint');
         grunt.loadNpmTasks('grunt-contrib-validate-xml');
         return false;
@@ -78,6 +74,7 @@
         target: [
           'Gruntfile.js',
           'src/*.js',
+          'src/build/*.js',
           'src/server/node/*.js',
           'src/server/node/**/*.js',
           'src/client/javascript/*.js',
@@ -119,6 +116,15 @@
           src: ['src/server/test/node/*.js']
         }
       },
+      mocha: {
+        test: {
+          options: {
+            urls: [
+              'http://localhost:8000/test.html'
+            ]
+          }
+        }
+      },
       watch: {
         core: {
           files: [
@@ -170,119 +176,6 @@
       }
     });
 
-    //
-    // BUILD TASKS
-    //
-
-    grunt.registerTask('clean', 'Clean up all build files', function(arg) {
-    });
-
-    grunt.registerTask('build', 'Builds OS.js', function(arg) {
-      _build.build(grunt, arg, this.async());
-    });
-
-    grunt.registerTask('generate', 'Generates configuration files etc.', function(arg) {
-      _build.generate(grunt, arg, this.async());
-    });
-
-    grunt.registerTask('config', 'Modify and build config files', function(arg) {
-      if ( arg ) {
-        _build.config(grunt, arg, this.async());
-      } else {
-        _build.build(grunt, 'config', this.async());
-      }
-    });
-
-    //
-    // DEPRECATED TASKS
-    //
-
-    grunt.registerTask('core', '(DEPRECATED) Build dist core files', function(arg) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt build:core" instead.'['yellow'].bold);
-      _build.build(grunt, 'core', this.async());
-    });
-
-    grunt.registerTask('packages', '(DEPRECATED) Builds package(s)', function(arg) {
-      if ( arg ) {
-        grunt.log.writeln('This task is deprecated. Please start using "grunt build:package --name=REPO/NAME" instead.'['yellow'].bold);
-        _build.build(grunt, 'package', this.async(), {
-          name: arg
-        });
-      } else {
-        grunt.log.writeln('This task is deprecated. Please start using "grunt build:packages" instead.'['yellow'].bold);
-        _build.build(grunt, 'packages', this.async());
-      }
-    });
-
-    grunt.registerTask('themes', '(DEPRECATED) Build theme files', function(arg) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt build:themes" instead.'['yellow'].bold);
-      _build.build(grunt, 'themes', this.async());
-    });
-
-    grunt.registerTask('manifest', '(DEPRECATED) Generate package manifest file', function(arg) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt build:manifest" instead.'['yellow'].bold);
-      _build.build(grunt, 'manifest', this.async());
-    });
-
-    grunt.registerTask('dist-files', '(DEPRECATED) Generate dist files from template', function(arg) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt build:core" instead.'['yellow'].bold);
-      _build.build(grunt, 'core', this.async());
-    });
-
-    grunt.registerTask('apache-vhost', '(DEPRECATED) Generate Apache vhost configuration', function(dist, outfile) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt generate:apache-vhost --out=/path/file" instead.'['yellow'].bold);
-      _build.build(grunt, 'generate', 'apache-vhost', this.async());
-    });
-
-    grunt.registerTask('apache-htaccess', '(DEPRECATED) Generate Apache htaccess file', function(dist, outfile) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt generate:apache-htaccess" instead.'['yellow'].bold);
-      _build.build(grunt, 'generate', 'apache-htaccess', this.async());
-    });
-
-    grunt.registerTask('lighttpd-config', '(DEPRECATED) Generate Lighttpd configuration', function(dist, outfile) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt generate:lighttpd-config --out=/path/file" instead.'['yellow'].bold);
-      _build.build(grunt, 'generate', 'lighttpd-config', this.async());
-    });
-
-    grunt.registerTask('nginx-config', '(DEPRECATED) Generate Nginx configuration', function(dist, outfile) {
-      grunt.log.writeln('This task is deprecated. Please start using "grunt generate:nginx-config --out=/path/file" instead.'['yellow'].bold);
-      _build.build(grunt, 'generate', 'nginx-config', this.async());
-    });
-
-    grunt.registerTask('dist', '(DEPRECATED) Build dist', function() {
-      grunt.log.writeln('This task is deprecated. use "grunt --target=dist" instead.'['yellow'].bold);
-    });
-
-    grunt.registerTask('dist-dev', '(DEPRECATED) Build dist-dev', function() {
-      grunt.log.writeln('This task is deprecated. use "grunt --target=dist-dev" instead.'['yellow'].bold);
-    });
-
-    grunt.registerTask('nw', '(DEPRECATED) Make NW build', function() {
-      grunt.log.writeln('This task is deprecated. use "grunt --target=dist --nw" instead.'['yellow'].bold);
-    });
-
-    grunt.registerTask('compress', '(DEPRECATED) Compress dist files', function(arg) {
-      grunt.log.writeln('This task is deprecated. use "grunt build:core,packages --compress" instead.'['yellow'].bold);
-    });
-
-    grunt.registerTask('standalone', '(DEPRECATED) Build dist standalone files', function(arg) {
-      grunt.log.writeln('This task is deprecated. use "grunt --target=dist --standalone" instead.'['yellow'].bold);
-    });
-
-    grunt.registerTask('create-package', '(DEPRECATED) Create a new package/application', function(arg1) {
-      grunt.log.writeln('This task is deprecated. use "grunt generate:package --name=REPO/NAME" instead.'['yellow'].bold);
-    });
-
-    grunt.registerTask('create-handler', '(DEPRECATED) Create a new handler with given name', function(arg1) {
-      grunt.log.writeln('This task is deprecated. use "grunt generate:handler --name=MyName" instead.'['yellow'].bold);
-    });
-
-    //
-    // Register aliases
-    //
-
-    grunt.registerTask('all', ['clean', 'build:config', 'build:core', 'build:themes', 'build:manifest', 'build:packages', 'generate:apache-htaccess']);
-    grunt.registerTask('default', ['all']);
     grunt.registerTask('test', ['eslint', 'csslint', 'validate_xml', 'mochaTest'/*, 'mocha'*/]);
   };
 

INSTALL.md

@@ -4,24 +4,6 @@ Installation is done in a few simple steps and only takes a minute to get runnin
 
 For more general information look at the [README](README.md) file or in the [official documentation](https://os.js.org/doc/).
 
-#### Table of Contents
-
-* [Dependencies](#dependencies)
-* [Installation methods](#installation)
-  1. Standard Installation
-    * [*NIX](#nix)
-    * [Windows](#windows)
-  2. Containers and Virtual Machines
-    * [Vagrant](#vagrant)
-    * [Docker](#docker)
-    * [NW.js](#nwjs)
-  3. Single-board-computers
-    * [Raspberry PI](#raspberry-pi)
-    * [Arduino](#arduino)
-    * [Intel Edison](#intel-edison)
-  4. Linux distribution
-* [Setting up optional features](#setting-up-optional-features)
-
 # Dependencies
 
 You only need these packages installed:
@@ -32,58 +14,10 @@ You only need these packages installed:
 
 # Installation
 
-OS.js runs on all patforms and web-servers. Choose one of the methods described below, then proceed to the [run](#running) section.
-
-## Standard Installation
-
-You can also find documentation on this on the [official homepage](https://os.js.org/doc/manuals/man-install.html).
-
-If you want to install on your computer or server directly:
-
-### *NIX
-
-See [install-nix.md](https://github.com/os-js/OS.js/blob/master/doc/install-nix.md).
-
-### Windows
-
-See [install-windows.md](https://github.com/os-js/OS.js/blob/master/doc/install-windows.md).
-
-## Containers and Virtual Machines
-
-If you want to install on your computer, but in an isolated environment (container)
-
-### Vagrant
-
-See [Vagrant.md](https://github.com/os-js/OS.js/blob/master/doc/Vagrant.md).
-
-### Docker
-
-See [Docker.md](https://github.com/os-js/OS.js/blob/master/doc/Docker.md).
-
-### NW.js
-
-See [NW.md](https://github.com/os-js/OS.js/blob/master/doc/NW.md).
-
-## Single-board-computers
-
-You can also install/deploy OS.js on these platforms, but has some spesific documentation:
-
-### Raspberry PI
-
-See [platform-raspi.md](https://github.com/os-js/OS.js/blob/master/doc/platform-raspi.md).
-
-### Arduino
-
-See [platform-arduino.md](https://github.com/os-js/OS.js/blob/master/doc/platform-arduino.md).
-
-### Intel Edison
-
-See [platform-edison.md](https://github.com/os-js/OS.js/blob/master/doc/platform-edison.md).
-
-## Linux distribution
-
-OS.js can run as a Linux distribution on top of X11. See [X11.md](https://github.com/os-js/OS.js/blob/master/doc/X11.md) for more information.
-
-# Setting up optional features
+For full instructions: https://os.js.org/manual/installation/
 
-Visit the [official documentation](https://os.js.org/doc/manuals/) for more information.
+```
+$ npm install --production
+$ node osjs build
+$ node osjs run --target=dist
+```