]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Tue, 17 Jan 2017 04:25:27 +0000 (22:25 -0600)]
add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 17 Jan 2017 04:22:05 +0000 (22:22 -0600)]
fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Mon, 16 Jan 2017 14:00:54 +0000 (15:00 +0100)]
Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Fri, 13 Jan 2017 17:46:41 +0000 (18:46 +0100)]
Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 13 Jan 2017 17:30:43 +0000 (18:30 +0100)]
Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Morris Jobke [Wed, 11 Jan 2017 16:08:52 +0000 (17:08 +0100)]
Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Wed, 11 Jan 2017 09:57:26 +0000 (10:57 +0100)]
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 15 Dec 2016 16:07:07 +0000 (17:07 +0100)]
Don't render non HTTP links, images and quotes
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 12:41:55 +0000 (14:41 +0200)]
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 12:41:37 +0000 (14:41 +0200)]
Remove the magic parsing of the description
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 12:41:19 +0000 (14:41 +0200)]
Render markdown
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 11:52:41 +0000 (13:52 +0200)]
Add marked
Signed-off-by: Joas Schilling <coding@schilljs.com>
John Molakvoæ [Fri, 13 Jan 2017 15:03:17 +0000 (16:03 +0100)]
Merge pull request #3048 from nextcloud/share-scss-optimisation
Share scss optimisation
Joas Schilling [Fri, 13 Jan 2017 13:47:06 +0000 (14:47 +0100)]
Merge pull request #3060 from nextcloud/cleanup-js-tests
Cleanup js tests
Joas Schilling [Fri, 13 Jan 2017 13:43:06 +0000 (14:43 +0100)]
Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
Change the row-format before changing the collation
Christoph Wurst [Fri, 13 Jan 2017 10:49:37 +0000 (11:49 +0100)]
fix image warnings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Fri, 13 Jan 2017 10:46:06 +0000 (11:46 +0100)]
allow/fix loading of fonts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Fri, 13 Jan 2017 10:33:12 +0000 (11:33 +0100)]
expect warning to be shown
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Morris Jobke [Fri, 13 Jan 2017 10:28:43 +0000 (11:28 +0100)]
Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
Christoph Wurst [Fri, 13 Jan 2017 10:20:19 +0000 (11:20 +0100)]
add spies for l10n warnings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Joas Schilling [Thu, 12 Jan 2017 15:54:29 +0000 (16:54 +0100)]
Change the row-format before changing the collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
John Molakvoæ (skjnldsv) [Thu, 12 Jan 2017 14:02:14 +0000 (15:02 +0100)]
Share scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Morris Jobke [Thu, 12 Jan 2017 09:09:30 +0000 (10:09 +0100)]
Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu
Fit federationScopeMenu to guidelines
Nextcloud bot [Thu, 12 Jan 2017 01:07:43 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
John Molakvoæ [Wed, 11 Jan 2017 20:17:27 +0000 (21:17 +0100)]
Update federationscopemenu.js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ [Wed, 11 Jan 2017 17:41:14 +0000 (18:41 +0100)]
Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
Systemtags scss optimisation
John Molakvoæ [Wed, 11 Jan 2017 17:24:15 +0000 (18:24 +0100)]
Merge pull request #3027 from nextcloud/multiselect-scss-optimisation
Multiselect scss optimisation
Morris Jobke [Wed, 11 Jan 2017 15:52:27 +0000 (16:52 +0100)]
Merge pull request #3026 from nextcloud/icons-scss-optimisation
Icons scss optimisation
Roeland Jago Douma [Wed, 11 Jan 2017 15:38:18 +0000 (16:38 +0100)]
Merge pull request #3028 from nextcloud/tooltip-scss-optimisation
Tooltip scss optimisation
Nextcloud bot [Wed, 11 Jan 2017 15:20:22 +0000 (15:20 +0000)]
[tx-robot] updated from transifex
John Molakvoæ (skjnldsv) [Wed, 11 Jan 2017 13:38:35 +0000 (14:38 +0100)]
Systemtags scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Wed, 11 Jan 2017 13:31:05 +0000 (14:31 +0100)]
Tooltip scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Wed, 11 Jan 2017 13:22:19 +0000 (14:22 +0100)]
Multiselect scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Wed, 11 Jan 2017 13:16:05 +0000 (14:16 +0100)]
Comments and delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Wed, 11 Jan 2017 13:12:39 +0000 (14:12 +0100)]
Loader and animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Roeland Jago Douma [Wed, 11 Jan 2017 12:06:01 +0000 (13:06 +0100)]
Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception
Downstream add two factor exception
Roeland Jago Douma [Wed, 11 Jan 2017 11:37:54 +0000 (12:37 +0100)]
Merge pull request #3007 from Loki3000/master
Remove non required db requests
Roeland Jago Douma [Wed, 11 Jan 2017 10:02:11 +0000 (11:02 +0100)]
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Christoph Wurst [Tue, 3 Jan 2017 08:57:52 +0000 (09:57 +0100)]
fix coding style and increase code coverage
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Cornelius Kölbel [Tue, 15 Nov 2016 07:51:07 +0000 (08:51 +0100)]
Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Cornelius Kölbel [Mon, 14 Nov 2016 16:12:28 +0000 (17:12 +0100)]
Update TwoFactorException.php
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Cornelius Kölbel [Mon, 14 Nov 2016 14:39:19 +0000 (15:39 +0100)]
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>
Roeland Jago Douma [Wed, 11 Jan 2017 08:34:32 +0000 (09:34 +0100)]
Merge pull request #3020 from nextcloud/2944
[#2944] Update mobile.css
Rodrigo Almeida [Thu, 5 Jan 2017 02:45:06 +0000 (00:45 -0200)]
Update mobile.css
Roeland Jago Douma [Wed, 11 Jan 2017 07:16:40 +0000 (08:16 +0100)]
Merge pull request #2744 from nextcloud/oc_26324
[downstream] Fix DAV stat cache to properly cache 404
Roeland Jago Douma [Wed, 11 Jan 2017 07:16:12 +0000 (08:16 +0100)]
Merge pull request #2745 from nextcloud/oc_26590
[downstream] Skip local shares in bkg scan and occ files:scan (#26590)
Roeland Jago Douma [Wed, 11 Jan 2017 07:14:24 +0000 (08:14 +0100)]
Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
Handle log_type "nextcloud" more gracefully
Bjoern Schiessle [Mon, 2 Jan 2017 20:24:37 +0000 (21:24 +0100)]
create new encryption keys on password reset and backup the old one
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Roeland Jago Douma [Tue, 10 Jan 2017 15:29:39 +0000 (16:29 +0100)]
Merge pull request #3012 from nextcloud/fix-karma-image-warnings
show fewer warnings in karma test runs
Roeland Jago Douma [Mon, 19 Dec 2016 18:53:35 +0000 (19:53 +0100)]
Only check for local shared storages
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Vincent Petry [Thu, 10 Nov 2016 14:44:18 +0000 (15:44 +0100)]
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.
Loki3000 [Tue, 10 Jan 2017 14:16:56 +0000 (17:16 +0300)]
remove non required sql requests
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
Loki3000 [Tue, 10 Jan 2017 13:44:14 +0000 (16:44 +0300)]
spaces added
Loki3000 [Tue, 10 Jan 2017 13:43:43 +0000 (16:43 +0300)]
spaces added
Loki3000 [Tue, 10 Jan 2017 13:39:10 +0000 (16:39 +0300)]
allowed '0' uid
Loki3000 [Tue, 10 Jan 2017 13:37:18 +0000 (16:37 +0300)]
allowed '0' uid
Morris Jobke [Tue, 10 Jan 2017 13:28:30 +0000 (14:28 +0100)]
Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type
Make sure the used event type and the setting/filter are the same
Morris Jobke [Tue, 10 Jan 2017 13:28:09 +0000 (14:28 +0100)]
Merge pull request #2914 from nextcloud/logrotate-logfile
Get the logfile location while running the logrotate cron job instead…
Roeland Jago Douma [Tue, 10 Jan 2017 13:07:13 +0000 (14:07 +0100)]
Merge pull request #3000 from nextcloud/cache-no-store
set 'no-store' cache header if we do not want FF to cache
Christoph Wurst [Tue, 10 Jan 2017 12:50:22 +0000 (13:50 +0100)]
show fewer warnings in karma test runs
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Morris Jobke [Tue, 10 Jan 2017 12:50:14 +0000 (13:50 +0100)]
Merge pull request #2943 from nextcloud/kill_old_preview_code
Cleanup old preview code
Roeland Jago Douma [Tue, 10 Jan 2017 12:06:20 +0000 (13:06 +0100)]
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
Joas Schilling [Tue, 10 Jan 2017 11:58:23 +0000 (12:58 +0100)]
Better fallback for unknown log types
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Tue, 10 Jan 2017 11:54:20 +0000 (12:54 +0100)]
Merge pull request #3005 from nextcloud/dev-manual-12
fix dev manual link
Joas Schilling [Tue, 10 Jan 2017 11:28:55 +0000 (12:28 +0100)]
Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
Loki3000 [Tue, 10 Jan 2017 11:21:23 +0000 (14:21 +0300)]
fix spaces
Christoph Wurst [Tue, 10 Jan 2017 10:54:45 +0000 (11:54 +0100)]
fix controller test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Loki3000 [Tue, 10 Jan 2017 10:29:35 +0000 (13:29 +0300)]
fix brackets
Loki3000 [Tue, 10 Jan 2017 10:09:33 +0000 (13:09 +0300)]
remove non required db requests
Loki3000 [Tue, 10 Jan 2017 10:05:21 +0000 (13:05 +0300)]
remove non required db requests
Christoph Wurst [Tue, 10 Jan 2017 10:02:05 +0000 (11:02 +0100)]
fix dev manual link
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Morris Jobke [Tue, 10 Jan 2017 09:27:01 +0000 (10:27 +0100)]
Merge pull request #2982 from nextcloud/better-notification-links
Set the link of the notification on render instead of creation
Roeland Jago Douma [Tue, 10 Jan 2017 09:21:10 +0000 (10:21 +0100)]
Merge pull request #2925 from nextcloud/remove-close-wrapper
replace close:// streamwrapper with CallBackWrapper
Christoph Wurst [Tue, 10 Jan 2017 09:13:08 +0000 (10:13 +0100)]
fix data response test expected cache headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Morris Jobke [Tue, 10 Jan 2017 09:06:48 +0000 (10:06 +0100)]
Merge pull request #2998 from Loki3000/master
Default cache value for null user
Loki3000 [Mon, 9 Jan 2017 20:34:23 +0000 (23:34 +0300)]
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.
Christoph Wurst [Mon, 9 Jan 2017 20:29:59 +0000 (21:29 +0100)]
set 'no-store' cache header if we do not want FF to cache
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Lukas Reschke [Mon, 9 Jan 2017 20:10:11 +0000 (21:10 +0100)]
Merge pull request #2987 from nextcloud/no-empty-bundle
dont write a certificate bundle if the shipped ca bundle is empty
Morris Jobke [Mon, 9 Jan 2017 17:37:08 +0000 (18:37 +0100)]
Merge pull request #2992 from nextcloud/fix_subdir_install_style
Fix subdir install style
Robin Appelman [Mon, 9 Jan 2017 13:26:31 +0000 (14:26 +0100)]
dont write a certificate bundle if the shipped ca bundle is empty
Signed-off-by: Robin Appelman <robin@icewind.nl>
Lukas Reschke [Mon, 9 Jan 2017 15:29:09 +0000 (16:29 +0100)]
Merge pull request #2985 from nextcloud/fix-trusted-domain-error
Allow access to CSS resources
Roeland Jago Douma [Mon, 9 Jan 2017 15:19:54 +0000 (16:19 +0100)]
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>
Joas Schilling [Mon, 9 Jan 2017 13:56:20 +0000 (14:56 +0100)]
Merge pull request #2814 from nextcloud/appstore_etag_validation
Add ETag validation to appstore requests
Lukas Reschke [Mon, 9 Jan 2017 11:52:43 +0000 (12:52 +0100)]
Allow access to CSS resources
Fixes https://github.com/nextcloud/server/issues/2984
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Joas Schilling [Mon, 9 Jan 2017 11:09:47 +0000 (12:09 +0100)]
Fix update notification tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 9 Jan 2017 11:03:34 +0000 (12:03 +0100)]
Cleanup comment tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 9 Jan 2017 10:24:09 +0000 (11:24 +0100)]
Only add the link when the user can follow it.
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 9 Jan 2017 10:18:59 +0000 (11:18 +0100)]
Set the link of the notification on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 9 Jan 2017 10:18:33 +0000 (11:18 +0100)]
Set the comment link on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 9 Jan 2017 09:55:40 +0000 (10:55 +0100)]
Add tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Mon, 9 Jan 2017 08:24:58 +0000 (08:24 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Fri, 6 Jan 2017 15:17:09 +0000 (16:17 +0100)]
Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
Only allow admins to delete tags
Robin Appelman [Mon, 2 Jan 2017 15:16:15 +0000 (16:16 +0100)]
Get the logfile location while running the logrotate cron job instead of when registering the job
Signed-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Fri, 6 Jan 2017 14:38:13 +0000 (15:38 +0100)]
Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-applicable
Remove group restrictions when those are not allowed anymore
Robin Appelman [Wed, 4 Jan 2017 13:29:07 +0000 (14:29 +0100)]
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Tue, 3 Jan 2017 16:26:44 +0000 (17:26 +0100)]
replace close:// streamwrapper with CallBackWrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
Morris Jobke [Fri, 6 Jan 2017 14:31:24 +0000 (15:31 +0100)]
Merge pull request #2948 from nextcloud/allow-global-composer-to-be-used
Allow to use a global composer instance
Roeland Jago Douma [Fri, 6 Jan 2017 14:25:20 +0000 (15:25 +0100)]
Merge pull request #2934 from nextcloud/quota-stream-non-global
remove the need to register the quota streamwrapper globally
Morris Jobke [Fri, 6 Jan 2017 14:21:56 +0000 (15:21 +0100)]
Merge pull request #2968 from nextcloud/update-3rdparty
Update 3rdparty
Roeland Jago Douma [Fri, 6 Jan 2017 13:42:17 +0000 (14:42 +0100)]
Merge pull request #2966 from nextcloud/ldif-mime-support
recognize LDIF (and schema) file types