aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-031-2/+2
| |
* | Merge branch 'clean-settings-layout' of ↵Marin Treselj2017-08-0485-225/+670
|\ \ | | | | | | | | | github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout
| * | 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
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| | * Merge pull request #5951 from nextcloud/use-public-methodMorris Jobke2017-08-021-8/+8
| | |\ | | | | | | | | Use public API instead of private
| | | * Use public API instead of privateLukas Reschke2017-08-011-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work. Fixes https://github.com/nextcloud/server/issues/5950 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| | * | [tx-robot] updated from transifexNextcloud bot2017-08-0236-36/+72
| | | |
| | * | Remove explicit type hints for ControllerLukas Reschke2017-08-011-2/+2
| | |/ | | | | | | | | | | | | | | | This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| | * Merge pull request #5877 from nextcloud/typehint_middlewareMorris Jobke2017-08-011-4/+5
| | |\ | | | | | | | | Prop argument type for Middleware
| | | * Fix middleware implementations signaturesRoeland Jago Douma2017-07-311-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Update server.phpJos Poortvliet2017-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | Typo: tips and tRicks ... Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
| | * | Fix settings/Controller/Lukas Reschke2017-08-013-18/+23
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| | * | Add |null to PHPDocLukas Reschke2017-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| | * | Return '0' instead of nullLukas Reschke2017-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| | * | Stricter phan config fixesLukas Reschke2017-08-012-9/+8
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| | * | [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 change
| | | * Fix show password button for password changeMorris Jobke2017-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix the show password button on the personal page * before: if the password change failed the show password icon was not shown again * after: show password icon is visible Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| | * | [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
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * [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
| | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
| | * [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
| | |\ | | | | | | | | Spelling: ": Bigversal"
| | | * : 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
|/ / | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Reintroduce a more compact grid.Marin Treselj2017-08-031-0/+5
| | | | | | | | | | | | Overrides core `.section` values. Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Clean up HTML structure, fix labels.Marin Treselj2017-08-032-60/+26
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Merge branch 'clean-settings-layout' of ↵Andreas Jacobsen2017-07-24157-5569/+6210
|\ \ | | | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout
| * | Merge branch 'master' into clean-settings-layoutAndreas Jacobsen2017-07-15157-5569/+6210
| |\|
| | * [tx-robot] updated from transifexNextcloud bot2017-07-15132-4076/+4076
| | |