Lukas Reschke
d4ba8198fe
Make the emergency disable also accept arrays
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke
47cd976035
Add app bundles
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:49 +02:00
Lukas Reschke
d89c76049f
Merge pull request #4374 from nextcloud/contactsmenu_popover
...
add contacts popover
2017-04-26 18:31:17 +02:00
Vincent Petry
0721a7d5cc
Fix scanner after review
2017-04-26 13:26:47 +02:00
Vincent Petry
e3218ddffd
OCC scanner commit in batches
2017-04-26 13:26:27 +02:00
Roeland Jago Douma
5b5c3a1773
Merge pull request #4430 from nextcloud/refactor-auth
...
Improve readability of login logic
2017-04-26 10:41:53 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
Roeland Jago Douma
7386bea23f
Merge pull request #4467 from nextcloud/lists-for-html-mails
...
Add lists to HTML emails
2017-04-26 08:30:30 +02:00
Roeland Jago Douma
752b219970
Merge pull request #4061 from nextcloud/downstream-26407
...
Redis cluster support
2017-04-26 08:27:30 +02:00
Morris Jobke
d4329f3355
Merge pull request #4449 from stweil/mimetypes
...
Add mimetypes for jp2 and webp
2017-04-26 01:22:49 -03:00
Jörn Friedrich Dreyer
fff6d6e3e8
Refactor auth methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-26 01:08:53 -03:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt
241e397326
Merge branch 'master' into contactsmenu
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
Morris Jobke
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
Morris Jobke
859bc245b1
Merge pull request #4479 from nextcloud/auth-flow
...
Add new auth flow basics
2017-04-25 18:26:15 -03:00
Roeland Jago Douma
c59652dbc3
Merge pull request #4495 from nextcloud/downstream-27638
...
Catch session already closed exception in destructor
2017-04-25 22:24:50 +02:00
Christoph Wurst
5c29fb16c0
Update composer autoloader
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst
2c2e1f7988
Use absolute URI for action icons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
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
Christoph Wurst
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
Christoph Wurst
e3efc4979b
Show mail address in popover menu
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst
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
Lukas Reschke
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
Stefan Weil
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
Julius Härtl
7548825743
Responsive app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
Joas Schilling
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
Victor Dubiniuk
131df248ef
Catch session already closed exception in destructor
2017-04-25 16:28:52 +02:00
Morris Jobke
5a9224fb4c
Merge pull request #3531 from nextcloud/theming-scss
...
Theming using SCSS variables
2017-04-25 10:56:13 -03:00
Joas Schilling
f1ffb728b9
Allow meta info and icons
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
Roeland Jago Douma
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
Julius Härtl
1c54463853
Use theming cachebuster for server resources
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Haertl
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
Joas Schilling
35414884d3
Add lists to HTML emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 13:48:27 +02:00
Daniel Calviño Sánchez
faea890b87
Extract updateSharePasswordIfNeeded function
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:38:36 +02:00
Daniel Calviño Sánchez
51e658da2a
Join if block to preceding if chain
...
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:17:46 +02:00
Joas Schilling
3d671cc536
Merge pull request #4443 from nextcloud/cleanup-unused-imports
...
Remove unused use statements
2017-04-24 11:47:37 +02:00
Daniel Calviño Sánchez
dcc8cce28b
Fix double hashing of shared link passwords
...
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Roeland Jago Douma
1c2cdc9d3a
Merge pull request #4444 from nextcloud/remove-unused-variables
...
Remove unused variables
2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex
2017-04-24 00:07:28 +00:00
Morris Jobke
c54a59d51e
Remove unused use statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex
2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 18:20:51 -05:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex
2017-04-22 00:07:36 +00:00
Roeland Jago Douma
867b3ee234
Merge pull request #4396 from nextcloud/scan-non-existing
...
show error when trying to scan non existing path
2017-04-21 19:47:33 +02:00
Roeland Jago Douma
d46b155916
Merge pull request #4428 from nextcloud/file-by-id-limit-user
...
limit the user when searching for a file by id if we know the user already
2017-04-21 19:43:53 +02:00
Robin Appelman
6fbe991afb
limit the user when searching for a file by id if we know the user already
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 17:11:26 +02:00
Roeland Jago Douma
e9b00f84b8
Merge pull request #4406 from nextcloud/fix-unit-test-problems
...
Fix unit test problems
2017-04-21 09:35:01 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex
2017-04-21 00:07:37 +00:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00