felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-09 17:37:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
18,861 Commits 1 Branch 67 Tags
bcf877d64fb002e3fed7585e6f0ebf443c704d2b
Commit Graph

18861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Rotermund bcf877d64f Merge branch 'feature/4231_change_icon_new_loginflow' into 'develop' 
Feature/4231 change icon new loginflow

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!105
 2023-03-07 13:05:50 +00:00
JanNiklas Grabowski 245be52991 Feature/4231 change icon new loginflow 2023-03-07 13:05:50 +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
Frank Rotermund 2c7a6e7745 Merge branch 'feature/4197_status_messages_cut_off' into 'develop' 
MESSENGER-4197 fix status messages cut off

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!104
 2023-03-07 12:14:51 +00:00
JanNiklas Grabowski 6344fa6cb6 MESSENGER-4197 fix status messages cut off 2023-03-07 12:14:51 +00:00
Frank Rotermund 73662bd023 Add some filetypes to our gitignore 2023-03-07 08:27:41 +01:00
Arnfried Griesert 8f8741c903 More tint color changes 2023-03-06 22:11:23 +01:00
Arnfried Griesert 40e1aace9d Merge branch 'feature/4179_send_button_wrong_color' into 'develop' 
MESSENGER-4179 send button wrong color

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!99
 2023-03-02 14:50:31 +00:00
Arnfried Griesert c8b969ae53 MESSENGER-4179 send button wrong color 2023-03-02 14:50:31 +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 1d95c8354b Merge branch 'feature/4157_better_serverdowntime_messages' into 'develop' 
MESSENGER-4157 Better Texts for downtime warnings

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!101
 2023-03-02 12:43:25 +00:00
Frank Rotermund 5e8a1ae716 Merge branch 'feature/4173_room_invites_wrong_number' into 'develop' 
MESSENGER-4173 fix invites mismatched number

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!102
 2023-03-02 11:28:56 +00:00
JanNiklas Grabowski 76deae25ca MESSENGER-4173 fix invites mismatched number 2023-03-02 11:08:23 +01:00
Frank Rotermund 8741d904e9 MESSENGER-4157 Better Texts for downtime warnings 2023-03-01 08:47:25 +01:00
JanNiklas Grabowski 7830c3c6f0 MESSENGER-4231 add new loginflow 2023-02-28 18:06:13 +01:00
Frank Rotermund 41a266871e MESSENGER-4211 Fix Notes clickablility 2023-02-28 13:08:57 +01:00
Arnfried Griesert 44814147d1 Merge branch 'feature/4218_wellknown_defaults' into 'develop' 
Feature/4218 wellknown defaults

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!97
 2023-02-28 10:07:25 +00:00
Frank Rotermund 241d322543 Feature/4218 wellknown defaults 2023-02-28 10:07:25 +00:00
Arnfried Griesert cd2303e446 Merge branch 'feature/3948_show_hide_login_password' into 'develop' 
MESSENGER-3948 show hide login password

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!95
 2023-02-24 12:01:56 +00:00
Arnfried Griesert dfb5e47985 MESSENGER-3948 show hide login password 2023-02-24 12:01:55 +00: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
Frank Rotermund 1526ffa707 Merge branch 'feature/4093_scan_permalinks_as_qr' into 'develop' 
MESSENGER-4093 scan permalinks as qr

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!94
 2023-02-23 06:50:16 +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
Arnfried Griesert 1bff461abb Merge branch 'feature/4211_notes_room_improvements' into 'develop' 
MESSENGER-4211 Notes room improvements for new layout

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!93
 2023-02-22 07:19:05 +00:00
Frank Rotermund 79743b5165 MESSENGER-4211 Notes room improvements for new layout 2023-02-22 07:19:05 +00:00
Frank Rotermund 74059c0bef Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop 2023-02-16 16:30:07 +01:00
Frank Rotermund cb100fab66 Merge branch 'release/v.2.3.0' into develop 
# Conflicts:
#	Podfile
 2023-02-16 16:29:24 +01:00
Arnfried Griesert 8d6ed5d003 MESSENGER-4161 text change forgot password 2023-02-16 15:14:46 +00:00
Frank Rotermund 8b0ff57d69 MESSENGER-4258 Fixes from Testprotocol 2023-02-16 15:40:21 +01:00
JanNiklas Grabowski a834293a41 Merge branch 'feature/4167_text_change_buttons_recovery_key' into 'develop' 
Changed text for recovery key buttons

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!91
 2023-02-16 13:42:36 +00:00
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
Arnfried Griesert e488896f6d Changed text for recovery key buttons 2023-02-14 06:52:29 +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