felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
31,822 Commits 1 Branch 67 Tags
f8348a66d04c37f5496eebfc61164d64d8a64a5a
Commit Graph

31822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JanNiklas Grabowski
f8348a66d0 Feature/4772 add accessibility declaration 2023-06-14 06:14:17 +00:00
Frank Rotermund
42214cad99 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
986b086e33 MESSENGER-4736 text changes 2023-06-14 05:54:29 +00:00
Frank Rotermund
c41d7417f0 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
5d1dd60c24 MESSENGER-4383 fix for undisclosed button visibility and small UI fixes 2023-06-14 07:45:18 +02:00
Arnfried Griesert
7ed6d52ef7 Changed sdk version in Podfile2 2023-06-12 06:48:41 +02:00
Arnfried Griesert
81832c15b7 Removed CryptoSdk lab feature file 2023-06-12 06:10:31 +02:00
Arnfried Griesert
b4f6992e56 Fixed additional merge issues 2023-06-12 06:08:33 +02:00
Arnfried Griesert
1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Arnfried Griesert
110dc72b77 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
9bd569dac0 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
JanNiklas Grabowski
f48f3edf31 MESSENGER-4699 update element version string 2023-05-31 13:53:21 +02:00
Frank Rotermund
00286183f6 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
99d75ecf01 MESSENGER-1678 add webview navigation policy 2023-05-25 14:32:54 +00:00
JanNiklas Grabowski
c5aad96ddc 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
902b529245 Feature/4393 poll with visible participant p1 2023-05-25 13:52:30 +00:00
JanNiklas Grabowski
b76b4e0803 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
deac79fb49 Merge branch 'hotfix/v2.6.0.1' into develop 2023-05-16 16:14:20 +02:00
Frank Rotermund
f6b12ebc45 MESSENGER-4697 remove rej file 2023-05-16 16:13:34 +02:00
Element CI
a3048b3125 Merge branch 'release/1.10.12/master' 2023-05-16 16:26:10 +03:00
Element CI
617c978437 finish version++ 2023-05-16 16:26:10 +03:00
Stefan Ceriu
ac00445ef6 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
49254e6b89 version++ 2023-05-16 15:46:02 +03:00
Element CI
3006c3ae5c 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
2d454dc971 Merge branch 'release/v2.6.0' into develop 2023-05-16 07:39:06 +02:00
Frank Rotermund
d6b5b3aa6b Merge branch 'release/v2.6.0' v2.6.0 2023-05-16 07:38:56 +02:00
Frank Rotermund
2ad3cfd9d7 MESSENGER-4697 use cherry picked sdk 2023-05-15 17:08:56 +02:00
Frank Rotermund
0ad39c8894 MESSENGER-4697 matomo select right server after relogin 2023-05-15 17:06:58 +02:00
Frank Rotermund
929d70877d 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
c2c6cf69e5 Merge pull request #7545 from vector-im/nimau/PSB307_last_event_description_color 2023-05-15 09:03:45 +02:00
aringenbach
23d7c0b849 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
49edce4ead 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
f6f172c5f2 Fix mention pills display in thread list 2023-05-12 18:41:19 +02:00
aringenbach
401d6a59cf Disable removing mention/command text trigger with RTE enabled 2023-05-12 18:30:20 +02:00
Nicolas Mauri
c843eafe84 Fix: text color of the last event description was incorrect. 2023-05-12 17:15:20 +02:00
Nicolas Mauri
16340a18a6 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
519aae1469 MESSENGER-4699 update sdk version 2023-05-11 13:39:05 +02:00
JanNiklas Grabowski
97243bc063 Merge commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4' into feature/4699_basis_update_element 
* commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4': (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
40c57f7968 Fix: apply the changes requested in the PR review 2023-05-11 09:45:04 +02:00
Doug
7d3efda5ef Fix voiceover order of room creation header and message composer. 2023-05-10 16:15:00 +01:00
Nicolas Mauri
68029d6b89 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
05f89f1160 Use the app's language for accessibility. 2023-05-10 10:15:41 +01:00
Frank Rotermund
5d77413746 MESSENGER-4697 set app version to 2.7.0 2023-05-09 09:02:36 +02:00
Frank Rotermund
b0439d3d36 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
fcb748b1f2 MESSENGER-4697 release prep 2023-05-09 08:44:20 +02:00
Nicolas Mauri
3011b4b639 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
fc59290a34 Add logs to track a problem with the top left avatar disappearing 2023-05-05 17:14:53 +02:00
Arnfried Griesert
74a5ebc668 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
4b2f221b13 Recovery key textfield starts now with gray border 2023-05-05 12:55:48 +02:00
Nicolas Mauri
bb374c67a8 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