Commit Graph

19828 Commits

Author SHA1 Message Date
JanNiklas Grabowski 5aa841d45f MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
JanNiklas Grabowski 76fe39bad5 Merge branch 'feature/5033_add_feature_flag_OIDC_login' into 'develop'
MESSENGER-5033 add feature flag for OIDC login

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!241
2023-10-27 06:43:26 +00:00
JanNiklas Grabowski c2fcd57251 refactor 2023-10-26 19:28:35 +02:00
JanNiklas Grabowski 54a0df8451 MESSENGER-5033 change OIDC Button appearance 2023-10-26 16:05:08 +02:00
JanNiklas Grabowski 32a6083ee8 MESSENGER-5033 add feature flag for OIDC login 2023-10-26 13:35:13 +02:00
Arnfried Griesert 5d2b79140c Merge branch 'feature/changed_sdk_version_in_podfile' into 'develop'
Feature/Set sdk version to v2.12.0-BWI02

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!239
2023-10-26 10:36:17 +00:00
Arnfried Griesert c7c0934734 Merge branch 'feature/fixed_diawi_bug' into 'develop'
Feature/fixed diawi bug

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!240
2023-10-26 10:35:56 +00:00
Arnfried Griesert aed588d4bb Removed diawi completly from Gemfile.lock 2023-10-26 12:01:54 +02:00
Arnfried Griesert f38f661bb7 Removed revision from diawi git 2023-10-26 11:56:08 +02:00
Arnfried Griesert 5d6c45cdeb Set sdk version to v2.12.0-BWI02 2023-10-25 15:53:47 +02:00
Arnfried Griesert 76562578d7 Merge branch 'feature/5254_basis_update_element' into 'develop'
MESSENGER-5254 basis update element

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!236
2023-10-25 13:44:33 +00:00
Frank Rotermund 1816423042 Merge branch 'feature/5252_version_jump' into 'develop'
MESSENGER-5252 2.12

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!238
2023-10-23 12:33:33 +00:00
Frank Rotermund 06c510b615 MESSENGER-5252 2.12 2023-10-23 14:18:58 +02:00
Arnfried Griesert 6b98e78924 Merge branch 'feature/5209_build_settings' into 'develop'
MESSENGER-5209 added new hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!237
2023-10-23 12:13:21 +00:00
Arnfried Griesert 638ad336b2 Changed build settings 2023-10-23 08:33:24 +02:00
Arnfried Griesert 8ef162f8c6 Updated element version in BWIBuildSettings 2023-10-22 19:03:25 +02:00
Arnfried Griesert 5980f94fe9 Changed SDK version to v2.12.0-BWI01 (Element SDK v0.27.3) 2023-10-22 18:59:07 +02:00
Arnfried Griesert 67f2801417 Merge branch 'master' into feature/5254_merge_element_into_bum
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
2023-10-22 18:57:22 +02:00
JanNiklas Grabowski 03b0532200 Merge branch 'feature/5240_fix_app_crash_set_notes_room_as_favorite' into 'develop'
MESSENGER-5240 fix crash set personal notes room as favorite

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!235
2023-10-20 15:28:52 +00:00
JanNiklas Grabowski 9f992e2859 MESSENGER-5240 fix crash set personal notes room as favorite 2023-10-20 15:23:40 +02:00
JanNiklas Grabowski 0681b3a069 Merge branch 'feature/4583_optimize_nexus_upload_add_tag_to_version' into 'develop'
Feature/4583 optimize nexus upload add tag to version

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!234
2023-10-20 08:46:03 +00:00
JanNiklas Grabowski 28cb267ee0 Feature/4583 optimize nexus upload add tag to version 2023-10-20 08:46:03 +00:00
JanNiklas Grabowski 04369ad78d Merge branch 'feature/4956_matomo_add_rust_crypto_decryption_errors' into 'develop'
Feature/4956 matomo add rust crypto decryption errors

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!233
2023-10-17 11:15:18 +00:00
Frank Rotermund 05840e918f Merge branch 'feature/5031_maintenance_error_handling' into 'develop'
Feature/5031 maintenance error handling

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!232
2023-10-17 10:12:31 +00:00
Frank Rotermund 27f390f1fb Feature/5031 maintenance error handling 2023-10-17 10:12:31 +00:00
JanNiklas Grabowski e55df3009c MESSENGER-4956 add missing error codes 2023-10-17 10:00:58 +02:00
JanNiklas Grabowski 7c7d7a77d2 MESSENGER-4956 matomo add decryption error information 2023-10-16 18:55:56 +02:00
JanNiklas Grabowski 6e9bb44a44 MESSENGER-4956 update sdk version 2023-10-16 18:54:04 +02:00
JanNiklas Grabowski 74563978ff Merge branch 'feature/4821_matomo_add_dimension_for_decryption_errors' into 'develop'
Feature/4821 matomo add dimension for decryption errors

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!230
2023-10-12 08:55:17 +00:00
Frank Rotermund fa74ac3af7 Merge branch 'hotfix/v2.10.1' into develop
# Conflicts:
#	Config/AppVersion.xcconfig
2023-10-12 07:40:20 +02:00
Frank Rotermund 6355ea95ca Merge branch 'feature/3811_hotfix_mdm_crash' into 'hotfix/v2.10.1'
MESSENGER-3811 hotfix 2.10.1 crash on mdm

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!231
2023-10-12 05:31:07 +00:00
Frank Rotermund 62035b1ff5 MESSENGER-3811 hotfix 2.10.1 crash on mdm 2023-10-11 16:08:10 +02:00
JanNiklas Grabowski 517acba072 MESSENGER-4821 add missing file to target 2023-10-11 15:26:28 +02:00
JanNiklas Grabowski 4a7827792a MESSENGER-4821 add dimension for decryption error tracking 2023-10-11 15:07:07 +02:00
Arnfried Griesert f8672a9b39 Merge branch 'feature/4433_content_scanner_upload' into 'develop'
MESSENGER-4433 content scanner upload

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!229
2023-10-10 12:33:47 +00:00
Arnfried Griesert 7a837886c4 Content scanner thumbnail status 2023-10-10 07:17:36 +02:00
Arnfried Griesert 8f73166745 Fixed retry buttons text and image color 2023-10-10 06:57:03 +02:00
Arnfried Griesert 62bc428f71 Merge branch 'feature/5161_basis_update_element' into 'develop'
MESSENGER-5616 basis update element

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!225
2023-10-05 12:21:38 +00:00
Arnfried Griesert 064ef359aa Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
JanNiklas Grabowski 037a82b806 Merge tag 'v2.10.0' into develop
Changes in BWI project 2.10.0 (2023-09-26)
===================================================

Upstream merge :
- v1.11.1

Features :
- New WYSIWYG composer (#4941)

Improvements 🙌:
- UI optimization room overview (#4704, #4806)
- Change date format for poll details (#4798)
- Add additional information to the developer menu for Beta app (#4565)
- Update huddle permissions for new rooms (#4928)
- Update element call permissions when resetting room permissions (#5035)
- Disable all WYSIWYG commands (#4955)
- Change date format for maintenance to ISO-8601 (#5071)
- Update notes room layout in room overview (#4802)
- Enable/disable notes room in settings (#4730)

Bugfix 🐛:
- Crashfix for dm creation when WYSIWYG composer is enabled (#5133)
- Change permalink URL scheme (#4910)
- No popup for successful password change (#4951)

Translations 🗣  :
- German translations voice message (#5017)
- German translations wrong password (#4857)
- Add special characters for password creation/resetting (#4952)

SDK API changes ⚠️:

Build 🧱:
2023-10-04 15:50:20 +02:00
JanNiklas Grabowski 3db5241200 Merge branch 'release/v2.10.0' 2023-10-04 15:50:19 +02:00
JanNiklas Grabowski 1df5cdb4aa Merge branch 'releaseprep/v2.10.0' into 'release/v2.10.0'
MESSENGER-5159 text changes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!227
2023-10-04 11:45:48 +00:00
Stefan Ceriu 4bba5ce0b4 Merge branch 'release/1.11.4/master' 2023-10-04 13:08:17 +03:00
Stefan Ceriu a550f49b73 finish version++ 2023-10-04 13:08:17 +03:00
Stefan Ceriu 9db8f75115 Merge pull request #7694 from vector-im/release/1.11.4/release
Release 1.11.4
2023-10-04 13:07:43 +03:00
Stefan Ceriu 0a3b1ea940 version++ 2023-10-04 13:07:22 +03:00
Stefan Ceriu 40025ee843 changelog.d: Upgrade MatrixSDK version ([v0.27.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.3)). 2023-10-04 13:07:21 +03:00
JanNiklas Grabowski 0777e7e6ab MESSENGER-5159 text changes 2023-10-04 11:46:02 +02:00
Alfonso Grillo 6910734f26 Merge pull request #7692 from vector-im/alfogrillo/fix-rte-crash
Fix new dm crash with RTE is enabled
2023-10-04 11:01:45 +02:00
Arnfried Griesert 8a7b1dd430 Hide IP addresses in session manager 2023-10-04 08:57:33 +02:00