Commit Graph

40712 Commits

Author SHA1 Message Date
Christoph Wurst 38bb6e1477
Fix duplicate session token after remembered login
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-20 21:39:31 +02:00
Joas Schilling 72bf1df7f7
Set the displayname for the avatar in the personal info
Otherwise the color used is different

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-20 21:39:12 +02:00
Roeland Jago Douma 8358c63f53 Merge pull request #6573 from nextcloud/nonfound-webroot-empty-string
Fix "webroot not found" when installed to the root of the webserver
2017-09-20 20:04:27 +02:00
Daniel Calviño Sánchez 2131e95c61 Extract setting the avatar for the unknown user to its own function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-20 18:25:20 +02:00
Daniel Calviño Sánchez ea10a1292a Use "?" instead of user ID as seed for the image placeholder
The seed of the image placeholder is needed to generate the background
color of the image, but as the background color is later overriden any
seed could be used. When no text is explicitly given the seed is used as
text too, so there is no need to pass the user ID and simply using "?"
as seed is enough.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-20 18:20:58 +02:00
Daniel Calviño Sánchez ff71dd07a6 Unify appearance of avatars for undefined and unknown users
When calling the jQuery avatar plugin with a user that did not exist
(that is, users for which "/avatar/{user}/{size}" return a JSON response
with an empty "displayname" value) "?" on a grey background was shown.
However, if the jQuery avatar plugin was called with an undefined
JavaScript value then "?" was shown on a bluish background. This commit
unifies both cases to use the grey background.

The unit tests were also modified to ensure that the grey background is
used in both cases.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-20 17:19:35 +02:00
Morris Jobke e8d80ed071 Merge pull request #6571 from nextcloud/cachefactory-local-locking
expose local and locking memcaches trough public interfaces
2017-09-20 16:04:51 +02:00
Robin Appelman 5430d73a0e
Fix "webroot not found" when installed to the root of the webserver
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 14:19:15 +02:00
Robin Appelman 388376c077
expose local and locking memcaches trough public interfaces
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 14:16:22 +02:00
Joas Schilling e43400eddb Merge pull request #5562 from nextcloud/link-password-style
Fix style of link share password input view
2017-09-20 11:30:31 +02:00
Morris Jobke f900ba8183 Merge pull request #6574 from nextcloud/external-storage-root-undefined-offset
Fix undefined offset warning when using '/' as external storage root
2017-09-20 11:26:19 +02:00
Morris Jobke b593d37d47 Merge pull request #6577 from nextcloud/3rdparty_swiftmailer
[3rdparty] Bump swiftmailer
2017-09-20 10:46:03 +02:00
Lukas Reschke df81853c41
Bump third-party ref
Required for https://github.com/nextcloud/3rdparty/pull/67

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-20 09:29:32 +02:00
Joas Schilling 8199ace435 Merge pull request #6566 from nextcloud/fix-tfbc-structure
Fix database structure of twofactor backupcodes app to match 12
2017-09-20 09:09:13 +02:00
Nextcloud bot efbd3bb518
[tx-robot] updated from transifex 2017-09-20 00:08:25 +00:00
Roeland Jago Douma 00e341925b Merge pull request #6564 from nextcloud/fix-missing-unsigned
Fix missing "unsigned" on integer columns
2017-09-19 20:52:49 +02:00
Roeland Jago Douma 543f19a979 Merge pull request #6565 from nextcloud/appinfo_localcache
Read appinfo from a local cache
2017-09-19 20:18:06 +02:00
Joas Schilling d4da2a6dab
Fix autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 20:09:10 +02:00
Joas Schilling d5c2b98207
Fix missing "unsigned" on integer columns
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 20:09:10 +02:00
John Molakvoæ (skjnldsv) 4faa562403
Fix browser width compatibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-19 18:19:47 +02:00
Robin Appelman c83232adae
Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-19 17:18:04 +02:00
Morris Jobke 11d2006b44 Merge pull request #6562 from nextcloud/fix-unsigned-typo
Fix unsigned typo
2017-09-19 16:34:39 +02:00
Lukas Reschke 916a1b5662 Merge pull request #6569 from nextcloud/fix-comments-activity-error
Use the wrapper to get the parameters which was added in #6369
2017-09-19 16:07:01 +02:00
Joas Schilling 10c7ecb5e9
Use the wrapper to get the parameters which was added in #6369
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:01:43 +02:00
Joas Schilling 55d9d24370
Fix database structure of twofactor backupcodes app to match 12
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 14:37:56 +02:00
Roeland Jago Douma 6d7ca1092d
Read appinfo from a local cache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-19 14:34:11 +02:00
Joas Schilling b72eaaab73
Increase version
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 14:25:10 +02:00
Joas Schilling d5b5fc7fca
Fix unsigned state
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 12:49:42 +02:00
Joas Schilling 8768faacaa
Fix migration naming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 12:44:46 +02:00
Roeland Jago Douma 66698b2d42 Merge pull request #6264 from nextcloud/dav-migrations
Move DAV app to migrations
2017-09-19 08:03:12 +02:00
Nextcloud bot d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Robin Appelman 1995c69928 Merge pull request #4410 from nextcloud/update-aws-sdk
Update aws sdk + s3 improvements
2017-09-18 17:47:22 +02:00
Robin Appelman f0c7b8f264
show diff in autoload checker
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 17:20:08 +02:00
Robin Appelman e7f3c12b20
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 17:20:08 +02:00
Robin Appelman 91f44f5309
fix undefined constants
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman 3eaf6626f8
merge vendor js
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman d526969a68
fix path style
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman 9154b27943
disable part files for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman cc9dd4280f
add stat cache for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman d5678201b4
more efficient is_dir
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman 4bbc1cdc79
more efficient permissions for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman 9b5accf9f3
more efficient write only fopen
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman d70607104e
reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman dad18baec8
update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman cf1da57c1d
remove non composer aws sdk
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:26 +02:00
Roeland Jago Douma 32234a23da
Move DAV app to migrations
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-18 14:35:27 +02:00
Roeland Jago Douma ca5c3f839a Merge pull request #6490 from nextcloud/share_pagination_query
Improve sharing pagination
2017-09-18 14:34:15 +02:00
Morris Jobke a06ba68919 Merge pull request #6518 from nextcloud/allow-apps-to-control-versions
allow apps to disable versions for some files
2017-09-18 14:30:29 +02:00
Morris Jobke a0132a49a6 Merge pull request #6549 from nextcloud/fix-6534
don't pass User object when uid string is expected
2017-09-18 14:28:14 +02:00
Lukas Reschke 53057f2bd0 Merge pull request #5462 from nextcloud/add-frameancestor-support
Add CSP frame-ancestors support
2017-09-18 14:25:44 +02:00