summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22249 from owncloud/fix-22245Thomas Müller2016-02-091-0/+8
|\
| * Save display name and email address on paste operations - fixes #22245Thomas Müller2016-02-091-0/+8
* | Merge pull request #20928 from owncloud/publicdav-check-permissionsC. Montero Luque2016-02-095-2/+139
|\ \
| * | add testsRobin Appelman2016-02-091-0/+49
| * | Fix unit testsRoeland Jago Douma2016-02-091-0/+2
| * | check share permissions in share controllerRobin Appelman2016-02-091-0/+17
| * | Check that the owner of a link share still has share permissions on accessRobin Appelman2016-02-093-2/+71
* | | Merge pull request #22252 from owncloud/consolidate-user-set-quotaC. Montero Luque2016-02-0914-94/+162
|\ \ \
| * | | revolutionar: change updates might even sent the new value (optional)Arthur Schiwon2016-02-092-7/+7
| * | | More fixed tests :)Arthur Schiwon2016-02-092-40/+45
| * | | Avatar should also claim its changeArthur Schiwon2016-02-091-2/+2
| * | | Doc improvementsArthur Schiwon2016-02-092-3/+5
| * | | fix testsArthur Schiwon2016-02-091-29/+51
| * | | Consolidate getQuota and setQuota methods in User instanceArthur Schiwon2016-02-0910-23/+62
| | |/ | |/|
* | | Merge pull request #22238 from owncloud/add-link-to-updaterLukas Reschke2016-02-099-33/+210
|\ \ \
| * | | Move update notification code into appLukas Reschke2016-02-099-33/+210
|/ / /
* | | Merge pull request #22228 from owncloud/comments-limit-messageThomas Müller2016-02-098-1/+191
|\ \ \
| * | | on DAV throw Bad Request if provided message is too longArthur Schiwon2016-02-095-2/+144
| * | | Limit comment message to 1k charsArthur Schiwon2016-02-094-1/+49
* | | | Merge pull request #22241 from owncloud/more-info-in-case-of-trusted-server-addThomas Müller2016-02-095-36/+46
|\ \ \ \
| * | | | Forward exception message to the admin in case of errors and in case the remo...Thomas Müller2016-02-095-36/+46
* | | | | Merge pull request #20571 from owncloud/transfer-ownershipThomas Müller2016-02-093-2/+235
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Adjust command descriptionThomas Müller2016-02-091-1/+1
| * | | | Set share owner and share initiator on upate as wellThomas Müller2016-02-093-9/+4
| * | | | Introduce console command to transfer ownerships of files - refs #19154Thomas Müller2016-02-092-2/+240
|/ / / /
* | | | Merge pull request #22234 from owncloud/systemtags-filter-intersect-emptyThomas Müller2016-02-092-19/+113
|\ \ \ \
| * | | | Stop when a mid result is emptyJoas Schilling2016-02-091-2/+8
| * | | | Add a test for empty mid-resultJoas Schilling2016-02-091-23/+84
| * | | | Fix system tag filter AND conditionVincent Petry2016-02-092-0/+27
| |/ / /
* | | | Merge pull request #21773 from owncloud/files_external-list-authtypeThomas Müller2016-02-093-3/+72
|\ \ \ \
| * | | | add testsRobin Appelman2016-02-041-0/+69
| * | | | update import logic for the new export logicRobin Appelman2016-02-041-2/+2
| * | | | Show the proper auth identifier when listing mounts as jsonRobin Appelman2016-02-041-1/+1
* | | | | Merge pull request #21893 from owncloud/migrate-calendarsThomas Müller2016-02-0911-11/+801
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Migration of calendarsThomas Müller2016-02-0911-11/+801
* | | | | Merge pull request #22197 from owncloud/files-filterbysystemtagsThomas Müller2016-02-0917-8/+926
|\ \ \ \ \
| * | | | | Fix unit tests for system tag filter sectionVincent Petry2016-02-092-7/+20
| * | | | | Add system tags filter section for files appVincent Petry2016-02-0914-2/+897
| * | | | | Fix elementToFile to also return path when definedVincent Petry2016-02-082-0/+10
| | |_|_|/ | |/| | |
* | | | | Merge pull request #22202 from owncloud/global-auth-no-userThomas Müller2016-02-092-2/+119
|\ \ \ \ \
| * | | | | Add testsRobin Appelman2016-02-082-2/+117
| * | | | | handle no user set for personal global authRobin Appelman2016-02-081-0/+2
* | | | | | Merge pull request #22225 from owncloud/sharing-moar-hooksThomas Müller2016-02-094-8/+88
|\ \ \ \ \ \
| * | | | | | Move password update hook after updateRoeland Jago Douma2016-02-091-8/+10
| * | | | | | Example hook checkRoeland Jago Douma2016-02-093-14/+27
| * | | | | | Fix unit testRoeland Jago Douma2016-02-091-1/+5
| * | | | | | throw hooks when accessing a link shareArthur Schiwon2016-02-091-2/+55
| * | | | | | add post hook on link-share password changeArthur Schiwon2016-02-081-1/+9
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22212 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-097-18/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | More fixesJoas Schilling2016-02-093-18/+9