summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge setMetaData into constructorJoas Schilling2017-09-043-9/+4
| * Set the meta data before everythingJoas Schilling2017-09-041-12/+11
* | 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 dataJoas Schilling2017-09-011-4/+4
* | [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 emailsMorris Jobke2017-08-303-0/+24
* | [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 nameJoas Schilling2017-08-221-10/+14
* | [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
* | [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 executionMorris Jobke2017-08-171-21/+19
* | [tx-robot] updated from transifexNextcloud bot2017-08-172-0/+30
* | Fix group management which was broken since #5847Tobia De Koninck2017-08-151-3/+4
|/
* Merge pull request #6098 from nextcloud/fix-federation-scopeRoeland Jago Douma2017-08-141-1/+1
|\
| * Fix federation scope dropdownMorris Jobke2017-08-141-1/+1
* | Merge pull request #6090 from nextcloud/federationscope-title-boldMorris Jobke2017-08-141-0/+4
|\ \ | |/ |/|
| * Bold federation scope title in dropdown menu, as intendedJan-Christoph Borchardt2017-08-121-0/+4
* | [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 success and error iconsMarin Treselj2017-08-092-7/+7
| * display error icon on non-successMaxence Lange2017-08-083-11/+25
* | [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
|\
| * Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-031-2/+2
* | Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextclou...Marin Treselj2017-08-0485-225/+670
|\ \
| * | Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-0385-225/+670
| |\|
| | * [tx-robot] updated from transifexNextcloud bot2017-08-0312-0/+12
| | * Proof of concept #5593 - inline SVG icon for icon-contactsMarin Treselj2017-08-021-2/+2
| | * Merge pull request #5951 from nextcloud/use-public-methodMorris Jobke2017-08-021-8/+8
| | |\
| | | * Use public API instead of privateLukas Reschke2017-08-011-8/+8
| | * | [tx-robot] updated from transifexNextcloud bot2017-08-0236-36/+72
| | * | Remove explicit type hints for ControllerLukas Reschke2017-08-011-2/+2
| | |/
| | * Merge pull request #5877 from nextcloud/typehint_middlewareMorris Jobke2017-08-011-4/+5
| | |\
| | | * Fix middleware implementations signaturesRoeland Jago Douma2017-07-311-4/+5