Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16467 from owncloud/apps-fixsort | Lukas Reschke | 2015-05-28 | 2 | -9/+27 |
|\ | | | | | Sort apps by level, then by name | ||||
| * | Sort apps by level, then by name | Vincent Petry | 2015-05-20 | 2 | -9/+27 |
| | | | | | | | | Also properly initialize the level to 0 when no level was returned | ||||
* | | Merge pull request #16577 from owncloud/enc_improve_migration | Vincent Petry | 2015-05-28 | 1 | -3/+4 |
|\ \ | | | | | | | only request encryption module for files which are not excluded | ||||
| * | | only request encryption module for files which are not excluded | Bjoern Schiessle | 2015-05-27 | 1 | -3/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-28 | 4 | -0/+8 |
|/ / | |||||
* | | Merge pull request #16565 from owncloud/add-urandom-check | Thomas Müller | 2015-05-26 | 1 | -0/+19 |
|\ \ | | | | | | | Add check for availability of /dev/urandom | ||||
| * | | Add check for availability of /dev/urandom | Lukas Reschke | 2015-05-26 | 1 | -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-arrow | Vincent Petry | 2015-05-26 | 1 | -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 section | Jan-Christoph Borchardt | 2015-05-22 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-26 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-25 | 4 | -4/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-24 | 2 | -2/+60 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-23 | 6 | -0/+6 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-22 | 2 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-21 | 20 | -4/+34 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-20 | 28 | -28/+0 |
| | |||||
* | Merge pull request #16085 from owncloud/encryption-module-rename | Thomas Müller | 2015-05-19 | 1 | -1/+1 |
|\ | | | | | rename to 'Default encryption module' | ||||
| * | rename to 'Default encryption module' | Jan-Christoph Borchardt | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 1 | -1/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-18 | 2 | -6/+20 |
| | | |||||
* | | Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips | Thomas Müller | 2015-05-15 | 2 | -9/+5 |
|\ \ | | | | | | | [enc2]fixing recovery tooltip | ||||
| * | | adding username as param for isrecoveryenabled | Clark Tomlinson | 2015-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | fixing recovery tooltip | Clark Tomlinson | 2015-05-04 | 2 | -8/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-15 | 4 | -0/+12 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-14 | 2 | -0/+34 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-13 | 6 | -6/+124 |
| | | | |||||
* | | | Subadmin permissions are also not required | Lukas Reschke | 2015-05-12 | 1 | -0/+2 |
| | | | |||||
* | | | Add NoAdminRequired annotation | Lukas Reschke | 2015-05-12 | 1 | -0/+4 |
| | | | | | | | | | | | | Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288 | ||||
* | | | fix user mgmt search box position, fix #15928 | Jan-Christoph Borchardt | 2015-05-12 | 1 | -1/+8 |
| | | | |||||
* | | | Use active instead of non existing pressed | Lukas Reschke | 2015-05-12 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16083 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-12 | 4 | -0/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-11 | 6 | -0/+16 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-10 | 16 | -0/+34 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-09 | 38 | -40/+32 |
| | | | |||||
* | | | Merge pull request #16168 from owncloud/cron-errors | Lukas Reschke | 2015-05-08 | 1 | -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 list | Jan-Christoph Borchardt | 2015-05-07 | 1 | -3/+1 |
| | | | | |||||
* | | | | Merge pull request #16175 from owncloud/fix-enc-typo | Joas Schilling | 2015-05-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix typo in encryption module message | ||||
| * | | | | Fix typo in encryption module message | Morris Jobke | 2015-05-07 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | * finishes #16021 | ||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-08 | 14 | -14/+84 |
|/ / / | |||||
* | | | Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page | Morris Jobke | 2015-05-07 | 2 | -2/+10 |
|\ \ \ | | | | | | | | | Display the module settings in the list of the encryption modules | ||||
| * | | | Display the module settings in the list of the encryption modules | Joas Schilling | 2015-05-04 | 2 | -2/+10 |
| |/ / | |||||
* | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-07 | 22 | -0/+34 |
| |/ |/| | |||||
* | | kill new lines in l10n strings | Morris Jobke | 2015-05-06 | 1 | -6/+2 |
| | | |||||
* | | Add l10n support to encryption settings | Morris Jobke | 2015-05-06 | 1 | -5/+5 |
| | | | | | | | | * fixes #16111 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-06 | 6 | -4/+6 |
| | | |||||
* | | Merge pull request #16037 from owncloud/enc_dont_disable_encryption | Jan-Christoph Borchardt | 2015-05-05 | 3 | -16/+25 |
|\ \ | | | | | | | don't let the the user disable encryption once it was activated | ||||
| * | | fix label reference | Morris Jobke | 2015-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | adjust wording and add button to confirm encryption | Bjoern Schiessle | 2015-05-05 | 2 | -15/+15 |
| | | | |||||
| * | | don't let the the user disable encryption once it was activated | Bjoern Schiessle | 2015-05-04 | 3 | -1/+10 |
| |/ | |||||
* | | Allow user to set an empty email address | Morris Jobke | 2015-05-05 | 2 | -5/+11 |
| | | | | | | | | * fixes #16057 |