felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-19 14:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
19,382 Commits 1 Branch 67 Tags
62e840e30ba5c9c5e3627d45843eae35efc08a8a
Commit Graph

19382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Rotermund 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
Frank Rotermund 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
Arnfried Griesert 08b159b675 MESSENGER-4769 color changes part 2 2023-06-20 11:32:09 +00:00
Frank Rotermund 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
JanNiklas Grabowski 4abaab4061 MESSENGER-4742 fix permalink info when room is not available 2023-06-16 17:01:12 +02:00
JanNiklas Grabowski 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
JanNiklas Grabowski a52c450bbb MESSENGER-4390 fix private room sharing 2023-06-15 10:21:50 +02:00
Frank Rotermund 1a21b03d6e MESSENGER-3539 prevent logout and error popup when logging out 2023-06-15 07:40:58 +02:00
Frank Rotermund 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
Arnfried Griesert 10ec6686e0 MESSENGER-4744 Removed black theme and map already set black theme to dark 2023-06-14 06:28:28 +00:00
Frank Rotermund 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
Frank Rotermund 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
JanNiklas Grabowski 273017eafa Feature/4772 add accessibility declaration 2023-06-14 06:14:17 +00:00
Frank Rotermund 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
JanNiklas Grabowski 208ad9f3d1 MESSENGER-4736 text changes 2023-06-14 05:54:29 +00:00
Frank Rotermund 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
Frank Rotermund df2d409fc1 MESSENGER-4383 fix for undisclosed button visibility and small UI fixes 2023-06-14 07:45:18 +02:00
JanNiklas Grabowski 62548a16f2 MESSENGER-4748 fix permalink qr code scan 2023-06-12 14:14:30 +02:00
Arnfried Griesert c2b4d7081b Changed sdk version in Podfile2 2023-06-12 06:48:41 +02:00
Arnfried Griesert 1a415fd42c Removed CryptoSdk lab feature file 2023-06-12 06:10:31 +02:00
Arnfried Griesert 4fc5e366e3 Fixed additional merge issues 2023-06-12 06:08:33 +02:00
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Arnfried Griesert 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
Frank Rotermund 5179eecaa1 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
JanNiklas Grabowski 338e1946f6 MESSENGER-4699 update element version string 2023-05-31 13:53:21 +02:00
Frank Rotermund 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
JanNiklas Grabowski 5370dded66 MESSENGER-1678 add webview navigation policy 2023-05-25 14:32:54 +00:00
JanNiklas Grabowski 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
Frank Rotermund 260c8de584 Feature/4393 poll with visible participant p1 2023-05-25 13:52:30 +00:00
JanNiklas Grabowski 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
Frank Rotermund 87fee41db4 Merge branch 'hotfix/v2.6.0.1' into develop 2023-05-16 16:14:20 +02:00
Frank Rotermund 025a151b7a MESSENGER-4697 remove rej file 2023-05-16 16:13:34 +02:00
Element CI 4c83fe6dbe Merge branch 'release/1.10.12/master' 2023-05-16 16:26:10 +03:00
Element CI 30a924bad5 finish version++ 2023-05-16 16:26:10 +03:00
Stefan Ceriu 20ec994be3 Merge pull request #7549 from vector-im/release/1.10.12/release 
Release 1.10.12
 2023-05-16 16:24:23 +03:00
Element CI 41bd49f99b version++ 2023-05-16 15:46:02 +03:00
Element CI 8e2761de4e changelog.d: Upgrade MatrixSDK version ([v0.26.10](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.10)). 2023-05-16 15:46:01 +03:00
Frank Rotermund f321e86357 Merge branch 'release/v2.6.0' into develop 2023-05-16 07:39:06 +02:00
Frank Rotermund 8a132896ec Merge branch 'release/v2.6.0' 2023-05-16 07:38:56 +02:00
Frank Rotermund 4ccbe422f3 MESSENGER-4697 use cherry picked sdk 2023-05-15 17:08:56 +02:00
Frank Rotermund 0d9f089e35 MESSENGER-4697 matomo select right server after relogin 2023-05-15 17:06:58 +02:00
Frank Rotermund bb659a71e6 MESSENGER-4697 enable SessionManager in Prod, fix peralink pills fix Matomo config bug when login out 2023-05-15 17:06:25 +02:00
Nicolas Mauri 5e55b582de Merge pull request #7545 from vector-im/nimau/PSB307_last_event_description_color 2023-05-15 09:03:45 +02:00
aringenbach bea2bcec90 Merge pull request #7546 from vector-im/aringenbach/7322_fix_pills_in_thread_list 
Fix mention pills display in thread list
 2023-05-15 08:03:42 +02:00
aringenbach da50a4312e Merge pull request #7547 from vector-im/aringenbach/disable_removing_trigger_text_in_rte_mode 
Disable removing mention/command text trigger with RTE enabled
 2023-05-15 08:03:33 +02:00
aringenbach 1d15f31ab9 Fix mention pills display in thread list 2023-05-12 18:41:19 +02:00
aringenbach ff61523154 Disable removing mention/command text trigger with RTE enabled 2023-05-12 18:30:20 +02:00
Nicolas Mauri e3b1880f49 Fix: text color of the last event description was incorrect. 2023-05-12 17:15:20 +02:00
Nicolas Mauri 513b9d340a Merge pull request #7541 from vector-im/nimau/PSB349_force_hs_selection 
Feat: add a build setting flag to always show the server selection screen in login/registration flow.
 2023-05-11 14:57:07 +02:00
JanNiklas Grabowski 0d1e16bae9 MESSENGER-4699 update sdk version 2023-05-11 13:39:05 +02:00