Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6031 from nextcloud/master-5937 | Morris Jobke | 2017-08-09 | 3 | -16/+30 |
|\ | | | | | display error icon on non-success | ||||
| * | Display success and error icons | Marin Treselj | 2017-08-09 | 2 | -7/+7 |
| | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| * | display error icon on non-success | Maxence Lange | 2017-08-08 | 3 | -11/+25 |
| | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-09 | 4 | -32/+146 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-08 | 4 | -2/+4 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-06 | 4 | -4/+6 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-05 | 130 | -264/+268 |
| | |||||
* | Merge branch 'master' into clean-settings-layout | Morris Jobke | 2017-08-04 | 1 | -2/+2 |
|\ | |||||
| * | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" | Joas Schilling | 2017-08-03 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'clean-settings-layout' of ↵ | Marin Treselj | 2017-08-04 | 85 | -225/+670 |
|\ \ | | | | | | | | | | github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout | ||||
| * | | Merge branch 'master' into clean-settings-layout | Morris Jobke | 2017-08-03 | 85 | -225/+670 |
| |\| | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-03 | 12 | -0/+12 |
| | | | |||||
| | * | Proof of concept #5593 - inline SVG icon for icon-contacts | Marin Treselj | 2017-08-02 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | Merge pull request #5951 from nextcloud/use-public-method | Morris Jobke | 2017-08-02 | 1 | -8/+8 |
| | |\ | | | | | | | | | Use public API instead of private | ||||
| | | * | Use public API instead of private | Lukas Reschke | 2017-08-01 | 1 | -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 transifex | Nextcloud bot | 2017-08-02 | 36 | -36/+72 |
| | | | | |||||
| | * | | Remove explicit type hints for Controller | Lukas Reschke | 2017-08-01 | 1 | -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_middleware | Morris Jobke | 2017-08-01 | 1 | -4/+5 |
| | |\ | | | | | | | | | Prop argument type for Middleware | ||||
| | | * | Fix middleware implementations signatures | Roeland Jago Douma | 2017-07-31 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | Update server.php | Jos Poortvliet | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Typo: tips and tRicks ... Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com> | ||||
| | * | | Fix settings/Controller/ | Lukas Reschke | 2017-08-01 | 3 | -18/+23 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Add |null to PHPDoc | Lukas Reschke | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Return '0' instead of null | Lukas Reschke | 2017-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Stricter phan config fixes | Lukas Reschke | 2017-08-01 | 2 | -9/+8 |
| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-08-01 | 2 | -2/+2 |
| | |/ | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-31 | 2 | -0/+28 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-30 | 2 | -4/+56 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-29 | 4 | -4/+16 |
| | | | |||||
| | * | Merge pull request #5895 from nextcloud/fix-password-change | Morris Jobke | 2017-07-27 | 1 | -1/+1 |
| | |\ | | | | | | | | | Fix show password button for password change | ||||
| | | * | Fix show password button for password change | Morris Jobke | 2017-07-26 | 1 | -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 transifex | Nextcloud bot | 2017-07-27 | 2 | -0/+64 |
| | |/ | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-26 | 2 | -0/+36 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-25 | 6 | -2/+50 |
| | | | |||||
| | * | Some app fixes of phpstorm inspections | Roeland Jago Douma | 2017-07-24 | 3 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-24 | 4 | -4/+184 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-23 | 2 | -6/+6 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-22 | 4 | -0/+8 |
| | | | |||||
| | * | The app password avoids 1Il etc. Adapted comment accordingly | Marcel Waldvogel | 2017-07-21 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de> | ||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-21 | 68 | -134/+74 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-20 | 12 | -0/+24 |
| | | | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-19 | 66 | -130/+130 |
| | | | |||||
| | * | Merge pull request #5758 from nextcloud/comradekingu-patch-7 | Roeland Jago Douma | 2017-07-18 | 1 | -2/+2 |
| | |\ | | | | | | | | | Spelling: ": Bigversal" | ||||
| | | * | : Bigversal | Allan Nordhøy | 2017-07-18 | 1 | -2/+2 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-18 | 4 | -6/+6 |
| | |/ | |||||
* | / | Fix federation icon menu and container paddings. | Marin Treselj | 2017-08-04 | 2 | -48/+11 |
|/ / | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
* | | Reintroduce a more compact grid. | Marin Treselj | 2017-08-03 | 1 | -0/+5 |
| | | | | | | | | | | | | Overrides core `.section` values. Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
* | | Clean up HTML structure, fix labels. | Marin Treselj | 2017-08-03 | 2 | -60/+26 |
| | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
* | | Merge branch 'clean-settings-layout' of ↵ | Andreas Jacobsen | 2017-07-24 | 157 | -5569/+6210 |
|\ \ | | | | | | | | | | https://github.com/andreasjacobsen93/server into clean-settings-layout | ||||
| * | | Merge branch 'master' into clean-settings-layout | Andreas Jacobsen | 2017-07-15 | 157 | -5569/+6210 |
| |\| | |||||
| | * | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-15 | 132 | -4076/+4076 |
| | | |