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
30,726 Commits 1 Branch 67 Tags
66b2259f7c618efef80ccbd3cb8aa2ac4a4d372d
Commit Graph

30726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Frank Rotermund
71413d1f70 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
Juergen Wischer
3e4bc21292 add new server 2023-02-07 09:19:36 +00:00
JanNiklas Grabowski
e4fd86d839 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
Frank Rotermund
d2a0493b23 MESSENGER-4029 remove longpress and context menus for state events 2023-01-30 10:35:09 +00:00
Frank Rotermund
90ba8689c2 Merge branch 'hotfix/v2.2.1' into develop 
# Conflicts:
#	Podfile
 2023-01-27 15:22:35 +01:00
Frank Rotermund
c87868ea09 MESSENGER-4073 fix for multi backup problem 2023-01-27 14:48:24 +01:00
JanNiklas Grabowski
c2cd3293e2 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
0d1b84b04e Feature/4014 new layout notes room 2023-01-27 10:18:49 +00:00
Frank Rotermund
e57b51ed09 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
bf39cd5340 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
73ded73d25 MESSENGER-4039 new layout - add last admin function 2023-01-25 11:06:00 +00:00
Arnfried Griesert
4d55fd8513 merged release_2_2_0 into develop 2023-01-24 09:24:47 +01:00
Arnfried Griesert
a7a704435b 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
  ...
v2.2.0 		2023-01-24 09:06:44 +01:00
Arnfried Griesert
124d49f4b8 Minor change in build settings 2023-01-23 16:00:45 +01:00
JanNiklas Grabowski
b4861346cf 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
4882c4ac49 MESSENGER-4016 add netiquette 2023-01-23 14:42:33 +00:00
Frank Rotermund
dc2c51706a 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
afabb50f1f MESSENGER-3790 activate new layout 2023-01-23 13:41:49 +00:00
Arnfried Griesert
47663713b4 Hide lottie animation when user logs out 2023-01-23 13:05:29 +01:00
Arnfried Griesert
ccf8704234 Added missing english translation 2023-01-23 13:01:50 +01:00
Arnfried Griesert
b7d86f1847 Hide navigation bar on launch screen 2023-01-23 12:59:04 +01:00
Frank Rotermund
29f0c04da6 MESSENGER-4073 fix version of html formatter package 2023-01-20 16:02:22 +01:00
Arnfried Griesert
126a516836 fixed merge issues 2023-01-19 16:13:43 +01:00
Juergen Wischer
cc9874b346 more details for forks 2023-01-18 15:35:32 +00:00
Arnfried Griesert
7ff42c060b Changes in new features and build settings 2023-01-17 12:33:12 +01:00
Frank Rotermund
46cae7117f Merge branch 'feature/4068_merge_foss_1_9_15' into develop 2023-01-17 10:22:17 +01:00
Frank Rotermund
80bc68ea8e MESSENGER-4068 buildfixes 2023-01-16 14:37:53 +01:00
Arnfried Griesert
2c7bd61e47 Updated element version to 1.9.14 2023-01-16 14:03:41 +01:00
Frank Rotermund
9f6deb9110 Merge commit '2e9bb7067e9f1596f29b986729822184145906db' 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
c2517b8637 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
3aa886fb49 MESSENGER-4078 permalinks only in open rooms, better texts and icons 2023-01-16 08:06:13 +01:00
Arnfried Griesert
12a49697b0 merged develop into feature_3418_text_changes_chrosssigning 2023-01-11 15:29:03 +01:00
Arnfried Griesert
c543d72534 Scan verification screen shows again the old icon instead of the activity indicator 2023-01-11 15:21:52 +01:00
Frank Rotermund
facfb6e74a 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
4b6aac50ab MESSENGER-4032 disable thread options 2023-01-11 13:26:13 +00:00
Frank Rotermund
dce22944f2 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
2aaa27bcd1 MESSENGER-3418 text changes chrosssigning 2023-01-11 13:11:20 +00:00
Arnfried Griesert
316cbd757a Enable cross signing 2023-01-10 21:11:52 +01:00
Arnfried Griesert
774dd70e3a Bugfixes 2023-01-10 21:10:42 +01:00
Doug
a9c617fe00 Merge branch 'release/1.9.15/master' 2023-01-10 16:50:13 +00:00
Doug
939f873ffb finish version++ 2023-01-10 16:50:13 +00:00
Doug
62a09e18c1 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
9ed2133acd 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
6e3b99b485 MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user... 2023-01-10 14:37:37 +00:00
Doug
a7a8fd4c63 version++ 2023-01-10 14:13:25 +00:00