summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-087-7/+26
| | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* Merge pull request #22200 from owncloud/node-checksum-resolvefileinfoThomas Müller2016-02-082-1/+11
|\ | | | | Make sure fileinfo exists when calling getCheckSum in node API
| * Add proper throw tags to FileRoeland Jago Douma2016-02-081-0/+10
| |
| * Make sure fileinfo exists when calling getCheckSum in node APIVincent Petry2016-02-081-1/+1
| |
* | Merge pull request #21817 from owncloud/support-old-carddav-endpointThomas Müller2016-02-089-29/+193
|\ \ | | | | | | Adding pre oc 9.0 CardDAV endpoint for migration of old clients
| * | Fix pathThomas Müller2016-02-081-2/+2
| | |
| * | Adding pre oc 9.0 CalDAV endpoint for migration of old clientsThomas Müller2016-02-082-2/+75
| | |
| * | Remove calendar-proxy support - did this ever work?Thomas Müller2016-02-082-6/+1
| | |
| * | Adding pre oc 9.0 CardDAV endpoint for migration of old clientsThomas Müller2016-02-087-26/+122
| | |
* | | Merge pull request #22164 from owncloud/files_external-verifyThomas Müller2016-02-083-0/+173
|\ \ \ | | | | | | | | Add occ command to verify storage configurations
| * | | Add occ command to verify storage configurationsRobin Appelman2016-02-083-0/+173
| | |/ | |/|
* | | Merge pull request #22080 from owncloud/fed_share_providerThomas Müller2016-02-0821-25/+1854
|\ \ \ | |/ / |/| | implementation of the federated share provider
| * | Added tests for used partsRoeland Jago Douma2016-02-084-3/+450
| | |
| * | Fix intergration testsRoeland Jago Douma2016-02-081-0/+1
| | |
| * | Fix unit testsRoeland Jago Douma2016-02-082-4/+11
| | |
| * | Force app to be always enabled for nowRoeland Jago Douma2016-02-081-3/+4
| | |
| * | Respect not allowing outgoing sharesRoeland Jago Douma2016-02-085-10/+65
| | |
| * | Update OCS Share API to use federated share providerRoeland Jago Douma2016-02-082-15/+31
| | |
| * | Add federated share provider to coreRoeland Jago Douma2016-02-082-0/+53
| | |
| * | implementation of the federated share providerBjoern Schiessle2016-02-0811-1/+1250
| |/
* | Merge pull request #22168 from owncloud/fix-some-dav-sharing-uxThomas Müller2016-02-083-22/+33
|\ \ | |/ |/| Fix some dav sharing ux
| * Fix PHPDocLukas Reschke2016-02-081-5/+7
| |
| * Adding common name to shareeThomas Müller2016-02-083-4/+7
| |
| * Original resources should not be overwritten by shared resourcesThomas Müller2016-02-082-13/+19
|/
* Merge pull request #22190 from owncloud/fix_22189Thomas Müller2016-02-082-2/+2
|\ | | | | Even single shares are returned as array
| * Even single shares are returned as arrayRoeland Jago Douma2016-02-082-2/+2
| | | | | | | | | | | | | | When fetching a single share using ../shares/<ID> we should still return an array of shares. Fixes #22189
* | Merge pull request #22138 from owncloud/comments-collapseThomas Müller2016-02-082-4/+68
|\ \ | | | | | | Collapse long comments
| * | Collapse long commentsVincent Petry2016-02-082-4/+68
|/ / | | | | | | | | | | | | Very crude a naive implementation that relies on length and number of newlines. Should be good enough for most cases. Clicking on such comments will expand them.
* | Merge pull request #22156 from owncloud/share2_unshare_ifexpiredThomas Müller2016-02-083-3/+239
|\ \ | | | | | | Delete a link share if it is expired on access
| * | Fix exception on deleteRoeland Jago Douma2016-02-061-1/+6
| | |
| * | getSharesBy should also expire link sharesRoeland Jago Douma2016-02-063-2/+151
| | |
| * | Delete expired share when fetched by idRoeland Jago Douma2016-02-062-0/+35
| | |
| * | Delete a link share if it is expired on accessRoeland Jago Douma2016-02-062-1/+48
| | | | | | | | | | | | | | | If we access a link share we should check if it has expired already. If so we should remove it and throw a ShareNotFound exception
* | | Merge pull request #22160 from owncloud/files_external-createThomas Müller2016-02-084-0/+358
|\ \ \ | | | | | | | | Add occ files_external:create command to add new mounts
| * | | output mount id on createRobin Appelman2016-02-051-0/+5
| | | |
| * | | verify that the auth backend is valid for the storage backendRobin Appelman2016-02-051-0/+5
| | | |
| * | | list supported auth backends for storage backendsRobin Appelman2016-02-051-0/+3
| | | |
| * | | Add occ files_external:create command to add new mountsRobin Appelman2016-02-054-0/+345
| | | |
* | | | Merge pull request #22161 from owncloud/dav-ie9Thomas Müller2016-02-081-55/+41
|\ \ \ \ | |_|_|/ |/| | | Make JS Webdav work again with IE9-IE10
| * | | Make JS Webdav work again with IE9-IE10Vincent Petry2016-02-051-55/+41
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0824-0/+76
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0718-0/+74
| |_|/ |/| |
* | | Merge pull request #22102 from owncloud/ldap_2nddispname-masterThomas Müller2016-02-0611-15/+209
|\ \ \ | | | | | | | | [LDAP] add second field for additional/optional display name attribute
| * | | Port of test_ldap_2nddispname to masterArthur Schiwon2016-02-0311-15/+209
| | | |
* | | | Merge pull request #22139 from owncloud/comments-files-cleanupThomas Müller2016-02-0613-34/+257
|\ \ \ \ | | | | | | | | | | cleanup jobs for comments and comment read marks
| * | | | Move casting to IExpressionBuilderJoas Schilling2016-02-058-12/+108
| | | | |
| * | | | Remove old background jobJoas Schilling2016-02-051-0/+1
| | | | |
| * | | | fix pgsqlArthur Schiwon2016-02-051-2/+4
| | | | |
| * | | | cleanup jobs for comments and comment read marksArthur Schiwon2016-02-055-24/+148
| | |/ / | |/| |
* | | | Merge pull request #22163 from owncloud/comments-sizelimitThomas Müller2016-02-063-2/+116
|\ \ \ \ | | | | | | | | | | Limit comment size to 1000 in UI