Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23218 from ↵ | Thomas Müller | 2016-03-14 | 2 | -5/+25 |
|\ | | | | | | | | | owncloud/memcached-not-found-on-remove-means-success Fix errors in memcached implementation | ||||
| * | Fix errors in memcached implementation | Joas Schilling | 2016-03-14 | 2 | -5/+25 |
| | | |||||
* | | Merge pull request #23214 from owncloud/issue-23076-max-key-for-memcache-urls | Vincent Petry | 2016-03-14 | 1 | -1/+1 |
|\ \ | |/ |/| | Shorter cache key for URL entries | ||||
| * | Shorter cache key for URL entries | Joas Schilling | 2016-03-14 | 1 | -1/+1 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-14 | 74 | -76/+66 |
| | |||||
* | Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1 | Thomas Müller | 2016-03-13 | 1 | -1/+1 |
|\ | | | | | Mark testing app as compatible with 9.1 | ||||
| * | Mark testing app as compatible with 9.1 | Lukas Reschke | 2016-03-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #23091 from ↵ | Thomas Müller | 2016-03-13 | 3 | -7/+260 |
|\ \ | | | | | | | | | | | | | owncloud/issue-23085-csae-insensitive-group-search Return the correct group casing in sharee api | ||||
| * | | Add integration tests for the "anti user iteration" | Joas Schilling | 2016-03-11 | 1 | -0/+54 |
| | | | |||||
| * | | Correctly lower the search input as well | Joas Schilling | 2016-03-11 | 1 | -5/+5 |
| | | | |||||
| * | | Return the correct group casing in sharee api | Joas Schilling | 2016-03-11 | 1 | -2/+2 |
| | | | |||||
| * | | Add integration tests for sharee API | Joas Schilling | 2016-03-11 | 2 | -0/+199 |
| | | | |||||
* | | | Merge pull request #23162 from owncloud/adjust-wording-for-an-happier-matt | Thomas Müller | 2016-03-13 | 2 | -2/+2 |
|\ \ \ | |_|/ |/| | | Adjust wording a bit | ||||
| * | | Adjust wording a bit | Lukas Reschke | 2016-03-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **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 | ||||
* | | | Merge pull request #22242 from owncloud/remove_old_ocs_share_api_code | Roeland Douma | 2016-03-13 | 3 | -1538/+636 |
|\ \ \ | | | | | | | | | Remove old ocs share api code | ||||
| * | | | Do not recurse link share fetching | Roeland Jago Douma | 2016-03-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | * Might fix an issue on oracle | ||||
| * | | | Fix intergration tests | Roeland Jago Douma | 2016-03-13 | 1 | -893/+631 |
| | | | | |||||
| * | | | Remove the old OCS Share API code | Roeland Jago Douma | 2016-03-13 | 1 | -645/+0 |
|/ / / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-12 | 14 | -8/+60 |
|/ / | |||||
* | | Merge pull request #23137 from owncloud/bump_doctrine | Thomas Müller | 2016-03-11 | 1 | -0/+0 |
|\ \ | | | | | | | [3rdparty] Bump doctrine/dbal | ||||
| * | | [3rdparty] Bump doctrine/dbal | Roeland Jago Douma | 2016-03-11 | 1 | -0/+0 |
|/ / | |||||
* | | Merge pull request #23141 from owncloud/behat-code-style | Thomas Müller | 2016-03-11 | 13 | -51/+233 |
|\ \ | | | | | | | Fix all the yellow, orange and red errors in integration tests | ||||
| * | | Fix WebDav | Joas Schilling | 2016-03-11 | 2 | -5/+39 |
| | | | |||||
| * | | Fix docs of Tags | Joas Schilling | 2016-03-11 | 1 | -0/+35 |
| | | | |||||
| * | | Remove unnecessary imports | Joas Schilling | 2016-03-11 | 1 | -2/+0 |
| | | | |||||
| * | | Fix comments | Joas Schilling | 2016-03-11 | 1 | -2/+29 |
| | | | |||||
| * | | Fix checksumsContext | Joas Schilling | 2016-03-11 | 1 | -1/+23 |
| | | | |||||
| * | | Fix issues in CardDav | Joas Schilling | 2016-03-11 | 1 | -3/+13 |
| | | | |||||
| * | | Add docs for CalDavContext | Joas Schilling | 2016-03-11 | 1 | -0/+10 |
| | | | |||||
| * | | Docs for BasicStructure | Joas Schilling | 2016-03-11 | 1 | -0/+16 |
| | | | |||||
| * | | Remove trailing spaces | Joas Schilling | 2016-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | Fix the use of traits | Joas Schilling | 2016-03-11 | 2 | -4/+0 |
| | | | |||||
| * | | Fix inheritance of members | Joas Schilling | 2016-03-11 | 3 | -13/+31 |
| | | | |||||
| * | | API version needs to be on basic because we use it there | Joas Schilling | 2016-03-11 | 2 | -12/+11 |
| | | | |||||
| * | | Fix type in class name | Joas Schilling | 2016-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | Remove hardcoded api versions | Joas Schilling | 2016-03-11 | 1 | -3/+3 |
| | | | |||||
| * | | asCreatingAShareWith has no return | Joas Schilling | 2016-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | Fix docs | Joas Schilling | 2016-03-11 | 1 | -3/+20 |
| |/ | |||||
* | | Merge pull request #23125 from owncloud/add-port-support-to-trusteddomain | Thomas Müller | 2016-03-11 | 2 | -1/+15 |
|\ \ | | | | | | | Explicitly check for port | ||||
| * | | Explicitly check for port | Lukas Reschke | 2016-03-10 | 2 | -1/+15 |
| | | | | | | | | | | | | | | | | | | The setup uses `\OCP\IRequest::getInsecureServerHost` which in some cases can also include a port. This makes the trusted domain check fail thus. I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why `parse_url` is not our friend: https://3v4l.org/k501Z | ||||
* | | | Merge pull request #22750 from owncloud/integration-tests-federated-resharing | Thomas Müller | 2016-03-11 | 3 | -1/+152 |
|\ \ \ | | | | | | | | | Adding new tests for federation sharing | ||||
| * | | | Change resharing to local instead of remote because of a deadlock | Sergio Bertolin | 2016-03-11 | 1 | -5/+10 |
| | | | | |||||
| * | | | Adding new tests for federation sharing | Sergio Bertolín | 2016-03-11 | 3 | -1/+147 |
| | | | | |||||
* | | | | Merge pull request #23133 from owncloud/more_generic_share_parameters | Thomas Müller | 2016-03-11 | 4 | -26/+9 |
|\ \ \ \ | |_|_|/ |/| | | | Use more generic node instead of File/Folder | ||||
| * | | | Use more generic node instead of File/Folder | Roeland Jago Douma | 2016-03-11 | 4 | -26/+9 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #23080 from owncloud/use-non-localized-birthday-title | Thomas Müller | 2016-03-11 | 2 | -3/+3 |
|\ \ \ | |/ / |/| | | Use a birthday title which does not require translation because we ha… | ||||
| * | | Use a birthday title which does not require translation because we have no ↵ | Thomas Müller | 2016-03-10 | 2 | -3/+3 |
| | | | | | | | | | | | | idea about the target device language and forcing English upon all users is kind of bad | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-11 | 44 | -214/+446 |
| | | | |||||
* | | | Merge pull request #23086 from owncloud/ldap-sort-deprecated | Thomas Müller | 2016-03-11 | 3 | -30/+1 |
|\ \ \ | | | | | | | | | remove deprecated ldap_sort | ||||
| * | | | remove deprecated ldap_sort | Arthur Schiwon | 2016-03-10 | 3 | -30/+1 |
| |/ / |