summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-268-1/+360
|\ | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Merge pull request #4508 from nextcloud/fix/remove-js-debug-loggingMorris Jobke2017-04-251-1/+0
| |\ | | | | | | Remove js debug logging
| | * Remove js debug loggingChristoph Wurst2017-04-251-1/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix auth flow background color and redirect view layoutJan-Christoph Borchardt2017-04-252-4/+11
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | AppToken to 72 charsRoeland Jago Douma2017-04-251-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not remove the state token to earlyRoeland Jago Douma2017-04-251-1/+3
| | | | | | | | | | | | | | | | | | | | | we should check the stateToken before we remove it. Else the check will always fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Correctly case the stateTokenRoeland Jago Douma2017-04-251-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add new auth flowLukas Reschke2017-04-257-0/+351
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the basics for the new app-password based authentication flow for our clients. The current implementation tries to keep it as simple as possible and works the following way: 1. Unauthenticated client opens `/index.php/login/flow` 2. User will be asked whether they want to grant access to the client 3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password. If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler. While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the near future we have to think about an automatic migration endpoint so there's that anyways :-) If the user chooses to use the regular login the following happens: 1. A session state token is written to the session 2. User is redirected to the login page 3. If successfully authenticated they will be redirected to a page redirecting to the POST controller 4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler. This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Fix testJan-Christoph Borchardt2017-04-261-1/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Fix emptycontent HTML and wordingJan-Christoph Borchardt2017-04-251-4/+5
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Fix spinner position of Contacts menuJan-Christoph Borchardt2017-04-251-3/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Use HTTP POST to retrieve the list of contactsChristoph Wurst2017-04-252-2/+2
| | | | | | | | | | | | | | | | We do not want to have sensitive information in the URL and therefore also not in the access log. Thus the GET request is replaced by a POST request. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix failing contacts menu js test dataChristoph Wurst2017-04-251-2/+12
| | | | | | | | | | | | | | | | When we test wheter action menus in the contacts menu close when clicking other ones, we have to provide test data that actually causes the view to render the menu. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix icon of second actionChristoph Wurst2017-04-251-3/+5
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use absolute URI for action iconsChristoph Wurst2017-04-251-2/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Let apps register contact menu provider via info.xmlChristoph Wurst2017-04-251-6/+7
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use tooltop for contact's top action titleChristoph Wurst2017-04-251-1/+4
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Contacts menuChristoph Wurst2017-04-2511-21/+988
|/ | | | | | | * load list of contacts from the server * show last message of each contact Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Fix loading spinner for new app menuJulius Härtl2017-04-252-13/+33
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Responsive app menuJulius Härtl2017-04-253-87/+100
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #3195 from nextcloud/settings-apps-tabularMorris Jobke2017-04-251-0/+0
|\ | | | | Make apps settings tabular
| * Fix app icon being inverted for app store apps tooJan-Christoph Borchardt2017-04-251-0/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Show placeholder for image-less apps in app managementJan-Christoph Borchardt2017-04-251-1/+0
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #4462 from danxuliu/fix-sharing-password-protected-linkRoeland Jago Douma2017-04-254-33/+327
|\ \ | | | | | | Fix sharing a password protected link
| * | Use "complete" callback in onPasswordEnteredDaniel Calviño Sánchez2017-04-242-3/+3
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract common ajax call for addShare and updateShareDaniel Calviño Sánchez2017-04-241-36/+17
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Document options parameter in saveLinkShareDaniel Calviño Sánchez2017-04-241-1/+8
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add "complete" callback support for addShareDaniel Calviño Sánchez2017-04-242-0/+57
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add "complete" callback support for updateShareDaniel Calviño Sánchez2017-04-242-0/+55
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add missing unit test cases and conditionsDaniel Calviño Sánchez2017-04-241-0/+49
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix working icon not hidden when successfully setting a passwordDaniel Calviño Sánchez2017-04-242-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a request to set the password of a shared link is sent a working icon is shown. However, as there was no "success" callback, the icon was never hidden again after successfully setting the password (it worked fine if there was an error, though). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Fix remember redirect_url on failed login attemptsChristoph Wurst2017-04-251-0/+3
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2560-1464/+544
| |/ |/|
* | Merge pull request #4321 from nextcloud/improve-sharing-tooltipMorris Jobke2017-04-241-43/+38
|\ \ | | | | | | change sharing tooltip with a more general description of all available share options
| * | simplify share placeholderBjoern Schiessle2017-04-181-20/+7
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | change sharing tooltip with a more general description of all available ↵Bjoern Schiessle2017-04-121-23/+31
| | | | | | | | | | | | | | | | | | share options Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Fix link password toggleRoeland Jago Douma2017-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | We took the wrong field from the share api response. So the password was never shown as set. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4463 from ↵Roeland Jago Douma2017-04-241-2/+2
|\ \ \ | | | | | | | | | | | | | | | | danxuliu/fix-working-icon-placement-on-password-save Fix working icon placement on password save
| * | | Fix working icon placement on password saveDaniel Calviño Sánchez2017-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the icon appeared below the text input for the password. Now, it appears inside the text input, to the right end. The CSS was adjusted based on other icons shown in that position for other text inputs in the Share tab view, like the information icon or the clipboard icon. Fixes #4135 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warningsRoeland Jago Douma2017-04-242-3/+3
|\ \ \ \ | | | | | | | | | | Fix sinon.stub deprecation warnings
| * | | | Fix sinon.stub deprecation warningsChristoph Wurst2017-04-242-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by the deprecation warning. This makes the js unit testing output readable again. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-242-2/+0
|\ \ \ \ | |/ / / |/| | | Remove unused use statements
| * | | Remove unused use statementsMorris Jobke2017-04-222-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4434 from ↵Lukas Reschke2017-04-241-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/add-rate-limiting-to-solve-challenge-controller Add rate limit to TOTP solve challenge controller
| * | | | Add rate limit to TOTP solve challenge controllerLukas Reschke2017-04-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2626 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-246-0/+10
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-234-4/+8
| | | |
* | | | Add at most 10 password reset requests per 5 minutes and IP rangeLukas Reschke2017-04-222-1/+4
|/ / / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / [tx-robot] updated from transifexNextcloud bot2017-04-224-2/+38
|/ /
* | Update core.jsRoeland Jago Douma2017-04-211-6/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>