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
8465630063
Feature/4041 new layout new feature banner
2023-02-08 15:39:51 +00:00
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
4264e3b02f
MESSENGER-4034 app icon name
2023-02-08 14:53:45 +00:00
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
c013098ac9
MESSENGER-3895 qr code login
2023-02-08 12:19:07 +00:00
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
19ff9e0371
Feature/2821 server maintenance info
2023-02-07 12:48:46 +00:00
e17e7c87a9
Merge branch 'feature/new_server' into 'develop'
...
add new server
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!84
2023-02-07 09:30:05 +00:00
359d688a44
add new server
2023-02-07 09:19:36 +00:00
ed8c9bad51
Merge branch 'feature/4029_statusmessages' into 'develop'
...
MESSENGER-4029 remove longpress and context menus for state events
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!81
2023-01-30 10:35:09 +00:00
f7110e461a
MESSENGER-4029 remove longpress and context menus for state events
2023-01-30 10:35:09 +00:00
534c1721b3
Merge branch 'hotfix/v2.2.1' into develop
...
# Conflicts:
# Podfile
2023-01-27 15:22:35 +01:00
cc1db228ff
MESSENGER-4073 fix for multi backup problem
2023-01-27 14:48:24 +01:00
1c8e6b2250
Merge branch 'feature/4014_new_layout_notes_room' into 'develop'
...
Feature/4014 new layout notes room
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!80
2023-01-27 10:18:50 +00:00
cdb37aaab7
Feature/4014 new layout notes room
2023-01-27 10:18:49 +00:00
39d67b8bcb
Merge branch 'feature/update_readme' into 'develop'
...
more details for forks
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!74
2023-01-26 09:17:07 +00:00
bef5e9c9c4
Merge branch 'feature/4039_activate_new_layout' into 'develop'
...
MESSENGER-4039 new layout - add last admin function
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!78
2023-01-25 11:06:01 +00:00
0f22ac9855
MESSENGER-4039 new layout - add last admin function
2023-01-25 11:06:00 +00:00
10e66e2e96
merged release_2_2_0 into develop
2023-01-24 09:24:47 +01:00
9c9fc53cdb
Merge branch 'release/v2.2.0'
...
* release/v2.2.0: (774 commits)
Minor change in build settings
Hide lottie animation when user logs out
Added missing english translation
Hide navigation bar on launch screen
MESSENGER-4073 fix version of html formatter package
fixed merge issues
Changes in new features and build settings
Updated element version to 1.9.14
MESSENGER-4078 permalinks only in open rooms, better texts and icons
Scan verification screen shows again the old icon instead of the activity indicator
MESSENGER-4032 disable thread options
MESSENGER-3418 text changes chrosssigning
Enable cross signing
Bugfixes
MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user...
Added two missing translations in alerts
Replaced icon with activity indicator
Changed text
MESSENGER-4008 add clickable copyright to staticlocationview
MESSENGER-3977 disable Threadpopup if threads are disabled
...
2023-01-24 09:06:44 +01:00
4591cb5685
Minor change in build settings
2023-01-23 16:00:45 +01:00
7cd26583e8
Merge branch 'feature/4016_netiquette' into 'develop'
...
MESSENGER-4016 add netiquette
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!76
2023-01-23 14:42:33 +00:00
fb92b09f64
MESSENGER-4016 add netiquette
2023-01-23 14:42:33 +00:00
5a2c0a3865
Merge branch 'feature/3790_activate_new_layout' into 'develop'
...
MESSENGER-3790 activate new layout
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!75
2023-01-23 13:41:51 +00:00
b8b6134226
MESSENGER-3790 activate new layout
2023-01-23 13:41:49 +00:00
b0cb9c40e0
Hide lottie animation when user logs out
2023-01-23 13:05:29 +01:00
4781da87c9
Added missing english translation
2023-01-23 13:01:50 +01:00
d85fdc1c6f
Hide navigation bar on launch screen
2023-01-23 12:59:04 +01:00
cf6ed6241e
MESSENGER-4073 fix version of html formatter package
2023-01-20 16:02:22 +01:00
7a11ef776b
fixed merge issues
2023-01-19 16:13:43 +01:00
1c68d5ea29
more details for forks
2023-01-18 15:35:32 +00:00
3b8a3d9bce
Changes in new features and build settings
2023-01-17 12:33:12 +01:00
14ea486899
Merge branch 'feature/4068_merge_foss_1_9_15' into develop
2023-01-17 10:22:17 +01:00
3288335a79
MESSENGER-4068 buildfixes
2023-01-16 14:37:53 +01:00
cbc4903e34
Updated element version to 1.9.14
2023-01-16 14:03:41 +01:00
d9057cd0cb
Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
...
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Assets/de.lproj/Localizable.strings
# Riot/Modules/Room/RoomViewController.m
# RiotNSE/NotificationService.swift
# fastlane/Fastfile
2023-01-16 12:11:51 +01:00
48cebfcfc5
Merge branch 'feature/4078_permalink_improvements' into 'develop'
...
MESSENGER-4078 permalinks only in open rooms, better texts and icons
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!73
2023-01-16 07:15:27 +00:00
cc5a9ed847
MESSENGER-4078 permalinks only in open rooms, better texts and icons
2023-01-16 08:06:13 +01:00
c962a16917
merged develop into feature_3418_text_changes_chrosssigning
2023-01-11 15:29:03 +01:00
05e9eb846d
Scan verification screen shows again the old icon instead of the activity indicator
2023-01-11 15:21:52 +01:00
9d6b348812
Merge branch 'feature/4032_disable_thread_functions' into 'develop'
...
MESSENGER-4032 disable thread options
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!72
2023-01-11 13:26:13 +00:00
b959345067
MESSENGER-4032 disable thread options
2023-01-11 13:26:13 +00:00
314bee6dca
Merge branch 'feature/3418_text_changes_chrosssigning' into 'develop'
...
MESSENGER-3418 text changes chrosssigning
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!69
2023-01-11 13:11:20 +00:00
6285b3c1b9
MESSENGER-3418 text changes chrosssigning
2023-01-11 13:11:20 +00:00
6886a1de4f
Enable cross signing
2023-01-10 21:11:52 +01:00
c6a2684926
Bugfixes
2023-01-10 21:10:42 +01:00
0bf30fc7d2
Merge branch 'release/1.9.15/master'
2023-01-10 16:50:13 +00:00
ade70074d9
finish version++
2023-01-10 16:50:13 +00:00
16c4049df9
Merge pull request #7255 from vector-im/release/1.9.15/release
...
Release 1.9.15
2023-01-10 16:49:41 +00:00
Frank Rotermund
Arnfried Griesert
Juergen Wischer
JanNiklas Grabowski
Doug
Doug