Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4070b16 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

upgrade to 4.52

parent 945acf2a

lib/Controller/ViewController.php

+0 −3
Original line number Diff line number Diff line
@@ -111,10 +111,7 @@ class ViewController extends Controller { 
			$forceEventAlarmType = false;

		}

		$canSubscribeLink = $this->config->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes';

<<<<<<< HEAD

=======

		$showResources = $this->config->getAppValue($this->appName, 'showResources', 'yes') === 'yes';

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4



		$talkEnabled = $this->appManager->isEnabledForUser('spreed');

		$talkApiVersion = version_compare($this->appManager->getAppVersion('spreed'), '12.0.0', '>=') ? 'v4' : 'v1';

src/views/Dashboard.vue

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import IconCheck from 'vue-material-design-icons/Check.vue' 
import IconCheckbox from 'vue-material-design-icons/CheckboxBlankOutline.vue'

import { loadState } from '@nextcloud/initial-state'

import moment from '@nextcloud/moment'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'

import { imagePath, generateUrl } from '@nextcloud/router'

import { initializeClientForUserView } from '../services/caldavService.js'

import { dateFactory } from '../utils/date.js'