summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22228 from owncloud/comments-limit-messageThomas Müller2016-02-098-1/+191
|\ | | | | Limit comment message to 1k chars
| * 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 …
| * | Forward exception message to the admin in case of errors and in case the ↵Thomas Müller2016-02-095-36/+46
| | | | | | | | | | | | remote server version is to low and appropriate message is displayed as well
* | | Merge pull request #20571 from owncloud/transfer-ownershipThomas Müller2016-02-093-2/+235
|\ \ \ | | | | | | | | Introduce console command to transfer ownerships of files
| * | | 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
|\ \ \ | | | | | | | | Fix system tag filter AND condition
| * | | 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
| |/ / | | | | | | | | | | | | If one of the results is empty, no need to do array_intersect and return an empty result directly.
* | | Merge pull request #21773 from owncloud/files_external-list-authtypeThomas Müller2016-02-093-3/+72
|\ \ \ | | | | | | | | Show the proper auth identifier when listing mounts as json
| * | | 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
|\ \ \ \ | | | | | | | | | | Migrate calendars
| * | | | Migration of calendarsThomas Müller2016-02-0911-11/+801
| | | | |
* | | | | Merge pull request #22197 from owncloud/files-filterbysystemtagsThomas Müller2016-02-0917-8/+926
|\ \ \ \ \ | | | | | | | | | | | | Add file list filter to filter by system tags
| * | | | | 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
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Fixes issue when opening the share dialog for a file inside the favorite list, and the file is from a subfolder
* | | | | Merge pull request #22202 from owncloud/global-auth-no-userThomas Müller2016-02-092-2/+119
|\ \ \ \ \ | | | | | | | | | | | | handle no user set for personal global auth
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | More sharing hooks for extended auditing
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Scrutinizer Auto-Fixes
| * | | | | More fixesJoas Schilling2016-02-093-18/+9
| | | | | |
| * | | | | 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 #22227 from owncloud/appmanager-hooksThomas Müller2016-02-095-9/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | Send events when enabling and disabling of apps
| * | | | | | Send events when enabling and disabling of appsArthur Schiwon2016-02-095-9/+116
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22232 from owncloud/fix-user-settings-navigationThomas Müller2016-02-091-3/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix scroll area in navigation of users management
| * | | | | fixes #22221Thomas Müller2016-02-091-3/+0
| | | | | |
* | | | | | Merge pull request #22220 from owncloud/enc-fixfilesizelogicwithpartfileThomas Müller2016-02-091-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix part file partial cache logic in encryption code
| * | | | | | Fix part file partial cache logic in encryption codeVincent Petry2016-02-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encryption code uses partial cache entries for the part file (which are not stored in the database) but are useful for other parts of the code to retrieve the file size again. This means that in the fixed code $info was empty, so getData() could not be called. The fix makes sure to support both cases when the cache entry exists and doesn't.
* | | | | | | Merge pull request #22223 from owncloud/git-ignore-ackrcThomas Müller2016-02-091-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | gitignore ack config file
| * | | | | | | ignore ack config fileblizzz2016-02-081-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #22231 from owncloud/remove_modify_ajax_share.phpThomas Müller2016-02-091-86/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove modifying calls in ajax/share.php
| * | | | | | Remove modifying calls in ajax/share.phpRoeland Jago Douma2016-02-091-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those calls used the old sharing endpoint that created incompatible shares. Which eventually would lead to some weird bugs.
* | | | | | | Merge pull request #22199 from owncloud/multiple_checksumsThomas Müller2016-02-092-8/+75
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make checksum propfind future proof
| * | | | | | | For possible future usage allow multiple checksumsRoeland Jago Douma2016-02-082-8/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of returning <oc:checksum>TYPE:CHECKSUM</oc:checksum> Return <oc:checksums> <oc:checksum>TYPE:CHECKSUM</oc:checksum> </oc:checksums> This will allow us to expand in the future to multiple checksums. Without doing just string concatenation. And even for a single checksum it is now correct.
* | | | | | | | Merge pull request #22217 from owncloud/fix_22215Thomas Müller2016-02-091-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Federates shares have to set a file_target
| * | | | | | | Federates shares have to set a file_targetRoeland Jago Douma2016-02-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code path is still used to get the sharing info in the webui. This requires the file_target to be set. This does not mean anything for federated shares. Fixes #22215
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0988-84/+134
| |_|_|/ / / / |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 03:16:45 +0000