summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [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
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-02-2822-6/+42
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2735-750/+138
|\ | | | | Revert "Updating license headers"
| * Revert "Updating license headers"Morris Jobke2015-02-2635-750/+138
| | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2770-196/+2
| |
* | Merge pull request #14527 from owncloud/clarify-linkMorris Jobke2015-02-261-1/+1
|\ \ | | | | | | clarify link on apps management to the dev documentation
| * | clarify link on apps management to the dev documentationMorris Jobke2015-02-261-1/+1
| |/
* | Merge pull request #14474 from owncloud/move-utf-8-check-to-setupMorris Jobke2015-02-262-16/+1
|\ \ | |/ |/| Move UTF-8 check to setup
| * Move UTF-8 check to setupLukas Reschke2015-02-242-16/+1
| | | | | | | | | | | | | | | | Nobody reads the warnings anyways and so we should enforce it at installation time... Also allows us to get rid of some duplicated code. To test change the `default_charset` to something other than `utf-8` or `UTF-8`, both should work fine with that change here. An error should then get shown. We already set those default charsets in the shipped .user.ini and .htaccess
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-268-94/+150
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-25120-118/+4
|/
* Merge pull request #10599 from owncloud/move_passwordchange_textLukas Reschke2015-02-243-9/+13
|\ | | | | Make the password changed msg inline to fix #10242
| * Make the password changed msg inline to fix #10242kondou2015-02-113-9/+13
| |
* | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupidThomas Müller2015-02-241-6/+29
|\ \ | | | | | | don't allow installation of already installed apps - fixes #14004
| * | don't allow installation of already installed apps - fixes #14004Thomas Müller2015-02-231-6/+29
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-242-2/+2
|/ /
* | Merge pull request #13439 from owncloud/app-filterThomas Müller2015-02-232-48/+186
|\ \ | | | | | | Make the search box filter apps
| * | Added unit test for app filterVincent Petry2015-02-232-56/+167
| | |
| * | Make the search box filter appsRobin Appelman2015-02-191-0/+27
| | |
* | | Merge pull request #14403 from owncloud/update-license-headersThomas Müller2015-02-2335-138/+750
|\ \ \ | | | | | | | | Update license headers
| * | | Updating license headersJenkins for ownCloud2015-02-2335-138/+750
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-232-0/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-226-2/+14
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-214-0/+18
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-206-0/+38
| | |
* | | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-1913-17/+17
|\ \ \ | | | | | | | | Manually type-cast all AJAX files
| * | | This is an arrayLukas Reschke2015-02-131-1/+1
| | | |
| * | | Manually type-case all AJAX filesLukas Reschke2015-02-1313-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support :see_no_evil: Fixes https://github.com/owncloud/core/issues/14196 for core
* | | | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ \ \ | | | | | | | | | | Encode Requesttoken for avatars
| * | | | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged. Shocking to see how much places in our code do it wrong :gun:
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1920-26/+82
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1822-12/+54
| | | |
* | | | Use APCu only if available in version 4.0.6 and higherLukas Reschke2015-02-172-0/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | APCu before 4.0.6 is unbelievable buggy and tend to segfault the PHP process (i.e. the whole webserver) This potentially fixes https://github.com/owncloud/core/issues/14175 Requires a backport to stable8
* | | Merge pull request #14056 from owncloud/refactor/13976Lukas Reschke2015-02-171-2/+3
|\ \ \ | | | | | | | | Refactor OC_Request into TrustedDomainHelper and IRequest
| * | | Refactor OC_Request into TrustedDomainHelper and IRequestLukas Reschke2015-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-17112-180/+8
|/ / /
* | | Merge pull request #14261 from owncloud/fix-last-login-masterLukas Reschke2015-02-161-1/+1
|\ \ \ | | | | | | | | Return milliseconds instead of seconds for lastLogin - refs #14005