be4e921306
Use basename() instead of self implementation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 12:35:47 +01:00
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
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
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
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
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
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api
...
Calendar API for apps
2017-11-16 21:10:35 +01:00
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
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
c225bbd021
Merge pull request #7113 from nextcloud/s3-download-stream-fix
...
Fix s3 download and touch
2017-11-14 20:38:50 +01:00
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
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
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
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
f6ef3b6464
add proper type hinting
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 14:49:24 +01:00
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
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
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
d2a2793073
JSResourceLocator: re-use $app_path
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-12 08:08:38 -08:00
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
556b2a2b6f
implement CalendarManager
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:50 +01:00
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
eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1
...
Rello patch 1
2017-11-09 09:41:01 +01:00
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
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
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
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
70a4860ccb
Fix contructing headers for s3 download
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:50:46 +01:00
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
732c951ae1
Revert "Only allow colons in db host for IPv6 addresses"
...
This reverts commit 1287d6ddb3
2017-11-08 10:47:35 +01:00
06ba1a8a02
JSResourceLocator: account for symlinks in app path
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 14:54:21 -08:00
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
f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
...
Remove unused variables
2017-11-07 16:18:40 +01:00
4866314ce0
Run updated license header updater
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:47:42 +01:00
f9e70c2ab6
Merge pull request #7020 from Fiech/master
...
Extended list of sensitive configuration values (2)
2017-11-07 10:27:53 +01:00
31c5c2a592
Change @georgehrke's email
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers
...
Update license headers
2017-11-06 18:48:04 +01:00
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
5ed05219d7
Merge pull request #7076 from nextcloud/s3-valid-bucket-name
...
Better error message for invalid bucket names
2017-11-06 16:16:28 +01:00
5411d60b24
Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure
...
Implement plugins infrastructure in User_LDAP
2017-11-06 16:07:31 +01:00
6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization
...
Enhance calendar invitation emails
2017-11-06 15:14:49 +01:00
8b763ea0f7
Better error message for invalid bucket names
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:48:41 +01:00
5445b1ff17
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
b0d296639c
CSSResourceLocator: account for symlinks in app path
...
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.
Use realpath when retrieving app path, and these issues go away.
Fix #6028
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-03 23:52:09 -07:00
c7482402b8
Unlock files even if an exception occurs
...
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-03 18:29:04 +01:00
10ca793452
Plugins infrastructure in User_LDAP
...
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:41:40 -02:00
e111da777a
Make L10N->l provide weekdayName
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:04 +01:00
687c92bfd3
Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage
...
Fix seeking on object storage
2017-11-02 14:56:51 +01:00
07016a1e5b
Improve performance of UserMountCache with external storage folders
2017-11-01 21:11:39 +01:00
e2805f02aa
Merge branch 'master' into autocomplete-gui
2017-11-01 15:37:29 +01:00
Morris Jobke
blizzz
Roeland Jago Douma
Bjoern Schiessle
Joas Schilling
Christoph Wurst
Kyle Fazzari
Robin Appelman
Georg Ehrke
Lukas Reschke
Roeland Jago Douma
korelstar
Vinicius Cubas Brand
Dariusz Olszewski