c0a8942764
Fix missing conflict resolutions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 17:05:59 +02:00
9fec4031b3
Adjust query/event logging code in favour of more complex owncloud/diagnostics ( #27643 )
...
* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces
2017-04-26 13:19:43 +02:00
5b5c3a1773
Merge pull request #4430 from nextcloud/refactor-auth
...
Improve readability of login logic
2017-04-26 10:41:53 +02:00
bec9f18a0f
Merge pull request #4478 from nextcloud/improve_settings_help
...
adding some documentation hints and some smaller cleanup
2017-04-26 09:45:01 +02:00
7386bea23f
Merge pull request #4467 from nextcloud/lists-for-html-mails
...
Add lists to HTML emails
2017-04-26 08:30:30 +02:00
752b219970
Merge pull request #4061 from nextcloud/downstream-26407
...
Redis cluster support
2017-04-26 08:27:30 +02:00
527369be9c
Merge pull request #4500 from nextcloud/downstream-27118
...
Restrict proppatch to the proper nodes
2017-04-26 01:28:16 -03:00
4c2c08f376
Merge pull request #4416 from gvmura/avoid-duplicate-files-google
...
Avoid duplicate files in google with the same name
2017-04-26 01:26:04 -03:00
d4329f3355
Merge pull request #4449 from stweil/mimetypes
...
Add mimetypes for jp2 and webp
2017-04-26 01:22:49 -03:00
fff6d6e3e8
Refactor auth methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-26 01:08:53 -03:00
215573fe3c
Merge pull request #4486 from nextcloud/fix-js-unit
...
Remove DOMPurify from srcFiles
2017-04-25 22:39:55 -03:00
8a004ac41f
Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo
...
user_ldap: Add support for gidNumber
2017-04-25 22:34:30 -03:00
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
6db6911a13
Merge pull request #3233 from nextcloud/contactsmenu
...
Contacts menu
2017-04-26 01:31:11 +02:00
241e397326
Merge branch 'master' into contactsmenu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
0f0b04b7d9
Fix test
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:06:56 +02:00
255c7df3bd
Merge pull request #4499 from nextcloud/downstream-26984
...
Trigger change when a user is enabled/disabled
2017-04-25 18:27:38 -03:00
417bc606e4
Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging
...
Remove js debug logging
2017-04-25 18:26:53 -03:00
859bc245b1
Merge pull request #4479 from nextcloud/auth-flow
...
Add new auth flow basics
2017-04-25 18:26:15 -03:00
c59652dbc3
Merge pull request #4495 from nextcloud/downstream-27638
...
Catch session already closed exception in destructor
2017-04-25 22:24:50 +02:00
fd74ad452a
Remove js debug logging
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 21:42:38 +02:00
2ccaae8968
Fix emptycontent HTML and wording
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
4ae5340814
Fix spinner position of Contacts menu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
945420baaf
Use HTTP POST to retrieve the list of contacts
...
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>
2017-04-25 20:47:18 +02:00
5c29fb16c0
Update composer autoloader
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
98f02fad60
Adjust entry unit test to newly added avatar property
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
5c61852c25
Fix failing contacts menu js test data
...
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>
2017-04-25 20:47:18 +02:00
ecd408d524
Fix icon of second action
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
2c2e1f7988
Use absolute URI for action icons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
b8c2a8ae36
Don't show contacts an entry for themselves
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
36cee1f386
Let apps register contact menu provider via info.xml
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
5762cd9436
Use tooltop for contact's top action title
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
e3efc4979b
Show mail address in popover menu
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
d091793ceb
Contacts menu
...
* load list of contacts from the server
* show last message of each contact
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
61af3f41f0
Fix auth flow background color and redirect view layout
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:18:49 +02:00
aae079aa29
AppToken to 72 chars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
bb5e5efa6d
Do not remove the state token to early
...
we should check the stateToken before we remove it. Else the check will
always fail.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
05e1092c44
Correctly case the stateToken
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
6a16df7288
Add new auth flow
...
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>
2017-04-25 20:18:49 +02:00
db94b5d4af
Merge pull request #4439 from nextcloud/appmenu-responsive
...
Responsive app menu
2017-04-25 19:42:01 +02:00
8ba67fbe1e
Add test code for new image mime types
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 19:22:46 +02:00
c9e08a6445
Add repair steps for new image mime types
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 18:56:23 +02:00
eb7e4d48c9
Add mimetypes for jp2 and webp
...
Those image formats can be processed by Tesseract, so they are needed
for improved Nextcloud OCR.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 18:43:39 +02:00
16c8fdece3
Remove DOMPurify from srcFiles
...
It is already included via core.json
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-25 12:50:15 -03:00
3bb41f4144
Move h2 and settings-hint together
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:47:23 +02:00
51da0442d9
Merge pull request #4494 from nextcloud/fix-jsunit
...
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher
2017-04-25 12:45:52 -03:00
bbb58625fe
Wording fixes
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
4e537b5d6b
Small layout fixes to settings hints
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
f62b75b2b8
change the headline as suggested
2017-04-25 17:45:35 +02:00
c300d9b225
one more hint
2017-04-25 17:45:35 +02:00
Joas Schilling
Piotr Mrówczyński
Roeland Jago Douma
Morris Jobke
Jörn Friedrich Dreyer
Nextcloud bot
Jan-Christoph Borchardt
Christoph Wurst
Roeland Jago Douma
Lukas Reschke
Stefan Weil
Frank Karlitschek
Frank Karlitschek