wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
40620 commits 157 branches 562 tags 714 MiB
Commit graph

40620 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
6be5dc91cb
[tx-robot] updated from transifex 2017-09-05 00:08:24 +00:00
Morris Jobke
ff93dd7eb1 Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes 
LDAP Connectivity Fixes
 2017-09-04 18:31:32 +02:00
Christoph Wurst
87aeae21e3
Fix failing csp/nonce check due to timed out session 
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-09-04 17:29:26 +02:00
Joas Schilling
dea011243e
Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 17:01:31 +02:00
Morris Jobke
91fc25c28c Merge pull request #6082 from nextcloud/theming-fix-white-element-color 
Use separate element color in theming
 2017-09-04 15:43:06 +02:00
Morris Jobke
e0c92c2da3
Update autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 15:42:34 +02:00
Joas Schilling
6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Joas Schilling
95ecab0356
Set the meta data before everything 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 14:46:05 +02:00
Julius Härtl
63d1da50b4
Cleanup theming styles to fit the new login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:31:57 +02:00
Julius Härtl
8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl
da5662c454
Use separate element color in theming 
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Morris Jobke
4fd3240b5f Merge pull request #6254 from nextcloud/async-bus-split 
Allow configuring different command bus backends
 2017-09-04 14:22:06 +02:00
Morris Jobke
1ebf91ec16
Add proper EOL 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 14:21:44 +02:00
Morris Jobke
30ca3b70ed Merge pull request #6196 from nextcloud/downstream-26539-2 
Handle invalid ext storage backend to keep mount point visible
 2017-09-04 14:17:28 +02:00
Morris Jobke
0326c2c54f
Fix broken tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 14:17:03 +02:00
Morris Jobke
c04a494ea7 Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relative-to-files-on-theming-update 
Still throw a locked exception when the path is not relative to $user/files/
 2017-09-04 14:05:34 +02:00
blizzz
2060ff591b Merge pull request #6120 from nextcloud/public_upload_share_api_fix 
Public upload share permission handling
 2017-09-04 12:43:02 +02:00
Roeland Jago Douma
f0158e42e9 Merge pull request #6309 from nextcloud/new-dav-event 
add a new dav event to allow apps to register their own sabredav plugins
 2017-09-04 12:12:46 +02:00
Morris Jobke
5927a63680 Merge pull request #6351 from nhirokinet/master 
not to backquote LIMIT on CalDavBackend.php
 2017-09-04 12:10:57 +02:00
Roeland Jago Douma
c4f175d079 Merge pull request #6326 from nextcloud/fix_4654_3375 
Pass new value to triggerChange
 2017-09-04 12:03:19 +02:00
Roeland Jago Douma
57b74c921b Merge pull request #6342 from nextcloud/rich-link-preview 
Add rich link preview to the login page
 2017-09-04 12:02:33 +02:00
Morris Jobke
139f9bd3ca Merge pull request #6331 from nextcloud/update-repair-step 
Generate system wide key pair (update repair step after backport)
 2017-09-04 11:59:34 +02:00
Bjoern Schiessle
e195021926
update autoloader 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-09-04 11:59:00 +02:00
Morris Jobke
e33aa460f1 Merge pull request #6297 from te-online/add-mimetype-internet-shortcut 
Add mimetype application/internet-shortcut for .url files
 2017-09-04 11:55:05 +02:00
Robin Appelman
e9a58f8579
show storage as unavailable in the file list 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-04 11:54:13 +02:00
Robin Appelman
68ee79b595
set the exception for failedstorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-04 11:54:13 +02:00
Morris Jobke
442d4ed24a
Use the FailedStorage instead 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 11:54:13 +02:00
Vincent Petry
5df5b9c8b1
Handle invalid ext storage backend to keep mount point visible 
Keep mount point visible and also ext storage config visible when
dealing with configs relating to storage backends or auth mechanisms
that were provided by an app that is currently disabled.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 11:54:08 +02:00
Morris Jobke
d21713d526 Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-name 
Fix naming of user id in email meta data
 2017-09-04 11:43:41 +02:00
Morris Jobke
d5cba5eeaa Merge pull request #6221 from nextcloud/fav_share_api_fix 
Correctly format OCS response with favorites
 2017-09-04 08:46:09 +02:00
Morris Jobke
ad5a298570 Merge pull request #6352 from nextcloud/scss-rebuild-frontend-controller 
Rebuild SCSS files if frontend controller value changes
 2017-09-03 20:59:25 +02:00
Morris Jobke
27644c7502 Merge pull request #6341 from nextcloud/jquery-ui-scss 
Use SCSS for jquery-ui-fixes
 2017-09-03 20:25:25 +02:00
Morris Jobke
92a440a0b5
Fix font color 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-03 18:32:44 +02:00
Julius Härtl
b09ce70117
Rebuild SCSS files if frontend controller value changes 
fixes #6271
 2017-09-03 17:32:41 +02:00
nhirokinet
baba99a7e6 not to backquote LIMIT on CalDavBackend.php 2017-09-03 23:51:49 +09:00
Julius Härtl
99404fe5cd
Remove unnecessary files for jquery-ui-fixes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-03 15:34:04 +02:00
Morris Jobke
0f71e3fba2 Merge pull request #6344 from nextcloud/theming-invert-threshold 
Theming change invertion threshold to 55%
 2017-09-03 14:01:05 +02:00
Nextcloud bot
fd075240a4
[tx-robot] updated from transifex 2017-09-03 00:08:15 +00:00
Julius Härtl
0a49757535
Change invertion threshold to 55% 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 21:48:14 +02:00
Julius Härtl
46229a00f3
Add rich link preview to the login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 21:39:38 +02:00
Julius Härtl
2fdc51ffdf
Use SCSS for jquery-ui-fixes 
- Move to SCSS so we use theming color values
- Apply tab style from files sidebar to ui-tabs (e.g. in user_ldap)
- Move select style to the jquery-ui-fixes file and make those only apply to ui-autocomplete elements

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 15:50:51 +02:00
Nextcloud bot
27c6dc9657
[tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Joas Schilling
e47d627fc4
Fix naming of user id in email meta data 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-01 15:04:17 +02:00
Bjoern Schiessle
e039a4c191
move repair step to stable12 
because we decided to backport it the repair step needs to be executed
already on stable12

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-09-01 11:05:11 +02:00
Nextcloud bot
45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Arthur Schiwon
ab92e2ee14
listen to deletion hooks for proper handling, adjust and add tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-08-31 23:03:21 +02:00
Arthur Schiwon
efedc81c0a
simplify returning the homePath and fixing #4117 
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-08-31 23:03:16 +02:00
Roeland Jago Douma
ffe1429c4f
Pass new value to triggerChange 
it is not used. but pass in the empty string (on delete) and the new
file (on create)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-31 21:59:27 +02:00
Thomas Ebert
93d539b0cf Add mimetype support for .URL (Windows) and .webloc (macOS) files. Update places/link svg. Add filetype/link icon. Add repair step for mime types. 
Signed-off-by: Thomas Ebert <thomas.ebert@te-online.net>
 2017-08-31 16:53:07 +02:00
Roeland Jago Douma
84ea66dca8 Merge pull request #6296 from nextcloud/improve_2fa 
Improve 2FA
 2017-08-31 10:52:40 +02:00