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

10514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gil Eluard c43a4eef43 Podfile.lock reverted 2021-04-21 08:16:17 +02:00
Gil Eluard 3091b7cea2 Updated CHANGES.rst 2021-04-20 15:28:46 +02:00
Gil Eluard a4fccf4a63 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:27:27 +02:00
SBiOSoftWhare 9d75dca5fc Merge pull request #4244 from vector-im/fix_public_search 
PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off
 2021-04-20 14:20:59 +02:00
SBiOSoftWhare bf25591b95 Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe 54dbb583aa Merge pull request #4238 from vector-im/MadLittleMods/gitter.im-room-directory 
Add gitter.im to default list of room directories
 2021-04-20 14:04:11 +02:00
manuroe 6af4652c72 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard 2d67d354be Merge pull request #4243 from vector-im/element_4242 
Show/Hide public directory in Unified Search
 2021-04-20 12:40:29 +02:00
SBiOSoftWhare 4d7cc7b394 Update changes 2021-04-20 12:01:55 +02:00
SBiOSoftWhare f3eca9c33f DirectoryRecentTableViewCell: Do not use "directory_search_results_more_than" string when there is no rooms and the search is on. 2021-04-20 12:01:34 +02:00
Gil Eluard 3de2531180 Merge branch 'develop' into element_4242 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 11:52:47 +02:00
Gil Eluard 346edc413f Merge pull request #4237 from vector-im/element_4236 
Enable / Disable VoIP feature in Rooms
 2021-04-20 11:49:07 +02:00
SBiOSoftWhare fef1fa8aec Update changes 2021-04-20 11:31:43 +02:00
SBiOSoftWhare 27f21e58f3 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
Gil Eluard 16ff9fb44a Merge branch 'develop' into element_4236 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 10:38:30 +02:00
Gil Eluard 05b5c5f992 Enable / Disable VoIP feature in Rooms 
- Update after review
 2021-04-20 10:36:05 +02:00
Gil Eluard 257f3a8f42 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Gil Eluard 219cdc5df5 Merge pull request #4235 from vector-im/element_4234 
Show/Hide Home Screen tabs
 2021-04-20 09:46:24 +02:00
Eric Eastwood 8377982fd1 Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Eric Eastwood 84e45d744a 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 a610fc0c47 Enable / Disable VoIP feature in Rooms 
- Updated CHANGES.rst
 2021-04-19 20:41:06 +02:00
Gil Eluard 78fa1d0219 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 1ace35a72b Show/Hide Home Screen tabs 
- Updated CHANGES.rst
 2021-04-19 18:55:46 +02:00
Gil Eluard 61abfd0e70 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe d64c056034 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe a7c677fc43 Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe 00f31cfeeb Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe 25a26d0c29 finish version++ 2021-04-19 18:00:54 +02:00
manuroe 89f7511bd1 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 3f00a6f897 version++ 2021-04-19 15:07:56 +02:00
Gil Eluard 134115327b Merge pull request #4231 from vector-im/element_4230 
RoomVC: Crash in refreshTypingNotification
 2021-04-19 14:18:13 +02:00
Gil Eluard d831e901a7 RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe 9328277c21 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe 0865538926 Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00
manuroe 5f027560fc Merge branch 'release/1.3.3/master' 2021-04-16 17:35:19 +02:00
manuroe afdfde1dec finish version++ 2021-04-16 17:35:19 +02:00
manuroe d80c4c4dd5 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 5720631cb8 version++ 2021-04-16 17:13:16 +02:00
manuroe 4fc54ecbb2 Prepare for new sprint 2021-04-16 17:03:06 +02:00
manuroe 58c49062f1 Merge branch 'master' into develop 2021-04-16 17:03:02 +02:00
manuroe 6b34d28941 Merge branch 'release/1.3.2/master' 2021-04-16 17:02:55 +02:00
manuroe 5e88afc251 finish version++ 2021-04-16 17:02:55 +02:00
manuroe 8047b09d85 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 1ac1e2e10d version++ 2021-04-16 15:54:12 +02:00
manuroe 4b1e8483da 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 091ada7ffd 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 d7804c8e5f Merge pull request #4224 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-04-16 15:39:12 +02:00
Weblate 65f1e7ebf2 Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:56 +00:00
Weblate f43a73c2f9 Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:42 +00:00
manuroe 4975947851 Notifications: Fix sender display name that can miss 
Fix #4222
 2021-04-16 15:02:02 +02:00