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
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
27b19aaba1
Fix loading spinner for new app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:25 +02:00
673b58ef09
Fix adding/removing apps
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
7548825743
Responsive app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
5ee445c54b
Audit log for enabling/disabling a user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:20:35 +02:00
ac0c21f4a7
Trigger change when a user is enabled/disabled
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:20:35 +02:00
131df248ef
Catch session already closed exception in destructor
2017-04-25 16:28:52 +02:00
8ef25a7628
Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion
...
Audit group creation/deletion
2017-04-25 16:14:52 +02:00
5a9224fb4c
Merge pull request #3531 from nextcloud/theming-scss
...
Theming using SCSS variables
2017-04-25 10:56:13 -03:00
bcf587542c
Merge pull request #4485 from nextcloud/translation-checker
...
Check whether we can json decode the translations
2017-04-25 10:46:51 -03:00
dd5dbe3ebd
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-25 10:26:46 -03:00
6f2df5e495
Merge pull request #3195 from nextcloud/settings-apps-tabular
...
Make apps settings tabular
2017-04-25 10:25:29 -03:00
7ea492b69a
Loop over the apps directory and add the task
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:35:51 +02:00
82c9eb1c56
Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link
...
Fix sharing a password protected link
2017-04-25 14:12:44 +02:00
026070a2fc
Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login
...
Fix remember redirect_url on failed login attempts
2017-04-25 13:15:53 +02:00
f1522a8dca
4190
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-25 19:06:49 +08:00
6448cf5748
Mock it
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 12:16:07 +02:00
bedd500884
Logo and background URLs must be relative
...
They are used way to often for such a change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:43:06 +02:00
bc1efdf2e1
Fix theming tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
1c54463853
Use theming cachebuster for server resources
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
68a63ad3f3
Implement scss variable injection by OC_Defaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Add Scss variables to example theme and theming app
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Use SCSSCacher to build theming css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Update theming.scss
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Code cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Inject SCSSCacher for easier testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix typehint
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Generate absolute URLs
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Fix tests to always use absolute urls for theming images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
MailheaderColor -> ColorPrimary
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
5be1010d45
Fix invalid character
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:06:27 +02:00
dee2c8d23b
Check whether we can json decode the translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:01:34 +02:00
Jan-Christoph Borchardt
Morris Jobke
Roeland Jago Douma
Christoph Wurst
Roeland Jago Douma
Lukas Reschke
Julius Härtl
Joas Schilling
Victor Dubiniuk
blizzz
Roger Szabo