summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4467 from nextcloud/lists-for-html-mailsRoeland Jago Douma2017-04-262-22/+138
|\ | | | | Add lists to HTML emails
| * Allow meta info and iconsJoas Schilling2017-04-252-8/+32
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add lists to HTML emailsJoas Schilling2017-04-242-22/+114
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4061 from nextcloud/downstream-26407Roeland Jago Douma2017-04-263-40/+86
|\ \ | | | | | | Redis cluster support
| * | no ternaryJörn Friedrich Dreyer2017-03-251-2/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | fix constantJörn Friedrich Dreyer2017-03-251-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add Redis Cluster supportRobin McCorkell2017-03-253-40/+78
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4500 from nextcloud/downstream-27118Morris Jobke2017-04-263-26/+20
|\ \ \ | | | | | | | | Restrict proppatch to the proper nodes
| * | | Restrict proppatch to the proper nodesVincent Petry2017-04-253-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to fetch the node earlier because cancelling from within the handler is not possible. Well, it is but it prevents other node types using the same property names to run because the failure marks the property with status 403.
* | | | Merge pull request #4416 from gvmura/avoid-duplicate-files-googleMorris Jobke2017-04-261-0/+13
|\ \ \ \ | | | | | | | | | | Avoid duplicate files in google with the same name
| * \ \ \ Merge branch 'avoid-duplicate-files-google' of ↵root2017-04-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/gvmura/server into avoid-duplicate-files-google
| | * | | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it renames the temporary file, it tests if the file is already present. If so, it moves to trash the previous version to avoid duplicate files with the same name (message log: "Ignoring duplicate file name: ... on Google Drive for Google user: ..."). It doesn't handle duplicate files in Google Drive, it tries to avoid them. You'll watch #4279 issue.
| * | | | | avoid duplicate files in google with the same namegvmura2017-04-211-0/+13
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: gvmura <gvmura@uniss.it>
* | | | | Merge pull request #4449 from stweil/mimetypesMorris Jobke2017-04-263-0/+36
|\ \ \ \ \ | | | | | | | | | | | | Add mimetypes for jp2 and webp
| * | | | | Add test code for new image mime typesStefan Weil2017-04-251-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
| * | | | | Add repair steps for new image mime typesStefan Weil2017-04-251-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
| * | | | | Add mimetypes for jp2 and webpStefan Weil2017-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those image formats can be processed by Tesseract, so they are needed for improved Nextcloud OCR. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | | | Merge pull request #4486 from nextcloud/fix-js-unitMorris Jobke2017-04-251-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove DOMPurify from srcFiles
| * | | | | | Remove DOMPurify from srcFilesLukas Reschke2017-04-251-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is already included via core.json Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwoMorris Jobke2017-04-256-13/+332
|\ \ \ \ \ \ | | | | | | | | | | | | | | user_ldap: Add support for gidNumber
| * | | | | | Fix usersInGroup retrievalArthur Schiwon2017-04-252-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | fix method name due to changes in masterArthur Schiwon2017-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2Arthur Schiwon2017-04-256-8/+302
| |\ \ \ \ \ \
| | * | | | | | user_ldap: Add support for gidNumberXuanwo2017-04-256-8/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on the work of @dleeuw (https://github.com/dleeuw) (See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details). The difference is user & group data will be written into cache to have better performance, and functions splited from primaryGroupID series to make them more readable. Fixed https://github.com/nextcloud/server/issues/2640 Signed-off-by: Xuanwo <xuanwo@yunify.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-04-26174-622/+1044
| | | | | | | |
* | | | | | | | Merge pull request #3233 from nextcloud/contactsmenuJan-Christoph Borchardt2017-04-2635-21/+2831
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Contacts menu
| * \ \ \ \ \ \ \ Merge branch 'master' into contactsmenuJan-Christoph Borchardt2017-04-2617-5/+849
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | | Merge pull request #4499 from nextcloud/downstream-26984Morris Jobke2017-04-254-2/+72
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Trigger change when a user is enabled/disabled
| * | | | | | | | | Audit log for enabling/disabling a userJoas Schilling2017-04-252-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | | Trigger change when a user is enabled/disabledJoas Schilling2017-04-252-2/+54
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | 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>
* | | | | | | | | | Merge pull request #4479 from nextcloud/auth-flowMorris Jobke2017-04-2510-0/+770
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add new auth flow basics
| * | | | | | | | | | 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-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2510-0/+761
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge pull request #4495 from nextcloud/downstream-27638Roeland Jago Douma2017-04-252-2/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Catch session already closed exception in destructor
| * | | | | | | | | Catch session already closed exception in destructorVictor Dubiniuk2017-04-252-2/+7
| |/ / / / / / / /
| | * | | | | | | 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>
| | * | | | | | | Update composer autoloaderChristoph Wurst2017-04-254-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| | * | | | | | | Adjust entry unit test to newly added avatar propertyChristoph Wurst2017-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| | * | | | | | | Don't show contacts an entry for themselvesChristoph Wurst2017-04-255-14/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 12:35:06 +0000