JanNiklas Grabowski
|
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 |
|
Frank Rotermund
|
cdb37aaab7
|
Feature/4014 new layout notes room
|
2023-01-27 10:18:49 +00:00 |
|
Frank Rotermund
|
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 |
|
Frank Rotermund
|
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 |
|
JanNiklas Grabowski
|
0f22ac9855
|
MESSENGER-4039 new layout - add last admin function
|
2023-01-25 11:06:00 +00:00 |
|
Arnfried Griesert
|
10e66e2e96
|
merged release_2_2_0 into develop
|
2023-01-24 09:24:47 +01:00 |
|
Arnfried Griesert
|
4591cb5685
|
Minor change in build settings
|
2023-01-23 16:00:45 +01:00 |
|
JanNiklas Grabowski
|
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 |
|
JanNiklas Grabowski
|
fb92b09f64
|
MESSENGER-4016 add netiquette
|
2023-01-23 14:42:33 +00:00 |
|
Frank Rotermund
|
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 |
|
Frank Rotermund
|
b8b6134226
|
MESSENGER-3790 activate new layout
|
2023-01-23 13:41:49 +00:00 |
|
Arnfried Griesert
|
b0cb9c40e0
|
Hide lottie animation when user logs out
|
2023-01-23 13:05:29 +01:00 |
|
Arnfried Griesert
|
4781da87c9
|
Added missing english translation
|
2023-01-23 13:01:50 +01:00 |
|
Arnfried Griesert
|
d85fdc1c6f
|
Hide navigation bar on launch screen
|
2023-01-23 12:59:04 +01:00 |
|
Frank Rotermund
|
cf6ed6241e
|
MESSENGER-4073 fix version of html formatter package
|
2023-01-20 16:02:22 +01:00 |
|
Arnfried Griesert
|
7a11ef776b
|
fixed merge issues
|
2023-01-19 16:13:43 +01:00 |
|
Juergen Wischer
|
1c68d5ea29
|
more details for forks
|
2023-01-18 15:35:32 +00:00 |
|
Arnfried Griesert
|
3b8a3d9bce
|
Changes in new features and build settings
|
2023-01-17 12:33:12 +01:00 |
|
Frank Rotermund
|
14ea486899
|
Merge branch 'feature/4068_merge_foss_1_9_15' into develop
|
2023-01-17 10:22:17 +01:00 |
|
Frank Rotermund
|
3288335a79
|
MESSENGER-4068 buildfixes
|
2023-01-16 14:37:53 +01:00 |
|
Arnfried Griesert
|
cbc4903e34
|
Updated element version to 1.9.14
|
2023-01-16 14:03:41 +01:00 |
|
Frank Rotermund
|
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 |
|
Frank Rotermund
|
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 |
|
Frank Rotermund
|
cc5a9ed847
|
MESSENGER-4078 permalinks only in open rooms, better texts and icons
|
2023-01-16 08:06:13 +01:00 |
|
Arnfried Griesert
|
c962a16917
|
merged develop into feature_3418_text_changes_chrosssigning
|
2023-01-11 15:29:03 +01:00 |
|
Arnfried Griesert
|
05e9eb846d
|
Scan verification screen shows again the old icon instead of the activity indicator
|
2023-01-11 15:21:52 +01:00 |
|
Frank Rotermund
|
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 |
|
JanNiklas Grabowski
|
b959345067
|
MESSENGER-4032 disable thread options
|
2023-01-11 13:26:13 +00:00 |
|
Frank Rotermund
|
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 |
|
Arnfried Griesert
|
6285b3c1b9
|
MESSENGER-3418 text changes chrosssigning
|
2023-01-11 13:11:20 +00:00 |
|
Arnfried Griesert
|
6886a1de4f
|
Enable cross signing
|
2023-01-10 21:11:52 +01:00 |
|
Arnfried Griesert
|
c6a2684926
|
Bugfixes
|
2023-01-10 21:10:42 +01:00 |
|
Doug
|
0bf30fc7d2
|
Merge branch 'release/1.9.15/master'
|
2023-01-10 16:50:13 +00:00 |
|
Doug
|
ade70074d9
|
finish version++
|
2023-01-10 16:50:13 +00:00 |
|
Doug
|
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
|
c1f7d20bdd
|
Merge branch 'feature/4030_disable_empty_direct_message' into 'develop'
MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user...
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!70
|
2023-01-10 14:37:37 +00:00 |
|
JanNiklas Grabowski
|
17fd93cd3d
|
MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user...
|
2023-01-10 14:37:37 +00:00 |
|
Doug
|
6fd8512008
|
version++
|
2023-01-10 14:13:25 +00:00 |
|
Doug
|
bbfbb924c9
|
changelog.d: Upgrade MatrixSDK version ([v0.24.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.7)).
|
2023-01-10 14:13:24 +00:00 |
|
Alfonso Grillo
|
3f97f89e0a
|
Merge pull request #7231 from vector-im/alfogrillo/render_poll_end_event
Render poll ended event in the timeline (PSG-196)
|
2023-01-10 14:49:13 +01:00 |
|
Doug
|
6914fff70d
|
Merge pull request #7251 from vector-im/doug/weblate
Weblate (with fixes)
|
2023-01-10 12:08:48 +00:00 |
|
Alfonso Grillo
|
0ed86d2b26
|
Fix ut build errors
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
e1e870c883
|
Add changelog.d file
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
c156f76ec5
|
Refine MXKEventFormatter
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
2ec0777b06
|
Remove warnings
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
493c91b2da
|
Add warnings
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
2ed4231ac0
|
Add push notification body for poll.end
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
d965becd7a
|
Fix poll.end read receipts
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
43d4ceb101
|
Cleanup code
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
64f904f8dd
|
Fix reactions layout
|
2023-01-10 12:19:39 +01:00 |
|