Commit Graph

32138 Commits

Author SHA1 Message Date
Arnfried Griesert
49fa198de5 MESSENGER-4565 Added new developer settings options 2023-09-19 11:59:20 +00:00
JanNiklas Grabowski
e3cfb301a9 Merge branch 'feature/5017_translate_voice_message_cancel_text' into 'develop'
MESSENGER-5017 translate voice message cancel text

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!215
2023-09-15 13:06:24 +00:00
JanNiklas Grabowski
22f6a85c04 MESSENGER-5017 translate voice message cancel text 2023-09-15 14:41:58 +02:00
Arnfried Griesert
11940c39ca Merge branch 'feature/4951_change_password_confirmation' into 'develop'
MESSENGER-4951 Changed password confirmation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!213
2023-09-15 12:13:19 +00:00
Arnfried Griesert
667266e93c MESSENGER-4951 Changed password confirmation 2023-09-15 12:13:19 +00:00
JanNiklas Grabowski
6f22832cef Merge branch 'feature/4798_change_date_format_for_poll_details' into 'develop'
MESSENGER-4798 change date format for poll details

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!214
2023-09-15 11:53:00 +00:00
JanNiklas Grabowski
cbcd169638 add localized strings 2023-09-15 13:46:16 +02:00
JanNiklas Grabowski
ffba5ba111 MESSENGER-4798 change date format for poll details 2023-09-15 13:08:07 +02:00
JanNiklas Grabowski
500791ac87 Merge branch 'feature/4857_translate_invalid_password_message' into 'develop'
MESSENGER-4857 translate invalid password message

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!212
2023-09-15 11:03:49 +00:00
JanNiklas Grabowski
52e03cd83b fix pipeline 2023-09-15 12:15:22 +02:00
JanNiklas Grabowski
0f3a48e414 MESSENGER-4857 translate invalid password message 2023-09-15 11:35:08 +02:00
JanNiklas Grabowski
5e6c4811fe Merge branch 'feature/5133_fix_crash_create_dm' into 'develop'
MESSENGER-5133 fix crash creating a dm

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!211
2023-09-15 09:27:27 +00:00
JanNiklas Grabowski
a694a20405 MESSENGER-5133 fix crash creating a dm 2023-09-15 10:05:53 +02:00
Frank Rotermund
9a99402181 Merge branch 'feature/4730_personal_notes_visibilty' into 'develop'
MESSENGER-4730 personal notes visibility old style

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!204
2023-09-15 07:39:41 +00:00
Frank Rotermund
6a83893e3a MESSENGER-4730 personal notes visibility old style 2023-09-15 07:39:41 +00:00
JanNiklas Grabowski
fdca2da2fa Merge branch 'feature/4955_disable_wysiwyg_commands' into 'develop'
MESSENGER 4955 disable WYSIWYG commands

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!206
2023-09-08 13:46:34 +00:00
Frank Rotermund
5fc2300e28 Merge branch 'hotfix/v2.9.1' into 'develop'
Hotfix/v2.9.1

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!210
2023-09-08 08:24:05 +00:00
Frank Rotermund
3b43285b26 Merge branch 'develop' into 'hotfix/v2.9.1'
# Conflicts:
#   Config/AppVersion.xcconfig
2023-09-08 08:20:37 +00:00
Frank Rotermund
e66f865137 MESSENGER-5130 hotfix maintenance popup on missing server 2023-09-08 09:52:48 +02:00
Arnfried Griesert
63f7078771 Merge branch 'feature/4807_new_add_room_menu' into 'develop'
MESSENGER-4807 new add room menu

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!202
2023-09-08 06:41:41 +00:00
Arnfried Griesert
53c675638d MESSENGER-4807 new add room menu 2023-09-08 06:41:40 +00:00
JanNiklas Grabowski
a8b759b63b MESSENGER 4955 disable WYSIWYG commands 2023-09-07 16:33:23 +02:00
Frank Rotermund
ac41d08e53 Merge branch 'feature/4802_personal_notes_redesign' into 'develop'
MESSENGER-4802 personal notes in favorites

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!203
2023-09-07 12:53:46 +00:00
Frank Rotermund
6b0df6aa2f MESSENGER-4802 personal notes in favorites 2023-09-07 12:53:46 +00:00
JanNiklas Grabowski
c16bc6da5f Merge branch 'feature/4941_beta_features' into 'develop'
MESSENGER 4941 add and remove beta features

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!201
2023-09-07 12:35:41 +00:00
Arnfried Griesert
99695336ff Merge branch 'feature/4806_new_room_filter_behaviour' into 'develop'
MESSENGER-4806 new room filter behaviour

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!199
2023-09-06 13:07:19 +00:00
Arnfried Griesert
ab949d8277 MESSENGER-4806 new room filter behaviour 2023-09-06 13:07:19 +00:00
JanNiklas Grabowski
cd38534dc7 MESSENGER 4941 remove old feature flags 2023-09-06 14:29:58 +02:00
JanNiklas Grabowski
5a21e71235 MESSENGER 4941 deactivate voice broadcast 2023-09-06 13:39:59 +02:00
JanNiklas Grabowski
99f0a3ff9b MESSENGER 4941 remove old feature flags and activate WYSIWYG 2023-09-06 13:21:23 +02:00
JanNiklas Grabowski
309d479b26 Merge branch 'feature/4952_fix_change_password_special_characters' into 'develop'
MESSENGER 4952 support more special characters

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!200
2023-09-06 09:34:10 +00:00
JanNiklas Grabowski
2ef1fe05e7 MESSENGER 4941 add and remove beta features 2023-09-05 17:05:44 +02:00
JanNiklas Grabowski
75a35d28e2 MESSENGER 4952 support more special characters 2023-09-05 15:10:26 +02:00
JanNiklas Grabowski
92c60bb4e5 Merge branch 'develop' into 'feature/5004_basis_update_element'
# Conflicts:
#   Podfile
2023-09-04 14:03:03 +00:00
JanNiklas Grabowski
064c2f8116 MESSENGER 5004 update SDK Tag 2023-09-04 16:02:46 +02:00
Frank Rotermund
878ac0b6bc Merge branch 'release/v2.9.0' into 'develop'
MESSENGER-5047 Release Bundesmessenger

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!197
2023-09-04 07:58:13 +00:00
Frank Rotermund
e9ae248549 Merge branch 'release/v2.9.0' into 'master'
Release/v2.9.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!198
v2.9.0
2023-09-04 07:57:53 +00:00
Frank Rotermund
9f476f693f MESSENGER-5047 Release Bundesmessenger 2023-09-01 14:50:43 +02:00
JanNiklas Grabowski
d4ab5f4bad MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02:00
JanNiklas Grabowski
7c01638c81 MESSENGER 5004 corrected version 2023-08-30 17:57:13 +02:00
JanNiklas Grabowski
41b7905154 MESSENGER 5004 update element version string 2023-08-30 17:55:46 +02:00
JanNiklas Grabowski
4f0bc8d058 MESSENGER 5004 update sdk version 2023-08-30 17:55:15 +02:00
Arnfried Griesert
de45fc1054 Merge branch 'feature/4704_ui_optimierungen_raumuebersicht' into 'develop'
MESSENGER-4704 UI Optimierungen Raumübersicht

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!195
2023-08-30 12:34:58 +00:00
Arnfried Griesert
7f4c310ecd MESSENGER-4704 UI Optimierungen Raumübersicht 2023-08-30 12:34:58 +00:00
JanNiklas Grabowski
ccdbd400d2 Merge commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da' into feature/5004_basis_update_element
* commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da': (40 commits)
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1)).
  completed
  code improvement
  fix 7646
  opening the safari web view externally so that it will be able to share the cookies
  web view opened on tap + changelog
  added the cell, now I just need to implement the navigation to the web view
  completed
  Hide deactivate account if the auth property is present on the WK.
  Add changelogs
  Prevent mention crashes when room members are missing display names (objc interop)
  Prevent pill crashes when room members are missing display names (objc interop)
  Update introspect to the latest version, remove now duplicate `introspectCollectionView`
  Prepare for new sprint
  finish version++
  Add missing changelog entry.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)).
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
#	Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/target.yml
2023-08-29 17:00:19 +02:00
Frank Rotermund
08e23f7f6b Merge branch 'feature/5047_increment_version' into 'develop'
MESSENGER-5047 version to 2.10.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!194
2023-08-29 11:18:14 +00:00
Frank Rotermund
85fa33107b MESSENGER-5047 version to 2.10.0 2023-08-29 13:16:24 +02:00
Frank Rotermund
b635f77467 Merge branch 'feature/try_merge_2' into 'develop'
test change for merge to bwm

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!193
2023-08-29 11:06:54 +00:00
Frank Rotermund
47d6582b0c test change for merge to bwm 2023-08-29 12:50:28 +02:00
Stefan Ceriu
4f4ff3b181 Merge branch 'release/1.11.1/master' 2023-08-29 13:09:52 +03:00