Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-02 01:02:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
17277 commits 46 branches 261 tags 144 MiB
Commit graph

17277 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gil Eluard
93ce9abbb0
Merge pull request #6862 from vector-im/gil/6853-Tidy_up_TabBarCoordinator_now_that_AllChatsCoordinator_exists 
Tidy up TabBarCoordinator now that AllChatsCoordinator exists.
 2022-10-12 15:10:17 +02:00
Aleksandrs Proskurins
077a828627
Merge pull request #6860 from vector-im/aleksandrs/6838_filter_sessions 
Device Manager: Filter sessions
 2022-10-12 15:27:42 +03:00
Mauro Romito
ee789595b8 should now be aligned to the designs 2022-10-12 14:26:38 +02:00
Mauro Romito
802e8cd7a0 pr comment + some design improvements 2022-10-12 13:58:44 +02:00
Aleksandrs Proskurins
7a7ed567a4 Added accessibility label to filter menu 2022-10-12 14:34:26 +03:00
David Langley
692c97438f Revert collections update 2022-10-12 11:50:29 +01:00
David Langley
b6e0340bce Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/6830_wysiwyg_core_formatting 2022-10-12 11:46:24 +01:00
Aleksandrs Proskurins
e66d66d16e Renamed filerWasChanged to filterWasChanged 2022-10-12 13:18:33 +03:00
Aleksandrs Proskurins
32d8c2aa31 Single scale image 2022-10-12 13:16:19 +03:00
Aleksandrs Proskurins
a1ae4ec86c
Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-10-12 13:11:43 +03:00
Aleksandrs Proskurins
7015d12b78
Update Riot/Assets/en.lproj/Vector.strings 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-10-12 13:11:09 +03:00
Gil Eluard
9bc22e4ed2 Tidy up TabBarCoordinator now that AllChatsCoordinator exists. 2022-10-12 11:47:59 +02:00
Yoan Pintas
3488b67976
Add voice broadcast state event (#6785) 2022-10-12 11:30:38 +02:00
Mauro Romito
4bd524966b some UI tweaks 2022-10-12 11:06:01 +02:00
Alfonso Grillo
2045a6d2c8
Merge pull request #6858 from vector-im/alfogrillo/5571_remove_location_loader 
Remove location loader (PSG-818)
 2022-10-12 10:23:37 +02:00
Aleksandrs Proskurins
26a380d56a Formating 2022-10-12 11:00:38 +03:00
Aleksandrs Proskurins
5cb2b25eff Merge branch 'develop' into aleksandrs/6838_filter_sessions 
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
 2022-10-12 10:58:04 +03:00
Aleksandrs Proskurins
f556bd82de Changelog 2022-10-12 09:48:09 +03:00
Aleksandrs Proskurins
a6bc478a14 Renamed OtherUserSessionsFilter to UserOtherSessionsFilter 2022-10-12 09:30:41 +03:00
Mauro Romito
16b480d3da edit reply completed, just need to polish the UI a bit more. 2022-10-11 21:04:04 +02:00
Mauro Romito
f76959ee40 implemented cancel, but I need to actually need to solve a problem where the previous text is not stored in case of cancel of the reply/edit 2022-10-11 20:28:57 +02:00
Mauro Romito
9931bba4d4 color improvements and implementing the cancel callback 2022-10-11 19:58:22 +02:00
Mauro Romito
80f27c062b right assets 2022-10-11 17:54:27 +02:00
Mauro Romito
5757a79307 Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_reply_UI 2022-10-11 17:31:52 +02:00
Mauro Romito
7cc98520f5 edit mode changes the send button 2022-10-11 17:25:58 +02:00
Alfonso Grillo
163f278c5b Add changelog.d file 2022-10-11 17:19:43 +02:00
Alfonso Grillo
ec746fbb87 Move completions around 2022-10-11 17:18:05 +02:00
Alfonso Grillo
6831a00ad2 Remove loader for live location sharing 2022-10-11 17:15:10 +02:00
Alfonso Grillo
21a8a994f3 Remove loader for static location sharing 2022-10-11 17:15:10 +02:00
Doug
313331708d
Device Manager: Verify session (#6832) 
* Initial implementation
* Add verificationState to UserSessionInfo
* Listen for changes device changes in the service.
 2022-10-11 16:11:52 +01:00
Aleksandrs Proskurins
1d1a0eb914 UI and unit tests 2022-10-11 17:19:32 +03:00
David Langley
4c92b52fad
Merge pull request #6846 from Velin92/mauroromito/wysiwyg_edit_no_UI 
Functional edit and reply implementation (no UI changes)
 2022-10-11 14:45:59 +01:00
Doug
c358f28a55
Device Manager: Rename Session (#6826) 
* Publish the user sessions overview data.
* Add UserSessionName screen.
* Update logout action to match Figma more closely.
 2022-10-11 13:11:15 +01:00
Aleksandrs Proskurins
0af1ac2692 Clear filter button 2022-10-11 14:54:09 +03:00
ismailgulek
d5ac519e8f
Ignore OS version from web based sessions (PSG-826) (#6852) 
* Ignore OS version from web based sessions

* Add changelog
 2022-10-11 14:39:36 +03:00
Mauro Romito
9e842ce122 todo reminder 2022-10-11 13:06:28 +02:00
Mauro Romito
e6abf6688e revert 2022-10-11 13:03:32 +02:00
Mauro Romito
6eced06ddd reverting the xcscheme file 2022-10-11 13:02:39 +02:00
ismailgulek
ff8d3df86a Merge branch 'hotfix/1.9.8' into develop 2022-10-11 10:25:08 +03:00
Aleksandrs Proskurins
168de8bb78 Verified sessions 2022-10-11 09:42:07 +03:00
Aleksandrs Proskurins
b38288b658 Filter button 2022-10-11 08:42:28 +03:00
Mauro Romito
a40d874674 improving overall code 2022-10-10 18:54:20 +02:00
Mauro Romito
7427ece6e2 improving code 2022-10-10 18:44:19 +02:00
Mauro Romito
580f1c2829 code improvements 2022-10-10 18:43:46 +02:00
Mauro Romito
8ac9fff779 error logging improvement 2022-10-10 18:32:44 +02:00
Mauro Romito
9ec60a572e formatted reply support 2022-10-10 18:26:48 +02:00
Mauro Romito
66ccd7343c package update 2022-10-10 17:59:49 +02:00
Mauro Romito
e6d0366c35 Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_no_UI 2022-10-10 17:58:54 +02:00
Mauro Romito
e55f48c047 edit works functionally (no UI changes yet) 2022-10-10 17:44:57 +02:00
Weblate
293482f022 Merge branch 'origin/develop' into Weblate. 2022-10-10 15:35:31 +00:00