summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark testing app as compatible with 9.1Lukas Reschke2016-03-131-1/+1
* 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
| |/ /
* | | Merge pull request #23129 from SteKoe/add-jpg-to-htaccessThomas Müller2016-03-101-1/+1
|\ \ \
| * | | Allow jpg files to be statically servedStephan Köninger2016-03-101-1/+1
* | | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-masterThomas Müller2016-03-103-12/+65
|\ \ \ \
| * | | | getOwner is not available on FileHome - fixes #23116Thomas Müller2016-03-103-12/+65
* | | | | Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10Thomas Müller2016-03-101-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fake LOCK statement for Windows 7, 8 and 10 network mountsMorris Jobke2016-03-101-0/+1
| | |/ / | |/| |
* | | | Merge pull request #23027 from owncloud/bump_symfony_consoleThomas Müller2016-03-101-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | [3rdparty] Bump symfony/console to 2.8.3Roeland Jago Douma2016-03-101-0/+0
* | | | Merge pull request #23121 from owncloud/scrutinizer_share_fixesThomas Müller2016-03-103-4/+4
|\ \ \ \
| * | | | Fix some scrutinizer warning in the sharing codeRoeland Jago Douma2016-03-103-4/+4
| |/ / /
* | | | Merge pull request #23120 from owncloud/do_not_analyze_composerThomas Müller2016-03-101-1/+1
|\ \ \ \
| * | | | Scrutinizer should not check generated composer filesRoeland Jago Douma2016-03-101-1/+1
| |/ / /
* | | | Merge pull request #23056 from owncloud/fix_23044Thomas Müller2016-03-103-4/+26
|\ \ \ \