felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-16 04:40:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,501 Commits 1 Branch 67 Tags
b8a703dc553466c013f111fc86be90778e2e4cf1
Commit Graph

10501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
manuroe b8a703dc55 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard 5a6b33ae68 Merge pull request #4243 from vector-im/element_4242 
Show/Hide public directory in Unified Search
 2021-04-20 12:40:29 +02:00
Gil Eluard b9e1de5125 Merge branch 'develop' into element_4242 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 11:52:47 +02:00
Gil Eluard 5d3d485d01 Merge pull request #4237 from vector-im/element_4236 
Enable / Disable VoIP feature in Rooms
 2021-04-20 11:49:07 +02:00
Gil Eluard 217e5e0326 Merge branch 'develop' into element_4236 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 10:38:30 +02:00
Gil Eluard b178225617 Enable / Disable VoIP feature in Rooms 
- Update after review
 2021-04-20 10:36:05 +02:00
Gil Eluard e33f1faf35 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Gil Eluard 0b50f59a1a Merge pull request #4235 from vector-im/element_4234 
Show/Hide Home Screen tabs
 2021-04-20 09:46:24 +02:00
Eric Eastwood b25af54677 Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Eric Eastwood bf1f3e8880 Add gitter.im to default list of room directories 
Fix https://github.com/vector-im/element-ios/issues/4233
 2021-04-19 14:09:45 -05:00
Gil Eluard bd1ce8d6f1 Enable / Disable VoIP feature in Rooms 
- Updated CHANGES.rst
 2021-04-19 20:41:06 +02:00
Gil Eluard 2912074002 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard eae513cdb8 Show/Hide Home Screen tabs 
- Updated CHANGES.rst
 2021-04-19 18:55:46 +02:00
Gil Eluard 0893a13ba9 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe 84249051f5 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe 7d719dad2f Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe 3a53bd16a5 Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe 9f825fa06b finish version++ 2021-04-19 18:00:54 +02:00
manuroe 279aa84e4c Merge pull request #4232 from vector-im/release/1.3.4/release 
Release 1.3.4
 2021-04-19 18:00:11 +02:00
manuroe 6699358ba7 version++ 2021-04-19 15:07:56 +02:00
Gil Eluard f78f821845 Merge pull request #4231 from vector-im/element_4230 
RoomVC: Crash in refreshTypingNotification
 2021-04-19 14:18:13 +02:00
Gil Eluard bd3c178521 RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe 683946fca1 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe 4a672701f3 Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00
manuroe ebfb7233c8 Merge branch 'release/1.3.3/master' 2021-04-16 17:35:19 +02:00
manuroe 161c9c10e9 finish version++ 2021-04-16 17:35:19 +02:00
manuroe 48ffbf20ea Merge pull request #4227 from vector-im/release/1.3.3/release 
Release 1.3.3
 2021-04-16 17:34:38 +02:00
manuroe c03be435e5 version++ 2021-04-16 17:13:16 +02:00
manuroe ad41830aa0 Prepare for new sprint 2021-04-16 17:03:06 +02:00
manuroe 8bdc8424d9 Merge branch 'master' into develop 2021-04-16 17:03:02 +02:00
manuroe 80299e75b9 Merge branch 'release/1.3.2/master' 2021-04-16 17:02:55 +02:00
manuroe e3aece6b78 finish version++ 2021-04-16 17:02:55 +02:00
manuroe ff1db0d57d Merge pull request #4226 from vector-im/release/1.3.2/release 
Release 1.3.2
 2021-04-16 16:25:20 +02:00
manuroe 666261703b version++ 2021-04-16 15:54:12 +02:00
manuroe 726ba8e335 Merge pull request #4223 from vector-im/manu/4222_missing_sender_name 
Notifications: Fix sender display name that can miss
 2021-04-16 15:50:56 +02:00
manuroe e0bbe9d6de Merge pull request #4225 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2021-04-16 15:39:47 +02:00
manuroe 14481874b2 Merge pull request #4224 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-04-16 15:39:12 +02:00
Weblate 95704a4eb1 Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:56 +00:00
Weblate ee8c9497d0 Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:42 +00:00
manuroe f7bc544261 Notifications: Fix sender display name that can miss 
Fix #4222
 2021-04-16 15:02:02 +02:00
Sven Grewe 0824f864fa Translated using Weblate (German) 
Currently translated at 99.6% (1188 of 1192 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
 2021-04-15 20:34:46 +00:00
oksya8and8 a3083c035d Translated using Weblate (Japanese) 
Currently translated at 73.1% (872 of 1192 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ja/
 2021-04-15 20:34:45 +00:00
Sven Grewe d3e7f850fd Translated using Weblate (German) 
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/de/
 2021-04-15 20:34:21 +00:00
manuroe 2fdbfdb5c6 Merge pull request #4220 from vector-im/manu/4217_verification_as_per_web 
Self-verification: Fix compatibility with Element-Web
 2021-04-15 15:57:39 +02:00
manuroe 63958b57fd Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:31 +02:00
manuroe c7587d7ac0 Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:23 +02:00
manuroe e89588df96 Self-verification: Double check cross-signing state before displaying popups 2021-04-15 09:50:56 +02:00
manuroe 3eabba310e Self-verification: Fix compatibility with Element-Web when logging in on web 
#4217

If web triggers a verification request (because the users clicked on "Use another login"), remove the newSignIn alert dialog before display the incoming verification request.
 2021-04-14 18:50:37 +02:00
manuroe 9264128a8e Self-verification: Fix compatibility with Element-Web when logging in on iOS 
#4217

Just after login, send request instead of waiting for an incoming one as per recent EW changes
 2021-04-14 17:21:35 +02:00
manuroe 5a6a10e07c Prepare for new sprint 2021-04-14 12:36:50 +02:00