summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused repair stepsLukas Reschke2015-12-082-85/+2
| | | | These ones are not necessary anymore for the new major release.
* Remove legacy checkLukas Reschke2015-12-081-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-unsharelinkpapercutThomas Müller2015-12-081-3/+5
|\ | | | | Fix unshare link click element
| * Fix unshare link click elementVincent Petry2015-12-071-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 transifexJenkins for ownCloud2015-12-0814-8/+54
| |
* | Merge pull request #21015 from owncloud/update-redirecttocorrectpageThomas Müller2015-12-071-1/+1
|\ \ | | | | | | Redirect to correct URL after updating
| * | Redirect to correct URL after updatingVincent Petry2015-12-071-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üller2015-12-075-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-urlJoas Schilling2015-12-074-7/+22
| | |
| * | Remove password reset when the user can not change the passwordJoas Schilling2015-12-072-2/+12
| | |
* | | Merge pull request #21006 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-078-11/+0
|\ \ \ | | | | | | | | Scrutinizer Auto-Fixes
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-078-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-duplicatefieldThomas Müller2015-12-072-6/+10
|\ \ \ | | | | | | | | Fix duplicate bogus share field when link sharing is not allowed
| * | | Fix duplicate bogus share field when link sharing is not allowedVincent Petry2015-12-072-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-icoThomas Müller2015-12-071-0/+1
|\ \ \ | | | | | | | | Allow .ico files
| * | | Allow .ico filesLukas Reschke2015-12-071-0/+1
| | | | | | | | | | | | | | | | Makes `/core/img/favicon.ico` accessible again via web.
* | | | Merge pull request #18212 from ↵Thomas Müller2015-12-072-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 codeRenaud Fortier2015-11-261-5/+1
| | | |
| * | | if define, check the userfilter if the user is still allowedRenaud Fortier2015-08-112-2/+6
| | | |
* | | | Merge pull request #20991 from owncloud/disabled-checked-checkbox-css-rulesThomas Müller2015-12-071-0/+16
|\ \ \ \ | | | | | | | | | | Disabled checked checkbox css rules
| * | | | Add rules for checked+disabled and disabled checkbox styleJoas Schilling2015-12-071-0/+16
| | |_|/ | |/| |
* | | | Merge pull request #21004 from owncloud/adding-mention-botThomas Müller2015-12-071-0/+11
|\ \ \ \ | | | | | | | | | | Adding a basic configuration for the mention bot
| * | | | Adding a basic configuration for the mention botThomas Müller2015-12-071-0/+11
| | |_|/ | |/| |
* | | | Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopenThomas Müller2015-12-071-1/+10
|\ \ \ \ | |/ / / |/| | | Improving fopen behaviour for Swift backend
| * | | Improving fopen behaviour for Swift backendTim Dettrick2015-12-071-1/+10
| | | |
* | | | Merge pull request #20987 from owncloud/dont-deprecate-OC.filePath-masterThomas Müller2015-12-071-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üller2015-12-071-1/+0
| | |/ / | |/| | | | | | | | | | what for generateUrl cannot be used for - closes #15604
* | | | Merge pull request #20998 from owncloud/add-csp-header-to-static-resourcesThomas Müller2015-12-071-0/+4
|\ \ \ \ | | | | | | | | | | Add CSP header to static resources
| * | | | Add CSP header to static resourcesLukas Reschke2015-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16164
* | | | | Merge pull request #20993 from owncloud/issue-20666-language-always-overwrittenThomas Müller2015-12-071-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 appJoas Schilling2015-12-071-3/+7
| |/ / /
* | | | Merge pull request #20988 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-0710-9/+17
|\ \ \ \ | | | | | | | | | | Scrutinizer Auto-Fixes
| * | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-0710-9/+17
| |/ / / | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | Merge pull request #20981 from ↵Thomas Müller2015-12-072-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 wellJoas Schilling2015-12-071-7/+9
| | | |
| * | | Allow sending a share email to multiple usersJoas Schilling2015-12-072-4/+20
| |/ /
* | | Merge pull request #20569 from owncloud/issue_20427Thomas Müller2015-12-077-3/+732
|\ \ \ | | | | | | | | Show external storage status in file list + prompt credentials if different
| * \ \ Merge branch 'master' into issue_20427Jesus Macias Portela2015-12-031340-11370/+31525
| |\ \ \
| * | | | Delete js unit test. Another issue has been created to create js testJesús Macias2015-12-011-205/+0
| | | | |
| * | | | Fix css selector and bug checking personal mounts statusJesús Macias2015-11-242-5/+5
| | | | |
| * | | | Add css to manage row status colorJesús Macias2015-11-243-4/+12
| | | | |
| * | | | Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427Jesús Macias2015-11-242-1/+207
| |\ \ \ \
| | * | | | Added some unit tests for the status managerVincent Petry2015-11-202-1/+207
| | | | | |
| * | | | | Fix code from PR commentsJesús Macias2015-11-244-236/+208
| |/ / / /
| * | | | Adding logic to show custom icon for current backends, waiting for icon filesJesús Macias2015-11-201-0/+24
| | | | |
| * | | | Fix code from PR commentsJesús Macias2015-11-182-615/+525
| | | | |
| * | | | Add method to show custom icon and icon-error for each storage backendJesús Macias2015-11-183-211/+200
| | | | |
| * | | | Add icon management capabilities (error icon)Jesús Macias2015-11-132-17/+18
| | | | |
| * | | | First working approach to show mount statusJesús Macias2015-11-126-50/+874
| | | | |
* | | | | Merge pull request #20796 from owncloud/cleanup-trashbin-codeThomas Müller2015-12-071-15/+6
|\ \ \ \ \ | | | | | | | | | | | | Cleanup trashbin expire code