summaryrefslogtreecommitdiffstats
path: root/settings/controller
Commit message (Collapse)AuthorAgeFilesLines
* Add missing version fieldLukas Reschke2015-06-291-2/+2
|
* Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-291-1/+1
|\ | | | | Send OC version to appstore so it can reply with the right links
| * Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-291-1/+1
| |
* | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-291-0/+18
|\ \ | |/ |/| Request approved state for disabled apps with ocsid
| * Also load enabled appsLukas Reschke2015-06-291-0/+9
| |
| * Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+9
| | | | | | | | | | | | | | | | In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git. With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided. Fixes https://github.com/owncloud/core/issues/17003
* | update license headers and authorsMorris Jobke2015-06-254-0/+5
|/
* Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-191-4/+6
|\ | | | | Only sort by group name when LDAP is involved
| * Only sort by group name when LDAP is involvedJoas Schilling2015-06-161-4/+6
| |
* | Make "include update info" part of the cache keyJoas Schilling2015-06-151-3/+5
| |
* | Load the update information asyncroniously to fix the page load speedJoas Schilling2015-06-101-6/+10
|/
* Merge pull request #16402 from owncloud/issue-15956-slow-group-usercountThomas Müller2015-06-081-1/+1
|\ | | | | Sort user groups by group name and hide the user count
| * Sort user groups by group name and hide the user countJoas Schilling2015-05-181-1/+1
| |
* | only request encryption module for files which are not excludedBjoern Schiessle2015-05-271-3/+4
| |
* | Add check for availability of /dev/urandomLukas Reschke2015-05-261-0/+19
|/ | | | | | | | | | | | | | | Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system: 1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop 2. MTRand: chr((mt_rand() ^ mt_rand()) % 256) 3. Rand: chr((rand() ^ rand()) % 256) 4. UniqId: Plain uniqid() An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour. One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface. Thanks to David Black from d1b.org for bringing this again to our attention.
* Merge pull request #15978 from owncloud/feature/fix-encryption-tooltipsThomas Müller2015-05-151-3/+3
|\ | | | | [enc2]fixing recovery tooltip
| * fixing recovery tooltipClark Tomlinson2015-05-041-3/+3
| |
* | Subadmin permissions are also not requiredLukas Reschke2015-05-121-0/+2
| |
* | Add NoAdminRequired annotationLukas Reschke2015-05-121-0/+4
| | | | | | | | Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288
* | Allow user to set an empty email addressMorris Jobke2015-05-051-1/+6
|/ | | | * fixes #16057
* Adjust tests and statuscodeLukas Reschke2015-04-201-1/+1
|
* Migrate personal certificate handling into AppFramework controllersLukas Reschke2015-04-201-0/+93
| | | | Also added unit-tests and better error-handling
* allow user to start migration in admin settings if no external user ↵Bjoern Schiessle2015-04-161-0/+122
| | | | back-ends are enabled
* Merge pull request #15314 from owncloud/app-categories-15274Lukas Reschke2015-04-091-17/+58
|\ | | | | Add different trust levels to AppStore interface
| * Add experimental applications switchLukas Reschke2015-04-031-17/+58
| | | | | | | | Allows administrators to disable or enabled experimental applications as well as show the trust level.
* | Remove hardcoded link to performance docsJoas Schilling2015-04-071-0/+7
|/
* Add check for activated local memcacheLukas Reschke2015-03-281-0/+99
| | | | | | 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
* use StreamResponse to download the log file - fixes #14268Thomas Müller2015-03-271-36/+6
|
* Update license headersJenkins for ownCloud2015-03-266-33/+108
|
* remove unneeded status element from json response on /categories - fixes 15056Thomas Müller2015-03-231-1/+0
|
* show a better error message when trying to create a user that already existsRobin Appelman2015-03-201-0/+9
|
* Show more detailed error messageLukas Reschke2015-03-161-12/+12
|
* Incorporate review changesLukas Reschke2015-03-161-3/+2
|
* Migrate to SwiftMailLukas Reschke2015-03-162-21/+22
| | | | | | | | | | | | | | | | | | | | | 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
* Let users configure security headers in their WebserverLukas Reschke2015-03-021-37/+0
| | | | | | | | | | 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.
* Revert "Updating license headers"Morris Jobke2015-02-266-103/+39
| | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* don't allow installation of already installed apps - fixes #14004Thomas Müller2015-02-231-6/+29
|
* Updating license headersJenkins for ownCloud2015-02-236-39/+103
|
* Return milliseconds instead of seconds for lastLogin - refs #14005Thomas Müller2015-02-161-1/+1
|
* Merge pull request #13790 from owncloud/fix-subadmin-groupThomas Müller2015-02-021-24/+43
|\ | | | | Fix subadmin listing of group
| * Consistent variable namingLukas Reschke2015-01-301-10/+9
| |
| * Switch to a factory and add unit testsLukas Reschke2015-01-301-22/+21
| |
| * Add unit testsLukas Reschke2015-01-301-9/+15
| |
| * Fix subadmin listing of groupLukas Reschke2015-01-301-6/+21
| | | | | | | | | | | | Without this patch filtering for the "_everyone" (empty) group did not work for subadmins. Fixes itself.
* | Check whether return is an error case before using itJoas Schilling2015-01-301-8/+12
|/
* Add value if restore of data is possible for a userMorris Jobke2015-01-271-6/+47
| | | | | | | | | | | * reason: nice to know before password change in user management * restore is possible: * encryption is disabled * encryption is enabled, admin and user has checked the restore option * if not possible: * highlight users row in red once the admin wants to change the password * show also a little tipsy
* Use setConfigs() instead of calling setConfig() multiple timesJoas Schilling2015-01-231-10/+11
|
* Fix filtering for users when $gid is emptyLukas Reschke2015-01-181-1/+1
| | | | | | Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless. Fixes itself
* sorting enabled and disabled apps alphabetically - fixes #13404Thomas Müller2015-01-161-0/+16
|
* Cache responses from the AppStore serverLukas Reschke2015-01-091-43/+57
| | | | | | | | | | Otherwise every time the AppStore was opened a lot of connections to the AppStore server were made which resulted in a terrible performance. This changeset will cache the response for a sensible time so that only the first request will be somewhat slow. Performance changes: - Loading a category took previously more than 3 seconds on my machine. Now for every follow-up request it takes less than 200ms, resulting in a performance gain of 1950% - Loading the category list took previously about 750ms - now it takes 154ms, a total performance gain of 395%