56da60de83
Feature/4753 bum test app
2023-06-26 12:22:44 +00:00
7c24b01abc
Merge branch 'feature/4390_fix_forwarding_for_private_rooms' into 'develop'
...
MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!152
2023-06-26 11:09:37 +00:00
506bc9b8d2
Merge branch 'feature/4795_add_matomo_event_names' into 'develop'
...
MESSENGER-4795 add matomo event names
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!154
2023-06-26 11:08:42 +00:00
f33d85c143
MESSENGER-4795 add matomo event names
2023-06-26 12:19:39 +02:00
14993296cd
Merge branch 'feature/4897_new_hashes' into 'develop'
...
MESSENGER-4897 new hashes
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!153
2023-06-26 08:40:05 +00:00
14f4d77710
MESSENGER-4897 new hashes
2023-06-26 08:37:46 +00:00
c31a33a33b
activate lab setting voice broadcast and enable session manager by default
2023-06-23 10:48:24 +02:00
722112bef0
Merge branch 'feature/4682_imprint_from_wellknown' into 'develop'
...
MESSENGER-4682 imprint from wellknown (and fix lab feature list)
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!151
2023-06-22 09:48:24 +00:00
45cb26e914
MESSENGER-4682 imprint from wellknown (and fix lab feature list)
2023-06-22 09:48:24 +00:00
26a3639d01
MESSENGER-4390 fix message forwarding and disable permalinks for messages in private rooms
2023-06-22 10:33:41 +02:00
fe33dcdf04
Merge branch 'feature/4710_manual_verification' into 'develop'
...
MESSENGER-4710 remove any possibility to self verifiy with old device manager
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!147
2023-06-21 09:36:53 +00:00
43146508af
Merge branch 'feature/4795_feature_tracking_matomo' into 'develop'
...
Feature/4795 feature tracking matomo
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!150
2023-06-21 06:24:46 +00:00
5c7998e240
Feature/4795 feature tracking matomo
2023-06-21 06:24:46 +00:00
0558b35426
Merge branch 'feature/4573_reset_room_filter_on_logout' into 'develop'
...
MESSENGER-4573 reset room filter on logout
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!148
2023-06-20 13:26:11 +00:00
4b19143d37
Merge branch 'feature/4743_fix_remove_room_avatar' into 'develop'
...
MESSENGER-4743 fix removing room avatar
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!149
2023-06-20 11:56:21 +00:00
62e840e30b
Merge branch 'feature/4742_fix_permalink_info_when_room_not_available' into 'develop'
...
MESSENGER-4742 fix permalink info when room is not available
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!146
2023-06-20 11:33:37 +00:00
6aa6ce981f
Merge branch 'feature/4769_color_changes_II' into 'develop'
...
MESSENGER-4769 color changes part 2
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!145
2023-06-20 11:32:09 +00:00
08b159b675
MESSENGER-4769 color changes part 2
2023-06-20 11:32:09 +00:00
04e333302b
MESSENGER-4743 fix removing room avatar
2023-06-20 12:19:28 +02:00
30bc66acf5
MESSENGER-4573 reset room filter on logout
2023-06-20 11:14:01 +02:00
1cb7d01466
MESSENGER-4710 remove any possibility to self verifiy with old device manager
2023-06-19 16:10:12 +02:00
9315e226a0
Merge branch 'feature/4390_fix_private_room_sharing' into 'develop'
...
MESSENGER-4390 fix private room sharing
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!144
2023-06-19 05:52:11 +00:00
4abaab4061
MESSENGER-4742 fix permalink info when room is not available
2023-06-16 17:01:12 +02:00
71a64c06bb
Merge branch 'feature/3539_logout_airplane_mode' into 'develop'
...
MESSENGER-3539 prevent logout and error popup when logging out
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!143
2023-06-15 09:16:51 +00:00
a52c450bbb
MESSENGER-4390 fix private room sharing
2023-06-15 10:21:50 +02:00
1a21b03d6e
MESSENGER-3539 prevent logout and error popup when logging out
2023-06-15 07:40:58 +02:00
d124da52e6
Merge branch 'feature/4744_remove_black_theme' into 'develop'
...
MESSENGER-4744 Removed black theme and map already set black theme to dark
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!141
2023-06-14 06:28:28 +00:00
10ec6686e0
MESSENGER-4744 Removed black theme and map already set black theme to dark
2023-06-14 06:28:28 +00:00
4d0e185826
Merge branch 'feature/4748_fix_permalik_qr_code' into 'develop'
...
MESSENGER-4748 fix permalink qr code scan
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!139
2023-06-14 06:14:54 +00:00
a32fe77a65
Merge branch 'feature/4772_add_accessibility_declaration' into 'develop'
...
Feature/4772 add accessibility declaration
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!138
2023-06-14 06:14:17 +00:00
273017eafa
Feature/4772 add accessibility declaration
2023-06-14 06:14:17 +00:00
b4ad32afb2
Merge branch 'feature/4736_creating_dm_text_changes' into 'develop'
...
MESSENGER-4736 text changes
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!140
2023-06-14 05:54:29 +00:00
208ad9f3d1
MESSENGER-4736 text changes
2023-06-14 05:54:29 +00:00
a96c88a3a9
Merge branch 'feature/4483_poll_details_fixes' into 'develop'
...
MESSENGER-4383 fix for undisclosed button visibility and small UI fixes
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!142
2023-06-14 05:47:10 +00:00
df2d409fc1
MESSENGER-4383 fix for undisclosed button visibility and small UI fixes
2023-06-14 07:45:18 +02:00
62548a16f2
MESSENGER-4748 fix permalink qr code scan
2023-06-12 14:14:30 +02:00
c2b4d7081b
Changed sdk version in Podfile2
2023-06-12 06:48:41 +02:00
1a415fd42c
Removed CryptoSdk lab feature file
2023-06-12 06:10:31 +02:00
4fc5e366e3
Fixed additional merge issues
2023-06-12 06:08:33 +02:00
51e98cfe61
merged element 1.10.12 into bum
2023-06-07 15:45:59 +02:00
cb0da1d082
Merge branch 'feature/4383_poll_participants_details' into 'develop'
...
Feature/4383 poll participants details
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!136
2023-05-31 14:31:07 +00:00
5179eecaa1
Feature/4383 poll participants details
2023-05-31 14:31:07 +00:00
338e1946f6
MESSENGER-4699 update element version string
2023-05-31 13:53:21 +02:00
d6fc06ffa1
Merge branch 'feature/1678_add_webview_navigation_policy' into 'develop'
...
MESSENGER-1678 add webview navigation policy
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!120
2023-05-25 14:32:54 +00:00
5370dded66
MESSENGER-1678 add webview navigation policy
2023-05-25 14:32:54 +00:00
1856618c91
Merge branch 'feature/4393_poll_with_visible_participant_p1' into 'develop'
...
Feature/4393 poll with visible participant p1
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!135
2023-05-25 13:52:30 +00:00
260c8de584
Feature/4393 poll with visible participant p1
2023-05-25 13:52:30 +00:00
7da10c3534
Merge branch 'feature/4699_basis_update_element' into develop
...
# Conflicts:
# Podfile
# Riot/Modules/MatrixKit/Utils/MXKTools.m
# Riot/Modules/Pills/PillType.swift
2023-05-23 14:51:49 +02:00
87fee41db4
Merge branch 'hotfix/v2.6.0.1' into develop
2023-05-16 16:14:20 +02:00
025a151b7a
MESSENGER-4697 remove rej file
2023-05-16 16:13:34 +02:00
JanNiklas Grabowski
Frank Rotermund
Juergen Wischer
Arnfried Griesert