Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache | Robin McCorkell | 2015-03-30 | 4 | -43/+117 |
|\ | | | | | Add check for activated local memcache | ||||
| * | Add check for activated local memcache | Lukas Reschke | 2015-03-28 | 4 | -43/+117 |
| | | | | | | | | | | | | Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it. Fixes https://github.com/owncloud/core/issues/14956 | ||||
* | | Merge pull request #15239 from owncloud/see-no-evil | Morris Jobke | 2015-03-30 | 3 | -6/+109 |
|\ \ | | | | | | | Move federated cloud sharing, files externals and updater to special pos... | ||||
| * | | Fix link to the updater | Joas Schilling | 2015-03-27 | 2 | -1/+6 |
| | | | |||||
| * | | Move federated cloud sharing, files externals and updater to special positions | Joas Schilling | 2015-03-27 | 3 | -6/+104 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-30 | 2 | -0/+8 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-29 | 22 | -12/+36 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-28 | 26 | -0/+112 |
| | | |||||
* | | Merge pull request #15261 from owncloud/fix-14268-master | Thomas Müller | 2015-03-27 | 2 | -38/+7 |
|\ \ | | | | | | | use StreamResponse to download the log file | ||||
| * | | use StreamResponse to download the log file - fixes #14268 | Thomas Müller | 2015-03-27 | 2 | -38/+7 |
| |/ | |||||
* | | Merge pull request #15259 from owncloud/fix-change-password-ie8 | Vincent Petry | 2015-03-27 | 2 | -1/+15 |
|\ \ | | | | | | | Show label for password change in IE8 | ||||
| * | | Show label for password change in IE8 | Morris Jobke | 2015-03-27 | 2 | -1/+15 |
| | | | | | | | | | | | | * fixes #10729 | ||||
* | | | Merge pull request #15258 from owncloud/users-addtofilteredgroup | Morris Jobke | 2015-03-27 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Don't append user in a filtered list if groups don't match | ||||
| * | | | Don't append user in a filtered list if groups don't match | Vincent Petry | 2015-03-27 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge pull request #15225 from ↵ | Morris Jobke | 2015-03-27 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure Add some generic default headers as well via PHP | ||||
| * | | Add some generic default headers as well via PHP | Lukas Reschke | 2015-03-26 | 1 | -0/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-27 | 50 | -126/+310 |
| |/ |/| | |||||
* | | Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9 | Jan-Christoph Borchardt | 2015-03-26 | 1 | -1/+7 |
|\ \ | | | | | | | Don't use placeholder for password in IE8 & 9 | ||||
| * | | Don't use placeholder for password in IE8 & 9 | Morris Jobke | 2015-03-26 | 1 | -1/+7 |
| |/ | | | | | | | | | | | | | | | | | * the placeholder is in IE 8 and 9 just set as text and styled a bit grey. If the form is then serialized without typing something in the placeholder is sent as value * this fixes that behaviour for the password field and properly detects empyt passwords * fixes #14912 | ||||
* | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 4 | -0/+67 |
|\ \ | |/ |/| | core part of encryption 2.0 | ||||
| * | implement basic encryption functionallity in core to enable multiple ↵ | Bjoern Schiessle | 2015-03-26 | 4 | -0/+67 |
| | | | | | | | | encryption modules | ||||
* | | Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks | Thomas Müller | 2015-03-26 | 1 | -0/+1 |
|\ \ | | | | | | | Add navigation entry for tips and tricks setion | ||||
| * | | Add navigation entry for tips and tricks setion | Joas Schilling | 2015-03-26 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #15230 from owncloud/sqlite-notice | Jan-Christoph Borchardt | 2015-03-26 | 1 | -11/+10 |
|\ \ \ | | | | | | | | | move SQLite notice from warnings to tips & tricks | ||||
| * | | | move SQLite notice from warnings to tips & tricks | Jan-Christoph Borchardt | 2015-03-26 | 1 | -11/+10 |
| | | | | |||||
* | | | | Merge pull request #14958 from owncloud/dropdown-style | Jan-Christoph Borchardt | 2015-03-26 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | popover style for apps and user dropdown menus | ||||
| * | | | | fix accessibility of ownCloud logo and navigation entries, fix #15013g | Jan-Christoph Borchardt | 2015-03-26 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #14495 from owncloud/update-mailmap-01 | Thomas Müller | 2015-03-26 | 35 | -119/+767 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Updating .mailmap | ||||
| * | | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 35 | -119/+767 |
| | | | | | |||||
* | | | | | Merge pull request #15212 from owncloud/log-width | Morris Jobke | 2015-03-26 | 3 | -3/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | force log messages to break to alleviate horizontal scroll on Admin page | ||||
| * | | | | force log messages to break to alleviate horizontal scroll on Admin page | Jan-Christoph Borchardt | 2015-03-26 | 3 | -3/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Add wrapper for Guzzle | ||||
| * | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 70 | -70/+242 |
| |/ / |/| | | |||||
* | | | only show connection checks results if there are errors, fix #11476 | Jan-Christoph Borchardt | 2015-03-25 | 3 | -10/+1 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-25 | 112 | -864/+108 |
| | | |||||
* | | consolidate all admin warnings and notices into one section | Jan-Christoph Borchardt | 2015-03-24 | 3 | -97/+39 |
| | | |||||
* | | Merge pull request #15127 from owncloud/admin-tips-jenkins | Morris Jobke | 2015-03-24 | 2 | -2/+21 |
|\ \ | | | | | | | add Tips & tricks section to admin settings | ||||
| * | | add Tips & tricks section to admin settings | Jan-Christoph Borchardt | 2015-03-23 | 2 | -2/+21 |
| |/ | |||||
* | | Merge pull request #15149 from owncloud/fix-enable-for-group | Joas Schilling | 2015-03-24 | 1 | -1/+1 |
|\ \ | | | | | | | Correctly get array of groups and send OCP\IGroup objects to enable meth... | ||||
| * | | Correctly get array of groups and send OCP\IGroup objects to enable method | Joas Schilling | 2015-03-24 | 1 | -1/+1 |
| | | | |||||
* | | | Display a message when no apps can be found for this oc version | Joas Schilling | 2015-03-24 | 2 | -4/+15 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-24 | 114 | -274/+122 |
| | | |||||
* | | Merge pull request #15075 from owncloud/fix-15056-master | Thomas Müller | 2015-03-23 | 1 | -1/+0 |
|\ \ | | | | | | | remove unneeded status element from json response on /categories | ||||
| * | | remove unneeded status element from json response on /categories - fixes 15056 | Thomas Müller | 2015-03-23 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #15118 from owncloud/user-mgmt-groups | Jan-Christoph Borchardt | 2015-03-23 | 1 | -0/+10 |
|\ \ \ | |/ / |/| | | fix long group names overlapping in the sidebar, fix #12649 | ||||
| * | | fix long group names overlapping in the sidebar, fix #12649 | Jan-Christoph Borchardt | 2015-03-23 | 1 | -0/+10 |
| |/ | |||||
* | | Merge pull request #15107 from owncloud/user-mgmt-header | Morris Jobke | 2015-03-23 | 1 | -1/+9 |
|\ \ | | | | | | | fix first user mgmt header jumping around, fix #8873 | ||||
| * | | fix first user mgmt header jumping around, fix #8873 | Jan-Christoph Borchardt | 2015-03-23 | 1 | -1/+9 |
| |/ | |||||
* | | fix capitalization in Personal settings | Jan-Christoph Borchardt | 2015-03-23 | 1 | -3/+3 |
| | |