summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not trust castingLukas Reschke2015-12-082-1/+3
* Remove unused repair stepsLukas Reschke2015-12-082-85/+2
* Remove legacy checkLukas Reschke2015-12-081-5/+0
* Merge pull request #21014 from owncloud/share-unsharelinkpapercutThomas Müller2015-12-081-3/+5
|\
| * Fix unshare link click elementVincent Petry2015-12-071-3/+5
* | [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 updatingVincent Petry2015-12-071-1/+1
* | | Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-whe...Thomas Müller2015-12-075-6/+31
|\ \ \ | |/ / |/| |
| * | 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-FixesScrutinizer Auto-Fixer2015-12-078-11/+0
| | |/ | |/|
* | | 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 allowedVincent Petry2015-12-072-6/+10
| |/ /
* | | Merge pull request #21011 from owncloud/allow-icoThomas Müller2015-12-071-0/+1
|\ \ \
| * | | Allow .ico filesLukas Reschke2015-12-071-0/+1
* | | | Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_...Thomas Müller2015-12-072-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \
| * | | | 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 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 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 static files ...Thomas Müller2015-12-071-1/+0
| | |/ / | |/| |
* | | | Merge pull request #20998 from owncloud/add-csp-header-to-static-resourcesThomas Müller2015-12-071-0/+4
|\ \ \ \
| * | | | Add CSP header to static resourcesLukas Reschke2015-12-071-0/+4
* | | | | 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 appJoas Schilling2015-12-071-3/+7
| |/ / /
* | | | Merge pull request #20988 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-0710-9/+17
|\ \ \ \
| * | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-0710-9/+17
| |/ / /
* | | | Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-share...Thomas Müller2015-12-072-4/+22
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * \ \ 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