Nextcloud bot
07b6e234bd
[tx-robot] updated from transifex
2017-10-19 00:08:27 +00:00
Joas Schilling
ce27e8cf34
Add attachment support to emails
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:44:19 +02:00
Joas Schilling
cc798fd65f
Fix autoloading
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:16 +02:00
Joas Schilling
3119fd41ce
Set the data from the template
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling
c9af36a9ab
Introduce a public interface for Message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling
8b37fe7f65
Set the subject with the email template to allow theming
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling
f109c1a10c
Allow templating of email subjects
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:00 +02:00
Nextcloud bot
8e884ba52f
[tx-robot] updated from transifex
2017-10-18 00:08:23 +00:00
Roeland Jago Douma
3a9c24c04f
Allow apps to have their own autoloader
...
This will allow apps to also have a proper classmap and authorative
autoloader.
Currently if a file: <appdir>/composer/autoload.php exists we will use
it. Else we keep the current behavior.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-17 21:35:49 +02:00
Robin Appelman
91b3536f45
propagate multipart upload exception when aborting upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:10:58 +02:00
Nextcloud bot
59c3ea91fd
[tx-robot] updated from transifex
2017-10-17 00:08:23 +00:00
blizzz
c25be8d83c
Merge pull request #6837 from nextcloud/timespan-check-3
...
Fix future time spans
2017-10-16 13:35:53 +02:00
Joas Schilling
3b3ba8d0a1
Update autoloading
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-16 13:23:05 +02:00
Roeland Jago Douma
a5912cbe33
Merge pull request #6812 from nextcloud/upload-cache-path
...
also use configured 'cache_path' for new chunking
2017-10-15 21:42:41 +02:00
dartcafe
ac2a6e0f2f
Fix future time spans
...
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-15 08:31:11 +02:00
Nextcloud bot
d251623b01
[tx-robot] updated from transifex
2017-10-14 02:29:04 +00:00
Robin Appelman
1a99e0dab4
Merge pull request #6602 from nextcloud/s3-multipart-upload
...
Add multipart upload for s3
2017-10-11 16:10:58 +02:00
Robin Appelman
e393b3553e
set s3 part size to 500mb
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 15:59:53 +02:00
Robin Appelman
d27b0b07bc
also use configured 'cache_path' for new chunking
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:18:45 +02:00
Julius Härtl
ec0091d499
Do not return app names multiple times
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Nextcloud bot
436daf92e5
[tx-robot] updated from transifex
2017-10-07 00:08:31 +00:00
Joas Schilling
8e9505e7b1
Merge pull request #6759 from nextcloud/allow-multiple-settings-and-sections-per-app
...
Allow multiple settings and sections per app
2017-10-06 11:29:01 +02:00
Nextcloud bot
4c54ca571d
[tx-robot] updated from transifex
2017-10-06 00:08:30 +00:00
Joas Schilling
6292f665d7
Allow multiple settings and sections per app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-05 11:34:03 +02:00
blizzz
2d62f97f1b
Merge pull request #6328 from nextcloud/split-sharees-api-logic
...
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
2017-10-04 15:43:44 +02:00
Robin Appelman
73554a3228
Merge pull request #6742 from nextcloud/invalid-path-repair-from11
...
dont run invalid path repair step when upgrading from 11.0.5.2 and later
2017-10-04 15:08:49 +02:00
Nextcloud bot
3d981c0d40
[tx-robot] updated from transifex
2017-10-04 00:08:27 +00:00
Robin Appelman
7525c387ce
dont run invalid path repair step when upgrading from 11.0.5.2 and later
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:27:26 +02:00
Julius Härtl
d517d63a4d
Notifications: Add highlight type definition
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:38:15 +02:00
Nextcloud bot
7bac8a32b4
[tx-robot] updated from transifex
2017-10-03 00:08:20 +00:00
Nextcloud bot
8be053516b
[tx-robot] updated from transifex
2017-09-30 00:08:25 +00:00
Morris Jobke
870d71689a
Merge pull request #6563 from nextcloud/bigint-ids
...
Migrate ID columns to bigint
2017-09-29 12:23:41 +02:00
Joas Schilling
f205412371
Update autoloading
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:11:15 +02:00
Joas Schilling
a3bdb318e9
Fix bigint handling on postgres
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Joas Schilling
ce3bcf7e28
Migrate all core id columns to bigint
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:56 +02:00
Joas Schilling
124b4374d6
Add a base migration for easy updating to bigints
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:56 +02:00
Nextcloud bot
95ec247d10
[tx-robot] updated from transifex
2017-09-29 00:08:21 +00:00
Morris Jobke
e9aa11a1b0
Use full percentages in quota bar percentages
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-28 17:58:49 +02:00
Nextcloud bot
e5d39e63d1
[tx-robot] updated from transifex
2017-09-28 00:08:36 +00:00
Morris Jobke
5f25dd7095
Merge pull request #6599 from nextcloud/fix_2523
...
Add direct preview link
2017-09-27 23:27:54 +02:00
Arthur Schiwon
a579f8aa37
adapt attribute name (changed letter case style)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 13:22:59 +02:00
Roeland Jago Douma
90d7e8f6f4
Merge pull request #6586 from nextcloud/fix/app-install-extract-check
...
Check whether an app archive can be extracted
2017-09-27 10:41:21 +02:00
Morris Jobke
b87914be9c
Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6
...
Only allow colons in db host for IPv6 addresses
2017-09-27 10:17:36 +02:00
Morris Jobke
b30b4cddd9
Merge pull request #6660 from nextcloud/remove_saml_hack
...
Remove SAML hack from base.php
2017-09-27 10:13:36 +02:00
Roeland Jago Douma
95cc831ed7
Remove SAML hack from base.php
...
This is no longer required now that
https://github.com/nextcloud/user_saml/pull/159 is in
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-27 08:28:09 +02:00
Nextcloud bot
de2dc3c919
[tx-robot] updated from transifex
2017-09-27 00:08:23 +00:00
Arthur Schiwon
937a80c941
reduce nesting of the required app XML
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 01:22:17 +02:00
Arthur Schiwon
3db3e65121
add tests for Lookup Plugin
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
Arthur Schiwon
a28b1d91f9
split off former searchSharee unit test
...
also moves registering default plugins to Server for proper unit testing
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon
3d1d03a511
split off getEmail tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon
c92f7ee767
split off getRemote unit tests
...
adds two small fixes → they actually work \o/
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon
dd9e191d37
split off getUsers unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
f446ec83dd
minor fixes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
2eff174deb
add missing PHP doc
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
7122739dd6
updated autoloader
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
9db3b04f1b
finetune the appinfo parser
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
c55583d1b4
allow more than one plugin per share type
...
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
f7713e5f3f
make it possible to register plugins and kick out the circle one
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
4a96e22258
don't keep result types hard coded
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon
579c1476a3
missing PHP doc for public interfaces
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:22 +02:00
Arthur Schiwon
88db314f0c
update autoloader
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:22 +02:00
Arthur Schiwon
ea3ac4e656
Splits off the logic from sharees endpoint thus making it available from
...
within Nc/via PHP.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:17 +02:00
John Molakvoæ
fc46e98fc6
Merge pull request #6647 from nextcloud/scss-no-take-only-throw
...
Do not stop on scss compilation failure
2017-09-26 16:26:43 +02:00
John Molakvoæ (skjnldsv)
dec713fc92
Do not stop on scss compilation failure
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-26 15:29:37 +02:00
Joas Schilling
fe3b2385ab
Code clean up
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:27:42 +02:00
Joas Schilling
1287d6ddb3
Only allow colons in db host for IPv6 addresses
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:20:04 +02:00
Morris Jobke
11c31e94fe
Improve exception handling
...
If there is an exception in the template handling then a white page is shown.
This improves the handling of this and shows text only about the internal
error.
To test this just setup redis as cache and then disable the php-redis module.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-26 13:54:51 +02:00
Morris Jobke
292a704648
Merge pull request #6544 from nextcloud/fix/duplicate-session-token
...
Fix duplicate session token after remembered login
2017-09-25 17:39:02 +02:00
Roeland Jago Douma
3bd4e7e541
Merge pull request #6632 from nextcloud/do_not_show_hyphen
...
Do not show hyphen
2017-09-25 16:34:50 +02:00
Roeland Jago Douma
29fb315ffc
Allow requesting the max preview
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:48 +02:00
Stephan Müller
86265320b8
do not show hyphen after instance name in emails if slogan does not exist
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 09:20:46 +02:00
Roeland Jago Douma
c257cd57d4
Handle SameSiteCookie check for index.php in AppFramework Middleware
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-24 21:07:16 +02:00
John Molakvoæ (skjnldsv)
4a5eeb2ce7
Fixed webroot detection
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-22 07:20:31 +02:00
Morris Jobke
38568c362b
Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep
...
OC_OCS_Response is deprecated
2017-09-21 20:38:18 +02:00
Roeland Jago Douma
2207fdcd8c
Remove private legacy OC_OCS_Response
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:56 +02:00
Roeland Jago Douma
87e10f9e6a
OC_OCS_Response is deprecated
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:00 +02:00
Robin Appelman
385d6f098c
Add tests for multipart upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:47:34 +02:00
Robin Appelman
4ae46d8876
only do multipart upload for large files
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:06:59 +02:00
John Molakvoæ (skjnldsv)
0e17b65bcf
Avoid error undefined index classes in log
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:39 +02:00
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
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
Robin Appelman
e4e5e735db
multipart upload for s3 object storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 17:51:58 +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
Christoph Wurst
2e19c42bc5
Check whether an app archive can be extracted
...
If extraction fails we should not continue the installation/update
process as the info.xml cannot be loaded and an unrelated error
occurs.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-20 14:07:17 +02: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
Joas Schilling
d4da2a6dab
Fix autoloading
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 20:09:10 +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
Nextcloud bot
d603d78630
[tx-robot] updated from transifex
2017-09-19 00:08:27 +00:00
Robin Appelman
e7f3c12b20
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 17:20:08 +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
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
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
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
Morris Jobke
8b1eaba417
Merge pull request #5585 from nextcloud/contacts_menu_privacy
...
Enhance privacy of contactsmenu fixes #5107
2017-09-18 14:25:16 +02:00
Arthur Schiwon
0837745477
don't pass User object when uid string is expected
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 13:19:47 +02:00
Nextcloud bot
60e0de4a36
[tx-robot] updated from transifex
2017-09-18 00:08:32 +00:00
Nextcloud bot
cdb6b0295a
[tx-robot] updated from transifex
2017-09-17 00:08:25 +00:00
Nextcloud bot
967b563113
[tx-robot] updated from transifex
2017-09-16 00:08:23 +00:00
Roeland Jago Douma
ae1fdf73c2
Improve sharing pagination
...
Basically we did in almost all cases did a query to much.
This resulted in an extra query for each share type.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 19:44:19 +02:00
Lukas Reschke
705432ca6f
Add filter for `shareapi_allow_share_dialog_user_enumeration`
...
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.
Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-15 15:58:04 +02:00
Thomas Citharel
eb51c46549
fix typo and set @since properly
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 15:23:10 +02:00
Thomas Citharel
ecf347bd1a
Add CSP frame-ancestors support
...
Didn't set the @since annotation yet.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 15:23:10 +02:00
Tobia De Koninck
5896176d69
Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:41 +02:00
Tobia De Koninck
7dfa527da2
Improve code style
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck
f0370c0244
Some code improvements
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck
fa402c74d2
Add tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck
473a1ecad1
Fix tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:39 +02:00
Tobia De Koninck
92c238e0f0
Privacy enhancements for contacts menu
...
- Groups, which are excluded from sharing should not see local users at all
- If sharing is restricted to users own groups, he should only see contacts from his groups:
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:39 +02:00
Nextcloud bot
113fd47f30
[tx-robot] updated from transifex
2017-09-15 00:08:08 +00:00
John Molakvoæ (skjnldsv)
1a0ac912b2
Fix webroot throw
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-14 08:41:10 +02:00
Nextcloud bot
7698781a1e
[tx-robot] updated from transifex
2017-09-14 00:08:12 +00:00
Morris Jobke
883574974d
Merge pull request #6458 from nextcloud/rethrow-correct-exception
...
Rethrow the correct exception when there was an error in an app conta…
2017-09-14 00:32:13 +02:00
Lukas Reschke
8ef4fcb4b7
Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable
...
Fix undefined variable $tmpRoot
2017-09-13 22:42:42 +02:00
Nextcloud bot
5ce3c7003b
[tx-robot] updated from transifex
2017-09-13 00:08:12 +00:00
Roeland Jago Douma
9163cf9241
Fix AppPassword 2FA auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:28:43 +02:00
Axel Helmert
01d4967130
Fix undefined variable $tmpRoot
...
Refactoring of webroot detection left an unused variable.
Fixes : #6415
Signed-off-by: Axel Helmert <info@luka.de>
2017-09-12 12:14:27 +02:00
Joas Schilling
c4b3198ac2
Rethrow the correct exception when there was an error in an app container
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-12 11:54:13 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:28:22 +02:00
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:22:57 +02:00
Lukas Reschke
88731848c6
Merge pull request #6435 from nextcloud/add-exception-to-phpdoc
...
Add exceptions to PHPDoc of interface
2017-09-11 13:01:41 +02:00
William Pain
9a63ded43b
Fix uninitialized variable $this->params
...
Signed-off-by: William Pain <pain.william@gmail.com>
2017-09-11 10:01:12 +02:00
Lukas Reschke
b97f48f1af
Add exceptions to PHPDoc of interface
...
Improves static code analysis here and also keeps expectations proper.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-10 20:01:36 +02:00
Nextcloud bot
3f6692ee24
[tx-robot] updated from transifex
2017-09-10 00:08:23 +00:00
Morris Jobke
8a79d0cc70
Merge pull request #6414 from nextcloud/share-notification-wrong-language
...
Use the language of the recipient for the share notification
2017-09-08 19:15:05 +02:00
Morris Jobke
75c38d5d98
Merge pull request #6416 from nextcloud/make-sure-sqlite-works-without-content
...
Ask the schema whether the table and column exist
2017-09-08 19:09:38 +02:00
Morris Jobke
e9c713902e
Merge pull request #6417 from nextcloud/proper-english-nowhave
...
Improve text: 'you have now' -> 'you now have'
2017-09-08 18:29:22 +02:00
Leon Klingele
8e46e6b827
Improve text: 'you have now' -> 'you now have'
...
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-08 13:47:11 +02:00
Joas Schilling
29e1aa57e1
Ask the schema whether the table and column exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 11:45:16 +02:00
Joas Schilling
7e625a8d22
Use the language of the recipient for the share notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:48:16 +02:00
Nextcloud bot
194f880073
[tx-robot] updated from transifex
2017-09-08 00:08:16 +00:00
Lukas Reschke
bab313da5d
Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-token
...
Fix failing csp/nonce check due to timed out session
2017-09-07 19:51:59 +02:00
Lukas Reschke
11c7a98a2a
Merge pull request #6380 from nextcloud/cleanup-oci-setup
...
cleanup oci setup code
2017-09-07 14:11:55 +02:00
Morris Jobke
485e22acde
Merge pull request #6329 from nextcloud/ldap-password
...
Don't log LDAP password when server is not available
2017-09-07 09:25:56 +02:00
tux-rampage
7a33b9273e
Refactor webroot detection in resource locator
...
The current implementation breaks installations with symlinks to
directories inside the webroot (i.E. apps).
With this change both variants, directory and symlinks, will be detected
correctly.
Fixes : #6028
Signed-off-by: Axel Helmert <axel.helmert@luka.de>
2017-09-06 21:32:48 +02:00
Morris Jobke
a10c4517cb
Merge pull request #5571 from Luzifer/5570_backend_admin
...
Allow group backend to declare users as admins
2017-09-06 19:50:52 +02:00
Morris Jobke
5d4540f179
Merge pull request #6364 from nextcloud/fix_login_loop
...
Fix login with basic auth
2017-09-06 17:04:00 +02:00
Joas Schilling
b68609d0cf
Don't log LDAP password when server is not available
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-06 16:38:55 +02:00
Robin Appelman
2c0efae30f
cleanup oci setup code
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-06 15:55:05 +02:00
Nextcloud bot
9d930210ee
[tx-robot] updated from transifex
2017-09-06 00:08:21 +00:00
Morris Jobke
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
Knut Ahlers
586cefc4f1
Add @since tag to constant
...
Signed-off-by: Knut Ahlers <knut@ahlers.me>
2017-09-05 15:49:13 +02:00
Roeland Jago Douma
b96485b6bd
Fix login with basic auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-05 12:24:41 +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
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
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