summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23218 from ↵Thomas Müller2016-03-142-5/+25
|\ | | | | | | | | owncloud/memcached-not-found-on-remove-means-success Fix errors in memcached implementation
| * Fix errors in memcached implementationJoas Schilling2016-03-142-5/+25
| |
* | Merge pull request #23214 from owncloud/issue-23076-max-key-for-memcache-urlsVincent Petry2016-03-141-1/+1
|\ \ | |/ |/| Shorter cache key for URL entries
| * Shorter cache key for URL entriesJoas Schilling2016-03-141-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-1474-76/+66
|
* Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1Thomas Müller2016-03-131-1/+1
|\ | | | | Mark testing app as compatible with 9.1
| * Mark testing app as compatible with 9.1Lukas Reschke2016-03-131-1/+1
| |
* | Merge pull request #23091 from ↵Thomas Müller2016-03-133-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 Schilling2016-03-111-0/+54
| | |
| * | Correctly lower the search input as wellJoas Schilling2016-03-111-5/+5
| | |
| * | Return the correct group casing in sharee apiJoas Schilling2016-03-111-2/+2
| | |
| * | Add integration tests for sharee APIJoas Schilling2016-03-112-0/+199
| | |
* | | Merge pull request #23162 from owncloud/adjust-wording-for-an-happier-mattThomas Müller2016-03-132-2/+2
|\ \ \ | |_|/ |/| | Adjust wording a bit
| * | Adjust wording a bitLukas Reschke2016-03-112-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_codeRoeland Douma2016-03-133-1538/+636
|\ \ \ | | | | | | | | Remove old ocs share api code
| * | | Do not recurse link share fetchingRoeland Jago Douma2016-03-131-0/+5
| | | | | | | | | | | | | | | | * Might fix an issue on oracle
| * | | Fix intergration testsRoeland Jago Douma2016-03-131-893/+631
| | | |
| * | | Remove the old OCS Share API codeRoeland Jago Douma2016-03-131-645/+0
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-1214-8/+60
|/ /
* | Merge pull request #23137 from owncloud/bump_doctrineThomas Müller2016-03-111-0/+0
|\ \ | | | | | | [3rdparty] Bump doctrine/dbal
| * | [3rdparty] Bump doctrine/dbalRoeland Jago Douma2016-03-111-0/+0
|/ /
* | Merge pull request #23141 from owncloud/behat-code-styleThomas Müller2016-03-1113-51/+233
|\ \ | | | | | | Fix all the yellow, orange and red errors in integration tests
| * | Fix WebDavJoas Schilling2016-03-112-5/+39
| | |
| * | Fix docs of TagsJoas Schilling2016-03-111-0/+35
| | |
| * | Remove unnecessary importsJoas Schilling2016-03-111-2/+0
| | |
| * | Fix commentsJoas Schilling2016-03-111-2/+29
| | |
| * | Fix checksumsContextJoas Schilling2016-03-111-1/+23
| | |
| * | Fix issues in CardDavJoas Schilling2016-03-111-3/+13
| | |
| * | Add docs for CalDavContextJoas Schilling2016-03-111-0/+10
| | |
| * | Docs for BasicStructureJoas Schilling2016-03-111-0/+16
| | |
| * | Remove trailing spacesJoas Schilling2016-03-111-1/+1
| | |
| * | Fix the use of traitsJoas Schilling2016-03-112-4/+0
| | |
| * | Fix inheritance of membersJoas Schilling2016-03-113-13/+31
| | |
| * | API version needs to be on basic because we use it thereJoas Schilling2016-03-112-12/+11
| | |
| * | Fix type in class nameJoas Schilling2016-03-111-1/+1
| | |
| * | Remove hardcoded api versionsJoas Schilling2016-03-111-3/+3
| | |
| * | asCreatingAShareWith has no returnJoas Schilling2016-03-111-1/+1
| | |
| * | Fix docsJoas Schilling2016-03-111-3/+20
| |/
* | Merge pull request #23125 from owncloud/add-port-support-to-trusteddomainThomas Müller2016-03-112-1/+15
|\ \ | | | | | | Explicitly check for port
| * | Explicitly check for portLukas Reschke2016-03-102-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-resharingThomas Müller2016-03-113-1/+152
|\ \ \ | | | | | | | | Adding new tests for federation sharing
| * | | Change resharing to local instead of remote because of a deadlockSergio Bertolin2016-03-111-5/+10
| | | |
| * | | Adding new tests for federation sharingSergio Bertolín2016-03-113-1/+147
| | | |
* | | | Merge pull request #23133 from owncloud/more_generic_share_parametersThomas Müller2016-03-114-26/+9
|\ \ \ \ | |_|_|/ |/| | | Use more generic node instead of File/Folder
| * | | Use more generic node instead of File/FolderRoeland Jago Douma2016-03-114-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-titleThomas Müller2016-03-112-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üller2016-03-102-3/+3
| | | | | | | | | | | | idea about the target device language and forcing English upon all users is kind of bad
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1144-214/+446
| | |
* | | Merge pull request #23086 from owncloud/ldap-sort-deprecatedThomas Müller2016-03-113-30/+1
|\ \ \ | | | | | | | | remove deprecated ldap_sort
| * | | remove deprecated ldap_sortArthur Schiwon2016-03-103-30/+1
| |/ /