felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-14 03:40:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
18,828 Commits 1 Branch 67 Tags
3a5bea740160e2b2ce06ac87808a147f3a7bfa18
Commit Graph

18828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JanNiklas Grabowski 3a5bea7401 Merge branch 'feature/4260_merge_foss_1_10_2' into develop 2023-02-16 13:23:45 +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
Frank Rotermund a5b66acd9b Update Appversion at sprint start 2023-02-13 15:15:24 +01:00
Frank Rotermund 6e560823ef MESSENGER-3895 Fix presentation of two alerts 2023-02-13 08:08:52 +01:00
Doug 8b96dce52c Merge branch 'release/1.10.2/master' 2023-02-10 13:39:17 +00:00
Doug f852b10a55 finish version++ 2023-02-10 13:39:17 +00:00
Doug 0f5a0c0a32 Merge pull request #7360 from vector-im/release/1.10.2/release 
Release 1.10.2
 2023-02-10 13:38:49 +00:00
Doug 19d8481be4 Attempt fixing Alpha builds on releases. 2023-02-10 12:24:25 +00:00
Doug 6ec3cc7b32 version++ 2023-02-10 11:16:35 +00:00
Frank Rotermund f347864261 Merge branch 'feature/4088_emoji_name_changes' into 'develop' 
Align emoji names with other platforms

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!79
 2023-02-10 10:01:16 +00:00
Arnfried Griesert 5fadb61abf Align emoji names with other platforms 2023-02-10 10:01:15 +00:00
Juergen Wischer 3a71b94c7a Replace repo overview 2023-02-10 08:12:20 +00:00
Frank Rotermund c6ecbcc99a Merge branch 'feature/4235_location_sharing_without_gps' into 'develop' 
MESSENGER-4235 - location sharing without gps

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!88
 2023-02-10 06:40:24 +00:00
Frank Rotermund 2fb34fdb39 Merge branch 'feature/4168_text_change_pin_entry' into 'develop' 
MESSENGER-4168 text change pin entry

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!89
 2023-02-10 06:38:43 +00:00
Arnfried Griesert 61d084a76d MESSENGER-4168 text change pin entry 2023-02-10 06:38:43 +00:00
JanNiklas Grabowski 94b55866e2 MESSENGER-4235 - location sharing without gps 2023-02-09 17:50:33 +01:00
Anderas c375772eab Merge pull request #7349 from vector-im/andy/crashes 
Fix some crashes
 2023-02-09 08:45:43 +00:00
Andy Uhnak 0588f5bca7 Crashes in verification view models 2023-02-09 08:44:31 +00:00
Andy Uhnak 89da453433 More crashes 2023-02-09 08:44:31 +00:00
Andy Uhnak 599e20ea01 Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio 1a33d6976d "Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352) 
* fix green dot only to appear for marked action
 2023-02-09 09:01:16 +01:00
Frank Rotermund 4e8bf8c7f6 Merge branch 'feature/4041_new_layout_new_feature_banner' into 'develop' 
Feature/4041 new layout new feature banner

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!87
 2023-02-08 15:39:51 +00:00
Frank Rotermund 8465630063 Feature/4041 new layout new feature banner 2023-02-08 15:39:51 +00:00
Arnfried Griesert 35d24950d4 Merge branch 'feature/4034_appicon_name' into 'develop' 
MESSENGER-4034 app icon name

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!86
 2023-02-08 14:53:45 +00:00
Arnfried Griesert 4264e3b02f MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Frank Rotermund 50c2e4957f Merge branch 'feature/3895_qr_code_login' into 'develop' 
MESSENGER-3895 qr code login

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!82
 2023-02-08 12:19:07 +00:00
Arnfried Griesert c013098ac9 MESSENGER-3895 qr code login 2023-02-08 12:19:07 +00:00
Doug a1446aba98 Merge branch 'release/1.10.1/master' 2023-02-07 15:11:52 +00:00
Doug 1bcd8efba0 finish version++ 2023-02-07 15:11:52 +00:00
Doug 42063ddd4f Merge pull request #7348 from vector-im/release/1.10.1/release 
Release 1.10.1
 2023-02-07 15:07:59 +00:00
Doug 2649e8cd62 version++ 2023-02-07 12:57:52 +00:00
Doug 011c8e1794 changelog.d: Upgrade MatrixSDK version ([v0.25.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.1)). 2023-02-07 12:57:52 +00:00
Doug 611e1d8a86 Merge pull request #7347 from vector-im/doug/weblate 
Weblate
 2023-02-07 12:55:17 +00:00
Frank Rotermund 26820d7bc4 Merge branch 'feature/2821_server_maintenance_info' into 'develop' 
Feature/2821 server maintenance info

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!85
 2023-02-07 12:48:47 +00:00
Frank Rotermund 19ff9e0371 Feature/2821 server maintenance info 2023-02-07 12:48:46 +00:00
Doug 77099dc770 Fix placeholder mismatches. 2023-02-07 10:51:11 +00:00
Doug b7d509f0be Merge pull request #7346 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2023-02-07 10:41:26 +00:00
Doug e0b1cb014c Merge pull request #7345 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2023-02-07 10:41:18 +00:00
Doug df2ff06038 Merge pull request #7344 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2023-02-07 10:40:58 +00:00
LinAGKar 02cb377aa9 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
 2023-02-07 10:23:44 +00:00
keda82 5bf85217c3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
 2023-02-07 10:23:44 +00:00
Besnik Bleta 1dcc5f1c80 Translated using Weblate (Albanian) 
Currently translated at 99.6% (2369 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
 2023-02-07 10:23:44 +00:00
Suguru Hirahara 63a8d4e83a Translated using Weblate (Japanese) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ja/
 2023-02-07 10:23:44 +00:00
Thibault Martin 2840f7d3ab Translated using Weblate (French) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/fr/
 2023-02-07 10:23:44 +00:00
LinAGKar 3454d2858f Translated using Weblate (Swedish) 
Currently translated at 99.7% (2371 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
 2023-02-07 10:23:44 +00:00
keda82 f1ed863ee3 Translated using Weblate (Swedish) 
Currently translated at 99.7% (2371 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sv/
 2023-02-07 10:23:44 +00:00
Priit Jõerüüt ce597c9c81 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/
 2023-02-07 10:23:44 +00:00
Suguru Hirahara b249cdc5ec Translated using Weblate (Japanese) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ja/
 2023-02-07 10:23:44 +00:00
phardyle 8cd0dd38ff Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.0% (1975 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/
 2023-02-07 10:23:44 +00:00
Jozef Gaal d999bfb90b Translated using Weblate (Slovak) 
Currently translated at 100.0% (2378 of 2378 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
 2023-02-07 10:23:44 +00:00