summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
| | * Some app fixes of phpstorm inspectionsRoeland Jago Douma2017-07-243-5/+5
| | * [tx-robot] updated from transifexNextcloud bot2017-07-244-4/+184
| | * [tx-robot] updated from transifexNextcloud bot2017-07-232-6/+6
| | * [tx-robot] updated from transifexNextcloud bot2017-07-224-0/+8
| | * The app password avoids 1Il etc. Adapted comment accordinglyMarcel Waldvogel2017-07-211-1/+1
| | * [tx-robot] updated from transifexNextcloud bot2017-07-2168-134/+74
| | * [tx-robot] updated from transifexNextcloud bot2017-07-2012-0/+24
| | * [tx-robot] updated from transifexNextcloud bot2017-07-1966-130/+130
| | * Merge pull request #5758 from nextcloud/comradekingu-patch-7Roeland Jago Douma2017-07-181-2/+2
| | |\
| | | * : BigversalAllan Nordhøy2017-07-181-2/+2
| | * | [tx-robot] updated from transifexNextcloud bot2017-07-184-6/+6
| | |/
* | / Fix federation icon menu and container paddings.Marin Treselj2017-08-042-48/+11
|/ /
* | Reintroduce a more compact grid.Marin Treselj2017-08-031-0/+5
* | Clean up HTML structure, fix labels.Marin Treselj2017-08-032-60/+26
* | Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/...Andreas Jacobsen2017-07-24157-5569/+6210
|\ \
| * | Merge branch 'master' into clean-settings-layoutAndreas Jacobsen2017-07-15157-5569/+6210
| |\|
| | * [tx-robot] updated from transifexNextcloud bot2017-07-15132-4076/+4076
| | * this template file is no longer neededBjoern Schiessle2017-07-141-409/+0
| | * [tx-robot] updated from transifexNextcloud bot2017-07-146-48/+132
| | * [tx-robot] updated from transifexNextcloud bot2017-07-1310-56/+152
| | * [tx-robot] updated from transifexNextcloud bot2017-07-1294-1168/+1372
| | * Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
| | |\
| | | * Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
| | * | Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select...Morris Jobke2017-07-101-0/+1
| | |\ \
| | | * | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-101-0/+1
| | * | | Spelling: No "we" for recommendations.Allan Nordhøy2017-07-101-11/+11
| | * | | Merge pull request #5649 from nextcloud/fix-5611Morris Jobke2017-07-101-1/+1
| | |\ \ \
| | | * | | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-071-1/+1
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-102-42/+42
| | | |_|/ | | |/| |
| | * | | [tx-robot] updated from transifexNextcloud bot2017-07-096-6/+10
| | * | | [tx-robot] updated from transifexNextcloud bot2017-07-088-0/+8
| | |/ /
| | * | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-073-9/+27
| | |\ \
| | | * | Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-203-9/+27
| | * | | [tx-robot] updated from transifexNextcloud bot2017-07-0712-0/+12
| | * | | no warning on password change if no encryption module uses per-user keysBjoern Schiessle2017-07-061-1/+22
| | * | | [tx-robot] updated from transifexNextcloud bot2017-07-062-0/+2
| | * | | Merge pull request #5404 from nextcloud/use-translated-hint-insteadof-english...blizzz2017-07-051-0/+4
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Use translated Hint instead of english error on password policyJoas Schilling2017-06-141-0/+4
| | * | | Merge pull request #5342 from nextcloud/userlist-used-spaceMorris Jobke2017-07-054-163/+239
| | |\ \ \
| | | * | | show used space in user listRobin Appelman2017-06-154-163/+239
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-052-0/+2
| | * | | | Merge pull request #5591 from nextcloud/move-client-info-to-firstrunwizardMorris Jobke2017-07-041-59/+0
| | |\ \ \ \
| | | * | | | Move sync client to the firstrunwizard appJoas Schilling2017-07-041-59/+0
| | * | | | | [tx-robot] updated from transifexNextcloud bot2017-07-042-14/+14
| | |/ / / /
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-034-10/+26
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-024-0/+12
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-07-014-30/+34
| | * | | | [tx-robot] updated from transifexNextcloud bot2017-06-30134-6772/+6836
| | * | | | Merge pull request #4890 from nextcloud/unify-settingsblizzz2017-06-2920-382/+756
| | |\ \ \ \
| | | * | | | move admin templates to the right placeArthur Schiwon2017-06-276-0/+0