Bjoern Schiessle
27357569b6
generate correct path for owner and use the display name instead of the user id
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Joas Schilling
5dc6899d1a
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
Morris Jobke
00c3f807db
Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu
...
Fit federationScopeMenu to guidelines
2017-01-12 10:09:30 +01:00
Nextcloud bot
09a46b7bd6
[tx-robot] updated from transifex
2017-01-12 01:07:43 +00:00
John Molakvoæ
a3e31116b1
Update federationscopemenu.js
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:20:01 +01:00
John Molakvoæ (skjnldsv)
67c4f3d07c
App-navigation action layout fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:01:54 +01:00
Christoph Wurst
140555b786
always allow remembered login
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
6f84eb89fc
fix constructor params in failing test
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
21d3fe5883
do not hard-require the token provider
...
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
6f74ecd94a
use login hook credentials as fallback
...
If no session token is available, we can use the credentials provided
by the login hook.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
e4abb9cb6e
migrate 'password::sessioncredentials' extern storage auth to credential store
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
3316a9d294
fix @since annotations (9.1->12)
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
46adb3eced
replace session implementation if it changes at runtime
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst
730442cd8f
add @since annotations and document methods
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:10 +01:00
Christoph Wurst
a6dca9e7a0
add login credential store
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:09 +01:00
John Molakvoæ
fab82e9780
Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
...
Systemtags scss optimisation
2017-01-11 18:41:14 +01:00
John Molakvoæ (skjnldsv)
dda4b3b272
Fix padding if empty button
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 18:37:59 +01:00
John Molakvoæ
3463c134a9
Merge pull request #3027 from nextcloud/multiselect-scss-optimisation
...
Multiselect scss optimisation
2017-01-11 18:24:15 +01:00
Morris Jobke
b6c00a3f51
Merge pull request #3026 from nextcloud/icons-scss-optimisation
...
Icons scss optimisation
2017-01-11 16:52:27 +01:00
Roeland Jago Douma
96d2f2f124
Merge pull request #3028 from nextcloud/tooltip-scss-optimisation
...
Tooltip scss optimisation
2017-01-11 16:38:18 +01:00
Nextcloud bot
c35ea15916
[tx-robot] updated from transifex
2017-01-11 15:20:22 +00:00
Vincent Petry
eb5ea0e260
Refactor files node API for more code reuse
...
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-11 14:53:42 +01:00
John Molakvoæ (skjnldsv)
dfee6ffaca
Systemtags scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:38:35 +01:00
John Molakvoæ (skjnldsv)
2899f34c4c
Tooltip scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:33:11 +01:00
John Molakvoæ (skjnldsv)
8317a71fee
Multiselect scss optimisation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:22:19 +01:00
John Molakvoæ (skjnldsv)
2a2d4390c6
Comments and delete icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:16:05 +01:00
John Molakvoæ (skjnldsv)
27a1dadea4
Loader and animation
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:12:39 +01:00
John Molakvoæ (skjnldsv)
c87d48700c
Second optimisation and readability
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
735423e399
Copyright
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
3e36899778
Comments and cleanup
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv)
5b4d5aba41
Quote fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:41 +01:00
John Molakvoæ (skjnldsv)
2d56cceb87
popover menu restructuration & unification
...
fix #2798
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:15 +01:00
Roeland Jago Douma
bc26f78eb1
Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception
...
Downstream add two factor exception
2017-01-11 13:06:01 +01:00
Roeland Jago Douma
005ce8aaf6
Merge pull request #3007 from Loki3000/master
...
Remove non required db requests
2017-01-11 12:37:54 +01:00
Joas Schilling
ce7836378c
Filter out sensitive appconfig values
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-11 11:42:36 +01:00
Roeland Jago Douma
c7f0063a70
Update autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-11 11:02:11 +01:00
Christoph Wurst
243c9c0941
fix coding style and increase code coverage
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 11:01:54 +01:00
Cornelius Kölbel
b8d41752ca
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
Cornelius Kölbel
ee8c617a6d
Update TwoFactorException.php
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
Cornelius Kölbel
e077e01bf2
Add a TwoFactorException
...
A Two Factor third party App may throw a TwoFactorException()
with a more detailed error message in case the authentication fails.
The 2FA Controller will then display the message of this Exception
to the user.
Working on #26593
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:52 +01:00
Roeland Jago Douma
c4e51fd055
Merge pull request #3020 from nextcloud/2944
...
[#2944 ] Update mobile.css
2017-01-11 09:34:32 +01:00
Rodrigo Almeida
4f3da2bee4
Update mobile.css
2017-01-11 09:12:08 +01:00
Roeland Jago Douma
447e388ce9
Merge pull request #2744 from nextcloud/oc_26324
...
[downstream] Fix DAV stat cache to properly cache 404
2017-01-11 08:16:40 +01:00
Roeland Jago Douma
f515c6db4a
Merge pull request #2745 from nextcloud/oc_26590
...
[downstream] Skip local shares in bkg scan and occ files:scan (#26590 )
2017-01-11 08:16:12 +01:00
Roeland Jago Douma
a90cbb0f09
Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
...
Handle log_type "nextcloud" more gracefully
2017-01-11 08:14:24 +01:00
John Molakvoæ (skjnldsv)
ef9e2e4e7d
Added loader and fixed tabs
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 17:57:25 +01:00
John Molakvoæ (skjnldsv)
e4b3ba6590
Create unified css file and merge all needed data into this file
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 17:50:29 +01:00
Bjoern Schiessle
fcda3a20f4
create new encryption keys on password reset and backup the old one
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
Roeland Jago Douma
40239decb1
Merge pull request #3012 from nextcloud/fix-karma-image-warnings
...
show fewer warnings in karma test runs
2017-01-10 16:29:39 +01:00
Roeland Jago Douma
00b17c3af5
Only check for local shared storages
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-10 16:14:21 +01:00