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
15,722 Commits 1 Branch 67 Tags
7cdd0bf37f2e8fa2ff67b77a91e055a27ce15034
Commit Graph

15722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Wischer
7cdd0bf37f add api_key.p8 to gitignore 2022-06-29 08:12:50 +00:00
Frank Rotermund
77ac918df2 Merge branch 'feature/3288_automatic_room_alias' into 'develop' 
MESSENGER-3288 auto create room alias on room creation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!19
 2022-06-22 13:56:21 +00:00
Frank Rotermund
3953554a14 MESSENGER-3288 auto create room alias on room creation 2022-06-22 13:56:21 +00:00
Frank Rotermund
4139a61bb9 Merge branch 'feature/3294_permalink_appconfig' into 'develop' 
MESSENGER-3269 permalink config from appconfig

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!18
 2022-06-22 13:46:15 +00:00
Frank Rotermund
c454c173c7 Merge branch 'feature/3154_password_authentification' into 'develop' 
feature/3154_password_authentification

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!16
 2022-06-21 13:03:48 +00:00
Arnfried Griesert
64b723eb4b feature/3154_password_authentification 2022-06-21 13:03:48 +00:00
Frank Rotermund
aa7e91630b Merge branch 'feature/3224_password_reset_text_changes' into 'develop' 
feature/3224_password_reset_text_changes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!17
 2022-06-21 13:03:38 +00:00
Arnfried Griesert
0f97e147e2 feature/3224_password_reset_text_changes 2022-06-21 13:03:37 +00:00
Frank Rotermund
9e0f3de20c MESSENGER-3269 permalink config from appconfig 2022-06-21 13:47:35 +02:00
Frank Rotermund
22512343cb MESSENGER-3269 Element version and disable new room creation footer 2022-06-20 13:48:03 +02:00
Frank Rotermund
9ebb6258f3 MESSENGER-3269 Runnable 2022-06-19 17:47:41 +02:00
Frank Rotermund
316d2a57bd MESSENGER-3269 Compilability 2022-06-19 14:53:02 +02:00
Frank Rotermund
1ab51f37f8 Merge branch 'master' of https://github.com/vector-im/element-ios into feature/3269_merge_element_1_8_18 
# Conflicts:
#	Config/AppIdentifiers.xcconfig
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Modules/Analytics/DecryptionFailureTracker.m
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Onboarding/OnboardingCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/SupportingFiles/Info.plist
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.h
#	Riot/Utils/Tools.m
#	Riot/target.yml
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
#	fastlane/Fastfile
#	project.yml
 2022-06-12 19:49:46 +02:00
Frank Rotermund
8fc4d98971 Merge branch 'feature/3124_release_preparation' into 'develop' 
Feature/3124 release preparation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!14
 2022-06-08 13:04:21 +00:00
Frank Rotermund
00fb1d0f01 Feature/3124 release preparation 2022-06-08 13:04:21 +00:00
gulekismail
63ae6d06ab Merge branch 'release/1.8.18/master' 2022-06-03 14:04:48 +03:00
gulekismail
511d768494 finish version++ 2022-06-03 14:04:48 +03:00
ismailgulek
9bfcdda044 Merge pull request #6243 from vector-im/release/1.8.18/release 
Release 1.8.18
 2022-06-03 14:03:46 +03:00
gulekismail
268da7bf83 version++ 2022-06-03 13:24:16 +03:00
gulekismail
4ac34e8358 changelog.d: Upgrade MatrixSDK version ([v0.23.8](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.8)). 2022-06-03 13:24:15 +03:00
Gil Eluard
abecf0884a Show user indicators when paginating a room (#6234) 
- implemented
 2022-06-03 09:46:34 +02:00
MaximeEvrard42
341c14af50 Merge pull request #6232 from vector-im/maximee/6202_lls_improve_detection_pin_drop 
[Location sharing] Improve detection of user panning on the map (PSF-1050)
 2022-06-02 17:31:50 +02:00
Arnfried Griesert
2a2b0cd134 save button fix and text color for dark mode 2022-06-02 12:18:03 +02:00
MaximeE
e919bf2644 6202: Improve how pan gesture is handled 2022-06-02 11:34:01 +02:00
Arnfried Griesert
fc8e8cf7be Merge branch 'feature/1801_ruhezeit_einstellungsmenu' into 'develop' 
Feature/1801 ruhezeit einstellungsmenu

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!12
 2022-06-02 03:41:21 +00:00
Arnfried Griesert
c20966c2ab Feature/1801 ruhezeit einstellungsmenu 2022-06-02 03:41:21 +00:00
Germain
3e47bf39fd Remove spaces issues to delight board automation (#6230) 
* Remove spaces issues to delight board automation

* Move issues with the Team Delight label

* Fix label name
 2022-06-01 17:50:15 +02:00
Frank Rotermund
810124110b Merge branch 'feature/2865_Participant_Sorting' into 'develop' 
Feature/2865 participant sorting

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!13
 2022-06-01 13:53:24 +00:00
Frank Rotermund
067b7e26c4 Feature/2865 participant sorting 2022-06-01 13:53:23 +00:00
MaximeE
52a2d8a2d8 6202: Add pan gesture recognizer to handle detection of user moving across map 2022-06-01 14:17:27 +02:00
Doug
f327e93408 Merge pull request #6196 from wtimme/feature/No-Ticket-Inhibit-all-warnings-from-pods 
Silence warnings from 3rd-party CocoaPods dependencies
 2022-06-01 08:55:08 +01:00
wtimme
3badc14d88 Merge remote-tracking branch 'origin/develop' into feature/No-Ticket-Inhibit-all-warnings-from-pods 2022-05-31 19:51:54 +02:00
ismailgulek
34dccd4593 Merge pull request #6210 from vector-im/ismail/6176_auth_fallback 2022-05-31 19:11:32 +03:00
Doug
89d28501ab Merge pull request #6204 from vector-im/doug/5151_sso_login 
Support SSO login in the new flow.
 2022-05-31 17:05:14 +01:00
Doug
5c18b6522e Merge pull request #6201 from vector-im/doug/5654_login_flow 
Add login screen to new flow.
 2022-05-31 17:04:50 +01:00
aringenbach
e7f23612b7 WellKnown: support outbound keys presharing strategy 2022-05-31 17:38:33 +02:00
MaximeE
3e55d35998 Merge branch 'develop' into maximee/6202_lls_improve_detection_pin_drop 2022-05-31 16:43:06 +02:00
Doug
35f3846f18 Prepare for new sprint 2022-05-31 14:04:08 +01:00
Doug
93df2fd834 Merge branch 'master' into develop 2022-05-31 14:04:06 +01:00
Doug
07c70b260f Merge branch 'release/1.8.17/master' 2022-05-31 14:04:01 +01:00
Doug
90e1b302d4 finish version++ 2022-05-31 14:04:01 +01:00
Doug
241dbd388a Merge pull request #6226 from vector-im/release/1.8.17/release 
Release 1.8.17
 2022-05-31 14:02:09 +01:00
Doug
86bc24b468 Tweak CHANGES.md. 2022-05-31 13:10:33 +01:00
Doug
5779755a1d version++ 2022-05-31 13:06:14 +01:00
Doug
bafce5034c changelog.d: Upgrade MatrixSDK version ([v0.23.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.7)). 2022-05-31 13:06:13 +01:00
Doug
0dd3af6af7 Merge pull request #6222 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2022-05-31 11:49:57 +01:00
Doug
576299b44b Merge pull request #6223 from vector-im/doug/fix_weblate 
Weblate strings
 2022-05-31 11:08:17 +01:00
Doug
5c5e1d7d30 Remove bad string and add comment for translators. 2022-05-31 11:02:15 +01:00
Doug
624e65209f Merge pull request #6221 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2022-05-31 10:58:11 +01:00
Weblate
7a24a0640c Merge branch 'origin/develop' into Weblate. 2022-05-31 09:25:12 +00:00