Commit Graph

314 Commits

Author SHA1 Message Date
David Langley edf7830357 Merge pull request #5743 from vector-im/langleyd/5017_uisi_autoreporter
App: UISI AutoReporting
2022-03-24 14:58:23 +00:00
David Langley ee97c209e3 Fix documentation and update big report client init. 2022-03-21 14:45:54 +00:00
David Langley 737a7d85c4 Fix documentation and update big report client init. 2022-03-21 14:45:54 +00:00
ismailgulek d41d221161 Add notice displayed setting 2022-03-18 13:21:06 +03:00
ismailgulek 1b8c50a94f Add notice displayed setting 2022-03-18 13:21:06 +03:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard beeddf2fb4 Instrument metrics for iOS for the IA project #5401
- updates after review
2022-03-17 10:48:00 +01:00
Gil Eluard 75c1b4342a Instrument metrics for iOS for the IA project #5401
- updates after review
2022-03-17 10:48:00 +01:00
David Langley f449acf4f6 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 712a9bee13 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 ae320d1efa Add AutoReported, re-work big client interface and hook up AutoReporter. 2022-03-11 16:47:08 +00:00
David Langley 477dc34a50 Add AutoReported, re-work big client interface and hook up AutoReporter. 2022-03-11 16:47:08 +00:00
Gil Eluard cdd66146d8 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Gil Eluard 4f43793313 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.h
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
Arnaud Ringenbach cfeae5bc64 Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach e300d6ea6f Rename profile as userAvatarAndName 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach a6ed656107 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Arnaud Ringenbach 6ccf209ed8 Use only latest profiles in the timeline (labs) 2022-03-07 13:45:02 +01:00
Gil Eluard ff685a4c37 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Gil Eluard ceb74c2f6e Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
Doug 9582707146 Updates following PR feedback. 2022-02-10 12:59:13 +00:00
Doug 56b70d254b Updates following PR feedback. 2022-02-10 12:59:13 +00:00
Gil Eluard 23a898a1a4 Merge branch 'gil/SP1_space_creation' into gil/5228_let_people_know_when_rooms_have_moved 2022-02-04 14:31:26 +01:00
Gil Eluard 63d3843bb0 Merge branch 'gil/SP1_space_creation' into gil/5228_let_people_know_when_rooms_have_moved 2022-02-04 14:31:26 +01:00
Stefan Ceriu a3c6fc56c6 De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
Stefan Ceriu 500aba906e De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
SBiOSoftWhare a1cf7b9b7c Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2
Message bubbles: Layout for media (part 2)
2022-02-01 17:52:19 +01:00
SBiOSoftWhare 22f72fdf28 Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2
Message bubbles: Layout for media (part 2)
2022-02-01 17:52:19 +01:00
SBiOSoftWhare 24bb3d5c67 BuildSettings: Enable temporary message bubble setting. 2022-01-31 14:43:06 +01:00
SBiOSoftWhare 301a380bf2 BuildSettings: Enable temporary message bubble setting. 2022-01-31 14:43:06 +01:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
ismailgulek 4dc28af682 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
SBiOSoftWhare 535af1caf3 Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
SBiOSoftWhare 04267efeee Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
ismailgulek 3e2c4b32b0 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu f3422613cd vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
Stefan Ceriu 9ddf80f54b vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
ismailgulek 7e92b7cef5 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare 74dc5e0e2e RiotSettings: Add convenient method to get current room timeline style identifier. 2022-01-14 09:48:18 +01:00
SBiOSoftWhare e203942b94 RiotSettings: Add convenient method to get current room timeline style identifier. 2022-01-14 09:48:18 +01:00
SBiOSoftWhare ca87f9b1f6 Merge pull request #5342 from vector-im/steve/5321_bubbles_lauching
Message bubbles: Add settings and build flag
2022-01-13 09:50:23 +01:00
SBiOSoftWhare 3b82f6e56e Merge pull request #5342 from vector-im/steve/5321_bubbles_lauching
Message bubbles: Add settings and build flag
2022-01-13 09:50:23 +01:00
Stefan Ceriu 0bac754ad9 vector-im/element-ios/issues/5298 - Added build setting + ui and unit tests. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 8d97959cac vector-im/element-ios/issues/5298 - Added build setting + ui and unit tests. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 37db201124 vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 4ad5150c88 vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
ismailgulek ac1b79ff92 Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00
ismailgulek 9cd27d293c Merge branch 'develop' into ismail/5068_start_thread 2022-01-04 15:28:19 +03:00