aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Update server.phpJos Poortvliet2017-08-011-1/+1
| | * | Fix settings/Controller/Lukas Reschke2017-08-013-18/+23
| | * | Add |null to PHPDocLukas Reschke2017-08-011-1/+1
| | * | Return '0' instead of nullLukas Reschke2017-08-011-1/+1
| | * | Stricter phan config fixesLukas Reschke2017-08-012-9/+8
| | * | [tx-robot] updated from transifexNextcloud bot2017-08-012-2/+2
| | |/
| | * [tx-robot] updated from transifexNextcloud bot2017-07-312-0/+28
| | * [tx-robot] updated from transifexNextcloud bot2017-07-302-4/+56
| | * [tx-robot] updated from transifexNextcloud bot2017-07-294-4/+16
| | * Merge pull request #5895 from nextcloud/fix-password-changeMorris Jobke2017-07-271-1/+1
| | |\
| | | * Fix show password button for password changeMorris Jobke2017-07-261-1/+1
| | * | [tx-robot] updated from transifexNextcloud bot2017-07-272-0/+64
| | |/
| | * [tx-robot] updated from transifexNextcloud bot2017-07-262-0/+36
| | * [tx-robot] updated from transifexNextcloud bot2017-07-256-2/+50
| | * 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