summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
* | | | | | | Merge pull request #20796 from owncloud/cleanup-trashbin-codeThomas Müller2015-12-071-15/+6
|\ \ \ \ \ \ \
| * | | | | | | Cleanup trashbin expire codeMorris Jobke2015-11-301-15/+6
* | | | | | | | Merge pull request #20581 from owncloud/public-page-preview-hidpi-scaleThomas Müller2015-12-071-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix hidpi previews on public pageRobin Appelman2015-11-181-4/+8
* | | | | | | | | Merge pull request #20530 from owncloud/icons-moreThomas Müller2015-12-0752-91/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add new icon rules to icons.cssJan-Christoph Borchardt2015-11-201-1/+13
| * | | | | | | | | add icons for checked+disabled checkbox and radioJan-Christoph Borchardt2015-11-204-0/+10
| * | | | | | | | | compress action iconsJan-Christoph Borchardt2015-11-2022-84/+24
| * | | | | | | | | add icons for disabled checkbox, radio button, error and colored checkmarkJan-Christoph Borchardt2015-11-2025-6/+49
* | | | | | | | | | Merge pull request #20480 from owncloud/css-prefixesThomas Müller2015-12-077-41/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove unneeded css prefixesHendrik Leppelsack2015-11-237-41/+11
* | | | | | | | | | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContentThomas Müller2015-12-072-19/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove OC_Util::getUrlContent and replace by proper usage of public interfacesMorris Jobke2015-12-042-19/+12
* | | | | | | | | | | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-0710-19/+20
|\ \ \ \ \ \ \ \ \ \ \ \