Commit Graph

26063 Commits

Author SHA1 Message Date
Arthur Schiwon 1aaef6fde7 files and sharing will require backbonejs 2015-08-06 11:09:47 +02:00
Arthur Schiwon dc04afbe29 add backbone.js 2015-08-06 00:00:40 +02:00
Morris Jobke 7f44b0fd18 Merge pull request #18077 from owncloud/fix_18055
Set proper mimetype for directories
2015-08-05 23:38:02 +02:00
Bernhard Posselt 7cb0934fa2 Merge pull request #18035 from owncloud/ocs-2.0
Adding ocs/v2.php with status code mapper
2015-08-05 17:28:08 +02:00
Thomas Müller 314fc11e1b Merge pull request #18057 from owncloud/import_root_certificates
disable "ssl root certificate" settings if user can't mount external storages
2015-08-05 17:18:46 +02:00
Thomas Müller 6e8e411abf Merge pull request #18068 from owncloud/update-pear
[PHP7] Update pear-core-minimal
2015-08-05 15:39:38 +02:00
Thomas Müller 6060514d71 Update submodule after merge in 3rdparty 2015-08-05 14:04:19 +02:00
Roeland Jago Douma bc91c5c2de Set proper mimetype for directories 2015-08-05 13:54:09 +02:00
Thomas Müller a70f145d71 Merge pull request #17961 from owncloud/make_knowledgebase_configurable
make knowledge base url configurable
2015-08-05 11:54:58 +02:00
Thomas Müller 7243fc1228 Merge pull request #18062 from owncloud/use-full-namespace
Use absolute namespace
2015-08-05 11:50:33 +02:00
Thomas Müller 5683d68921 remove old pear classes 2015-08-05 11:44:01 +02:00
Thomas Müller 544f38785f "pear/pear-core-minimal": "v1.10.0alpha2" 2015-08-05 11:42:46 +02:00
Thomas Müller 6c46430cdb Return 200 not null - we should return consistent types 2015-08-05 11:23:29 +02:00
Thomas Müller 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
Lukas Reschke 99224905d8 Use absolute namespace 2015-08-05 10:30:39 +02:00
Lukas Reschke 90a11efecd Remove "use" statement
Ref https://bugs.php.net/bug.php?id=66773
2015-08-05 09:31:21 +02:00
Lukas Reschke 4efa7c09b1 Use StringUtils::equals on CSRF token and add unit tests 2015-08-04 18:34:33 +02:00
Bjoern Schiessle 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
Bjoern Schiessle 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
Thomas Müller 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
Morris Jobke 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
Lukas Reschke 3cd54cda24 Rebase upon newest master 2015-08-04 15:09:06 +02:00
Thomas Müller d0d6782615 Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2
[PHP7] Remove pointless unit test
2015-08-04 12:11:19 +02:00
Thomas Müller acd9b7576d Remove pointless unit test 2015-08-04 12:03:03 +02:00
Lukas Reschke 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
Thomas Müller 3ecf7fce79 Fix unit test within OCSController 2015-08-03 22:19:04 +02:00
Thomas Müller 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
Thomas Müller 649cc2fa89 Remove duplicate and unused code 2015-08-03 21:03:11 +02:00
Thomas Müller cd1bfd7eb6 Fix authors 2015-08-03 21:02:41 +02:00
Thomas Müller 3358db320b Reduce duplicate code 2015-08-03 18:06:07 +02:00
Robin Appelman 7b70343dc3 fix infinite loops with propagating etags on reshares 2015-08-03 17:33:12 +02:00
Thomas Müller bacf1603ff Adding ocs/v2.php with status code mapper 2015-08-03 16:05:50 +02:00
Morris Jobke 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
Thomas Müller 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
Björn Schießle 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
Andreas Fischer 3b803db6d8 Update phpseclib to 2.0 2015-08-03 09:43:45 +02:00
Jenkins for ownCloud 92da1a64b4 [tx-robot] updated from transifex 2015-08-03 01:54:54 -04:00
Jenkins for ownCloud 27bfab37bc [tx-robot] updated from transifex 2015-08-02 01:54:57 -04:00
Jenkins for ownCloud 54e94b95bc [tx-robot] updated from transifex 2015-08-01 01:55:02 -04:00
Bjoern Schiessle 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
Bjoern Schiessle 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
Jenkins for ownCloud de01951da3 [tx-robot] updated from transifex 2015-07-31 01:56:30 -04:00
Roeland Douma 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
Robin McCorkell 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
Robin McCorkell 46916914f8 Merge pull request #17993 from owncloud/simplecontainertest-fix
Fix incorrect test naming in SimpleContainerTest
2015-07-30 21:07:55 +01:00
Morris Jobke e184157684 [avatar] add error handlers for avatar setup
add colon to translated string

use placeholder in t()

Adding a size limitation for avatar upload

Unit test for file size

Fix typo & display server side error message
2015-07-30 18:05:32 +02:00
Jan-Christoph Borchardt 2d130826da correct order and capitalization of 'Server status' admin settings entry, fix #17395 2015-07-30 17:34:13 +02:00
Robin McCorkell 0223221a64 Fix incorrect test naming
`tesOverrideService()` was incorrect and wasn't getting called by
PHPUnit. Also, the unit test itself was wrong, but went unnoticed
because of point 1.
2015-07-30 16:06:26 +01:00
Morris Jobke 5699fff889 Merge pull request #17175 from owncloud/add-download-feedback
Add loading spinner to download icon
2015-07-30 16:34:35 +02:00
Thomas Müller 22fd04eb41 Merge pull request #17981 from owncloud/correct-regex
Correct regular expressions
2015-07-30 16:07:46 +02:00