Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #21025 from owncloud/remove-legacy-trusted-domain-support | Thomas Müller | 2015-12-08 | 4 | -91/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Do not trust casting | Lukas Reschke | 2015-12-08 | 2 | -1/+3 | |
| * | | | | | | | | | Remove unused repair steps | Lukas Reschke | 2015-12-08 | 2 | -85/+2 | |
| * | | | | | | | | | Remove legacy check | Lukas Reschke | 2015-12-08 | 1 | -5/+0 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #20951 from owncloud/Make_showing_logs_optional | Thomas Müller | 2015-12-08 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | forgotten variable | Sergio Bertolin | 2015-12-04 | 1 | -1/+1 | |
| * | | | | | | | | | Controlled arguments for run script | Sergio Bertolin | 2015-12-04 | 1 | -1/+6 | |
* | | | | | | | | | | Merge pull request #21028 from owncloud/fix-php-doc-for-storage-config | Thomas Müller | 2015-12-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Use proper PHPDoc reference | Lukas Reschke | 2015-12-08 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #21014 from owncloud/share-unsharelinkpapercut | Thomas Müller | 2015-12-08 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix unshare link click element | Vincent Petry | 2015-12-07 | 1 | -3/+5 | |
* | | | | | | | | | [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 | Vincent Petry | 2015-12-07 | 1 | -1/+1 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-whe... | Thomas Müller | 2015-12-07 | 5 | -6/+31 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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-Fixer | 2015-12-07 | 8 | -11/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | 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 | 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 |