felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-27 19:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,069 Commits 1 Branch 67 Tags
cc9ba7674ef0d069328480bc55f0299b4fd95682
Commit Graph

1315 Commits

Author SHA1 Message Date
SBiOSoftWhare c54ee890be RoomVC: Handle live location banner. 2022-03-17 16:58:52 +01:00
SBiOSoftWhare e8a4e5fa5f RoomVC: Handle live location banner. 2022-03-17 16:58:52 +01:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Gil Eluard 69cec41da0 Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard bd0041c5dc Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard c747ff86ac 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 67b0df922f 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
Andy Uhnak abce639820 Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 3865143ef5 Anchor action sheet to source view 2022-03-14 08:47:52 +00:00
Andy Uhnak 9751d22772 Anchor action sheet to source view 2022-03-14 08:47:52 +00:00
Andy Uhnak f6ee46890e Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Andy Uhnak e0adc29903 Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Arnaud Ringenbach a80e89f13c Room: Refresh header when call actions become available 2022-03-11 09:09:49 +01:00
Arnaud Ringenbach 63cb0e0ce7 Room: Refresh header when call actions become available 2022-03-11 09:09:49 +01:00
Andy Uhnak 838431368a Add more comments 2022-03-10 17:40:23 +00:00
Andy Uhnak 18d0ccf6b7 Add more comments 2022-03-10 17:40:23 +00:00
Andy Uhnak 863d7ca2bd Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Andy Uhnak 902a227e8d Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +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
Gil Eluard acf7d0de13 Instrument missing screen metrics (#5764) 
* Instrument missing screen metrics

- Done
 2022-03-08 10:13:46 +01:00
Gil Eluard 24de57bb58 Instrument missing screen metrics (#5764) 
* Instrument missing screen metrics

- Done
 2022-03-08 10:13:46 +01:00
Gil Eluard cf015c4ef2 selection impossible when filtering in add room screen #5757 (#5758) 
- Fixed
- Other minor code / UI tweaks
 2022-03-07 12:25:50 +01:00
Gil Eluard dcebd89fdf selection impossible when filtering in add room screen #5757 (#5758) 
- Fixed
- Other minor code / UI tweaks
 2022-03-07 12:25:50 +01:00
Gil Eluard 59038e18c1 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
Gil Eluard 42b4144323 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 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen 
Uses VectorL10n everywhere.
 2022-03-03 09:34:54 +00:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen 
Uses VectorL10n everywhere.
 2022-03-03 09:34:54 +00:00
Anderas fda6ba2862 Merge pull request #5690 from vector-im/andy/5603_room_indicators 
Room activity indicators
 2022-03-01 13:08:29 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators 
Room activity indicators
 2022-03-01 13:08:29 +00:00
ismailgulek 0f043fd357 Merge pull request #5709 from vector-im/ismail/5365_thread_analytics 
Threads: Analytics
 2022-03-01 15:23:47 +03:00
ismailgulek 67709c7da5 Merge pull request #5709 from vector-im/ismail/5365_thread_analytics 
Threads: Analytics
 2022-03-01 15:23:47 +03:00
Gil Eluard 72e280652a Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
SBiOSoftWhare 220e1872d4 Timeline: Rename call cells. 2022-02-28 16:48:41 +01:00
SBiOSoftWhare 02df90249c Timeline: Rename call cells. 2022-02-28 16:48:41 +01:00
Gil Eluard c84285955b SP3.1: Update room settings for Spaces #5231 
- Update after review
 2022-02-28 16:07:09 +01:00
Gil Eluard bca69bb7c8 SP3.1: Update room settings for Spaces #5231 
- Update after review
 2022-02-28 16:07:09 +01:00
ismailgulek 3f1f75f7ce Implement analytics for threads 2022-02-28 17:46:57 +03:00
ismailgulek cd031a631e Implement analytics for threads 2022-02-28 17:46:57 +03:00
MaximeE ee13527618 3779: Add comments 2022-02-25 17:03:09 +01:00
MaximeE 3a9d847954 3779: Add comments 2022-02-25 17:03:09 +01:00
MaximeE 4a003d49b1 3779: Apply PR comments 2022-02-25 16:22:15 +01:00
MaximeE 8580195006 3779: Apply PR comments 2022-02-25 16:22:15 +01:00
MaximeE b0516ea7cd Merge branch 'develop' into maximee/3779_fix_reply_after_jump_unread 2022-02-25 15:17:01 +01:00
MaximeE ec9e45ed43 Merge branch 'develop' into maximee/3779_fix_reply_after_jump_unread 2022-02-25 15:17:01 +01:00
MaximeE 4cb4eda6f1 3779: Apply PR comments 2022-02-25 12:18:28 +01:00
MaximeE 4f4471a65a 3779: Apply PR comments 2022-02-25 12:18:28 +01:00
Andy Uhnak 4617b3ed69 Room user indicators 
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
 2022-02-25 10:47:53 +00:00