summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Add navigation entry for tips and tricks setionJoas Schilling2015-03-261-0/+1
|
* Merge pull request #15212 from owncloud/log-widthMorris Jobke2015-03-263-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 pageJan-Christoph Borchardt2015-03-263-3/+7
| |
* | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-261-1/+1
|\ \ | |/ |/| Add wrapper for Guzzle
| * Add wrapper for GuzzleLukas Reschke2015-03-251-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2670-70/+242
| |
* | only show connection checks results if there are errors, fix #11476Jan-Christoph Borchardt2015-03-253-10/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-25112-864/+108
|
* consolidate all admin warnings and notices into one sectionJan-Christoph Borchardt2015-03-243-97/+39
|
* Merge pull request #15127 from owncloud/admin-tips-jenkinsMorris Jobke2015-03-242-2/+21
|\ | | | | add Tips & tricks section to admin settings
| * add Tips & tricks section to admin settingsJan-Christoph Borchardt2015-03-232-2/+21
| |
* | Merge pull request #15149 from owncloud/fix-enable-for-groupJoas Schilling2015-03-241-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 methodJoas Schilling2015-03-241-1/+1
| | |
* | | Display a message when no apps can be found for this oc versionJoas Schilling2015-03-242-4/+15
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-24114-274/+122
| |
* | Merge pull request #15075 from owncloud/fix-15056-masterThomas Müller2015-03-231-1/+0
|\ \ | | | | | | remove unneeded status element from json response on /categories
| * | remove unneeded status element from json response on /categories - fixes 15056Thomas Müller2015-03-231-1/+0
| | |
* | | Merge pull request #15118 from owncloud/user-mgmt-groupsJan-Christoph Borchardt2015-03-231-0/+10
|\ \ \ | |/ / |/| | fix long group names overlapping in the sidebar, fix #12649
| * | fix long group names overlapping in the sidebar, fix #12649Jan-Christoph Borchardt2015-03-231-0/+10
| |/
* | Merge pull request #15107 from owncloud/user-mgmt-headerMorris Jobke2015-03-231-1/+9
|\ \ | | | | | | fix first user mgmt header jumping around, fix #8873
| * | fix first user mgmt header jumping around, fix #8873Jan-Christoph Borchardt2015-03-231-1/+9
| |/
* | fix capitalization in Personal settingsJan-Christoph Borchardt2015-03-231-3/+3
| |
* | link back to top on Personal page, fix #14519Jan-Christoph Borchardt2015-03-233-3/+8
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-236-2/+24
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2218-0/+64
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2110-2/+44
|
* Merge pull request #14737 from owncloud/app-descriptions-collapsibleJan-Christoph Borchardt2015-03-203-16/+48
|\ | | | | collapse app descriptions by default, make expandable, fix #13112
| * collapse app descriptions by default, make expandable, fix #13112Jan-Christoph Borchardt2015-03-193-16/+48
| |
* | Merge pull request #15050 from owncloud/user-create-existsRobin McCorkell2015-03-201-0/+9
|\ \ | | | | | | show a better error message when trying to create a user that already exists
| * | show a better error message when trying to create a user that already existsRobin Appelman2015-03-201-0/+9
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-03-204-6/+18
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-1924-4/+84
|
* disable submit button while groupname is emptyRobin Appelman2015-03-181-0/+13
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-18114-270/+8
|
* Merge pull request #14972 from owncloud/add-group-styleMorris Jobke2015-03-181-2/+21
|\ | | | | User management design details
| * slight positioning fixes in user mgmt controls barJan-Christoph Borchardt2015-03-171-1/+4
| |
| * improve style of 'Add group' input and buttonJan-Christoph Borchardt2015-03-171-1/+17
| |
* | add whitespace to prevent file deletion when wanting to scrollJan-Christoph Borchardt2015-03-171-2/+6
|/
* Remove unused sectionLukas Reschke2015-03-171-1/+0
| | | | This section is now unused as the security configuration has to happen on the webserver layer since https://github.com/owncloud/core/pull/14651
* Merge pull request #12085 from owncloud/add-swift-mailerLukas Reschke2015-03-173-38/+38
|\ | | | | Migrate OC_Mail to SwiftMailer
| * Show more detailed error messageLukas Reschke2015-03-161-12/+12
| |
| * Incorporate review changesLukas Reschke2015-03-161-3/+2
| |
| * Migrate to SwiftMailLukas Reschke2015-03-163-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly. Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014 Conflicts: 3rdparty lib/private/server.php lib/public/iservercontainer.php tests/lib/mail.php tests/settings/controller/mailsettingscontrollertest.php Conflicts: 3rdparty lib/private/mail.php lib/private/server.php lib/public/iservercontainer.php settings/ajax/lostpassword.php settings/application.php
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1724-8/+36
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-16102-102/+16
| |
* | Put notice about checking logs in setup warningRobin McCorkell2015-03-151-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-142-0/+12
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-132-0/+26
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-126-8/+8
|
* Merge pull request #14705 from rullzer/avatarcontrollerLukas Reschke2015-03-111-1/+1
|\ | | | | Move AvatarController to AppFramework