felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-09 09:27:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
19,368 Commits 1 Branch 67 Tags
b4ad32afb28b558b3de809e2c0b4ddddfee6d27c
Commit Graph

19368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
JanNiklas Grabowski 674a44b702 Merge commit '98594fd01fc18ee18fde60a45542f1b4d7040c41' into feature/4699_basis_update_element 
* commit '98594fd01fc18ee18fde60a45542f1b4d7040c41': (59 commits)
  finish version++
  Tidy up event formatter issues.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)).
  Translated using Weblate (Russian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Albanian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  Translated using Weblate (Slovak)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Utils/EventFormatter.m
#	fastlane/Fastfile
 2023-05-11 13:19:24 +02:00
Nicolas Mauri cc1f0eea26 Fix: apply the changes requested in the PR review 2023-05-11 09:45:04 +02:00
Doug e499389998 Fix voiceover order of room creation header and message composer. 2023-05-10 16:15:00 +01:00
Nicolas Mauri 6b0ce2e65a Feat: add a flag in the build settings to force the user to define a homeserver. 2023-05-10 15:46:34 +02:00
Doug 7675da88c4 Use the app's language for accessibility. 2023-05-10 10:15:41 +01:00
Frank Rotermund b56686d337 MESSENGER-4697 set app version to 2.7.0 2023-05-09 09:02:36 +02:00
Frank Rotermund 21eb1854df Merge branch 'feature/4697_release_prep' into 'develop' 
MESSENGER-4697 release prep

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!134
 2023-05-09 06:50:39 +00:00
Frank Rotermund ea0d90cb86 MESSENGER-4697 release prep 2023-05-09 08:44:20 +02:00
Nicolas Mauri f0c9d85880 Merge pull request #7537 from vector-im/nimau/PSB_268_avatar_disappears 
Add logs to track a problem with the top left avatar disappearing
 2023-05-05 17:17:58 +02:00
Nicolas Mauri 211cc7e5f1 Add logs to track a problem with the top left avatar disappearing 2023-05-05 17:14:53 +02:00
Arnfried Griesert 690aff3e3c Merge branch 'feature/dynamic_textfield_colo' into 'develop' 
Recovery key textfield starts now with gray border

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!133
 2023-05-05 11:02:24 +00:00
Arnfried Griesert 87a22916c2 Recovery key textfield starts now with gray border 2023-05-05 12:55:48 +02:00
Nicolas Mauri 1933977544 Merge pull request #7404 from vector-im/nimau/PSB-269-reset-passphrase 
Secrets recovery: Fix an issue where the Secrets Reset screen would open twice.
 2023-05-05 10:22:46 +02:00
aringenbach 33eeeebf9d Merge pull request #7536 from vector-im/aringenbach/7535_fix_partial_text_messages 
Fix partial text messages not being saved for each room with RTE enabled
 2023-05-05 09:29:28 +02:00