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
fcfb4205bc
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00
587eca3ccd
Remove the magic parsing of the description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
91beb178a7
Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
...
Change the row-format before changing the collation
2017-01-13 14:43: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
77b5d7bc86
Change the row-format before changing the collation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 16:54:29 +01:00
5dc6899d1a
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
005ce8aaf6
Merge pull request #3007 from Loki3000/master
...
Remove non required db requests
2017-01-11 12:37:54 +01:00
ce7836378c
Filter out sensitive appconfig values
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-11 11:42:36 +01:00
447e388ce9
Merge pull request #2744 from nextcloud/oc_26324
...
[downstream] Fix DAV stat cache to properly cache 404
2017-01-11 08:16:40 +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
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
7e06f051c9
remove non required sql requests
...
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
2017-01-10 17:16:56 +03:00
8ab16f87ac
spaces added
2017-01-10 16:44:14 +03:00
6a74f7db11
spaces added
2017-01-10 16:43:43 +03:00
5c77923360
allowed '0' uid
2017-01-10 16:39:10 +03:00
b7e6c5ecdf
allowed '0' uid
2017-01-10 16:37:18 +03:00
30689f338f
Merge pull request #2914 from nextcloud/logrotate-logfile
...
Get the logfile location while running the logrotate cron job instead…
2017-01-10 14:28:09 +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
74a2938f8e
fix spaces
2017-01-10 14:21:23 +03:00
5262779101
fix brackets
2017-01-10 13:29:35 +03:00
b0ff59d42f
remove non required db requests
2017-01-10 13:09:33 +03:00
33259b41cd
remove non required db requests
2017-01-10 13:05:21 +03:00
b847dfcee9
Merge pull request #2925 from nextcloud/remove-close-wrapper
...
replace close:// streamwrapper with CallBackWrapper
2017-01-10 10:21:10 +01:00
135198bf0d
Default value for null user
...
For guest users on every request executes query:
SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null)
as I see, uid can't be equal to null by design.
2017-01-09 23:34:23 +03: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
9a5b9d8555
Merge pull request #2992 from nextcloud/fix_subdir_install_style
...
Fix subdir install style
2017-01-09 18:37:08 +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
dec4b26355
Fix subdir install style
...
* We need to pass the serverroot so that it can include the right files.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-09 16:19:54 +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
54f96e5f58
Get the logfile location while running the logrotate cron job instead of when registering the job
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 16:10:07 +01:00
4a2fbe9a5b
Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-applicable
...
Remove group restrictions when those are not allowed anymore
2017-01-06 15:38:13 +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
7b8c777b57
Fix css url prefix for IgnoreFrontController enabled configs
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
8bcad88c6f
ScssCcacher typo fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
6d3a890cb3
Camelcase fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
7b8debc5d3
Remove webroot from file path
...
The webroot is already provided, otherwise this links to stuff like "/nextcloud/nextcloud/index.php" instead of "/nextcloud/index.php"
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-06 09:42:39 +01:00
350b7ebc86
Adds CssControllerTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:39 +01:00
e3a57c1f07
Fix variables should be passed by reference
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
203143e26a
Fix typo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
7bd9087f9e
Inject SCSSCacher
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
d64d661ef5
Make SCCCacher injectable
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Joas Schilling
Christoph Wurst
Morris Jobke
Roeland Jago Douma
Bjoern Schiessle
Roeland Jago Douma
Vincent Petry
Loki3000
Lukas Reschke
Robin Appelman
John Molakvoæ (skjnldsv)