aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-06174-220/+584
|
* Merge pull request #22169 from owncloud/cache-interface-fixesThomas Müller2016-02-052-10/+8
|\ | | | | Cache interface cleanup/phpdoc
| * remove unused Storage->searchRobin Appelman2016-02-051-9/+0
| |
| * additional phpdoc for searchRobin Appelman2016-02-051-1/+1
| |
| * add deprecation notice to search methodsRobin Appelman2016-02-051-0/+7
| |
* | Merge pull request #22155 from owncloud/use-svg-for-desktopappThomas Müller2016-02-056-4/+167
|\ \ | | | | | | Use SVG for desktop app button
| * | use path instead of text inside desktop app badgeHendrik Leppelsack2016-02-051-2/+32
| | |
| * | update google play and apple badgeHendrik Leppelsack2016-02-055-1/+134
| | |
| * | fix font in desktopapp.svgHendrik Leppelsack2016-02-051-2/+2
| | |
| * | Use SVG for desktop app buttonLukas Reschke2016-02-051-1/+1
| |/ | | | | | | For the other ones we unfortunately don't have that. Partially addresses https://github.com/owncloud/core/issues/22154
* | Merge pull request #22159 from owncloud/fix_21678Thomas Müller2016-02-051-0/+6
|\ \ | | | | | | Gracefull handle link shares rename hook
| * | Gracefull handle link shares rename hookRoeland Jago Douma2016-02-051-0/+6
| |/ | | | | | | | | | | | | Fixes #21678 The hook is called on all renames. However when we use a link share the getUserFolder fails. We now just opt out.
* | Merge pull request #22157 from owncloud/use-https-instead-of-httpThomas Müller2016-02-051-1/+1
|\ \ | | | | | | Use HTTPS instead of HTTP
| * | Use HTTPS instead of HTTPLukas Reschke2016-02-051-1/+1
| |/ | | | | This is now supported by github.io
* | Merge pull request #22152 from owncloud/activities-for-commentsThomas Müller2016-02-059-8/+572
|\ \ | | | | | | Activities for comments
| * | Only dispatch the delete event, when the deletion was successfulJoas Schilling2016-02-051-6/+8
| | |
| * | Add a filter for comment activitiesJoas Schilling2016-02-051-3/+22
| | |
| * | Add activities for commentsJoas Schilling2016-02-055-1/+435
| | |
| * | Dispatch events when adding, updating and deleting commentsJoas Schilling2016-02-054-7/+116
| | |
* | | Merge pull request #22153 from owncloud/event-for-console-commandsThomas Müller2016-02-053-5/+87
|\ \ \ | | | | | | | | Dispatch an event when a console command is run
| * | | Dispatch an event when a console command is runJoas Schilling2016-02-053-5/+87
| |/ /
* | | Merge pull request #18194 from RealRancor/proxy_fcgiThomas Müller2016-02-051-2/+5
|\ \ \ | |_|/ |/| | Add mod_proxy_fcgi to .htaccess
| * | Add mod_proxy_fcgi and mod_fastcgi to .htaccessRealRancor2015-11-171-2/+5
| | |
* | | Merge pull request #22146 from owncloud/delete-email-addressThomas Müller2016-02-051-18/+14
|\ \ \ | | | | | | | | Allow to delete the email address in user management
| * | | 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
|\ \ \ \ | | | | | | | | | | When a user is removed we should remove the right shares
| * | | | 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
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This means all the shares directly shared with them * Or all group shares having a special share with them This patch fixes the operator precedece (AND before OR). So before this patch: (share_with = <deleted user> AND share_type = 0) OR share_type=2 So it deleted all user specific shares Now: share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
* | | | Merge pull request #22149 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-057-11/+13
|\ \ \ \ | |/ / / |/| | | Scrutinizer Auto-Fixes
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-057-11/+13
|/ / / | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | Merge pull request #20920 from owncloud/issue_20888Thomas Müller2016-02-057-86/+219
|\ \ \ | | | | | | | | Add dialog to enter credentials on errored mount point
| * | | Improve credentials dialog usability a bitVincent Petry2016-02-041-2/+13
| | | | | | | | | | | | | | | | | | | | Automatically focus on the first field. Pressing enter submits the form.
| * | | 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
|\ \ \ \ | | | | | | | | | | [Share 2.0] Add missing post_update_permissions hook
| * | | | 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 auth
| * | | | 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 content
| * | | Add check for contentLukas Reschke2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The response may be a redirect which is always followed by jQuery. Thus leading to false positives depending on the server configuration (e.g. when it issues a 302) To prevent that there is also a check performed on the response content.
* | | | Merge pull request #22130 from owncloud/fix-jsunit-filesclientThomas Müller2016-02-042-148/+142
|\ \ \ \ | | | | | | | | | | Fix jsunit filesclient
| * | | | Fix JS DAV files client unit testsVincent Petry2016-02-041-146/+140
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of trying to mock the promise, just stub davclient.js' request object.