Commit graph

31046 commits

Author SHA1 Message Date
Thomas Müller
0b6eaa863d Merge pull request #23208 from owncloud/reduce-unneeded-methods
Replace unneded OC::needUpgrade with OCP method
2016-03-14 16:10:19 +01:00
Thomas Müller
6023fadaf4 Merge pull request #23211 from owncloud/cleanup-federation-tests
Only match LOCAL and REMOTE as servers, correctly make use of the sha…
2016-03-14 16:09:57 +01:00
Thomas Müller
852acd364a Merge pull request #23218 from owncloud/memcached-not-found-on-remove-means-success
Fix errors in memcached implementation
2016-03-14 16:08:47 +01:00
Vincent Petry
2934b7e694 Merge pull request #23214 from owncloud/issue-23076-max-key-for-memcache-urls
Shorter cache key for URL entries
2016-03-14 15:03:25 +01:00
Joas Schilling
2f67aa9bc4 Fix errors in memcached implementation 2016-03-14 12:39:34 +01:00
Joas Schilling
c3c491689b Shorter cache key for URL entries 2016-03-14 11:05:46 +01:00
Joas Schilling
f62a7b2447 Only match LOCAL and REMOTE as servers, correctly make use of the sharer server from the command 2016-03-14 10:55:52 +01:00
Morris Jobke
0864851001 Replace unneded OC::needUpgrade with OCP method 2016-03-14 10:10:29 +01:00
Jenkins for ownCloud
e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Thomas Müller
31aeca32c2 Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1
Mark testing app as compatible with 9.1
2016-03-13 19:59:47 +01:00
Thomas Müller
101e446577 Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search
Return the correct group casing in sharee api
2016-03-13 19:51:07 +01:00
Lukas Reschke
239f1c067c Mark testing app as compatible with 9.1 2016-03-13 19:47:30 +01:00
Thomas Müller
e415af68af Merge pull request #23162 from owncloud/adjust-wording-for-an-happier-matt
Adjust wording a bit
2016-03-13 19:47:19 +01:00
Roeland Douma
9c1915965e Merge pull request #22242 from owncloud/remove_old_ocs_share_api_code
Remove old ocs share api code
2016-03-13 19:17:07 +01:00
Roeland Jago Douma
3f8c998afe Do not recurse link share fetching
* Might fix an issue on oracle
2016-03-13 13:31:28 +01:00
Roeland Jago Douma
6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma
4b1fe0083a Remove the old OCS Share API code 2016-03-13 13:31:28 +01:00
Jenkins for ownCloud
5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Lukas Reschke
2ca3c0d461 Adjust wording a bit
**Before:**
> Your PHP version (5.4.16) is no longer supported by PHP. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.

**After:**
> You are currently running PHP 5.4.0. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by the PHP Group as soon as your distribution supports it.

Fixes https://github.com/owncloud/enterprise/issues/1170
2016-03-11 17:39:35 +01:00
Thomas Müller
8082105a19 Merge pull request #23137 from owncloud/bump_doctrine
[3rdparty] Bump doctrine/dbal
2016-03-11 17:15:57 +01:00
Roeland Jago Douma
5c7b26e1ef [3rdparty] Bump doctrine/dbal 2016-03-11 15:18:33 +01:00
Thomas Müller
c874ebf425 Merge pull request #23141 from owncloud/behat-code-style
Fix all the yellow, orange and red errors in integration tests
2016-03-11 14:56:44 +01:00
Thomas Müller
a8922e9d35 Merge pull request #23125 from owncloud/add-port-support-to-trusteddomain
Explicitly check for port
2016-03-11 14:55:27 +01:00
Thomas Müller
a7f6f10d4e Merge pull request #22750 from owncloud/integration-tests-federated-resharing
Adding new tests for federation sharing
2016-03-11 14:51:06 +01:00
Thomas Müller
19695ff8da Merge pull request #23133 from owncloud/more_generic_share_parameters
Use more generic node instead of File/Folder
2016-03-11 14:50:48 +01:00
Joas Schilling
722188e503 Add integration tests for the "anti user iteration" 2016-03-11 14:15:09 +01:00
Joas Schilling
aad8aa0970 Correctly lower the search input as well 2016-03-11 14:08:13 +01:00
Joas Schilling
8cd52ed36d Return the correct group casing in sharee api 2016-03-11 14:08:12 +01:00
Joas Schilling
ab39be1d11 Add integration tests for sharee API 2016-03-11 14:08:12 +01:00
Joas Schilling
6d80efc2a4 Fix WebDav 2016-03-11 13:59:20 +01:00
Joas Schilling
6ff3d23b24 Fix docs of Tags 2016-03-11 13:59:19 +01:00
Joas Schilling
957a13d879 Remove unnecessary imports 2016-03-11 13:59:19 +01:00
Joas Schilling
d78357c210 Fix comments 2016-03-11 13:59:19 +01:00
Joas Schilling
c604046e3e Fix checksumsContext 2016-03-11 13:59:19 +01:00
Joas Schilling
2faf520504 Fix issues in CardDav 2016-03-11 13:59:19 +01:00
Joas Schilling
b4affa4d27 Add docs for CalDavContext 2016-03-11 13:59:19 +01:00
Joas Schilling
0f214017d2 Docs for BasicStructure 2016-03-11 13:59:19 +01:00
Joas Schilling
6381c22a7d Remove trailing spaces 2016-03-11 13:59:19 +01:00
Joas Schilling
cdc5470f7e Fix the use of traits 2016-03-11 13:59:19 +01:00
Joas Schilling
26e974d859 Fix inheritance of members 2016-03-11 13:59:19 +01:00
Joas Schilling
62b77d8ed0 API version needs to be on basic because we use it there 2016-03-11 13:59:19 +01:00
Joas Schilling
5f7502de6c Fix type in class name 2016-03-11 13:59:19 +01:00
Joas Schilling
95a7518653 Remove hardcoded api versions 2016-03-11 13:59:19 +01:00
Joas Schilling
985b11876f asCreatingAShareWith has no return 2016-03-11 13:59:18 +01:00
Joas Schilling
9be7f4d19d Fix docs 2016-03-11 13:59:18 +01:00
Thomas Müller
750ec93394 Merge pull request #23080 from owncloud/use-non-localized-birthday-title
Use a birthday title which does not require translation because we ha…
2016-03-11 11:49:13 +01:00
Sergio Bertolin
c153a27ce5 Change resharing to local instead of remote because of a deadlock 2016-03-11 08:49:26 +00:00
Sergio Bertolín
44da5fe1ab Adding new tests for federation sharing 2016-03-11 08:49:26 +00:00
Roeland Jago Douma
b8ce9c5554 Use more generic node instead of File/Folder
The phpdoc for the sharing functions was very restrictive. As a
consequence passing node object (for example from the OCS Share API
where we don't really care if it is a file or folder), would actually
be invalid.

With this loser restriction the interfaces become more generic.
2016-03-11 08:51:07 +01:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00