Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-02-08 | 7 | -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-resolvefileinfo | Thomas Müller | 2016-02-08 | 2 | -1/+11 |
|\ | | | | | Make sure fileinfo exists when calling getCheckSum in node API | ||||
| * | Add proper throw tags to File | Roeland Jago Douma | 2016-02-08 | 1 | -0/+10 |
| | | |||||
| * | Make sure fileinfo exists when calling getCheckSum in node API | Vincent Petry | 2016-02-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #21817 from owncloud/support-old-carddav-endpoint | Thomas Müller | 2016-02-08 | 9 | -29/+193 |
|\ \ | | | | | | | Adding pre oc 9.0 CardDAV endpoint for migration of old clients | ||||
| * | | Fix path | Thomas Müller | 2016-02-08 | 1 | -2/+2 |
| | | | |||||
| * | | Adding pre oc 9.0 CalDAV endpoint for migration of old clients | Thomas Müller | 2016-02-08 | 2 | -2/+75 |
| | | | |||||
| * | | Remove calendar-proxy support - did this ever work? | Thomas Müller | 2016-02-08 | 2 | -6/+1 |
| | | | |||||
| * | | Adding pre oc 9.0 CardDAV endpoint for migration of old clients | Thomas Müller | 2016-02-08 | 7 | -26/+122 |
| | | | |||||
* | | | Merge pull request #22164 from owncloud/files_external-verify | Thomas Müller | 2016-02-08 | 3 | -0/+173 |
|\ \ \ | | | | | | | | | Add occ command to verify storage configurations | ||||
| * | | | Add occ command to verify storage configurations | Robin Appelman | 2016-02-08 | 3 | -0/+173 |
| | |/ | |/| | |||||
* | | | Merge pull request #22080 from owncloud/fed_share_provider | Thomas Müller | 2016-02-08 | 21 | -25/+1854 |
|\ \ \ | |/ / |/| | | implementation of the federated share provider | ||||
| * | | Added tests for used parts | Roeland Jago Douma | 2016-02-08 | 4 | -3/+450 |
| | | | |||||
| * | | Fix intergration tests | Roeland Jago Douma | 2016-02-08 | 1 | -0/+1 |
| | | | |||||
| * | | Fix unit tests | Roeland Jago Douma | 2016-02-08 | 2 | -4/+11 |
| | | | |||||
| * | | Force app to be always enabled for now | Roeland Jago Douma | 2016-02-08 | 1 | -3/+4 |
| | | | |||||
| * | | Respect not allowing outgoing shares | Roeland Jago Douma | 2016-02-08 | 5 | -10/+65 |
| | | | |||||
| * | | Update OCS Share API to use federated share provider | Roeland Jago Douma | 2016-02-08 | 2 | -15/+31 |
| | | | |||||
| * | | Add federated share provider to core | Roeland Jago Douma | 2016-02-08 | 2 | -0/+53 |
| | | | |||||
| * | | implementation of the federated share provider | Bjoern Schiessle | 2016-02-08 | 11 | -1/+1250 |
| |/ | |||||
* | | Merge pull request #22168 from owncloud/fix-some-dav-sharing-ux | Thomas Müller | 2016-02-08 | 3 | -22/+33 |
|\ \ | |/ |/| | Fix some dav sharing ux | ||||
| * | Fix PHPDoc | Lukas Reschke | 2016-02-08 | 1 | -5/+7 |
| | | |||||
| * | Adding common name to sharee | Thomas Müller | 2016-02-08 | 3 | -4/+7 |
| | | |||||
| * | Original resources should not be overwritten by shared resources | Thomas Müller | 2016-02-08 | 2 | -13/+19 |
|/ | |||||
* | Merge pull request #22190 from owncloud/fix_22189 | Thomas Müller | 2016-02-08 | 2 | -2/+2 |
|\ | | | | | Even single shares are returned as array | ||||
| * | Even single shares are returned as array | Roeland Jago Douma | 2016-02-08 | 2 | -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-collapse | Thomas Müller | 2016-02-08 | 2 | -4/+68 |
|\ \ | | | | | | | Collapse long comments | ||||
| * | | Collapse long comments | Vincent Petry | 2016-02-08 | 2 | -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_ifexpired | Thomas Müller | 2016-02-08 | 3 | -3/+239 |
|\ \ | | | | | | | Delete a link share if it is expired on access | ||||
| * | | Fix exception on delete | Roeland Jago Douma | 2016-02-06 | 1 | -1/+6 |
| | | | |||||
| * | | getSharesBy should also expire link shares | Roeland Jago Douma | 2016-02-06 | 3 | -2/+151 |
| | | | |||||
| * | | Delete expired share when fetched by id | Roeland Jago Douma | 2016-02-06 | 2 | -0/+35 |
| | | | |||||
| * | | Delete a link share if it is expired on access | Roeland Jago Douma | 2016-02-06 | 2 | -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-create | Thomas Müller | 2016-02-08 | 4 | -0/+358 |
|\ \ \ | | | | | | | | | Add occ files_external:create command to add new mounts | ||||
| * | | | output mount id on create | Robin Appelman | 2016-02-05 | 1 | -0/+5 |
| | | | | |||||
| * | | | verify that the auth backend is valid for the storage backend | Robin Appelman | 2016-02-05 | 1 | -0/+5 |
| | | | | |||||
| * | | | list supported auth backends for storage backends | Robin Appelman | 2016-02-05 | 1 | -0/+3 |
| | | | | |||||
| * | | | Add occ files_external:create command to add new mounts | Robin Appelman | 2016-02-05 | 4 | -0/+345 |
| | | | | |||||
* | | | | Merge pull request #22161 from owncloud/dav-ie9 | Thomas Müller | 2016-02-08 | 1 | -55/+41 |
|\ \ \ \ | |_|_|/ |/| | | | Make JS Webdav work again with IE9-IE10 | ||||
| * | | | Make JS Webdav work again with IE9-IE10 | Vincent Petry | 2016-02-05 | 1 | -55/+41 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-08 | 24 | -0/+76 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-07 | 18 | -0/+74 |
| |_|/ |/| | | |||||
* | | | Merge pull request #22102 from owncloud/ldap_2nddispname-master | Thomas Müller | 2016-02-06 | 11 | -15/+209 |
|\ \ \ | | | | | | | | | [LDAP] add second field for additional/optional display name attribute | ||||
| * | | | Port of test_ldap_2nddispname to master | Arthur Schiwon | 2016-02-03 | 11 | -15/+209 |
| | | | | |||||
* | | | | Merge pull request #22139 from owncloud/comments-files-cleanup | Thomas Müller | 2016-02-06 | 13 | -34/+257 |
|\ \ \ \ | | | | | | | | | | | cleanup jobs for comments and comment read marks | ||||
| * | | | | Move casting to IExpressionBuilder | Joas Schilling | 2016-02-05 | 8 | -12/+108 |
| | | | | | |||||
| * | | | | Remove old background job | Joas Schilling | 2016-02-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fix pgsql | Arthur Schiwon | 2016-02-05 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | cleanup jobs for comments and comment read marks | Arthur Schiwon | 2016-02-05 | 5 | -24/+148 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22163 from owncloud/comments-sizelimit | Thomas Müller | 2016-02-06 | 3 | -2/+116 |
|\ \ \ \ | | | | | | | | | | | Limit comment size to 1000 in UI |