aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix testsArthur Schiwon2016-02-091-29/+51
* Consolidate getQuota and setQuota methods in User instanceArthur Schiwon2016-02-0910-23/+62
* 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
| * | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-087-7/+26
* | | | | | Merge pull request #22227 from owncloud/appmanager-hooksThomas Müller2016-02-095-9/+116
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 codeVincent Petry2016-02-091-1/+7
* | | | | | | Merge pull request #22223 from owncloud/git-ignore-ackrcThomas Müller2016-02-091-0/+3
|\ \ \ \ \ \ \
| * | | | | | | 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.phpRoeland Jago Douma2016-02-091-86/+0
* | | | | | | Merge pull request #22199 from owncloud/multiple_checksumsThomas Müller2016-02-092-8/+75
|\ \ \ \ \ \ \
| * | | | | | | For possible future usage allow multiple checksumsRoeland Jago Douma2016-02-082-8/+75
* | | | | | | | Merge pull request #22217 from owncloud/fix_22215Thomas Müller2016-02-091-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Federates shares have to set a file_targetRoeland Jago Douma2016-02-081-0/+6
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0988-84/+134
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #22170 from owncloud/occ-check-signatureThomas Müller2016-02-083-0/+138
|\ \ \ \ \ \ \
| * | | | | | | Cut authors list. Declare a member variableVictor Dubiniuk2016-02-082-18/+11
| * | | | | | | Optional path parameterVictor Dubiniuk2016-02-052-4/+7
| * | | | | | | CLI commands to check app and core signaturesVictor Dubiniuk2016-02-053-0/+142
* | | | | | | | Merge pull request #22112 from owncloud/dav-filesreportThomas Müller2016-02-083-1/+850
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add REPORT on files endpoint for filteringVincent Petry2016-02-083-1/+850
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #22211 from owncloud/versions-hook-infoThomas Müller2016-02-082-9/+16
|\ \ \ \ \ \ \