b8d41752ca
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
ee8c617a6d
Update TwoFactorException.php
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
e077e01bf2
Add a TwoFactorException
...
A Two Factor third party App may throw a TwoFactorException()
with a more detailed error message in case the authentication fails.
The 2FA Controller will then display the message of this Exception
to the user.
Working on #26593
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:52 +01:00
c4e51fd055
Merge pull request #3020 from nextcloud/2944
...
[#2944 ] Update mobile.css
2017-01-11 09:34:32 +01:00
4f3da2bee4
Update mobile.css
2017-01-11 09:12:08 +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
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
b727edf17e
Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type
...
Make sure the used event type and the setting/filter are the same
2017-01-10 14:28:30 +01: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
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
3fa715c2ab
Merge pull request #3005 from nextcloud/dev-manual-12
...
fix dev manual link
2017-01-10 12:54:20 +01:00
a70a081fff
Make sure the used event type and the setting/filter are the same
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:28:55 +01:00
45c6301772
fix controller test
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:54:45 +01:00
5a06dfaca1
fix dev manual link
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:02:05 +01:00
97a63ad689
Merge pull request #2982 from nextcloud/better-notification-links
...
Set the link of the notification on render instead of creation
2017-01-10 10:27:01 +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
bc8e565e2a
Merge pull request #2998 from Loki3000/master
...
Default cache value for null user
2017-01-10 10:06:48 +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
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
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
05d27ec148
Merge pull request #2985 from nextcloud/fix-trusted-domain-error
...
Allow access to CSS resources
2017-01-09 16:29:09 +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
69f3430552
Allow access to CSS resources
...
Fixes https://github.com/nextcloud/server/issues/2984
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-09 12:53:58 +01:00
b29149402c
Fix update notification tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:09:47 +01:00
bb84db02cb
Cleanup comment tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
315645ada3
Only add the link when the user can follow it.
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:24:09 +01:00
acbf0d151f
Set the link of the notification on render instead of creation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:59 +01:00
e675c2a66c
Set the comment link on render instead of creation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
e7ff1ba548
Add tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 10:55:40 +01:00
4f9ff96f79
[tx-robot] updated from transifex
2017-01-09 08:24:58 +00:00
6347d97c7f
Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
...
Only allow admins to delete tags
2017-01-06 16:17:09 +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
e40ecc1aa1
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:33 +01:00
5774d3e82c
replace close:// streamwrapper with CallBackWrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
3ab22c2df5
Merge pull request #2948 from nextcloud/allow-global-composer-to-be-used
...
Allow to use a global composer instance
2017-01-06 15:31:24 +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
ced5fbcc9c
Merge pull request #2968 from nextcloud/update-3rdparty
...
Update 3rdparty
2017-01-06 15:21:56 +01:00
Cornelius Kölbel
Roeland Jago Douma
Rodrigo Almeida
Roeland Jago Douma
Vincent Petry
Morris Jobke
Christoph Wurst
Joas Schilling
Loki3000
Lukas Reschke
Robin Appelman
Nextcloud bot