summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20636 from owncloud/savre-3.0Thomas Müller2015-11-241-3/+6
|\
| * Adjust sabre changes in coreThomas Müller2015-11-241-3/+6
* | Merge pull request #20692 from owncloud/federation_auto_add_serversThomas Müller2015-11-241-1/+4
|\ \ | |/ |/|
| * use hooks to auto add server to the list of trusted servers once a federated ...Björn Schießle2015-11-241-1/+4
* | Merge pull request #20693 from owncloud/phpdoc_nodeThomas Müller2015-11-241-8/+0
|\ \
| * | Consistent interface declarationRoeland Jago Douma2015-11-231-8/+0
| |/
* | Merge pull request #20682 from owncloud/objectid-to-stringThomas Müller2015-11-242-10/+14
|\ \
| * | Make sure that object id can be a stringJoas Schilling2015-11-232-10/+14
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-11-2484-158/+6
|/
* Merge pull request #20679 from owncloud/fixphpdocThomas Müller2015-11-231-1/+1
|\
| * p() supports string as argumentMorris Jobke2015-11-231-1/+1
* | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertIdThomas Müller2015-11-233-18/+5
|\ \
| * | Throw an exception in case no table name is passed into lastInsertId of the O...Thomas Müller2015-11-232-2/+4
| * | lastInsertId() is properly working with Oracle if the table name is properly ...Thomas Müller2015-11-231-16/+1
| |/
* | Merge pull request #20543 from owncloud/share2.0_fix_hooksThomas Müller2015-11-233-49/+93
|\ \
| * | [Sharing 2.0] Move hook and delete children logic to share managerRoeland Jago Douma2015-11-233-49/+93
| |/
* / Use a DateTime object instead of a timestampJoas Schilling2015-11-232-22/+23
|/
* Merge pull request #16902 from owncloud/jsocclientThomas Müller2015-11-232-3/+13
|\
| * also match ie11 with Request::USER_AGENT_IERobin Appelman2015-11-221-1/+1
| * Now using IE8 workaround of davclient.js for all IE versionsVincent Petry2015-11-221-2/+2
| * Fix undefined HTTP_USER_AGENTThomas Müller2015-11-221-0/+3
| * Add evert's davclient.js + es6-promise + IE8 workaroundVincent Petry2015-11-221-2/+9
* | Merge pull request #20524 from owncloud/pgsql-version-check-errorThomas Müller2015-11-231-6/+3
|\ \
| * | assume pgsql >=9 if checking the version failsRobin Appelman2015-11-161-6/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-232-0/+4
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-224-0/+14
* | Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisab...Thomas Müller2015-11-207-14/+27
|\ \
| * | Adjust PHPDoc as suggestedThomas Müller2015-11-203-3/+3
| * | Fix failing unit test :skull:Thomas Müller2015-11-191-1/+1
| * | Use mocks when testing isSharingDisabledForUserThomas Müller2015-11-195-11/+24
* | | Merge pull request #20034 from owncloud/icewind_streams_0.3.0Thomas Müller2015-11-191-0/+9
|\ \ \
| * | | Follow the interface againRoeland Jago Douma2015-11-191-0/+9
| |/ /
* | | Adjust the method name to reflect it's behaviourJoas Schilling2015-11-191-1/+1
* | | Merge pull request #20563 from owncloud/systemtags-interfaceThomas Müller2015-11-195-0/+352
|\ \ \ | |/ / |/| |
| * | Core interfaces for system tags and its managerVincent Petry2015-11-195-0/+352
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-194-2/+26
* | | Handle non existing users as owner in the viewRobin Appelman2015-11-181-5/+20
* | | Merge pull request #20438 from owncloud/memcache-key-length-fixThomas Müller2015-11-181-8/+30
|\ \ \
| * | | Handle errors on memcached level - fixes #17397Thomas Müller2015-11-101-8/+30
* | | | Merge pull request #20540 from owncloud/fix-format-call-in-loggerThomas Müller2015-11-181-2/+5
|\ \ \ \
| * | | | fixes #20538Thomas Müller2015-11-161-2/+5
| | |/ / | |/| |
* | | | Merge pull request #20494 from owncloud/storage-forbidden-exceptionThomas Müller2015-11-184-0/+64
|\ \ \ \
| * | | | Allow storage wrappers to through a forbidden exception with retry informationJoas Schilling2015-11-174-0/+64
* | | | | Merge pull request #20551 from owncloud/notification-fix-testsThomas Müller2015-11-182-1/+4
|\ \ \ \ \
| * | | | | Add tests for the "return $this" and fix it on the new methodJoas Schilling2015-11-172-1/+4
| |/ / / /
* | | | | Merge pull request #20188 from owncloud/webdav-exposeshareownerThomas Müller2015-11-172-0/+14
|\ \ \ \ \
| * | | | | Add getOwner() method to FileInfo and Node APIVincent Petry2015-11-132-0/+14
| | |_|_|/ | |/| | |
* | | | | Merge pull request #20544 from owncloud/move-index-to-appframeworkThomas Müller2015-11-171-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move index.php from files to AppFrameworkLukas Reschke2015-11-161-0/+4
| | |/ / | |/| |
* | | | Merge pull request #20539 from owncloud/notification-api-adjustmentThomas Müller2015-11-174-72/+61
|\ \ \ \ | |/ / / |/| | |