Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix duplicate bogus share field when link sharing is not allowed | Vincent Petry | 2015-12-07 | 2 | -6/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #21011 from owncloud/allow-ico | Thomas Müller | 2015-12-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow .ico files | Lukas Reschke | 2015-12-07 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_... | Thomas Müller | 2015-12-07 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | 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 | 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 static files ... | Thomas Müller | 2015-12-07 | 1 | -1/+0 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | 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 | Lukas Reschke | 2015-12-07 | 1 | -0/+4 | |
* | | | | | | | 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 | 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-Fixer | 2015-12-07 | 10 | -9/+17 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-share... | Thomas Müller | 2015-12-07 | 2 | -4/+22 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | 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 | Morris Jobke | 2015-11-30 | 1 | -15/+6 | |
* | | | | | | | | Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale | Thomas Müller | 2015-12-07 | 1 | -4/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix hidpi previews on public page | Robin Appelman | 2015-11-18 | 1 | -4/+8 | |
* | | | | | | | | | Merge pull request #20530 from owncloud/icons-more | Thomas Müller | 2015-12-07 | 52 | -91/+96 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add new icon rules to icons.css | Jan-Christoph Borchardt | 2015-11-20 | 1 | -1/+13 | |
| * | | | | | | | | | add icons for checked+disabled checkbox and radio | Jan-Christoph Borchardt | 2015-11-20 | 4 | -0/+10 | |
| * | | | | | | | | | compress action icons | Jan-Christoph Borchardt | 2015-11-20 | 22 | -84/+24 | |
| * | | | | | | | | | add icons for disabled checkbox, radio button, error and colored checkmark | Jan-Christoph Borchardt | 2015-11-20 | 25 | -6/+49 | |
* | | | | | | | | | | Merge pull request #20480 from owncloud/css-prefixes | Thomas Müller | 2015-12-07 | 7 | -41/+11 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove unneeded css prefixes | Hendrik Leppelsack | 2015-11-23 | 7 | -41/+11 | |
* | | | | | | | | | | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent | Thomas Müller | 2015-12-07 | 2 | -19/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove OC_Util::getUrlContent and replace by proper usage of public interfaces | Morris Jobke | 2015-12-04 | 2 | -19/+12 | |
* | | | | | | | | | | | | Merge pull request #11131 from owncloud/use-phpini-wrapper | Thomas Müller | 2015-12-07 | 10 | -19/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |