Merge pull request #1217 from nextcloud/release/1.6.5 (3ff76afd) · Commits · e / infra / ecloud / nextcloud-apps / calendar

CHANGELOG.md

+7 −0

Original line number	Diff line number	Diff line
		## 1.6.5 - 2019-04-04
		### Fixed
		- Buttons not visible in dark theme
		[#1042](https://github.com/nextcloud/calendar/issues/1042)
		- Fix datepicker alignment
		[#1085](https://github.com/nextcloud/calendar/pull/1085)

		## 1.6.4 - 2018-11-23
		### Fixed
		- Use clearer color to easier locate today

appinfo/application.php

+2 −1

Original line number	Diff line number	Diff line
		@@ -58,8 +58,9 @@ class Application extends App {
		$client = $c->getServer()->getHTTPClientService();
		$l10n = $c->getServer()->getL10N($c->query('AppName'));
		$logger = $c->getServer()->getLogger();
		$config = $c->getServer()->getConfig();

		return new Controller\ProxyController($c->getAppName(), $request, $client, $l10n, $logger);
		return new Controller\ProxyController($c->getAppName(), $request, $client, $l10n, $logger, $config);
		});

		$container->registerService('SettingsController', function(IAppContainer $c) {

appinfo/info.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* 🙋 Attendees! Invite people to your events.
		* 🙈 We’re not reinventing the wheel! Based on the great [davclient.js](https://github.com/evert/davclient.js), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.
		]]></description>
		<version>1.6.4</version>
		<version>1.6.5</version>
		<licence>agpl</licence>
		<author homepage="https://georg.coffee">Georg Ehrke</author>
		<author homepage="http://raghunayyar.com">Raghu Nayyar</author>

controller/proxycontroller.php

+31 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ use OCP\AppFramework\Http\JSONResponse;
		use OCP\AppFramework\Http\DataDisplayResponse;
		use OCP\AppFramework\Controller;
		use OCP\Http\Client\IClientService;
		use OCP\IConfig;
		use OCP\IL10N;
		use OCP\ILogger;
		use OCP\IRequest;
		@@ -52,20 +53,28 @@ class ProxyController extends Controller {
		*/
		protected $logger;

		/**
		* @var IConfig
		*/
		protected $config;

		/**
		* @param string $appName
		* @param IRequest $request an instance of the request
		* @param IClientService $client
		* @param IL10N $l10n
		* @param ILogger $logger
		* @param IConfig $config
		*/
		public function __construct($appName, IRequest $request,
		IClientService $client,
		IL10N $l10n, ILogger $logger) {
		IL10N $l10n, ILogger $logger,
		IConfig $config) {
		parent::__construct($appName, $request);
		$this->client = $client;
		$this->l10n = $l10n;
		$this->logger = $logger;
		$this->config = $config;
		}

		/**
		@@ -83,6 +92,27 @@ class ProxyController extends Controller {
		$max_redirects = 5;
		$done = false;

		$allowLocalAccess = $this->config->getAppValue('dav', 'webcalAllowLocalAccess', 'no');
		if ($allowLocalAccess !== 'yes') {
		$host = parse_url($url, PHP_URL_HOST);
		// remove brackets from IPv6 addresses
		if (strpos($host, '[') === 0 && substr($host, -1) === ']') {
		$host = substr($host, 1, -1);
		}

		if ($host === 'localhost' \|\| substr($host, -6) === '.local' \|\| substr($host, -10) === '.localhost' \|\|
		preg_match('/(^127\.)\|(^192\.168\.)\|(^10\.)\|(^172\.1[6-9]\.)\|(^172\.2[0-9]\.)\|(^172\.3[0-1]\.)\|(^::1$)\|(^[fF][cCdD])/', $host)) {
		$this->logger->warning("Subscription $url was not refreshed because it violates local access rules");

		$response = new JSONResponse([
		'message' => $this->l10n->t('URL violates local access rules'),
		'proxy_code' => 403
		], Http::STATUS_UNPROCESSABLE_ENTITY);

		return $response;
		}
		}

		// try to find a chain of 301s
		do {
		$clientResponse = $client->get($queryUrl, [

css/app/calendarlist.scss

+29 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,7 @@ ul#calendarlistcontainer {

		#datepicker-ng-show-container {
		display: block !important;
		height: 185px;
		height: 205px;
		overflow: hidden;
		transition: 200ms ease-in-out all;
		}
		@@ -334,6 +334,34 @@ ul#calendarlistcontainer {
		height: 0;
		}

		div.uib-daypicker {
		display: flex;

		table {
		flex: 1;

		tbody {
		flex: 1;
		display: flex;
		flex-direction: column;

		tr.uib-weeks {
		flex: 1;
		display: flex;
		width: 100%;
		justify-content: space-evenly;

		td.uib-day {
		display: flex;
		flex: 1;
		align-items: center;
		justify-content: center;
		}
		}
		}
		}
		}

		/* Spacing */
		#spacer {
		height: 44px;