Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unused repair steps | Lukas Reschke | 2015-12-08 | 2 | -85/+2 |
| | | | | These ones are not necessary anymore for the new major release. | ||||
* | Remove legacy check | Lukas Reschke | 2015-12-08 | 1 | -5/+0 |
| | | | | This one is not required anymore as we have the RepairConfig repair step since November 2014. | ||||
* | Merge pull request #21014 from owncloud/share-unsharelinkpapercut | Thomas Müller | 2015-12-08 | 1 | -3/+5 |
|\ | | | | | Fix unshare link click element | ||||
| * | Fix unshare link click element | Vincent Petry | 2015-12-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | When clicking on the unshare link (trash icon), the correct link element needs to be used instead of whatever child was clicked. Then, that element might contain a visible loading icon. This fixes the spinner detection and also prevents a full page reload in case the spinner was visible. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-08 | 14 | -8/+54 |
| | | |||||
* | | Merge pull request #21015 from owncloud/update-redirecttocorrectpage | Thomas Müller | 2015-12-07 | 1 | -1/+1 |
|\ \ | | | | | | | Redirect to correct URL after updating | ||||
| * | | Redirect to correct URL after updating | Vincent Petry | 2015-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Now requires a trailing slash to make sure we don't land on the forbidden page. | ||||
* | | | Merge pull request #20996 from ↵ | Thomas Müller | 2015-12-07 | 5 | -6/+31 |
|\ \ \ | |/ / |/| | | | | | | | | owncloud/issue-12215-remove-password-reset-when-not-possible Issue 12215 remove password reset when not possible | ||||
| * | | Allow specifying a custom reset-password-url | Joas Schilling | 2015-12-07 | 4 | -7/+22 |
| | | | |||||
| * | | Remove password reset when the user can not change the password | Joas Schilling | 2015-12-07 | 2 | -2/+12 |
| | | | |||||
* | | | Merge pull request #21006 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-07 | 8 | -11/+0 |
|\ \ \ | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 8 | -11/+0 |
| | |/ | |/| | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | Merge pull request #21009 from owncloud/share-forbidlinkshare-duplicatefield | Thomas Müller | 2015-12-07 | 2 | -6/+10 |
|\ \ \ | | | | | | | | | Fix duplicate bogus share field when link sharing is not allowed | ||||
| * | | | Fix duplicate bogus share field when link sharing is not allowed | Vincent Petry | 2015-12-07 | 2 | -6/+10 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Whenever link share is not allowed, it was outputting a bogus sharing field which name would conflict with the regular sharing field. This fix makes sure that the bogus sharing field with "Resharing not allowed" message only appears when triggered by removed share permissions. | ||||
* | | | Merge pull request #21011 from owncloud/allow-ico | Thomas Müller | 2015-12-07 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Allow .ico files | ||||
| * | | | Allow .ico files | Lukas Reschke | 2015-12-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Makes `/core/img/favicon.ico` accessible again via web. | ||||
* | | | | Merge pull request #18212 from ↵ | Thomas Müller | 2015-12-07 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | ryno83/treat_LDAP_users_not_available_by_user_filter_as_deleted treat LDAP users not available by user filter as deleted | ||||
| * | | | Remove of useless code | Renaud Fortier | 2015-11-26 | 1 | -5/+1 |
| | | | | |||||
| * | | | if define, check the userfilter if the user is still allowed | Renaud Fortier | 2015-08-11 | 2 | -2/+6 |
| | | | | |||||
* | | | | Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rules | Thomas Müller | 2015-12-07 | 1 | -0/+16 |
|\ \ \ \ | | | | | | | | | | | Disabled checked checkbox css rules | ||||
| * | | | | Add rules for checked+disabled and disabled checkbox style | Joas Schilling | 2015-12-07 | 1 | -0/+16 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #21004 from owncloud/adding-mention-bot | Thomas Müller | 2015-12-07 | 1 | -0/+11 |
|\ \ \ \ | | | | | | | | | | | Adding a basic configuration for the mention bot | ||||
| * | | | | Adding a basic configuration for the mention bot | Thomas Müller | 2015-12-07 | 1 | -0/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen | Thomas Müller | 2015-12-07 | 1 | -1/+10 |
|\ \ \ \ | |/ / / |/| | | | Improving fopen behaviour for Swift backend | ||||
| * | | | Improving fopen behaviour for Swift backend | Tim Dettrick | 2015-12-07 | 1 | -1/+10 |
| | | | | |||||
* | | | | Merge pull request #20987 from owncloud/dont-deprecate-OC.filePath-master | Thomas Müller | 2015-12-07 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | OC.FilePath has still a valid use case when generating paths to stati… | ||||
| * | | | | OC.FilePath has still a valid use case when generating paths to static files ↵ | Thomas Müller | 2015-12-07 | 1 | -1/+0 |
| | |/ / | |/| | | | | | | | | | | what for generateUrl cannot be used for - closes #15604 | ||||
* | | | | Merge pull request #20998 from owncloud/add-csp-header-to-static-resources | Thomas Müller | 2015-12-07 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Add CSP header to static resources | ||||
| * | | | | Add CSP header to static resources | Lukas Reschke | 2015-12-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16164 | ||||
* | | | | | Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten | Thomas Müller | 2015-12-07 | 1 | -3/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | Do not overwrite the language when it's just missing for one app | ||||
| * | | | | Do not overwrite the language when it's just missing for one app | Joas Schilling | 2015-12-07 | 1 | -3/+7 |
| |/ / / | |||||
* | | | | Merge pull request #20988 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-07 | 10 | -9/+17 |
|\ \ \ \ | | | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 10 | -9/+17 |
| |/ / / | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | | Merge pull request #20981 from ↵ | Thomas Müller | 2015-12-07 | 2 | -4/+22 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/issue-19848-multiple-emails-for-sharelink Allow sending a share email to multiple users | ||||
| * | | | Add a unit test for single user case as well | Joas Schilling | 2015-12-07 | 1 | -7/+9 |
| | | | | |||||
| * | | | Allow sending a share email to multiple users | Joas Schilling | 2015-12-07 | 2 | -4/+20 |
| |/ / | |||||
* | | | Merge pull request #20569 from owncloud/issue_20427 | Thomas Müller | 2015-12-07 | 7 | -3/+732 |
|\ \ \ | | | | | | | | | Show external storage status in file list + prompt credentials if different | ||||
| * \ \ | Merge branch 'master' into issue_20427 | Jesus Macias Portela | 2015-12-03 | 1340 | -11370/+31525 |
| |\ \ \ | |||||
| * | | | | Delete js unit test. Another issue has been created to create js test | Jesús Macias | 2015-12-01 | 1 | -205/+0 |
| | | | | | |||||
| * | | | | Fix css selector and bug checking personal mounts status | Jesús Macias | 2015-11-24 | 2 | -5/+5 |
| | | | | | |||||
| * | | | | Add css to manage row status color | Jesús Macias | 2015-11-24 | 3 | -4/+12 |
| | | | | | |||||
| * | | | | Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427 | Jesús Macias | 2015-11-24 | 2 | -1/+207 |
| |\ \ \ \ | |||||
| | * | | | | Added some unit tests for the status manager | Vincent Petry | 2015-11-20 | 2 | -1/+207 |
| | | | | | | |||||
| * | | | | | Fix code from PR comments | Jesús Macias | 2015-11-24 | 4 | -236/+208 |
| |/ / / / | |||||
| * | | | | Adding logic to show custom icon for current backends, waiting for icon files | Jesús Macias | 2015-11-20 | 1 | -0/+24 |
| | | | | | |||||
| * | | | | Fix code from PR comments | Jesús Macias | 2015-11-18 | 2 | -615/+525 |
| | | | | | |||||
| * | | | | Add method to show custom icon and icon-error for each storage backend | Jesús Macias | 2015-11-18 | 3 | -211/+200 |
| | | | | | |||||
| * | | | | Add icon management capabilities (error icon) | Jesús Macias | 2015-11-13 | 2 | -17/+18 |
| | | | | | |||||
| * | | | | First working approach to show mount status | Jesús Macias | 2015-11-12 | 6 | -50/+874 |
| | | | | | |||||
* | | | | | Merge pull request #20796 from owncloud/cleanup-trashbin-code | Thomas Müller | 2015-12-07 | 1 | -15/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Cleanup trashbin expire code |