Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
14839 commits 46 branches 261 tags 144 MiB
Commit graph

14839 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Langley
fc9e4a9847 Actually fix merge. 2022-03-21 10:41:10 +00:00
David Langley
cff98cdd1d Revert "fix merge" 
This reverts commit 0251a01bb0.
 2022-03-21 10:39:50 +00:00
David Langley
0251a01bb0 fix merge 2022-03-17 09:16:11 +00:00
David Langley
4e1e9afa59 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/5017_uisi_autoreporter 2022-03-16 21:45:33 +00:00
David Langley
5c39eb2f51 Update detector to match web implementation(only track decryption attempts), add labs flag, increase rate limit spacing. 2022-03-16 17:47:41 +00:00
ismailgulek
3171b2533d
Merge pull request #5833 from vector-im/ismail/5829_reply_to_thread_root 
Fix replies to thread root events
 2022-03-16 18:14:07 +03:00
Doug
14fddc1d22
Merge pull request #5826 from vector-im/doug/scroll_edge_name 
Make scrollEdgesAppearance singular to match UIKit
 2022-03-16 14:45:49 +00:00
SBiOSoftWhare
0f8d5045d2
Merge pull request #5828 from vector-im/steve/5827_map_multiple_annot 
Location sharing: Support multiple user annotation views on the map
 2022-03-16 15:22:04 +01:00
ismailgulek
6b2317b50d
Add changelog 2022-03-16 17:13:52 +03:00
ismailgulek
0184791f23
Pass threadId of room data source on replies 2022-03-16 17:13:18 +03:00
SBiOSoftWhare
2dcd713199 LocationSharingViewModelTests: Fix issues. 2022-03-16 14:39:51 +01:00
SBiOSoftWhare
00f19be101 Update changes 2022-03-16 11:39:15 +01:00
SBiOSoftWhare
d9ac23b4a3 LocationSharingView: Update with updated map view and model. 2022-03-16 11:35:15 +01:00
SBiOSoftWhare
9dda19bc8a LocationSharingView: Update state and view model. 2022-03-16 11:33:36 +01:00
SBiOSoftWhare
42d4e4afd4 Create reusable MapCreditsView. 2022-03-16 11:04:58 +01:00
SBiOSoftWhare
27fc574b9c UserLocationAnnotatonView: Handle init with UserLocationAnnotation. 2022-03-16 10:57:00 +01:00
SBiOSoftWhare
8a42d65559 Create custom map annotation UserLocationAnnotation. 2022-03-16 10:50:18 +01:00
SBiOSoftWhare
ae191f1549 LocationSharingMapView: Support displaying multiple annotation views. 2022-03-16 10:49:24 +01:00
Doug
b42c3fa87c Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
ismailgulek
0d5bd2341a
Merge pull request #5817 from vector-im/ismail/5816_reply_fallback 
Extend Reply Fallbacks to non-thread Events
 2022-03-15 14:46:25 +03:00
ismailgulek
07d734b8c2
Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek
4e8bb7b4b0
Merge branch 'develop' into ismail/5816_reply_fallback 2022-03-15 13:50:06 +03:00
Andy Uhnak
a0f45a2d78 Prepare for new sprint 2022-03-14 16:26:10 +00:00
Andy Uhnak
9a4c3e485b Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak
31ff803f59 Merge branch 'release/1.8.6/master' 2022-03-14 16:26:01 +00:00
Andy Uhnak
a719fc5fdf finish version++ 2022-03-14 16:26:01 +00:00
Anderas
2e04271a38
Merge pull request #5820 from vector-im/release/1.8.6/release 
Release 1.8.6
 2022-03-14 16:25:40 +00:00
Andy Uhnak
74f6b4f57c version++ 2022-03-14 15:45:55 +00:00
Andy Uhnak
5b94236cc5 changelog.d: Upgrade MatrixSDK version ([v0.22.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.6)). 2022-03-14 15:45:54 +00:00
Anderas
76eb83be75
Merge pull request #5809 from vector-im/andy/5807_ignore_from_invite 
Ignore the sender of a room invite without needing to join the room first
 2022-03-14 13:13:37 +00:00
ismailgulek
efae900a4e
Add changelog 2022-03-14 13:44:50 +03:00
ismailgulek
0c0d6da1ff
Extend reply fallback for also non-thread events 2022-03-14 13:44:13 +03:00
Andy Uhnak
dab59bece5 Anchor action sheet to source view 2022-03-14 08:47:52 +00:00
David Langley
2309908c0e Add AutoReported, re-work big client interface and hook up AutoReporter. 2022-03-11 16:47:08 +00:00
Andy Uhnak
31ec9be2ad Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Anderas
53245af5c2
Merge pull request #5804 from vector-im/andy/5801_dismiss_indicators 
Do not show user indicators when the view controller is not visible
 2022-03-11 08:16:03 +00:00
Arnaud Ringenbach
62c6ff759f Room: Refresh header when call actions become available 2022-03-11 09:09:49 +01:00
Andy Uhnak
64652b4f4f Add more comments 2022-03-10 17:40:23 +00:00
Andy Uhnak
9b72e91947 Name changes 2022-03-10 17:32:25 +00:00
Doug
1e349aebc4
Merge pull request #5802 from vector-im/doug/5879_fix_sso_buttons 
Fix social button visibility during registration
 2022-03-10 17:08:16 +00:00
Andy Uhnak
18e78864c8 Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Doug
c65ead8e58 Fix social button visibility during registration 
Hide the back button at the same time.
Disable custom server entry when picking a different use case.
 2022-03-10 11:28:03 +00:00
Gil Eluard
c76e0bc4b4
Merge pull request #5748 from vector-im/gil/SP1_space_creation 
Creating & managing Spaces
 2022-03-10 10:18:48 +01:00
Andy Uhnak
8e4a669f3d Prepare for new sprint 2022-03-09 15:15:58 +00:00
Andy Uhnak
eb5dafc91f Merge branch 'master' into develop 2022-03-09 15:15:55 +00:00
Andy Uhnak
9b23dd3750 Merge branch 'release/1.8.5/master' 2022-03-09 15:15:50 +00:00
Andy Uhnak
cfc2e25319 finish version++ 2022-03-09 15:15:50 +00:00
Anderas
4e33ebba37
Merge pull request #5787 from vector-im/release/1.8.5/release 
Release 1.8.5
 2022-03-09 15:15:26 +00:00
Andy Uhnak
d31ae401fb version++ 2022-03-09 14:31:19 +00:00
Anderas
afef79cc46
Merge pull request #5785 from vector-im/andy/5783_hidden_messages 
Only render missing messages for m.room.message types
 2022-03-09 14:21:03 +00:00