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
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
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
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
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
7b70343dc3
fix infinite loops with propagating etags on reshares
2015-08-03 17:33:12 +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
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
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
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
2d130826da
correct order and capitalization of 'Server status' admin settings entry, fix #17395
2015-07-30 17:34:13 +02:00
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
5699fff889
Merge pull request #17175 from owncloud/add-download-feedback
...
Add loading spinner to download icon
2015-07-30 16:34:35 +02:00
22fd04eb41
Merge pull request #17981 from owncloud/correct-regex
...
Correct regular expressions
2015-07-30 16:07:46 +02:00
80810ae10f
Merge pull request #17963 from owncloud/remove-derecated-mysql-functions
...
Moving mysql setup code over to Doctrine
2015-07-30 15:21:54 +02:00
e95bc68ac7
Check for PDO instead of removed function for PHP 7 compatibility
2015-07-30 12:32:22 +02:00
52cd4efc83
Add more unit tests
2015-07-30 11:25:05 +02:00
ad4c731c4c
Correct regular expressions
...
Previously the regex was only matching on single characters. Meaning that file names such as "👍 .txt" where possible while "👍 " alone never was. This check apparently never worked as expected.
2015-07-30 11:22:14 +02:00
4d672ded24
properly mock dependencies for setup tests
2015-07-30 09:02:35 +02:00
a07254856c
[tx-robot] updated from transifex
2015-07-30 01:55:20 -04:00
c3cac887f5
- more injection
...
- less static calls
- use params on sql queries
- handle sql exception on database and user creation gracefully
2015-07-30 00:04:30 +02:00
114f128fc3
Moving mysql setup code over to Doctrine
2015-07-29 23:12:59 +02:00
0fcb9f79cc
Merge pull request #17814 from owncloud/update-moment-js
...
update moment.js to 2.10.3
2015-07-29 22:10:16 +01:00
aff11d7a79
Merge pull request #17966 from owncloud/remove-mssql
...
Remove remainings of mssql
2015-07-29 22:59:31 +02:00
ddb32d42d2
Merge pull request #17969 from owncloud/fix-log-file-check
...
[admin settings] only retrieve log file size if file exists
2015-07-29 21:58:16 +01:00
8184527760
[admin settings] only retrieve log file size if file exists
...
* fixes #17467
2015-07-29 20:41:34 +02:00
8bc4a10dbe
fix unit tests
2015-07-29 20:14:28 +02:00
b5ea97ef81
Merge pull request #17965 from owncloud/theme-color
...
add theme-color for better Android browser integration
2015-07-29 19:59:01 +02:00
Thomas Müller
Lukas Reschke
Morris Jobke
Robin Appelman
Björn Schießle
Andreas Fischer
Jenkins for ownCloud
Bjoern Schiessle
Roeland Douma
Robin McCorkell
Jan-Christoph Borchardt
Robin McCorkell