summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-0954-62/+80
|
* Merge pull request #6413 from nextcloud/translate-settings-headersMorris Jobke2017-09-081-2/+2
|\ | | | | Translate settings headers
| * Translate settings headersJoas Schilling2017-09-081-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6417 from nextcloud/proper-english-nowhaveMorris Jobke2017-09-081-1/+1
|\ \ | |/ |/| Improve text: 'you have now' -> 'you now have'
| * Improve text: 'you have now' -> 'you now have'Leon Klingele2017-09-081-1/+1
| | | | | | | | Signed-off-by: Leon Klingele <leon@struktur.de>
* | [tx-robot] updated from transifexNextcloud bot2017-09-082-0/+2
| |
* | Make sure the password contains special charactersJoas Schilling2017-09-071-1/+3
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-09-074-0/+34
|
* Properly include fileLukas Reschke2017-09-061-1/+1
| | | | | | Regression from https://github.com/nextcloud/server/commit/005ef115fbffecb22a7ac9e65425419aca90c1aa Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-09-062-0/+22
|
* Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-053-20/+14
|\ | | | | Set the meta data before everything
| * Merge setMetaData into constructorJoas Schilling2017-09-043-9/+4
| | | | | | | | | | | | This ensures that the meta data is set in the beginning Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Set the meta data before everythingJoas Schilling2017-09-041-12/+11
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-nameMorris Jobke2017-09-041-4/+4
|\| | | | | Fix naming of user id in email meta data
| * Fix naming of user id in email meta dataJoas Schilling2017-09-011-4/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-09-022-0/+26
|/
* Merge pull request #6315 from nextcloud/metadata-for-all-emailsMorris Jobke2017-08-313-0/+24
|\ | | | | Implement metadata for email templates of remaining emails
| * Implement metadata for email templates of remaining emailsMorris Jobke2017-08-303-0/+24
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-08-316-2/+10
|/
* Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-nameMorris Jobke2017-08-301-10/+14
|\ | | | | Allow to sort groups by name
| * Allow to sort groups by nameJoas Schilling2017-08-221-10/+14
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-08-302-26/+34
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-292-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-252-0/+12
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-244-56/+130
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-222-0/+36
| |
* | Use correct l10n for app password menuMorris Jobke2017-08-211-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-08-216-6/+314
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-202-0/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-194-2/+20
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-186-2/+26
|
* Merge pull request #6158 from nextcloud/always-log-cron-executionLukas Reschke2017-08-171-21/+19
|\ | | | | Always log cron execution
| * Always log cron executionMorris Jobke2017-08-171-21/+19
| | | | | | | | | | | | | | | | | | | | | | There was a setting to disable the last execution of cron. There is no known problem with this write access and it was also questioned when this feature was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707 Recently there was also a bug report about a non-visible last cron execution (#6088) - let's better remove this. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-08-172-0/+30
| |
* | Fix group management which was broken since #5847Tobia De Koninck2017-08-151-3/+4
|/ | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* Merge pull request #6098 from nextcloud/fix-federation-scopeRoeland Jago Douma2017-08-141-1/+1
|\ | | | | Fix federation scope dropdown
| * Fix federation scope dropdownMorris Jobke2017-08-141-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6090 from nextcloud/federationscope-title-boldMorris Jobke2017-08-141-0/+4
|\ \ | |/ |/| Bold federation scope title in dropdown menu, as intended
| * Bold federation scope title in dropdown menu, as intendedJan-Christoph Borchardt2017-08-121-0/+4
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2017-08-142-0/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-08-132-0/+50
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-122-0/+26
|
* Merge pull request #6031 from nextcloud/master-5937Morris Jobke2017-08-093-16/+30
|\ | | | | display error icon on non-success
| * Display success and error iconsMarin Treselj2017-08-092-7/+7
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * display error icon on non-successMaxence Lange2017-08-083-11/+25
| | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | [tx-robot] updated from transifexNextcloud bot2017-08-094-32/+146
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-084-2/+4
|
* [tx-robot] updated from transifexNextcloud bot2017-08-064-4/+6
|
* [tx-robot] updated from transifexNextcloud bot2017-08-05130-264/+268
|
* Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-041-2/+2
|\