aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use SVG for desktop app buttonLukas Reschke2016-02-051-1/+1
* Merge pull request #22146 from owncloud/delete-email-addressThomas Müller2016-02-051-18/+14
|\
| * Allow to delete the email address in user managementMorris Jobke2016-02-051-18/+14
* | Merge pull request #22143 from owncloud/fix_12385Thomas Müller2016-02-052-11/+16
|\ \
| * | Add intergration testRoeland Jago Douma2016-02-051-10/+15
| * | When a user is removed we should remove the right sharesRoeland Jago Douma2016-02-051-1/+1
| |/
* | Merge pull request #22149 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-057-11/+13
|\ \ | |/ |/|
| * Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-057-11/+13
|/
* Merge pull request #20920 from owncloud/issue_20888Thomas Müller2016-02-057-86/+219
|\
| * Improve credentials dialog usability a bitVincent Petry2016-02-041-2/+13
| * fix error code for unconfigured user provided authRobin Appelman2016-02-041-0/+11
| * set read permissions on failed mount rootRobin Appelman2016-02-041-1/+2
| * handle exception in availibilty checkRobin Appelman2016-02-041-3/+8
| * fix input typeRobin Appelman2016-02-041-1/+1
| * show failed external storages properlyRobin Appelman2016-02-041-0/+5
| * Use handlebars templateRobin Appelman2016-02-041-22/+25
| * Fix PR from commentsJesús Macias2016-02-041-5/+3
| * Add credentials dialog for user provided authJesús Macias2016-02-044-85/+184
* | Merge pull request #22118 from owncloud/post_update_permissions_hookThomas Müller2016-02-053-7/+53
|\ \
| * | Path should be relativeRoeland Jago Douma2016-02-042-3/+8
| * | [Share 2.0] Add missing post_update_permissions hookRoeland Jago Douma2016-02-043-7/+48
* | | Merge pull request #22135 from owncloud/global-auth-warningThomas Müller2016-02-051-1/+4
|\ \ \
| * | | fix warning caused by global authRobin Appelman2016-02-041-1/+4
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0514-2/+46
| |/ |/|
* | Merge pull request #22133 from owncloud/add-check-for-contentThomas Müller2016-02-041-1/+1
|\ \
| * | Add check for contentLukas Reschke2016-02-041-1/+1
* | | Merge pull request #22130 from owncloud/fix-jsunit-filesclientThomas Müller2016-02-042-148/+142
|\ \ \
| * | | Fix JS DAV files client unit testsVincent Petry2016-02-041-146/+140
| * | | Small fixes in Dav files clientVincent Petry2016-02-041-2/+2
* | | | Merge pull request #21766 from farukuzun/masterThomas Müller2016-02-046-1/+59
|\ \ \ \ | |_|_|/ |/| | |
| * | | Introduce some mimetypes for richdocumentsFaruk Uzun2016-02-046-1/+59
* | | | Merge pull request #22107 from owncloud/external-auth-globalThomas Müller2016-02-049-3/+156
|\ \ \ \
| * | | | Add global auth backend for files externalRobin Appelman2016-02-049-3/+156
| | |/ / | |/| |
* | | | Merge pull request #22111 from owncloud/use-intermediate-certificateThomas Müller2016-02-047-81/+135
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add proper line endingLukas Reschke2016-02-031-1/+1
| * | | Also check daily and testing channelLukas Reschke2016-02-031-0/+2
| * | | Allow specifing the signing pathLukas Reschke2016-02-035-24/+46
| * | | Use intermediate root authorityLukas Reschke2016-02-032-57/+87
* | | | Merge pull request #22124 from owncloud/comments-author-checkThomas Müller2016-02-042-1/+184
|\ \ \ \
| * | | | Check for authorship on edit and delete attemptsArthur Schiwon2016-02-042-1/+184
| | |_|/ | |/| |
* | | | Merge pull request #22126 from owncloud/share2_lazy_sharesThomas Müller2016-02-047-77/+375
|\ \ \ \ | |_|_|/ |/| | |
| * | | Also add type (file/folder) to IShare objectRoeland Jago Douma2016-02-045-3/+147
| * | | Unit test for delete lazy sharesRoeland Jago Douma2016-02-041-0/+33
| * | | Add unit testsRoeland Jago Douma2016-02-041-0/+79
| * | | Make the share object lazyRoeland Jago Douma2016-02-047-74/+116
| |/ /
* | | Merge pull request #22121 from owncloud/comments-deleteduserThomas Müller2016-02-042-5/+24
|\ \ \ | |/ / |/| |
| * | Special label for deleted users in comments listVincent Petry2016-02-042-5/+24
* | | Merge pull request #22025 from owncloud/21838-jenkinsThomas Müller2016-02-045-5/+109
|\ \ \ | |/ / |/| |
| * | fix unit testsArthur Schiwon2016-02-031-4/+9
| * | change error loggingalexweirig2016-02-031-1/+1