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

Commit 48c6440e authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

update 4.4.4

parent 33886091

CHANGELOG.md

+7 −15
Original line number Diff line number Diff line
@@ -96,15 +96,7 @@ 


## 4.1.1 - 2022-12-15

### Fixed

<<<<<<< HEAD

<<<<<<< HEAD

- Disabled timezone popup 

=======

- Disabled timezone popup

>>>>>>> a46efa4aa6a96d152602a9c07152c6b785760c18

=======

- Disabled timezone popup 

>>>>>>> 910b7d393f7baeeef462c55929f6d7fe2538d4a1

- Style for timezone popup

- Location in booking VEVENT

- Bottom part cut off for public calendar
@@ -149,7 +141,7 @@ 


## 3.5.0 - 2022-08-25

### Added

- Option to duplicate calendar events

- Option to copy calendar events

- Config setting to disable appointments

### Changed

- Moved icons to material design

src/components/AppNavigation/EditCalendarModal/SharingSearch.vue

+0 −15
Original line number Diff line number Diff line
@@ -25,11 +25,7 @@ 


<template>

	<div class="sharing-search">

<<<<<<< HEAD

		<Multiselect :options="usersOrGroups"

=======

		<NcSelect :options="usersOrGroups"

>>>>>>> 910b7d393f7baeeef462c55929f6d7fe2538d4a1

			:searchable="true"

			:internal-search="false"

			:max-height="600"
@@ -40,26 +36,15 @@ 
			open-direction="above"

			track-by="user"

			label="displayName"

<<<<<<< HEAD

			@search-change="findSharee"

			@change="shareCalendar">

			<span slot="noResult">{{ $t('calendar', 'No users or groups') }}</span>

		</Multiselect>

=======

			@search="findSharee"

			@option:selected="shareCalendar">

			<span slot="no-options">{{ $t('calendar', 'No users or groups') }}</span>

		</NcSelect>

>>>>>>> 910b7d393f7baeeef462c55929f6d7fe2538d4a1

	</div>

</template>



<script>

<<<<<<< HEAD

import Multiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'

=======

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

>>>>>>> 910b7d393f7baeeef462c55929f6d7fe2538d4a1

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

import HttpClient from '@nextcloud/axios'

import debounce from 'debounce'

src/components/CalendarGrid.vue

+1 −1

File changed.

Contains only whitespace changes.