Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 692f1e9

Browse files
cdujeucdujeu
committed
Merge branch 'develop'
2 parents ee1e4a7 + c52ed89 commit 692f1e9

File tree

3,295 files changed

+109825
-128710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,295 files changed

+109825
-128710
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.DS_Store

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ php:
44
- 5.5.9
55
- 5.6
66
- 7.0
7+
- 7.1
78

89
script:
910
- dist/scripts/tests/syntax.sh

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
[Homepage](https://pydio.com/) |
44
[GitHub-Repository](https://github.com/pydio/pydio-core) |
55
[Issue-Tracker](https://github.com/pydio/pydio-core/issues)
6-
| ![Latest Stable](https://img.shields.io/badge/stable-7.0.1-brightgreen.svg)
6+
| ![Latest Stable](https://img.shields.io/badge/stable-7.0.4-brightgreen.svg)
77
| ![License Badge](https://img.shields.io/badge/License-AGPL%203%2B-blue.svg)
88
| [![Codacy Badge](https://api.codacy.com/project/badge/3b5cafea44e949e789d1928687e04032)](https://www.codacy.com/app/charles_3085/pydio-core)
99
| [![Build Status](https://travis-ci.org/pydio/pydio-core.svg)](https://travis-ci.org/pydio/pydio-core)
1010

1111
This is the main source code repository of Pydio (formerly AjaXplorer), containing all the PHP server and HTML5 Web GUI.
1212

13-
* Latest Stable release : 7.0.2
13+
* Latest Stable release : 7.0.4
1414
* Latest Dev release : 6.5.5 (Final Release Candidate for Pydio 7)
1515
* License: [AGPLv3](https://www.gnu.org/licenses/agpl.html)
1616
* Lead developer : Charles du Jeu (cdujeu): [Github](https://github.com/cdujeu) | [Twitter](https://twitter.com/Pydio)

‎core/src/.gitignore‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ node_modules
1414
composer.lock
1515
/core/vendor/
1616
/plugins/*/vendor/
17+
/plugins/*/res/build
18+
/plugins/*/js/build
1719
/plugins/access.ajxp_user/build
18-
/plugins/access.ajxp_home/res/build
19-
/plugins/access.inbox/res/build
20-
/plugins/core.mailer/js/build
21-
/plugins/uploader.html/js/build
22-
/plugins/core.tasks/js/build
23-
/plugins/action.demo_counter/build
20+
/plugins/action.demo_counter/build

‎core/src/.htaccess‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ RewriteRule (.*) index.php [L]
2121
# to make sure that authorization is transmitted.
2222
# Just remove the # at the beginning of the line
2323

24-
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
24+
#SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
2525

2626
</IfModule>
2727

28-
AddType application/json .json
28+
AddType application/json .json

‎core/src/base.conf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
3+
* Copyright 2007-2017 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
44
* This file is part of Pydio.
55
*
66
* Pydio is free software: you can redistribute it and/or modify

‎core/src/cmd.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
3+
* Copyright 2007-2017 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
44
* This file is part of Pydio.
55
*
66
* Pydio is free software: you can redistribute it and/or modify

‎core/src/conf/RELEASE_NOTE‎

Lines changed: 60 additions & 1032 deletions
Large diffs are not rendered by default.

‎core/src/conf/bootstrap_conf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2007-2013 Charles du Jeu <contact (at) cdujeu.me>
3+
* Copyright 2007-2017 Charles du Jeu <contact (at) cdujeu.me>
44
* This file is part of Pydio.
55
*
66
* Pydio is free software: you can redistribute it and/or modify

‎core/src/conf/bootstrap_context.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
3+
* Copyright 2007-2017 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
44
* This file is part of Pydio.
55
*
66
* Pydio is free software: you can redistribute it and/or modify
@@ -160,4 +160,4 @@ function pydioAutoloader($className)
160160
}
161161
if(!isSet($resWriteBootstrapCache) || $resWriteBootstrapCache !== false){
162162
require_once(AJXP_PLUGINS_BOOTSTRAP_CACHE);
163-
}
163+
}

0 commit comments

Comments
 (0)