summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [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'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
|\ \
| * | 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
* | | 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
* | | [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 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 messageMorris Jobke2015-05-071-1/+1
| |/ / /
* / / / [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 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
* | [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
|\ \
| * | 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
* | Merge pull request #16031 from owncloud/fix-15953-masterJan-Christoph Borchardt2015-05-051-9/+9
|\ \
| * | fix l10n stringsThomas Müller2015-05-041-8/+2
| * | no link if there is no detailpage property set - fixes #15953Thomas Müller2015-05-041-1/+7
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-052-0/+12
* | Only show SSL table header if there are certificatesRoeland Jago Douma2015-05-041-0/+9
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-042-0/+96
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0378-112/+34
* Merge pull request #16005 from owncloud/remove-more-appsLukas Reschke2015-05-021-3/+0
|\
| * remove 'More apps' link from apps mgmt now that we have support for experimen...Jan-Christoph Borchardt2015-05-011-3/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-024-16/+16
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-018-10/+116
* fix layout for documentation link hintsJan-Christoph Borchardt2015-04-301-0/+7
* add admin documentation links for Sharing, Encryption and Email serverJan-Christoph Borchardt2015-04-301-1/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-304-2/+30