Morris Jobke
be4e921306
Use basename() instead of self implementation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 12:35:47 +01:00
blizzz
98cdd9885f
Merge pull request #7168 from nextcloud/fix-user-list
...
Fix accesslist when a user has an ID only containting 0-9
2017-11-23 12:17:11 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root
...
Use the correct root for shared jail when the source storage is also a jail
2017-11-23 12:03:36 +01:00
Morris Jobke
6fd51426bf
Remove wrong entry in admin_settings that causes 500
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 20:49:03 +01:00
Nextcloud bot
96b15cec83
[tx-robot] updated from transifex
2017-11-20 01:09:40 +00:00
Roeland Jago Douma
2eb2b6e437
If there is no internet connection don't try to contact appstore
...
Fixes #7119
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-17 20:35:04 +01:00
Bjoern Schiessle
1ade6b0817
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-17 12:45:46 +01:00
Morris Jobke
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api
...
Calendar API for apps
2017-11-16 21:10:35 +01:00
Nextcloud bot
b2e9cb6a00
[tx-robot] updated from transifex
2017-11-16 01:09:50 +00:00
Morris Jobke
82502b10db
Merge pull request #7169 from nextcloud/fix-user-search
...
Fix search in user managent when no group is selected
2017-11-14 23:30:02 +01:00
Morris Jobke
80e527d21e
Merge pull request #7172 from nextcloud/improve-error-handling-on-preview-cleanup
...
check if the user still exists before we try to cleanup the previews
2017-11-14 23:29:28 +01:00
Björn Schießle
c225bbd021
Merge pull request #7113 from nextcloud/s3-download-stream-fix
...
Fix s3 download and touch
2017-11-14 20:38:50 +01:00
Bjoern Schiessle
a923e755e6
check if the user still exists before we try to cleanup the previews
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-14 20:26:18 +01:00
Morris Jobke
eb0f3ebf75
Fix search in user managent when no group is selected
...
* also allows to search by displayname
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 17:32:03 +01:00
Joas Schilling
3820d6883d
Fix accesslist when a user has an ID only containting 0-9
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-14 17:21:16 +01:00
Morris Jobke
16549ae5fb
Merge pull request #7166 from nextcloud/enhancement/crash-report-context
...
Pass the exception context to the crash reporter
2017-11-14 15:07:33 +01:00
Morris Jobke
f6ef3b6464
add proper type hinting
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 14:49:24 +01:00
Christoph Wurst
ad757805ca
Pass the exception context to the crash reporter
...
This should allow better reports as often the app id is passed
as context. While this is not used right now, I'd like to have this
for NC13 as adding it later will break the interface for existing apps
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 14:28:04 +01:00
Morris Jobke
ab0a3fbbbc
Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath
...
{J,CS}SResourceLocator: account for symlinks in app path
2017-11-14 13:58:02 +01:00
Christoph Wurst
4c5593998a
Add a mechanism to register crach reporters
...
This adds a crash reporter registry, which is meant for third party apps
to hook into the error logging/reporting chain. This way, external tools
like Sentry can be used to track and aggregate system crashes.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 12:20:05 +01:00
Kyle Fazzari
d2a2793073
JSResourceLocator: re-use $app_path
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-12 08:08:38 -08:00
Nextcloud bot
8e3861563b
[tx-robot] updated from transifex
2017-11-12 01:10:00 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex
2017-11-11 01:10:09 +00:00
Robin Appelman
56fd462718
Use the correct root for shared jail when the source storage is also a jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-10 17:03:27 +01:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex
2017-11-10 01:09:43 +00:00
Georg Ehrke
f06fc67e8e
update autoloader to included added classes and interface
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke
556b2a2b6f
implement CalendarManager
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:50 +01:00
Georg Ehrke
5d206eec69
Public interfaces for calendar API
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 13:00:26 +01:00
Morris Jobke
e6ad00b33d
Merge pull request #7117 from nextcloud/fix-welcome-string
...
Fix welcome text for better grammar in themed instances
2017-11-09 10:03:59 +01:00
Morris Jobke
5d8421135e
Merge pull request #7014 from nextcloud/rename-locks
...
Unlock files even if an exception occurs while renaming
2017-11-09 09:47:36 +01:00
Morris Jobke
eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1
...
Rello patch 1
2017-11-09 09:41:01 +01:00
Morris Jobke
a0aef6ab1b
Fix welcome text for better grammar in themed instances
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:27:38 +01:00
Nextcloud bot
aa525d89e8
[tx-robot] updated from transifex
2017-11-09 01:09:13 +00:00
Lukas Reschke
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath
...
Allow getting the filepath when getting cached mounts by fileid
2017-11-09 00:04:25 +01:00
Morris Jobke
e0784c66ed
Merge pull request #7109 from nextcloud/fix_6898
...
If for some reason the json can't be decoded it is not cached
2017-11-08 23:33:02 +01:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master
...
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
Robin Appelman
c566b2854b
Use non empty files for object store touch
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:51:02 +01:00
Robin Appelman
70a4860ccb
Fix contructing headers for s3 download
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:50:46 +01:00
Roeland Jago Douma
448fa4f59e
If for some reason the json can't be decoded it is not cached
...
Should fix #6898
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-08 12:37:35 +01:00
Morris Jobke
732c951ae1
Revert "Only allow colons in db host for IPv6 addresses"
...
This reverts commit 1287d6ddb3
.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-08 10:47:35 +01:00
Kyle Fazzari
06ba1a8a02
JSResourceLocator: account for symlinks in app path
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 14:54:21 -08:00
Morris Jobke
0913bc2157
Merge pull request #6552 from nextcloud/notifications-add-highlight-definition
...
Notifications: Add highlight type definition
2017-11-07 20:34:05 +01:00
Morris Jobke
19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance
...
Improve performance of UserMountCache with external storage folders
2017-11-07 17:32:06 +01:00
Roeland Jago Douma
f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
...
Remove unused variables
2017-11-07 16:18:40 +01:00
Morris Jobke
4866314ce0
Run updated license header updater
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:47:42 +01:00
Morris Jobke
f9e70c2ab6
Merge pull request #7020 from Fiech/master
...
Extended list of sensitive configuration values (2)
2017-11-07 10:27:53 +01:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex
2017-11-07 01:08:57 +00:00
Morris Jobke
31c5c2a592
Change @georgehrke's email
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke
da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers
...
Update license headers
2017-11-06 18:48:04 +01:00
Morris Jobke
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00