summaryrefslogtreecommitdiffstats
path: root/settings/controller
Commit message (Expand)AuthorAgeFilesLines
* fix subadmin user count for empty groupsMorris Jobke2015-11-041-0/+1
* Fix everyone count for subadminsVincent Petry2015-10-291-0/+36
* Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-292-19/+45
* Merge pull request #19813 from owncloud/stay-on-apps-category-refreshThomas Müller2015-10-261-6/+41
|\
| * Use speaking idsJoas Schilling2015-10-261-7/+40
| * Stay on the same category when refreshing the page on the apps listJoas Schilling2015-10-261-1/+3
* | Update license headersLukas Reschke2015-10-263-2/+3
|/
* Fix unit testRoeland Jago Douma2015-10-211-1/+1
* Fix memcached/memcache module checkRobin McCorkell2015-10-201-2/+2
* Use injected requestVincent Petry2015-10-091-1/+1
* fix IE8 user agent detectionMorris Jobke2015-10-091-1/+1
* Fix uploading avatar and root certs in IE8Vincent Petry2015-10-091-5/+14
* Don't perform checks for outdated TLS libs when no internet connectionLukas Reschke2015-10-081-2/+20
* Fix comment syntaxLukas Reschke2015-10-081-2/+2
* Fix importing of certificatesLukas Reschke2015-10-061-2/+3
* Merge pull request #19597 from owncloud/update-license-headersThomas Müller2015-10-063-0/+5
|\
| * deduplicate @xenopathicMorris Jobke2015-10-061-1/+1
| * update licence headers via scriptMorris Jobke2015-10-053-0/+5
* | [admin] check for correct PHP memcached moduleMorris Jobke2015-10-061-0/+18
|/
* Update isCertificateImportAllowed() check to new APIRobin McCorkell2015-09-101-2/+2
* use config.php value instead of version stringMorris Jobke2015-09-021-1/+1
* Add setup check for reverse proxy header configurationRobin McCorkell2015-08-101-1/+20
* Merge pull request #17919 from rullzer/php_supported_checkThomas Müller2015-08-101-0/+18
|\
| * Display warning in security & setup warnings if php version is EOLRoeland Jago Douma2015-07-291-0/+18
* | also block certificate management in the back-end if external storages are di...Bjoern Schiessle2015-08-041-1/+33
|/
* Merge pull request #17912 from owncloud/detect-old-openssl-versionsRobin McCorkell2015-07-281-1/+69
|\
| * Detect old NSS and OpenSSL versionsLukas Reschke2015-07-281-1/+69
* | Add unit testsLukas Reschke2015-07-281-13/+25
* | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/
* don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-171-2/+8
* Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-161-0/+2
|\
| * only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-081-0/+2
* | Handle returned null value in app level codeMorris Jobke2015-07-131-2/+2
|/
* 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 linksJoas Schilling2015-06-291-1/+1
* | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-291-0/+18
|\ \ | |/ |/|
| * Also load enabled appsLukas Reschke2015-06-291-0/+9
| * Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+9
* | 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 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 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
|/
* Merge pull request #15978 from owncloud/feature/fix-encryption-tooltipsThomas Müller2015-05-151-3/+3
|\
| * fixing recovery tooltipClark Tomlinson2015-05-041-3/+3