aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16467 from owncloud/apps-fixsortLukas Reschke2015-05-282-9/+27
|\ | | | | Sort apps by level, then by name
| * Sort apps by level, then by nameVincent Petry2015-05-202-9/+27
| | | | | | | | Also properly initialize the level to 0 when no level was returned
* | Merge pull request #16577 from owncloud/enc_improve_migrationVincent Petry2015-05-281-3/+4
|\ \ | | | | | | only request encryption module for files which are not excluded
| * | only request encryption module for files which are not excludedBjoern Schiessle2015-05-271-3/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-284-0/+8
|/ /
* | Merge pull request #16565 from owncloud/add-urandom-checkThomas Müller2015-05-261-0/+19
|\ \ | | | | | | Add check for availability of /dev/urandom
| * | 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 #16518 from owncloud/external-link-arrowVincent Petry2015-05-261-1/+1
|\ \ \ | | | | | | | | use arrow icon for external link to Apps dev docs, like in Help section
| * | | use arrow icon for external link to Apps dev docs, like in Help sectionJan-Christoph Borchardt2015-05-221-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-262-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-254-4/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-242-2/+60
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-236-0/+6
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-222-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-2120-4/+34
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-2028-28/+0
|
* Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-191-1/+1
|\ | | | | rename to 'Default encryption module'
| * rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-061-1/+1
| |
* | a new approach to display the error messageBjoern Schiessle2015-05-181-1/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-182-6/+20
| |
* | Merge pull request #15978 from owncloud/feature/fix-encryption-tooltipsThomas Müller2015-05-152-9/+5
|\ \ | | | | | | [enc2]fixing recovery tooltip
| * | adding username as param for isrecoveryenabledClark Tomlinson2015-05-051-1/+1
| | |
| * | fixing recovery tooltipClark Tomlinson2015-05-042-8/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-154-0/+12
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-142-0/+34
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-136-6/+124
| | |
* | | 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
* | | fix user mgmt search box position, fix #15928Jan-Christoph Borchardt2015-05-121-1/+8
| | |
* | | Use active instead of non existing pressedLukas Reschke2015-05-121-2/+2
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16083
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-124-0/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-116-0/+16
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1016-0/+34
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0938-40/+32
| | |
* | | Merge pull request #16168 from owncloud/cron-errorsLukas Reschke2015-05-081-3/+1
|\ \ \ | | | | | | | | fix cron errors to only appear in one line instead of introducing another list
| * | | fix cron errors to only appear in one line instead of introducing another listJan-Christoph Borchardt2015-05-071-3/+1
| | | |
* | | | Merge pull request #16175 from owncloud/fix-enc-typoJoas Schilling2015-05-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in encryption module message
| * | | | Fix typo in encryption module messageMorris Jobke2015-05-071-1/+1
| |/ / / | | | | | | | | | | | | * finishes #16021
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-0814-14/+84
|/ / /
* | | Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-pageMorris Jobke2015-05-072-2/+10
|\ \ \ | | | | | | | | Display the module settings in the list of the encryption modules
| * | | Display the module settings in the list of the encryption modulesJoas Schilling2015-05-042-2/+10
| |/ /
* | / [tx-robot] updated from transifexJenkins for ownCloud2015-05-0722-0/+34
| |/ |/|
* | kill new lines in l10n stringsMorris Jobke2015-05-061-6/+2
| |
* | Add l10n support to encryption settingsMorris Jobke2015-05-061-5/+5
| | | | | | | | * fixes #16111
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-066-4/+6
| |
* | Merge pull request #16037 from owncloud/enc_dont_disable_encryptionJan-Christoph Borchardt2015-05-053-16/+25
|\ \ | | | | | | don't let the the user disable encryption once it was activated
| * | fix label referenceMorris Jobke2015-05-051-1/+1
| | |
| * | adjust wording and add button to confirm encryptionBjoern Schiessle2015-05-052-15/+15
| | |
| * | don't let the the user disable encryption once it was activatedBjoern Schiessle2015-05-043-1/+10
| |/
* | Allow user to set an empty email addressMorris Jobke2015-05-052-5/+11
| | | | | | | | * fixes #16057