Commit Graph

33003 Commits

Author SHA1 Message Date
JanNiklas Grabowski
ada0c652da feat: add hash (MESSENGER-6522) 2024-09-26 16:29:52 +02:00
JanNiklas Grabowski
384bebc921 Merge branch 'feature/6393_fix_display_permalink_to_message_as_pill' into 'develop'
fix: display permalink to message as pill (MESSENGER-6393)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!400
2024-09-05 11:27:03 +00:00
JanNiklas Grabowski
50d6b729b8 Merge branch 'feature/6377_use_match' into 'develop'
feat: use match (MESSENGER-6377)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!401
2024-09-05 10:22:25 +00:00
JanNiklas Grabowski
acaa3cf145 feat: use match (MESSENGER-6377) 2024-09-05 10:22:25 +00:00
JanNiklas Grabowski
2716b8f15d fix: display permalink to message as pill (MESSENGER-6393) 2024-08-26 16:36:30 +02:00
JanNiklas Grabowski
01e6bd3f1c Merge branch 'feature/6076_add_feature_flag_for_room_retention' into 'develop'
feat: disable room retention feature (MESSENGER-6076)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!399
2024-08-26 11:05:33 +00:00
JanNiklas Grabowski
14b13835a8 feat: disable room retention feature (MESSENGER-6076) 2024-08-26 11:38:03 +02:00
JanNiklas Grabowski
8cc139b57b feat: disable room retention feature (MESSENGER-6076) 2024-08-26 11:02:16 +02:00
JanNiklas Grabowski
fb269acd8e Merge branch 'feature/6076_foss_merge_remove_room_report' into 'develop'
feat: remove report room function on room info screen (MESSENGEr-6076)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!398
2024-08-22 11:01:07 +00:00
JanNiklas Grabowski
f442243546 feat: remove report room function on room info screen (MESSENGEr-6076) 2024-08-21 15:43:27 +02:00
JanNiklas Grabowski
3cd565a265 Merge branch 'feature/6076_foss_merge' into 'develop'
feat: foss merge (MESSENGER-6076)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!396
2024-08-21 10:10:30 +00:00
JanNiklas Grabowski
ca4bc2d6ab feat: remove unused option (MESSNEGER-6076) 2024-08-20 17:35:55 +02:00
JanNiklas Grabowski
7ddfa990cf feat: remove duplicated copyright (MESSENGER-6076) 2024-08-20 15:55:29 +02:00
Arnfried Griesert
73b30dae88 Merge branch 'feature/6348_invite_notifications' into 'develop'
fix: invite notifications sometimes not appearing (MESSENGER-6348)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!397
2024-08-20 12:50:42 +00:00
JanNiklas Grabowski
a3a9fc2c66 feat: foss merge changes from review 2024-08-20 12:58:18 +02:00
Arnfried Griesert
9149992f0b Removed bug where notifications where discarded because of missing roomDisplayNames 2024-08-20 07:54:12 +02:00
JanNiklas Grabowski
eb005301ee feat: remove changes after merge 2024-08-19 16:20:23 +02:00
JanNiklas Grabowski
6e5f30575b feat: update matrix dependencies 2024-08-19 16:19:31 +02:00
JanNiklas Grabowski
c3155b9f2b feat: reset to our decryption failure tracking 2024-08-19 16:16:06 +02:00
JanNiklas Grabowski
c652fb9089 feat: update element version (MESSENGER-6077) 2024-08-19 16:14:54 +02:00
JanNiklas Grabowski
c4d6678607 feat: remove new PostHog code 2024-08-19 16:14:27 +02:00
JanNiklas Grabowski
5d8810acfa feat: update sdk version (#6076) 2024-08-19 16:09:40 +02:00
JanNiklas Grabowski
6c22fa37f1 Merge commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5' into feature/6076_foss_merge
* commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5': (79 commits)
  finish version++
  version++
  Translated using Weblate (Hungarian)
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Slovak)
  Translated using Weblate (Swedish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Albanian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Estonian)
  updated the submodule
  updated SDK
  Update the SDK. (#7819)
  Prepare for new sprint
  finish version++
  version++
  fix
  Changelog.
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Analytics/Analytics.swift
#	Riot/Modules/Analytics/DecryptionFailure.swift
#	Riot/Modules/Analytics/PHGPostHogConfiguration.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewAction.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift
#	Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.m
#	RiotNSE/target.yml
#	fastlane/Fastfile
#	project.yml
2024-08-19 12:52:38 +02:00
JanNiklas Grabowski
f1ecfe2894 Merge tag 'v2.21.0' into develop
Changes in BWI project 2.21.0 (2024-08-09)
===================================================

Upstream merge :

Features :
- MESSENGER-6162 add server selection protection with jwt
- MESSENGER-6273 add hash
- MESSENGER-6236 add hash
- MESSENGER-6229 add hash
- MESSENGER-6372 add hash

Improvements 🙌:

Bugfix 🐛:
- MESSENGER-5896 disable periodic maintenance on logout
- MESSENGER-4172 use fixed sdk version
- MESSENGER-4172 read message marker

Translations 🗣   :

SDK API changes ⚠️:

Build 🧱:
- MESSENGER-6243 change ci runner

Documentation 📄:
- MESSENGER-MESSENGER new license file
2024-08-15 10:48:46 +02:00
JanNiklas Grabowski
4a7d5771a6 Merge branch 'releaseprep/v2.21.0' into 'release/v2.21.0'
Releaseprep/v2.21.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!395
v2.21.0
2024-08-15 08:46:09 +00:00
JanNiklas Grabowski
a67d41b878 docs: update changelog (MESSENG-6344) 2024-08-14 15:35:41 +02:00
JanNiklas Grabowski
d62cd1e586 feat: add hash (MESSENGER-6372) 2024-08-14 15:33:41 +02:00
JanNiklas Grabowski
3f3c45a729 feat: update public keys for server selection protection with JWT (MESSENGER-6162) 2024-08-14 14:26:07 +02:00
JanNiklas Grabowski
8da5fbe9dc feat: update public keys for server selection protection with JWT (MESSENGER-6162) 2024-08-14 14:05:53 +02:00
JanNiklas Grabowski
39b2137a0e build: update sdk version (MESSENGER-6344) 2024-08-13 17:42:49 +02:00
JanNiklas Grabowski
4506e055cc Merge branch 'feature/6344_new_app_version' into 'develop'
MESSENGER-6344 update app version

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!394
2024-08-13 14:51:59 +00:00
JanNiklas Grabowski
527f5aad1b docs: update changelogs (MESSENGER-6344) 2024-08-12 11:34:47 +02:00
JanNiklas Grabowski
4680101704 MESSENGER-6344 update app version 2024-08-09 14:01:16 +02:00
Frank Rotermund
035ff137e7 Merge branch 'feature/5896_maintenance_before_server_selection' into 'develop'
fix: disable periodic maintenance on logout (MESSENGER-5896)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!392
2024-08-02 05:28:08 +00:00
JanNiklas Grabowski
617d63e10e Merge branch 'feature/6273_add_hash' into 'develop'
feat: add hash (MESSENGER-6273)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!393
2024-07-31 06:21:59 +00:00
JanNiklas Grabowski
9bd806c689 feat: add hash (MESSENGER-6273) 2024-07-30 16:13:03 +02:00
Frank Rotermund
d5ca308e49 fix: disable periodic maintenance on logout (MESSENGER-5896) 2024-07-29 14:52:02 +02:00
Frank Rotermund
2180870764 Merge branch 'feature/6162_jwt_token' into 'develop'
feat: add server selection protection with jwt (MESSENGER-6162)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!391
2024-07-26 04:53:27 +00:00
Frank Rotermund
dc6c9f8fc4 feat: add JWT Support to MDM and refacture (MESSENGER-6162) 2024-07-25 12:51:43 +02:00
Frank Rotermund
bb60e8f85d feat: add server selection protection with jwt (MESSENGER-6162) 2024-07-24 15:54:45 +02:00
Mauro Romito
1f16e10a01 Merge branch 'release/1.11.16/master' 2024-07-23 14:13:03 +02:00
Mauro Romito
bbc74c1c8f finish version++ 2024-07-23 14:13:03 +02:00
Mauro
bd8e7f4223 Merge pull request #7824 from element-hq/release/1.11.16/release 2024-07-23 14:12:46 +02:00
Mauro Romito
0eb6ba084e version++ 2024-07-23 13:41:51 +02:00
Mauro
244511d77e Merge pull request #7823 from RiotTranslateBot/weblate-riot-ios-riot-ios 2024-07-23 12:47:43 +02:00
simsononroad
16862654cc Translated using Weblate (Hungarian)
Currently translated at 99.9% (2419 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
2024-07-23 10:05:34 +00:00
random
8b467f3847 Translated using Weblate (Italian)
Currently translated at 100.0% (2420 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
2024-07-23 10:05:34 +00:00
Ihor Hordiichuk
64de16c1dd Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2420 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
2024-07-23 10:05:34 +00:00
Balázs Meskó
1b0530141e Translated using Weblate (Hungarian)
Currently translated at 99.9% (2419 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
2024-07-23 10:05:34 +00:00
Jozef Gaal
6ed51f564d Translated using Weblate (Slovak)
Currently translated at 100.0% (2420 of 2420 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
2024-07-23 10:05:34 +00:00