Commit Graph

540 Commits

Author SHA1 Message Date
Frank Rotermund 4ccbe422f3 MESSENGER-4697 use cherry picked sdk 2023-05-15 17:08:56 +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
Frank Rotermund ea0d90cb86 MESSENGER-4697 release prep 2023-05-09 08:44:20 +02:00
Frank Rotermund 5e2e47a361 MESSENGER-4646 fix Server URL bugs and avoid using synapse URL before server selection 2023-05-02 17:34:45 +00:00
Arnfried Griesert f860185cd8 Merge branch 'feature/4454_tracking_config' into 'develop'
Feature/4454 tracking config

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!128
2023-05-02 10:55:42 +00:00
Frank Rotermund f81cf36649 Feature/4454 tracking config 2023-05-02 10:55:41 +00:00
Arnfried Griesert 4334170650 MESSENGER-4516 device manager anpassungen 2023-04-28 06:28:47 +00:00
Arnfried Griesert acc3b27f42 MESSENGER-4564 new hashes 2023-04-20 10:33:38 +00:00
Frank Rotermund 74a9c2d612 Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
# Conflicts:
#	Config/BWIBuildSettings.swift
2023-04-16 19:57:49 +02:00
JanNiklas Grabowski df8da04474 MESSENGER-4450 fix matomo consent alert not showing 2023-04-14 13:40:07 +00:00
Arnfried Griesert 8637f184d4 Merge branch 'feature/4537_basis_update_element' into develop
* feature/4537_basis_update_element: (86 commits)
  Updated displayed element version and fixed merge problems
  Changed sdk version to v0.26.6_bwi
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.26.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.6)).
  No event decoration if no decryption result
  Start QR scanning when camera ready
  Support for MSC3906 v2 (#7407)
  Code cleanup
  Expand rust crypto rollout to 50% users
  Fix comments
  Fix: read marker update
  Fix: read marker update
  Fix: Update the read marker position even if it is not displayed
  Fix: do not encode the maximum width of a Pill
  Prepare for new sprint
  finish version++
  Replace Ts&Cs with Acceptable Use Policy. (#7459)
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.26.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.5)).
  ...
2023-04-13 08:29:55 +02:00
Frank Rotermund b8d1e2e81d MESSENGER-4535 remove error popup "no other devices" on self verification/ crosssigning Cherrypick 2023-04-12 13:50:50 +02:00
Frank Rotermund 6c7f613f3b MESSENGER-4535 element base version 2023-04-11 13:37:29 +02:00
Frank Rotermund 4a8c655b91 MESSENGER-4535 remove error popup "no other devices" on self verification/ crosssigning 2023-04-11 13:36:36 +02:00
Arnfried Griesert bf5dceb423 Updated displayed element version and fixed merge problems 2023-04-11 13:13:11 +02:00
Arnfried Griesert 3736b8c9fd Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
JanNiklas Grabowski bec51bcfc0 MESSENGER-4482 fix feature banner link and add navigationbar 2023-04-05 06:10:07 +00:00
Frank Rotermund 1dd82af9c1 Feature/4382 performance send message 2023-03-31 10:31:06 +00:00
Andy Uhnak 60ff992e02 Merge branch 'develop' of github.com:vector-im/element-ios into develop 2023-03-28 18:01:06 +01:00
Andy Uhnak 6b3d01a94e Prepare for new sprint 2023-03-28 17:53:21 +01:00
Doug 1d9caef1ac Replace Ts&Cs with Acceptable Use Policy. (#7459) 2023-03-28 17:38:58 +01:00
JanNiklas Grabowski bba325bbe9 MESSENGER-2638 new layout feature banner 2023-03-28 10:38:04 +00:00
Arnfried Griesert 580a8924e8 MESSENGER-3411 Enable lab features for beta 2023-03-27 06:39:39 +00:00
Arnfried Griesert dbc8f39fec MESSENGER-4203 show user qr 2023-03-24 07:35:38 +00:00
Andy Uhnak fe6218558e Prepare for new sprint 2023-03-22 21:30:09 +00:00
Mauro Romito 63b18f43f7 Prepare for new sprint 2023-03-21 18:30:45 +01:00
Arnfried Griesert 285bf4bdc0 merged basis update 1_10_5 into develop 2023-03-21 07:52:11 +01:00
JanNiklas Grabowski 4c5eba691c Merge tag 'v2.4.0' into develop
Changes in BWI project 2.4.0 (2023-03-14)
===================================================

Upstream merge :

- v1.10.2

Features :
- Poll history

Improvements 🙌:
- Redesigned notes room in chat overview (#4211)
- New login flow for BwM (#4231)
- Added default server settings (#4218)
- Add changeable permalink config (#3425)
- Better permalink-header handling (#4146)
- Display user search results alphabetically (#3076)
- Text changes for downtime info (#4157)
- Changed text of reset passphrase button (#4167)
- Changed pin confirmation text (#4168)
- Color changes for ui elements (#4179)
- Improved forgot password text (#4161)

Bugfix 🐛:
- Fix for Cross-Signing error (#4303)
- Fix for status message getting cut off (#4197)
- Fix wrong number for room invites in chat overview (#4173)

Translations 🗣  :

SDK API changes ⚠️:

+Build 🧱:
2023-03-16 21:15:06 +01:00
JanNiklas Grabowski 76e0de4e38 MESSENGER-4407 fixes from testprotocol 2023-03-16 16:45:48 +01:00
Arnfried Griesert 28852aa790 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
JanNiklas Grabowski a6e95b9955 MESSENGER-4407 fixes from testprotocol and release notes 2023-03-14 18:07:07 +01:00
Doug c37593e28c Prepare for new sprint 2023-03-13 17:48:54 +00:00
Doug f0c876d0dd changelog.d: Upgrade MatrixSDK version ([v0.26.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1)). 2023-03-13 16:58:07 +00:00
JanNiklas Grabowski 51daf2e5ec Update Appversion at sprint start 2023-03-10 12:45:40 +01:00
Frank Rotermund df74a26f86 MESSENGER-4392 messges bubbles as default 2023-03-10 08:06:43 +01:00
Arnfried Griesert ca8901bade MESSENGER-3425 permalink prefix developer settings screen 2023-03-08 13:28:11 +00:00
Doug a4dd53a207 Prepare for new sprint 2023-03-07 13:55:21 +00:00
Arnfried Griesert 20ecc8ab46 MESSENGER-3157 third notification settings option 2023-03-07 13:28:09 +00:00
Frank Rotermund c5886f1836 Merge branch 'feature/4174_better_error_message_when_backend_down' into 'develop'
Feature/4174 better error message when backend down

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!103
2023-03-07 12:28:55 +00:00
Frank Rotermund e435aebd55 Feature/4174 better error message when backend down 2023-03-07 12:28:55 +00:00
Arnfried Griesert 8a41cb72a8 Merge branch 'feature/4231_add_new_loginflow' into 'develop'
MESSENGER-4231 add new loginflow

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!98
2023-03-02 13:09:34 +00:00
JanNiklas Grabowski 7830c3c6f0 MESSENGER-4231 add new loginflow 2023-02-28 18:06:13 +01:00
Arnfried Griesert 856692111f Merge branch 'feature/3076_alphabetic_user_search_results' into 'develop'
MESSENGER-3076 display user search results alphabetically

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!96
2023-02-24 11:59:29 +00:00
Arnfried Griesert eb618b395d MESSENGER-4093 scan permalinks as qr 2023-02-23 06:50:16 +00:00
Frank Rotermund 1a5980c79a MESSENGER-3076 display user search results alphabetically 2023-02-23 07:44:38 +01:00
Andy Uhnak 65c9dd3b40 CryptoSDK phased rollout feature 2023-02-22 11:25:28 +00:00
Mauro Romito 0f34aeaac8 Prepare for new sprint 2023-02-21 16:38:28 +01:00
Frank Rotermund cb100fab66 Merge branch 'release/v.2.3.0' into develop
# Conflicts:
#	Podfile
2023-02-16 16:29:24 +01:00
Frank Rotermund 8b0ff57d69 MESSENGER-4258 Fixes from Testprotocol 2023-02-16 15:40:21 +01:00
JanNiklas Grabowski b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00