summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* add Tips & tricks section to admin settingsJan-Christoph Borchardt2015-03-232-2/+21
|
* [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
| * Avatar controller moved to AppFrameWorkRoeland Jago Douma2015-03-111-1/+1
| | | | | | | | | | | | | | | | * Original avatarcontroller migrated to the appframework * Added DataDisplayResponse that show data inline in the browser (used to retrun the image) * Removed some unneeded code * Added unit tests for the avatarcontroller
* | display app update error messages - fixes #14611Thomas Müller2015-03-111-1/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-104-38/+280
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-094-6/+14
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-084-0/+10
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-072-0/+2
|
* adjust list of errors, more compact and readableJan-Christoph Borchardt2015-03-063-3/+9
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-068-0/+20
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-05142-618/+16
|
* Merge pull request #14651 from ↵Morris Jobke2015-03-045-132/+4
|\ | | | | | | | | owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins Let users configure security headers in their Webserver
| * Let users configure security headers in their WebserverLukas Reschke2015-03-025-132/+4
| | | | | | | | | | | | | | | | | | | | Doing this in the PHP code is not the right approach for multiple reasons: 1. A bug in the PHP code prevents them from being added to the response. 2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud) 3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations. This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0416-10/+38
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0324-30/+92
|/
* Merge pull request #14593 from owncloud/fix/13994Morris Jobke2015-03-022-0/+23
|\ | | | | Add detection for invalid CLI configuration for settings page
| * Add detection for invalid CLI configuration for settings pageLukas Reschke2015-02-272-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will log all failures that prevent the CLI cronjob from happening to the database and display a warning to administrators when an error happened. To test: 1. Configure some invalid CLI php.ini settings 2. Enable the CLI cronjob and run php cron.php 3. See the errors printed and also in the admin page 4. Configure the CLI settings correctly 5. Errors should be gone. Fixes https://github.com/owncloud/core/issues/13994
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0276-150/+0
| |
* | Merge pull request #14614 from jakobsack/masterMorris Jobke2015-03-012-5/+12
|\ \ | | | | | | Show time difference of last cron run instead of absolute time
| * | Improve language on backgroundjob admin pageJakob Sack2015-03-011-2/+2
| | |
| * | Rename $human_time to $relative_time in cron settingsJakob Sack2015-02-281-3/+3
| | |
| * | Add absolute time of last cronjob as hover tipJakob Sack2015-02-282-4/+11
| | |
| * | Use relative time for cron statusJakob Sack2015-02-281-3/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-018-2/+302
|/ /