aa814722ca
Merge branch 'feature/4394_pincode_fix' into 'develop'
...
MESSENGER-4394 restart pincode setup when app was closed during it the first time
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!108
2023-03-09 09:26:24 +00:00
144816108a
MESSENGER-4394 restart pincode setup when app was closed during it the first time
2023-03-09 09:26:24 +00:00
b4f015f30d
Merge branch 'feature/3425_permalink_prefix' into 'develop'
...
MESSENGER-3425 permalink prefix developer settings screen
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!107
2023-03-08 13:28:11 +00:00
ca8901bade
MESSENGER-3425 permalink prefix developer settings screen
2023-03-08 13:28:11 +00:00
b27f71e24e
Merge branch 'feature/4303_fix_cross_signing_error' into 'develop'
...
MESSENGER-4303 fix cross signing error
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!106
2023-03-08 07:11:34 +00:00
570f4c5391
MESSENGER-4303 fix cross signing error
2023-03-07 17:43:28 +01:00
46a6aaaeff
Merge branch 'feature/3157_third_notification_setting' into 'develop'
...
MESSENGER-3157 third notification settings option
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!100
2023-03-07 13:28:09 +00:00
20ecc8ab46
MESSENGER-3157 third notification settings option
2023-03-07 13:28:09 +00:00
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
245be52991
Feature/4231 change icon new loginflow
2023-03-07 13:05:50 +00:00
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
e435aebd55
Feature/4174 better error message when backend down
2023-03-07 12:28:55 +00:00
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
6344fa6cb6
MESSENGER-4197 fix status messages cut off
2023-03-07 12:14:51 +00:00
73662bd023
Add some filetypes to our gitignore
2023-03-07 08:27:41 +01:00
8f8741c903
More tint color changes
2023-03-06 22:11:23 +01:00
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
c8b969ae53
MESSENGER-4179 send button wrong color
2023-03-02 14:50:31 +00:00
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
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
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
76deae25ca
MESSENGER-4173 fix invites mismatched number
2023-03-02 11:08:23 +01:00
8741d904e9
MESSENGER-4157 Better Texts for downtime warnings
2023-03-01 08:47:25 +01:00
7830c3c6f0
MESSENGER-4231 add new loginflow
2023-02-28 18:06:13 +01:00
41a266871e
MESSENGER-4211 Fix Notes clickablility
2023-02-28 13:08:57 +01:00
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
241d322543
Feature/4218 wellknown defaults
2023-02-28 10:07:25 +00:00
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
dfb5e47985
MESSENGER-3948 show hide login password
2023-02-24 12:01:55 +00:00
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
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
eb618b395d
MESSENGER-4093 scan permalinks as qr
2023-02-23 06:50:16 +00:00
1a5980c79a
MESSENGER-3076 display user search results alphabetically
2023-02-23 07:44:38 +01:00
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
79743b5165
MESSENGER-4211 Notes room improvements for new layout
2023-02-22 07:19:05 +00:00
74059c0bef
Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
2023-02-16 16:30:07 +01:00
cb100fab66
Merge branch 'release/v.2.3.0' into develop
...
# Conflicts:
# Podfile
2023-02-16 16:29:24 +01:00
8d6ed5d003
MESSENGER-4161 text change forgot password
2023-02-16 15:14:46 +00:00
8b0ff57d69
MESSENGER-4258 Fixes from Testprotocol
2023-02-16 15:40:21 +01:00
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
3a5bea7401
Merge branch 'feature/4260_merge_foss_1_10_2' into develop
2023-02-16 13:23:45 +01:00
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
e488896f6d
Changed text for recovery key buttons
2023-02-14 06:52:29 +01:00
a5b66acd9b
Update Appversion at sprint start
2023-02-13 15:15:24 +01:00
6e560823ef
MESSENGER-3895 Fix presentation of two alerts
2023-02-13 08:08:52 +01:00
8b96dce52c
Merge branch 'release/1.10.2/master'
2023-02-10 13:39:17 +00:00
f852b10a55
finish version++
2023-02-10 13:39:17 +00:00
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
19d8481be4
Attempt fixing Alpha builds on releases.
2023-02-10 12:24:25 +00:00
6ec3cc7b32
version++
2023-02-10 11:16:35 +00:00
Frank Rotermund
Arnfried Griesert
JanNiklas Grabowski
Doug
Doug