6e8e411abf
Merge pull request #18068 from owncloud/update-pear
...
[PHP7] Update pear-core-minimal
2015-08-05 15:39:38 +02:00
6060514d71
Update submodule after merge in 3rdparty
2015-08-05 14:04:19 +02:00
bc91c5c2de
Set proper mimetype for directories
2015-08-05 13:54:09 +02:00
2128bd69de
No need to url decode the file
2015-08-05 13:21:04 +02:00
a70f145d71
Merge pull request #17961 from owncloud/make_knowledgebase_configurable
...
make knowledge base url configurable
2015-08-05 11:54:58 +02:00
7243fc1228
Merge pull request #18062 from owncloud/use-full-namespace
...
Use absolute namespace
2015-08-05 11:50:33 +02:00
5683d68921
remove old pear classes
2015-08-05 11:44:01 +02:00
544f38785f
"pear/pear-core-minimal": "v1.10.0alpha2"
2015-08-05 11:42:46 +02:00
ead25de628
add data: to allowed image domains
2015-08-05 11:41:25 +02:00
6c46430cdb
Return 200 not null - we should return consistent types
2015-08-05 11:23:29 +02:00
475adcf6ea
Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttoken
...
Use StringUtils::equals on CSRF token and add unit tests
2015-08-05 11:17:50 +02:00
99224905d8
Use absolute namespace
2015-08-05 10:30:39 +02:00
90a11efecd
Remove "use" statement
...
Ref https://bugs.php.net/bug.php?id=66773
2015-08-05 09:31:21 +02:00
4efa7c09b1
Use StringUtils::equals on CSRF token and add unit tests
2015-08-04 18:34:33 +02:00
dc5e89e624
also block certificate management in the back-end if external storages are disabled for the user
2015-08-04 18:33:19 +02:00
573177d176
only add the possibility to import ssl root certificates to the personal
...
setting if the user can mount external storages
2015-08-04 18:08:04 +02:00
728780aee8
Merge pull request #18024 from owncloud/phpseclib-2.0
...
Update phpseclib to 2.0 for increased PHP7 compatibility
2015-08-04 16:33:14 +02:00
151bad07df
Merge pull request #18050 from owncloud/php7-catch-type-error
...
[PHP 7] Change type hint to also accept Errors
2015-08-04 15:14:56 +02:00
3cd54cda24
Rebase upon newest master
2015-08-04 15:09:06 +02:00
d0d6782615
Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2
...
[PHP7] Remove pointless unit test
2015-08-04 12:11:19 +02:00
acd9b7576d
Remove pointless unit test
2015-08-04 12:03:03 +02:00
c6a181d00b
[PHP 7] Change type hint to also accept Errors
...
PHP 7 changed the exception types and thus our error handler needs to be able to catch this.
Without this in some cases just a white page is shown instead of an error message.
2015-08-04 11:54:05 +02:00
3ecf7fce79
Fix unit test within OCSController
2015-08-03 22:19:04 +02:00
fa0105d678
Merge pull request #18037 from owncloud/shared-propagate-check-recipient
...
fix infinite loops with propagating etags on reshares
2015-08-03 21:17:58 +02:00
649cc2fa89
Remove duplicate and unused code
2015-08-03 21:03:11 +02:00
cd1bfd7eb6
Fix authors
2015-08-03 21:02:41 +02:00
3358db320b
Reduce duplicate code
2015-08-03 18:06:07 +02:00
7b70343dc3
fix infinite loops with propagating etags on reshares
2015-08-03 17:33:12 +02:00
bacf1603ff
Adding ocs/v2.php with status code mapper
2015-08-03 16:05:50 +02:00
767ca44988
Merge pull request #17820 from owncloud/dav-exception-log-class
...
also log the class for dav exceptions
2015-08-03 15:14:21 +02:00
2a90cbe603
go trough the updater when uploading over webdav
2015-08-03 13:42:36 +02:00
af7bcb43b1
Merge pull request #18009 from owncloud/enc_always_update_file_cache
...
let the encryption storage wrapper always update the file cache
2015-08-03 12:50:01 +02:00
4105d17133
Merge pull request #17989 from owncloud/enc_only_update_file_cache_once
...
only update database on the first run
2015-08-03 11:33:46 +02:00
3b803db6d8
Update phpseclib to 2.0
2015-08-03 09:43:45 +02:00
92da1a64b4
[tx-robot] updated from transifex
2015-08-03 01:54:54 -04:00
98a7e42ebb
[provisioning api] Move away from OC\Util to OCP\Util
2015-08-02 10:27:36 +02:00
cea72c47f9
[provisioning_api] Move tests to OCP
2015-08-02 10:22:26 +02:00
a4822f9f9a
[provisioning_api] Move part of apps to OCP
2015-08-02 10:22:26 +02:00
97d79202ac
[provisioning_api] OC_User to IUserSession
2015-08-02 10:22:26 +02:00
9f59add9ed
[provisioning_api] subadmin check for users
2015-08-02 10:22:26 +02:00
b745e75737
[provisioning_api] Moved groups away from static stuff
2015-08-02 10:22:26 +02:00
abca7737b7
[provisioning_api] Move users away from static code
2015-08-02 10:22:26 +02:00
27bfab37bc
[tx-robot] updated from transifex
2015-08-02 01:54:57 -04:00
54e94b95bc
[tx-robot] updated from transifex
2015-08-01 01:55:02 -04:00
51a67a54e0
always update file cache, the cache can handle partial data correctly if the file doesn't already exists in the file cache
2015-07-31 17:14:32 +02:00
2f4bebb045
only update database on the first run (first run = we have a version number from the old encryption app)
2015-07-31 10:47:02 +02:00
de01951da3
[tx-robot] updated from transifex
2015-07-31 01:56:30 -04:00
db91b4505c
Merge pull request #17805 from owncloud/avatar-handle-errors
...
[avatar] add error handlers for avatar setup
2015-07-31 07:31:24 +02:00
519fcee15f
Merge pull request #17994 from owncloud/server-status
...
correct order and capitalization of 'Server status' admin settings entry
2015-07-30 21:31:10 +01:00
46916914f8
Merge pull request #17993 from owncloud/simplecontainertest-fix
...
Fix incorrect test naming in SimpleContainerTest
2015-07-30 21:07:55 +01:00
Thomas Müller
Roeland Jago Douma
sualko
Lukas Reschke
Bjoern Schiessle
Morris Jobke
Robin Appelman
Björn Schießle
Andreas Fischer
Jenkins for ownCloud
Roeland Douma
Robin McCorkell