Commit Graph

131 Commits

Author SHA1 Message Date
Frank Rotermund df14eedff6 Feature/2865 participant sorting 2022-06-01 13:53:23 +00:00
Frank Rotermund 6b63320488 Feature/2792 function accounts s1 2022-05-30 15:54:26 +00:00
Frank Rotermund 90d0616723 MESSENGER_2910 fix invite to personal notes && dms 2022-05-10 16:24:55 +02:00
Frank Rotermund 18aa3bfac5 MESSENGER_2910 buildfixes VII build successful 2022-05-03 16:45:58 +02:00
Arnfried Griesert f1becdd999 merged element 1.8.10 2022-05-03 12:48:01 +02:00
Frank Rotermund 11589b1626 Feature/2581 permalinks 2022-03-31 05:51:40 +00:00
Frank Rotermund 24a4feae96 Feature/2897 restricted user 2022-03-22 14:37:58 +00:00
Andy Uhnak 63c16f4441 Merge branch 'master' into develop 2022-03-18 17:01:32 +00:00
Andy Uhnak 8877259c18 Revert copy change 2022-03-18 14:02:50 +00:00
Andy Uhnak 7a8114bec3 Allow ignoring invited users that have not joined a room yet 2022-03-18 13:31:43 +00:00
Frank Rotermund 37d97d09db MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard 0df41c3b90 Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Gil Eluard 6dce767666 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 27571866b5 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Gil Eluard da9c921efb Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Doug 2aec883095 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Gil Eluard af99903cea 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
aringenbach 87ad400eb6 Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
Stefan Ceriu bc60512101 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard 4d6133ef85 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
Gil Eluard 40fdba0cc1 SP1.2: Invite to Space in room landing element-ios#5225
- Update after review
2022-02-03 23:44:07 +01:00
Gil Eluard 925ca81b04 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
ismailgulek 61e9d4feda Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
Doug 296f444b9e Add AnalyticsScreenTimer and track more screens.
Update Analytics with new methods in MXAnalyticsDelegate.
2021-12-16 16:59:45 +00:00
Doug cea6cd145b Use matrix-analytics-events generated stubs (locally for now).
Track screens, removing any that aren't part of the schema.
2021-12-16 16:59:45 +00:00
Doug 8ec27e8579 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
ismailgulek 58cd6058fa Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2021-12-16 14:46:43 +03:00
ismailgulek 7339a4fe23 Adapt MXEventTimeline changes 2021-12-15 01:44:04 +03:00
SBiOSoftWhare 22e65563dc RoomMemberDetailsViewController: Fix user id theming. 2021-12-14 15:47:09 +01:00
SBiOSoftWhare 48d8d71f91 RoomMemberDetails: Add safe area layout guides. 2021-12-10 14:02:09 +01:00
Gil Eluard fe4d84ec06 Implement FAB journeys & rough edge warnings element-ios#5226
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
2021-12-10 09:59:10 +01:00
SBiOSoftWhare bc6381d8a7 RoomMemberDetailsViewController: Refactor a property name. 2021-12-10 09:50:06 +01:00
SBiOSoftWhare 3b4daac2fa RoomMemberDetailsViewController: Show user Matrix id and make it copyable. 2021-12-10 09:29:09 +01:00
Gil Eluard 919911d53b Invite to Space in room landing #5225
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
SBiOSoftWhare e6ef1be7b6 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Phl-Pro ea322e1526 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
SBiOSoftWhare 9568c29401 Weakify strong reference delegates. 2021-10-29 12:23:06 +02:00
Philippe Loriaux af20d24960 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Stefan Ceriu 010178f397 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +03:00
Stefan Ceriu 04bc95a85c vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Gil Eluard d7a19a7531 [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-02 11:24:07 +03:00
Gil Eluard beb3cd5a05 [Spaces] M10.8 Browsing users in a space #4682
- Added navigation to member detail page
2021-08-22 08:48:54 +03:00
Stefan Ceriu b00d07ffca Adopt consolidated logging mechanism (#4370)
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
Gil Eluard 432ea1b1e8 Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
SBiOSoftWhare f723c1ead7 RoomParticipantsViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
ismailgulek 147e4c55e1 Remove old controls and add the fab 2020-10-09 12:27:26 +03:00
ismailgulek 421b68364e Update localization keys 2020-09-28 12:51:34 +03:00
ismailgulek bd74911f97 Wording for search placeholder 2020-09-25 13:30:52 +03:00
ismailgulek b0f5b5b698 Update encryption strings 2020-09-24 13:27:53 +03:00
ismailgulek dd9430db6e Update leave strings 2020-09-24 13:00:50 +03:00