aea1b72f54
Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
...
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
012708e1ba
Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs
...
Filter out sensitive appconfig values
2017-01-17 11:01:42 +01:00
6a047a045a
Apply DOMPurify over HTML
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-13 18:58:18 +01:00
4d7dee5996
Fix JSUnit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-13 18:33:43 +01:00
fcfb4205bc
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00
0f792fedef
Merge pull request #3060 from nextcloud/cleanup-js-tests
...
Cleanup js tests
2017-01-13 14:47:06 +01:00
dd88e70dff
fix image warnings
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:49:37 +01:00
c82befbc00
allow/fix loading of fonts
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:46:06 +01:00
622101f2dd
Merge pull request #2918 from nextcloud/encryption-recovery-improvements
...
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
5dc6899d1a
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
243c9c0941
fix coding style and increase code coverage
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 11:01:54 +01:00
b8d41752ca
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
f515c6db4a
Merge pull request #2745 from nextcloud/oc_26590
...
[downstream] Skip local shares in bkg scan and occ files:scan (#26590 )
2017-01-11 08:16:12 +01:00
a90cbb0f09
Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
...
Handle log_type "nextcloud" more gracefully
2017-01-11 08:14:24 +01:00
fcda3a20f4
create new encryption keys on password reset and backup the old one
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
40239decb1
Merge pull request #3012 from nextcloud/fix-karma-image-warnings
...
show fewer warnings in karma test runs
2017-01-10 16:29:39 +01:00
00b17c3af5
Only check for local shared storages
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-10 16:14:21 +01:00
706655ef20
Skip local shares in bkg scan and occ files:scan ( #26590 )
...
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
2017-01-10 16:11:45 +01:00
aee11009bd
Merge pull request #3000 from nextcloud/cache-no-store
...
set 'no-store' cache header if we do not want FF to cache
2017-01-10 14:07:13 +01:00
e6a3e8bcd0
show fewer warnings in karma test runs
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 13:50:22 +01:00
4dd2a1e679
Merge pull request #2943 from nextcloud/kill_old_preview_code
...
Cleanup old preview code
2017-01-10 13:50:14 +01:00
a5bf14ada3
Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
...
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
7fa063ceca
Better fallback for unknown log types
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:59:13 +01:00
45c6301772
fix controller test
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:54:45 +01:00
b847dfcee9
Merge pull request #2925 from nextcloud/remove-close-wrapper
...
replace close:// streamwrapper with CallBackWrapper
2017-01-10 10:21:10 +01:00
e3815b382d
fix data response test expected cache headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 10:13:08 +01:00
fe6416072d
set 'no-store' cache header if we do not want FF to cache
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-09 21:29:59 +01:00
307d45e3bd
Merge pull request #2987 from nextcloud/no-empty-bundle
...
dont write a certificate bundle if the shipped ca bundle is empty
2017-01-09 21:10:11 +01:00
817e974c5f
dont write a certificate bundle if the shipped ca bundle is empty
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-09 16:51:27 +01:00
fee18d6c78
Merge pull request #2814 from nextcloud/appstore_etag_validation
...
Add ETag validation to appstore requests
2017-01-09 14:56:20 +01:00
e7ff1ba548
Add tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 10:55:40 +01:00
5774d3e82c
replace close:// streamwrapper with CallBackWrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
73fcb69cad
Merge pull request #2934 from nextcloud/quota-stream-non-global
...
remove the need to register the quota streamwrapper globally
2017-01-06 15:25:20 +01:00
ccab1168ce
Fix js tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 13:33:18 +01:00
350b7ebc86
Adds CssControllerTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:39 +01:00
eeb5ea85f7
Merge pull request #2817 from nextcloud/fix-invalid-share-perms
...
Fix invalid share perms
2017-01-05 15:52:23 +01:00
64097aece9
Merge pull request #2946 from nextcloud/kill-apc
...
Kill APC because it requires PHP 5.4 or lower
2017-01-05 15:25:48 +01:00
7baa4ea1a4
Add repair step to fix file share permissions
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 14:30:22 +01:00
fc04779a26
Add ETag validation to appstore requests
...
* If the ETag if present store it
* If a stored ETag is present then pass it along (with the original
response) to get
* Add tests
* Added files to classmap
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-05 14:26:09 +01:00
7ba665b11d
Remove warning
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
6acfea61d0
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
bf043deba3
Kill APC because it requires PHP 5.4
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 10:58:34 +01:00
e723363053
Remove old preview code
...
* \OC\Preview is no more
* \Test\PreviewTests is no more
* PreviewHooks in base.php are gone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-04 20:14:16 +01:00
bca91f2216
remove static:// stream wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-04 15:57:02 +01:00
968de70bc5
remove the need to register the quota streamwrapper globally
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-04 15:15:47 +01:00
a45137bbca
also create mail share if public links are disabled
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 13:45:29 +01:00
a75cfb601e
Merge pull request #2923 from nextcloud/remove-fakedir-stream
...
remove no longer used fakedir stream wrapper
2017-01-03 20:22:16 +01:00
5b09565594
remove no longer used fakedir stream wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-03 17:06:03 +01:00
8e3f442fe2
Merge pull request #2872 from nextcloud/admin-settings-split-db
...
split db logic from settings manager and test them separately
2017-01-02 16:44:28 +01:00
1b8aae837c
Merge pull request #2912 from nextcloud/increase-coverage-response.php
...
Add 100% coverage for response.php
2017-01-02 16:01:47 +01:00
Joas Schilling
Christoph Wurst
Lukas Reschke
Morris Jobke
Christoph Wurst
Cornelius Kölbel
Roeland Jago Douma
Bjoern Schiessle
Roeland Jago Douma
Vincent Petry
Robin Appelman