felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
31,279 Commits 1 Branch 67 Tags
1768fb5eee8f0077753b0873df4aeee4d5ccd59a
Commit Graph

31279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JanNiklas Grabowski
1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' 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
91a837268f MESSENGER-3895 Fix presentation of two alerts 2023-02-13 08:08:52 +01:00
Doug
3bc5f8da6f Merge branch 'release/1.10.2/master' 2023-02-10 13:39:17 +00:00
Doug
24e4aa220f finish version++ 2023-02-10 13:39:17 +00:00
Doug
c6081fedc7 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
e8ed47fbad Attempt fixing Alpha builds on releases. 2023-02-10 12:24:25 +00:00
Doug
b4afe55ff3 version++ 2023-02-10 11:16:35 +00:00
Frank Rotermund
f03b25cc18 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
71cfda912d Align emoji names with other platforms 2023-02-10 10:01:15 +00:00
Juergen Wischer
366924da1a Replace repo overview 2023-02-10 08:12:20 +00:00
Frank Rotermund
dc658e0162 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
1dcb4afd2c 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
ce4617289b MESSENGER-4168 text change pin entry 2023-02-10 06:38:43 +00:00
JanNiklas Grabowski
eae05b3093 MESSENGER-4235 - location sharing without gps 2023-02-09 17:50:33 +01:00
Anderas
c47c2c3302 Merge pull request #7349 from vector-im/andy/crashes 
Fix some crashes
 2023-02-09 08:45:43 +00:00
Andy Uhnak
fbd6b068a6 Crashes in verification view models 2023-02-09 08:44:31 +00:00
Andy Uhnak
8f219f80b5 More crashes 2023-02-09 08:44:31 +00:00
Andy Uhnak
d203630795 Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio
9ecfe523aa "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
e3011a670c 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
1442750a6d Feature/4041 new layout new feature banner 2023-02-08 15:39:51 +00:00
Arnfried Griesert
1611724756 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
66b2259f7c MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Frank Rotermund
f163e917b3 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
d7a23d53dc MESSENGER-3895 qr code login 2023-02-08 12:19:07 +00:00
Doug
ca6181252a Merge branch 'release/1.10.1/master' 2023-02-07 15:11:52 +00:00
Doug
151a8c6509 finish version++ 2023-02-07 15:11:52 +00:00
Doug
d2b38ef7ab 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
41199d19d9 version++ 2023-02-07 12:57:52 +00:00
Doug
08134131f8 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
aa1c2911c7 Merge pull request #7347 from vector-im/doug/weblate 
Weblate
 2023-02-07 12:55:17 +00:00
Frank Rotermund
fd8ab8e648 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
0185a99e00 Feature/2821 server maintenance info 2023-02-07 12:48:46 +00:00
Doug
475182f92c Fix placeholder mismatches. 2023-02-07 10:51:11 +00:00
Doug
281e9b4ea9 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
003e479c26 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
bb1353015f Merge pull request #7344 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2023-02-07 10:40:58 +00:00
LinAGKar
9c66b67db8 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
f97a5a0edb 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
5aad4af289 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
584e39a93d 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
81524cb6a6 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
60103b70cb 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
25ca09903e 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
193c90c518 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
66fa08bb58 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
5e8e2aa279 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
1489d7fc3b 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
Linerly
d86f5e30d8 Translated using Weblate (Indonesian) 
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/id/
 2023-02-07 10:23:44 +00:00
Ihor Hordiichuk
ef103b763e Translated using Weblate (Ukrainian) 
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/uk/
 2023-02-07 10:23:44 +00:00