Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-06 | 174 | -220/+584 |
| | |||||
* | Merge pull request #22169 from owncloud/cache-interface-fixes | Thomas Müller | 2016-02-05 | 2 | -10/+8 |
|\ | | | | | Cache interface cleanup/phpdoc | ||||
| * | remove unused Storage->search | Robin Appelman | 2016-02-05 | 1 | -9/+0 |
| | | |||||
| * | additional phpdoc for search | Robin Appelman | 2016-02-05 | 1 | -1/+1 |
| | | |||||
| * | add deprecation notice to search methods | Robin Appelman | 2016-02-05 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #22155 from owncloud/use-svg-for-desktopapp | Thomas Müller | 2016-02-05 | 6 | -4/+167 |
|\ \ | | | | | | | Use SVG for desktop app button | ||||
| * | | use path instead of text inside desktop app badge | Hendrik Leppelsack | 2016-02-05 | 1 | -2/+32 |
| | | | |||||
| * | | update google play and apple badge | Hendrik Leppelsack | 2016-02-05 | 5 | -1/+134 |
| | | | |||||
| * | | fix font in desktopapp.svg | Hendrik Leppelsack | 2016-02-05 | 1 | -2/+2 |
| | | | |||||
| * | | Use SVG for desktop app button | Lukas Reschke | 2016-02-05 | 1 | -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_21678 | Thomas Müller | 2016-02-05 | 1 | -0/+6 |
|\ \ | | | | | | | Gracefull handle link shares rename hook | ||||
| * | | Gracefull handle link shares rename hook | Roeland Jago Douma | 2016-02-05 | 1 | -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-http | Thomas Müller | 2016-02-05 | 1 | -1/+1 |
|\ \ | | | | | | | Use HTTPS instead of HTTP | ||||
| * | | Use HTTPS instead of HTTP | Lukas Reschke | 2016-02-05 | 1 | -1/+1 |
| |/ | | | | | This is now supported by github.io | ||||
* | | Merge pull request #22152 from owncloud/activities-for-comments | Thomas Müller | 2016-02-05 | 9 | -8/+572 |
|\ \ | | | | | | | Activities for comments | ||||
| * | | Only dispatch the delete event, when the deletion was successful | Joas Schilling | 2016-02-05 | 1 | -6/+8 |
| | | | |||||
| * | | Add a filter for comment activities | Joas Schilling | 2016-02-05 | 1 | -3/+22 |
| | | | |||||
| * | | Add activities for comments | Joas Schilling | 2016-02-05 | 5 | -1/+435 |
| | | | |||||
| * | | Dispatch events when adding, updating and deleting comments | Joas Schilling | 2016-02-05 | 4 | -7/+116 |
| | | | |||||
* | | | Merge pull request #22153 from owncloud/event-for-console-commands | Thomas Müller | 2016-02-05 | 3 | -5/+87 |
|\ \ \ | | | | | | | | | Dispatch an event when a console command is run | ||||
| * | | | Dispatch an event when a console command is run | Joas Schilling | 2016-02-05 | 3 | -5/+87 |
| |/ / | |||||
* | | | Merge pull request #18194 from RealRancor/proxy_fcgi | Thomas Müller | 2016-02-05 | 1 | -2/+5 |
|\ \ \ | |_|/ |/| | | Add mod_proxy_fcgi to .htaccess | ||||
| * | | Add mod_proxy_fcgi and mod_fastcgi to .htaccess | RealRancor | 2015-11-17 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #22146 from owncloud/delete-email-address | Thomas Müller | 2016-02-05 | 1 | -18/+14 |
|\ \ \ | | | | | | | | | Allow to delete the email address in user management | ||||
| * | | | Allow to delete the email address in user management | Morris Jobke | 2016-02-05 | 1 | -18/+14 |
| | | | | |||||
* | | | | Merge pull request #22143 from owncloud/fix_12385 | Thomas Müller | 2016-02-05 | 2 | -11/+16 |
|\ \ \ \ | | | | | | | | | | | When a user is removed we should remove the right shares | ||||
| * | | | | Add intergration test | Roeland Jago Douma | 2016-02-05 | 1 | -10/+15 |
| | | | | | |||||
| * | | | | When a user is removed we should remove the right shares | Roeland Jago Douma | 2016-02-05 | 1 | -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-1 | Thomas Müller | 2016-02-05 | 7 | -11/+13 |
|\ \ \ \ | |/ / / |/| | | | Scrutinizer Auto-Fixes | ||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-02-05 | 7 | -11/+13 |
|/ / / | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | Merge pull request #20920 from owncloud/issue_20888 | Thomas Müller | 2016-02-05 | 7 | -86/+219 |
|\ \ \ | | | | | | | | | Add dialog to enter credentials on errored mount point | ||||
| * | | | Improve credentials dialog usability a bit | Vincent Petry | 2016-02-04 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | Automatically focus on the first field. Pressing enter submits the form. | ||||
| * | | | fix error code for unconfigured user provided auth | Robin Appelman | 2016-02-04 | 1 | -0/+11 |
| | | | | |||||
| * | | | set read permissions on failed mount root | Robin Appelman | 2016-02-04 | 1 | -1/+2 |
| | | | | |||||
| * | | | handle exception in availibilty check | Robin Appelman | 2016-02-04 | 1 | -3/+8 |
| | | | | |||||
| * | | | fix input type | Robin Appelman | 2016-02-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | show failed external storages properly | Robin Appelman | 2016-02-04 | 1 | -0/+5 |
| | | | | |||||
| * | | | Use handlebars template | Robin Appelman | 2016-02-04 | 1 | -22/+25 |
| | | | | |||||
| * | | | Fix PR from comments | Jesús Macias | 2016-02-04 | 1 | -5/+3 |
| | | | | |||||
| * | | | Add credentials dialog for user provided auth | Jesús Macias | 2016-02-04 | 4 | -85/+184 |
| | | | | |||||
* | | | | Merge pull request #22118 from owncloud/post_update_permissions_hook | Thomas Müller | 2016-02-05 | 3 | -7/+53 |
|\ \ \ \ | | | | | | | | | | | [Share 2.0] Add missing post_update_permissions hook | ||||
| * | | | | Path should be relative | Roeland Jago Douma | 2016-02-04 | 2 | -3/+8 |
| | | | | | |||||
| * | | | | [Share 2.0] Add missing post_update_permissions hook | Roeland Jago Douma | 2016-02-04 | 3 | -7/+48 |
| | | | | | |||||
* | | | | | Merge pull request #22135 from owncloud/global-auth-warning | Thomas Müller | 2016-02-05 | 1 | -1/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | fix warning caused by global auth | ||||
| * | | | | fix warning caused by global auth | Robin Appelman | 2016-02-04 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-05 | 14 | -2/+46 |
| |/ / |/| | | |||||
* | | | Merge pull request #22133 from owncloud/add-check-for-content | Thomas Müller | 2016-02-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Add check for content | ||||
| * | | | Add check for content | Lukas Reschke | 2016-02-04 | 1 | -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-filesclient | Thomas Müller | 2016-02-04 | 2 | -148/+142 |
|\ \ \ \ | | | | | | | | | | | Fix jsunit filesclient | ||||
| * | | | | Fix JS DAV files client unit tests | Vincent Petry | 2016-02-04 | 1 | -146/+140 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of trying to mock the promise, just stub davclient.js' request object. |