summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23218 from owncloud/memcached-not-found-on-remove-means-s...Thomas Müller2016-03-142-5/+25
|\
| * 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 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.1Lukas Reschke2016-03-131-1/+1
* | Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-se...Thomas Müller2016-03-133-7/+260
|\ \
| * | 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 bitLukas Reschke2016-03-112-2/+2
* | | Merge pull request #22242 from owncloud/remove_old_ocs_share_api_codeRoeland Douma2016-03-133-1538/+636
|\ \ \
| * | | Do not recurse link share fetchingRoeland Jago Douma2016-03-131-0/+5
| * | | 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/dbalRoeland Jago Douma2016-03-111-0/+0
|/ /
* | Merge pull request #23141 from owncloud/behat-code-styleThomas Müller2016-03-1113-51/+233
|\ \
| * | 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 portLukas Reschke2016-03-102-1/+15
* | | Merge pull request #22750 from owncloud/integration-tests-federated-resharingThomas Müller2016-03-113-1/+152
|\ \ \
| * | | 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/FolderRoeland Jago Douma2016-03-114-26/+9
| |/ /
* | | 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 have no id...Thomas Müller2016-03-102-3/+3
* | | [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_sortArthur Schiwon2016-03-103-30/+1
| |/ /