Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	core/src/plugins/action.compression/class.PluginCompression.php

.travis.yml

@@ -1,8 +1,7 @@
 language: php
 
 php:
- - 5.4
- - 5.5
+ - 5.5.9
  - 5.6
  - 7.0
 

CONTRIBUTING.md

@@ -19,3 +19,29 @@ PLEASE READ THE FOLLOWING BEFORE POSTING A BUG.
 **POST A GITHUB ISSUE / SUBMIT PR**
 > Make sure to put as many details as possible. If you are referring to a discussion on the Forum, add the link. The more info you give, the more easily we can reproduce the bug, the quicker we can fix it.  
 > If you are submitting a Pull Request, please sign the [Contributor License Agreement](https://pydio.com/en/community/contribute/contributor-license-agreement-cla).
+
+
+#### Setting up your dev environment
+
+Pydio 7 requires **PHP5.6** and upper. 
+
+The web root of the application is located in ***core/src/***. Create a virtual host to point to this folder, set up your webserver to use index.php as default page. This is generally done by default. 
+
+Pydio uses Composer and NPM to manage dependencies respectively in PHP and JS. It uses Grunt to build javascript sources. In order to start Pydio locally after a fresh `git clone`, you will first have to run these tools in both the core and in many plugins. 
+
+ - First install Composer (see https://getcomposer.org) and NPM (https://docs.npmjs.com/getting-started/installing-node)
+ - Install Grunt globally by running `npm install -g grunt-cli``
+ - Inside the core folder (under webroot, i.e. core/src/core/ from root of git repository), run `composer install`
+ - For each plugin that contains a composer.json file, run `composer install` as well.
+ - For each plugin tat contains a package.json file, run
+   - `npm install`
+   - `grunt`
+
+On a unix-based machine, this can be achieved by the following command (from the webroot directory):  
+```
+find . -maxdepth 5 -name Gruntfile.js -execdir bash -c "npm install && grunt" \;  
+find . -maxdepth 5 -name composer.json -execdir composer install \;
+```
+
+You should be good to go. When modifying JS files that require transpilation, there is generally a `grunt watch` task available to automatically run grunt on each file change.
+

README.md

@@ -2,13 +2,15 @@
 
 [Homepage](https://pydio.com/) |
 [GitHub-Repository](https://github.com/pydio/pydio-core) |
-[Issue-Tracker](https://github.com/pydio/pydio-core/issues) |
- [![Codacy Badge](https://api.codacy.com/project/badge/3b5cafea44e949e789d1928687e04032)](https://www.codacy.com/app/charles_3085/pydio-core) |
- [![Build Status](https://travis-ci.org/pydio/pydio-core.svg)](https://travis-ci.org/pydio/pydio-core)
+[Issue-Tracker](https://github.com/pydio/pydio-core/issues) 
+| ![Latest Stable](https://img.shields.io/badge/stable-6.4.2-brightgreen.svg) 
+| ![License Badge](https://img.shields.io/badge/License-AGPL%203%2B-blue.svg)
+| [![Codacy Badge](https://api.codacy.com/project/badge/3b5cafea44e949e789d1928687e04032)](https://www.codacy.com/app/charles_3085/pydio-core) 
+|  [![Build Status](https://travis-ci.org/pydio/pydio-core.svg)](https://travis-ci.org/pydio/pydio-core) 
 
 This is the main source code repository of Pydio (formerly AjaXplorer), containing all the PHP server and HTML5 Web GUI.
 
-* Latest Stable release : 6.4.1
+* Latest Stable release : 6.4.2
 * Latest Dev release : 6.3.1 (was RC for Pydio 6.4)
 * License: [AGPLv3](https://www.gnu.org/licenses/agpl.html)
 * Lead developer  : Charles du Jeu (cdujeu): [Github](https://github.com/cdujeu) | [Twitter](https://twitter.com/Pydio)
@@ -20,6 +22,31 @@ Please DO NOT send emails to Charles, but use the forum located on https://pydio
 
 ### How to contribute / Developer Resources
 
+#### Setting up your dev environment
+
+Pydio 7 requires **PHP5.5.9** and upper. 
+
+The web root of the application is located in ***core/src/***. Create a virtual host to point to this folder, set up your webserver to use index.php as default page. This is generally done by default. 
+
+Pydio uses Composer and NPM to manage dependencies respectively in PHP and JS. It uses Grunt to build javascript sources. In order to start Pydio locally after a fresh `git clone`, you will first have to run these tools in both the core and in many plugins. 
+
+ - First install Composer (see https://getcomposer.org) and NPM (https://docs.npmjs.com/getting-started/installing-node)
+ - Install Grunt globally by running `npm install -g grunt-cli``
+ - Inside the core folder (under webroot, i.e. core/src/core/ from root of git repository), run `composer install`
+ - For each plugin that contains a composer.json file, run `composer install` as well.
+ - For each plugin tat contains a package.json file, run
+   - `npm install`
+   - `grunt`
+
+On a unix-based machine, this can be achieved by the following command (from the webroot directory):  
+```
+find . -maxdepth 5 -name Gruntfile.js -execdir bash -c "npm install && grunt" \;  
+find . -maxdepth 5 -name composer.json -execdir composer install \;
+```
+
+You should be good to go. When modifying JS files that require transpilation, there is generally a `grunt watch` task available to automatically run grunt on each file change.
+
+
 #### Coding guidelines
 
 To enforce some coding standards, please run scripts in

core/src/.gitignore

@@ -1,7 +1,3 @@
-/plugins/access.ajxp_home/res/build
-/plugins/access.inbox/res/build
-/plugins/core.mailer/js/build
-/plugins/gui.ajax/res/js/ui/reactjs/build/
 .idea/
 data/cache/*
 data/files/*
@@ -10,9 +6,17 @@ data/personal/*
 data/plugins/*
 data/public/*
 data/tmp
-node_modules/
+node_modules
 .DS_Store
 .jshintignore
 .jshintrc
-/plugins/gui.ajax/res/mui/mui-sources
-.validate.json
+.validate.json
+composer.lock
+/core/vendor/
+/plugins/*/vendor/
+/plugins/access.ajxp_user/build
+/plugins/access.ajxp_home/res/build
+/plugins/access.inbox/res/build
+/plugins/core.mailer/js/build
+/plugins/uploader.html/js/build
+/plugins/core.tasks/js/build

core/src/.htaccess

@@ -8,14 +8,6 @@ RewriteEngine on
 RewriteBase /
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^shares ./dav.php [L]
-RewriteRule ^api ./rest.php [L]
-RewriteRule ^ocs/ ./opencollab.php [L]
-RewriteRule ^ocs-provider/ ./opencollab.php [L]
-RewriteRule ^user ./index.php?get_action=user_access_point [L]
-RewriteCond %{REQUEST_URI} !^/index
-RewriteCond %{REQUEST_URI} !^/plugins
-RewriteCond %{REQUEST_URI} ^/dashboard|^/settings|^/welcome|^/ws-
 RewriteRule (.*) index.php [L]
 
 #Following lines seem to be necessary if PHP is working
@@ -29,8 +21,8 @@ RewriteRule (.*) index.php [L]
 # to make sure that authorization is transmitted.
 # Just remove the # at the beginning of the line
 
-#SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
 
 </IfModule>
 
-AddType application/json .json
+AddType application/json .json

core/src/base.conf.php

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * This is the main configuration file for configuring the core of the application.
  * In a standard usage, you should not have to change any variables.