033d2de002
Properly include file
...
Regression from 005ef115fb
2017-09-06 15:35:38 +02:00
6f7d200838
Merge pull request #6370 from nextcloud/fix-alternative-logins
...
Fix layout of alternative login buttons
2017-09-06 10:22:04 +02:00
f5aea79bd7
Fix layout of alternative login buttons
...
* fixes #6367
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 10:21:11 +02:00
1724fed8c5
Merge pull request #5415 from nextcloud/search-cache-node
...
cache nodes from search results
2017-09-06 10:16:01 +02:00
9d930210ee
[tx-robot] updated from transifex
2017-09-06 00:08:21 +00:00
521ede8f5f
Allow translations of the comments activity in the emails too
...
Message and object data is not available on emails atm,
so we can not use them either...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 18:10:32 +02:00
15cd21d252
Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name
...
Set the meta data before everything
2017-09-05 16:08:57 +02:00
586cefc4f1
Add @since tag to constant
...
Signed-off-by: Knut Ahlers <knut@ahlers.me>
2017-09-05 15:49:13 +02:00
4e3c39c1d1
Fix tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 13:55:36 +02:00
cebbb1633a
Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard
...
recognize groupOfUniqueNames as valid LDAP group object
2017-09-05 13:33:15 +02:00
a1df91da9d
Sabre/VObject returns DateTimeImmutable, not a simple DateTime
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-09-05 13:13:37 +02:00
86f28669fc
don't send invitation emails for past events
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-09-05 13:13:37 +02:00
b96485b6bd
Fix login with basic auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-05 12:24:41 +02:00
6be5dc91cb
[tx-robot] updated from transifex
2017-09-05 00:08:24 +00:00
ff93dd7eb1
Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes
...
LDAP Connectivity Fixes
2017-09-04 18:31:32 +02:00
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
dea011243e
Fix unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 17:01:31 +02:00
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
e0c92c2da3
Update autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 15:42:34 +02:00
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
95ecab0356
Set the meta data before everything
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 14:46:05 +02:00
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
8f10cee3ff
Fix tests for primary element color
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 14:30:46 +02:00
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
4fd3240b5f
Merge pull request #6254 from nextcloud/async-bus-split
...
Allow configuring different command bus backends
2017-09-04 14:22:06 +02:00
1ebf91ec16
Add proper EOL
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 14:21:44 +02:00
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
0326c2c54f
Fix broken tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 14:17:03 +02:00
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
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
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
5927a63680
Merge pull request #6351 from nhirokinet/master
...
not to backquote LIMIT on CalDavBackend.php
2017-09-04 12:10:57 +02:00
c4f175d079
Merge pull request #6326 from nextcloud/fix_4654_3375
...
Pass new value to triggerChange
2017-09-04 12:03:19 +02:00
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
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
e195021926
update autoloader
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-04 11:59:00 +02:00
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
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
68ee79b595
set the exception for failedstorage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-04 11:54:13 +02:00
442d4ed24a
Use the FailedStorage instead
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 11:54:13 +02:00
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
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
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
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
27644c7502
Merge pull request #6341 from nextcloud/jquery-ui-scss
...
Use SCSS for jquery-ui-fixes
2017-09-03 20:25:25 +02:00
92a440a0b5
Fix font color
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-03 18:32:44 +02:00
b09ce70117
Rebuild SCSS files if frontend controller value changes
...
fixes #6271
2017-09-03 17:32:41 +02:00
baba99a7e6
not to backquote LIMIT on CalDavBackend.php
2017-09-03 23:51:49 +09:00
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
0f71e3fba2
Merge pull request #6344 from nextcloud/theming-invert-threshold
...
Theming change invertion threshold to 55%
2017-09-03 14:01:05 +02:00
Lukas Reschke
Morris Jobke
Nextcloud bot
Joas Schilling
Knut Ahlers
Georg Ehrke
Roeland Jago Douma
Christoph Wurst
Julius Härtl
blizzz
Roeland Jago Douma
Bjoern Schiessle
Robin Appelman
Vincent Petry
nhirokinet