ec0770434d
Merge pull request #7035 from vector-im/feature/bma/space_response_model
...
Space response model
2022-09-12 17:24:10 +02:00
73eb63a35e
Fix add by QR code layout ( #5424 )
...
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
2022-09-10 10:53:34 -07:00
4de62d84b4
towncrier
2022-09-10 08:04:20 +02:00
4b63f4b9bf
Merge pull request #7085 from vector-im/feature/bma/fix_push
...
Feature/bma/fix push
2022-09-09 18:03:10 +02:00
f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2
...
Use firebaseReceiver with FCM
2022-09-09 09:46:06 +02:00
41f75eed50
Adding changelog entry
2022-09-09 09:25:36 +02:00
de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs
...
New Layout - Labs Flag (to replace feature flag)
2022-09-08 14:35:38 +02:00
7bdcacf489
Merge branch 'misc/refactor-uphelper' into fix/fcm-push2
2022-09-08 10:49:53 +02:00
f2891b74c5
Adding changelog entry
2022-09-08 09:48:45 +02:00
6c2bf35d60
Merge pull request #7005 from vector-im/feature/mna/session-overview-screen
...
[Devices Management] Session overview screen (PSG-691, PSG-693)
2022-09-08 09:18:31 +02:00
5b46c803b2
Add changelog detail
...
Signed-off-by: sim <git@sgougeon.fr>
2022-09-07 18:19:06 +02:00
643f99b8e0
Merge branch 'feature/mna/clean-vm-for-dm-v2' into feature/ons/device_manager_filter
...
* feature/mna/clean-vm-for-dm-v2:
RefreshDevicesOnCryptoDevicesChangeUseCase unit tests
Adding changelog entry
Fix some coding style issues
DevicesViewModel unit tests
GetDeviceFullInfoListUseCase unit tests
GetCurrentSessionCrossSigningInfoUseCase unit tests
RefreshDevicesUseCase unit tests
Updating existing unit tests
Listen verification + refresh devices use cases
Moving recently created use cases inside v2 package
Inject new ViewModel in the fragment V2 + add use cases
Declare MarkAsManuallyVerified action
Empty ViewModel V2
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
2022-09-07 18:31:30 +03:00
5143ef9deb
Merge pull request #6727 from anoadragon453/patch-2
...
Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor.
2022-09-07 15:51:04 +02:00
59e6fa98c9
Merge pull request #7000 from pt2121/pt/6529-room
...
Suggest @room when @channel, @everyone, or @here is typed in composer
2022-09-07 15:49:18 +02:00
8dcbd3710d
Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter
...
* feature/mna/session-overview-screen: (57 commits)
Fix missing mapper in CryptoStoreHelper for tests
Fix unused string warning
Update unit tests
Rendering inactive status in SessionInfoView
Adding comment with examples of some parametrized strings
Fix post rebase
Fixing wrong copyright title
Adding last seen details + fix observation of wrong deviceId in ViewModel
Adding learn more link in verification status details
Unit tests for computing trust level of device
Unit tests for GetCurrentSessionCrossSigningInfoUseCase
Updating existing unit tests
Navigation from other session item
Show info in overview screen
Renaming CurrentSessionView into SessionInfoView to be more generic
Introducing some reusable usecases
Adding unit tests for viewModel
Adding unit tests for mapper
Adding unit tests for the new use case
Adding use case to get full device info for a given device id
...
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# vector/src/main/AndroidManifest.xml
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
2022-09-07 16:33:35 +03:00
37b216393e
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs
2022-09-07 14:02:10 +02:00
c408621bd5
Merge pull request #7054 from vector-im/feature/bma/fix_invite_to_room_in_space
...
Fix invite to room in space
2022-09-07 11:53:34 +02:00
8c32b08505
Changelog
2022-09-07 11:06:49 +02:00
199195dcbd
Merge pull request #7039 from vector-im/feature/eric/new-layout-update-icons
...
New Layout - Replace space icon (and release notes image)
2022-09-07 10:57:23 +02:00
64c8789ef2
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs
2022-09-07 10:35:44 +02:00
7d549a311f
Adding changelog entry
2022-09-07 09:44:45 +02:00
e2aa66e4c2
Adding changelog entry
2022-09-07 09:32:09 +02:00
1a5db3cc2c
Add changelog.
2022-09-06 18:49:15 +03:00
ef17aac981
Adds changelog file
2022-09-06 15:52:37 +02:00
31a3552e26
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
2022-09-06 15:32:00 +02:00
1c35e5ae9c
Merge pull request #6986 from vector-im/feature/nfe/invites_empty_state
...
empty state for new invites screen
2022-09-06 14:56:06 +02:00
4e0735c759
Merge pull request #7021 from vector-im/feature/nfe/app_layout_settings_update
...
obsolete settings are hidden when app layout flag is enabled
2022-09-06 14:53:51 +02:00
73d4492bf5
Adds changelog file
2022-09-06 14:40:47 +02:00
fbe5918f30
Adds changelog file
2022-09-06 12:52:48 +02:00
bfc89242fe
Changelog
2022-09-06 11:45:05 +02:00
e2ba576318
Merge pull request #7016 from vector-im/bugfix/eric/new-layout-accessibility-fixes
...
New Layout Accessibility Fixes
2022-09-06 08:25:29 +02:00
0a1c7561bd
Use embedded libopus encoder for devices that somehow lack the official one
2022-09-06 07:14:55 +02:00
9a29c79233
obsolete settings are hidden when app layout flag is enabled
2022-09-06 00:41:58 +02:00
14bce28c87
Adds changelog file
2022-09-05 21:17:59 +02:00
efe5eb0501
App layout Home screen empty states ( #7007 )
2022-09-05 18:11:25 +02:00
ae653eb672
Catch race condition while recording voice audio ( #7009 )
2022-09-05 15:57:16 +00:00
b37996e4c3
space switcher empty spaces ( #6988 )
2022-09-05 16:11:50 +02:00
8314eb71c0
Merge branch 'develop' into feature/nfe/invites_empty_state
2022-09-05 12:32:01 +02:00
098fac635d
Merge branch 'vector-im:develop' into develop
2022-09-05 12:06:19 +02:00
90fedfea93
Adding changelog entry
2022-09-05 09:13:12 +02:00
6917e97f49
Suggest @room when @channel, @everyone, or @here is typed in composer ( #6529 )
...
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
2022-09-03 17:26:45 -07:00
7991684fc8
Merge branch 'vector-im:develop' into develop
2022-09-02 16:05:45 +02:00
2f94b80c42
Add changelog.
2022-09-02 14:28:27 +02:00
bddb37ef7a
Merge pull request #6981 from vector-im/feature/adm/allow-optional-emails
...
Allowing optional email registration
2022-09-01 16:30:20 +01:00
22ce829645
moving all the strings to a dedicated libray/strings module
2022-09-01 14:58:07 +01:00
ed13177376
Merge pull request #6982 from p1gp1g/fix/autoplay-sticker
...
Fix autoplayed animated sticker
2022-09-01 14:43:23 +02:00
5003459962
empty state for new invites screen
2022-09-01 14:39:13 +02:00
833ad6463c
Add changelog detail
...
Signed-off-by: sim <git@sgougeon.fr>
2022-08-31 23:39:26 +02:00
3ef3e3760d
Fix crash on PIN code settings screen
2022-08-31 20:06:32 +02:00
62e8beadf8
allowing optional emails
...
- when the email stage is non mandatory, email emails are treated as a dummy step, as per the legacy flow
2022-08-31 17:40:35 +01:00
318352f1bd
Merge pull request #6978 from vector-im/feature/bma/null_room
...
Fix crash when opening an unknown room
2022-08-31 17:51:13 +02:00
6341cf92a3
Merge pull request #6946 from vector-im/feature/ons/device_manager_other_session_list
...
[Device Manager] Render other sessions (PSG-668)
2022-08-31 17:01:20 +03:00
0950e41526
Merge pull request #6967 from vector-im/feature/bma/fix_crashes
...
Fix crashes
2022-08-31 15:25:57 +02:00
642da5a8e8
Changelog
2022-08-31 15:25:12 +02:00
b18395f418
Changelog
2022-08-31 10:41:05 +02:00
10b1612ba3
fixing typo in changelog
2022-08-31 09:16:01 +01:00
39f9eb9641
adding changelog entry
2022-08-31 09:16:00 +01:00
657796c8b5
new app layout is enabled ( #6959 )
2022-08-31 10:06:01 +02:00
456d831a7d
Merge pull request #6917 from vector-im/feature/bma/incr_sync_perf
...
Feature/bma/incr sync perf
2022-08-31 09:06:32 +02:00
b0fb1f908e
Space Switching: Space Invites ( #6924 )
2022-08-30 15:30:51 +02:00
51dcaf7556
Merge pull request #6925 from vector-im/feature/bma/http_log
...
Feature/bma/http log
2022-08-29 15:04:46 +02:00
14e3753183
fabs are moved from HomeRoomListFragment to NewHomeDetailFragment ( #6943 )
2022-08-29 13:26:39 +02:00
84d938da94
fixed invites count badge bottom margin on a home screen ( #6948 )
2022-08-29 10:17:27 +02:00
b5debe92c0
Merge pull request #6877 from vector-im/feature/eric/new-layout-navigation
...
Space Switching Back Navigation
2022-08-26 17:40:18 +02:00
dc99c1122d
Merge pull request #6903 from vector-im/feature/ons/device_manager_current_session
...
[Device Manager] Render current session (PSG-668)
2022-08-26 16:22:46 +03:00
fdc2e1c3c3
Merge pull request #6941 from vector-im/feature/adm/invalid-space-command-parsing
...
Fixing /joinSpace and /addToSpace commands
2022-08-26 14:15:38 +01:00
95b37e2838
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
2022-08-26 14:06:11 +02:00
b67c3ce40b
Merge pull request #6907 from vector-im/feature/eric/accordion-bottom-sheet
...
Space Switching: Accordion-Style Bottom Sheet
2022-08-26 14:04:52 +02:00
2c6c23da9c
Merge branch 'feature/ons/device_manager_current_session' into feature/ons/device_manager_other_session_list
...
* feature/ons/device_manager_current_session: (169 commits)
new app layouts invites (#6911 )
bottom navigation tabs are removed for AppLayout (#6905 )
focus input when changing server address
Fix copyright
Improve createRoomThreePidEvents for clarity
Remove roomCreatorUserId and use current userId by default
Remove useless explicit field type
Change visibility of LocalRoomThirdPartyInviteContent to internal
Remove useless apply in CreateLocalRoomStateEventsTask
Update doc
Extract condition to reduce code complexity
Verify tombstone event
Remove safe call
Add unit tests for CreateRoomFromLocalRoomTask
Add unit tests for CreateLocalRoomStateEventsTask
Set stateKey as empty by default
Create local room state events in dedicated task
Fix local events generation following the specification
Update CreateRoomParams from the potential FeaturePreset before persisting
Persists CreateRoomParams into LocalRoomSummaryEntity
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
2022-08-26 14:47:09 +03:00
7a3a5ae30d
Merge branch 'develop' into feature/ons/device_manager_current_session
...
* develop: (169 commits)
new app layouts invites (#6911 )
bottom navigation tabs are removed for AppLayout (#6905 )
focus input when changing server address
Fix copyright
Improve createRoomThreePidEvents for clarity
Remove roomCreatorUserId and use current userId by default
Remove useless explicit field type
Change visibility of LocalRoomThirdPartyInviteContent to internal
Remove useless apply in CreateLocalRoomStateEventsTask
Update doc
Extract condition to reduce code complexity
Verify tombstone event
Remove safe call
Add unit tests for CreateRoomFromLocalRoomTask
Add unit tests for CreateLocalRoomStateEventsTask
Set stateKey as empty by default
Create local room state events in dedicated task
Fix local events generation following the specification
Update CreateRoomParams from the potential FeaturePreset before persisting
Persists CreateRoomParams into LocalRoomSummaryEntity
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
2022-08-26 13:45:47 +03:00
ed2c365db2
Add changelog.
2022-08-26 13:07:16 +03:00
da2eddd857
Merge pull request #6927 from noantiq/develop
...
FTUE: Make entering a custom Homeserver address faster by focusing the input
2022-08-26 10:43:13 +01:00
e43bc88a4d
Merge pull request #6127 from vector-im/feature/fre/start_dm_on_first_msg_impl
...
Create the DM when sending an event
2022-08-26 09:15:34 +02:00
70cfe00271
new app layouts invites ( #6911 )
2022-08-25 16:34:04 +02:00
493d9240c2
parsing the space commands by checking for the size and last segment to find the space id to join/add to
2022-08-25 15:30:43 +01:00
a5536ab894
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
2022-08-25 16:15:53 +02:00
225d05e0be
bottom navigation tabs are removed for AppLayout ( #6905 )
2022-08-25 15:59:38 +02:00
b2212a7e2b
focus input when changing server address
2022-08-25 14:52:16 +02:00
72896f1c8a
Create the DM when sending an event
2022-08-25 13:57:49 +02:00
da70d520bc
fixed space switching dialog measured with wrong height sometimes ( #6928 )
2022-08-25 10:49:44 +02:00
f7ae377874
Add changelog
...
Signed-off-by: sim <git@sgougeon.fr>
2022-08-25 09:33:26 +02:00
64894d4443
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
2022-08-24 20:25:02 +02:00
5d711793ad
Changelog
2022-08-24 12:39:58 +02:00
4c2f8537e1
Changelog
2022-08-23 18:51:14 +02:00
033557dba4
Towncrier
2022-08-23 16:07:57 +02:00
94e755552c
Merge pull request #6888 from vector-im/feature/adm/change-server-on-error
...
FTUE - Allow changing server on onboarding start error
2022-08-23 15:05:51 +02:00
c9e76f5f97
changelog
2022-08-23 11:58:05 +02:00
ace2c672ed
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
2022-08-23 10:00:55 +02:00
2830664dbb
Merge pull request #6868 from vector-im/feature/eric/space-settings
...
Space Switching: Adds Toolbar Click To Open Space Settings
2022-08-23 09:59:09 +02:00
8336d4c269
adding changelog entry
2022-08-22 17:24:11 +01:00
0be46adfda
Merge pull request #6862 from vector-im/feature/adm/ftue-fragment-crashes
...
FTUE - Crash fixes
2022-08-22 17:21:31 +01:00
841ee33c82
Merge pull request #6837 from vector-im/feature/adm/missing-notifications
...
Missing notifications due to stuck background workers
2022-08-22 17:20:04 +01:00
edb2d5d78e
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
# vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
2022-08-22 14:56:14 +02:00
a7aa72fb6e
Adds changelog file
2022-08-22 14:21:48 +02:00
6452a95e0a
clean up pin code and biometrics on logout
2022-08-22 14:08:29 +02:00
9b57630eae
Merge pull request #6873 from vector-im/feature/adm/allow-trusting-certificates
...
FTUE - Fix trusting certificates during edit server flow
2022-08-22 11:47:50 +01:00
7211c9c08e
Merge pull request #6890 from vector-im/feature/adm/missing-notifications-on-login
...
Missing push notifications on login
2022-08-22 11:14:28 +01:00
e86058b299
Merge pull request #6884 from vector-im/feature/bma/sync_thread_investigation
...
Ensure sync thread is started
2022-08-22 12:09:54 +02:00
43f191d073
Add changelog.
2022-08-22 12:40:15 +03:00
d405a66443
Merge pull request #6834 from vector-im/feature/adm/ftue-empty-identity-providers
...
Allow empty SSO `identity_providers`
2022-08-22 08:44:31 +01:00
2bca94d92b
Changelog: Add .bugfix entry for pull request #6215
...
Signed-off-by: networkException <git@nwex.de>
2022-08-21 12:07:55 +02:00
06c77e4b5e
adding changelog entry
2022-08-19 17:14:20 +01:00
cc49e96d36
dialpad moved from bottom navigation tab to a separate activity ( #6887 )
2022-08-19 17:55:43 +02:00
0629cae183
added dialog to change app layout settings ( #6840 )
2022-08-19 17:53:48 +02:00
add7bd9052
Merge branch 'feature/eric/new-layout-navigation' into feature/eric/new-layout-debug
...
# Conflicts:
# vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt
2022-08-19 14:33:49 +02:00
7fafd07e2c
Changes changelog file
2022-08-19 13:32:31 +02:00
f75b2e6ef1
Changelog files.
2022-08-19 10:11:31 +02:00
90ab40dccb
Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet
2022-08-18 17:38:15 +02:00
2a1483f6a5
Merge remote-tracking branch 'origin/develop' into feature/eric/space-settings
2022-08-18 17:37:56 +02:00
88fc0afea5
Merge branch 'feature/eric/new-layout-navigation' into feature/eric/new-layout-debug
2022-08-18 17:37:16 +02:00
fecaf3e360
Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation
2022-08-18 17:36:08 +02:00
e17e3fe00a
Adds changelog file
2022-08-18 17:22:19 +02:00
cdeea21917
adding changelog entries
2022-08-18 11:41:28 +01:00
e948fe05ca
adding changelog entry
2022-08-18 11:41:19 +01:00
e00a9a10fb
changelog
2022-08-18 11:24:02 +01:00
519855445e
Start DM on first message when selecting "direct message" from the room member details
2022-08-18 11:37:55 +02:00
136ca4bafb
Adds changelog file
2022-08-18 10:16:54 +02:00
003a254c17
Adds changelog file
2022-08-17 22:31:18 +02:00
ce8939a092
Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet
...
# Conflicts:
# vector/src/main/res/values/strings.xml
2022-08-17 21:13:39 +02:00
a3a76d1c35
adding changelog entry
2022-08-17 15:24:05 +01:00
6c860710bd
Merge pull request #6843 from vector-im/feature/bma/detect_object_log
...
Fix some string template
2022-08-17 14:37:42 +02:00
b6bcefbb92
Merge pull request #6795 from vector-im/feature/eric/toolbar-space-name
...
New App Layout: Space name reflected in toolbar
2022-08-17 10:52:07 +02:00
4fedafc1be
Merge pull request #6749 from vector-im/feature/eric/space-list-modal
...
Adds Space List Bottom Sheet
2022-08-17 10:51:56 +02:00
cd71abeb9f
[Bugfix #5029 ] disable emoji keyboard not applies to reply
...
Signed-off-by: eidonia <bastien_rambeaud@hotmail.com>
2022-08-16 19:29:14 +02:00
446bf7e0aa
changelog
2022-08-16 16:10:15 +02:00
74d99b156f
Merge pull request #6833 from vector-im/feature/adm/removing-login-poc
...
Removing `Login2` proof of concept
2022-08-16 13:02:40 +01:00
8b0fba2ef5
Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
2022-08-16 11:58:25 +02:00
8a4bd0c467
Merge pull request #6805 from vector-im/cgizard/ISSUE-6645
...
Add inputType for room name creation and settings
2022-08-16 11:05:57 +02:00
6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list
...
[Devices Management] Header view for sessions lists in new layout (PSG-668)
2022-08-15 23:09:53 +03:00
b152910f9c
adding changelog entry
2022-08-15 14:12:42 +01:00
314b077fbd
adding changelog entry
2022-08-15 11:58:04 +01:00
62f7b40a3e
Add changelog entry
2022-08-12 13:10:49 +02:00
971ad26deb
Merge pull request #6809 from vector-im/fix/mna/leak-in-call
...
[Call] Memory leak after a call
2022-08-11 16:44:33 +02:00
e0e21d4282
filtered room list at home ( #6724 )
2022-08-11 16:26:24 +02:00
292f6622bd
Adding changelog entry
2022-08-11 15:28:18 +02:00
ef2aa6f829
Adding changelog entry
2022-08-11 14:26:15 +02:00
fa8f72c909
Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary
...
Add a developer setting to enable LeakCanary at runtime
2022-08-11 12:10:26 +02:00
616c16f8c6
Merge pull request #6783 from vector-im/feature/adm/decouple-variants
...
Decouple `:vector` variants/build types
2022-08-11 10:59:42 +01:00
ce23303b97
Add inputType for room name creation and settings
2022-08-11 11:53:43 +02:00
0515303c8c
Merge pull request #6800 from vector-im/feature/mna/new-device-management-screen
...
[Devices management] Add a feature flag and empty screen for future new layout (PSG-676)
2022-08-11 08:59:57 +02:00
989471a409
Adds changelog file
2022-08-10 17:44:33 +02:00
a2c39c079a
Adding changelog entry
2022-08-10 15:28:51 +02:00
12405527e1
Adding changelog entry
2022-08-10 14:47:08 +02:00
fcc7bbadfa
Merge branch 'release/v1.4.32' into develop
2022-08-10 12:30:42 +01:00
527bcf2e6f
Adds changelog file
2022-08-10 11:30:15 +02:00
fd37b31c44
Changes changelog file extension
2022-08-10 11:28:14 +02:00
ed00685514
Adding changelog entry
2022-08-10 10:40:06 +02:00
e81da5d8b4
generating 1.4.32 changelog
2022-08-10 09:02:04 +01:00
e87eefb319
Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
2022-08-10 08:24:55 +02:00
ce4ab78f13
Merge pull request #6693 from vector-im/feature/eric/new_fab
...
New App Layout FABs
2022-08-10 08:13:36 +02:00
Benoit Marty
Prat T
Benoit Marty
Maxime NATUREL
sim
Maxime NATUREL
Onuray Sahin
ericdecanini
Jorge Martín
NIkita Fedrunov
Nikita Fedrunov
Artjom König
Adam Brown
Florian Renaud
Timuçin Boldt
Florian Renaud
Artjom König
networkException
Andrew Morgan
eidonia
Claire G