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

10658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ismailgulek b29f6a4d50 Update join button icon 2021-04-21 14:02:01 +03:00
ismailgulek d947ff438f Adjust join button content insets 2021-04-21 13:58:15 +03:00
ismailgulek cd01ee2a71 Merge branch 'develop' into voip_design_updates 2021-04-21 12:49:21 +03:00
ismailgulek f8cbd54738 Update call button for groups 2021-04-21 12:47:28 +03:00
ismailgulek d898d9c496 Remove temporary call bar 2021-04-21 11:41:28 +03:00
Gil Eluard 4fc6497308 Merge pull request #4219 from vector-im/element_4218 
Make room settings screen configurable dynamically
 2021-04-21 09:40:18 +02:00
Gil Eluard c9967f4461 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-21 09:08:58 +02:00
Gil Eluard af8738e694 Merge pull request #4212 from vector-im/element_4211 
Make joining public rooms configurable
 2021-04-21 09:03:17 +02:00
Gil Eluard 927bfab0b9 Merge branch 'develop' into element_4211 
# Conflicts:
#	CHANGES.rst
 2021-04-21 08:23:33 +02:00
Gil Eluard 900d3a3210 Merge pull request #4246 from vector-im/element_4245 
Show / Hide integrations and actions in rooms
 2021-04-21 08:21:41 +02:00
Gil Eluard 31cc798b10 Podfile.lock reverted 2021-04-21 08:16:17 +02:00
Gil Eluard f2448a1848 Podfile.lock 2021-04-21 08:15:13 +02:00
Gil Eluard 59dc8f5985 Updated CHANGES.rst 2021-04-20 15:28:46 +02:00
Gil Eluard 5d187167a1 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:27:27 +02:00
Gil Eluard c2317951a7 Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
ismailgulek 78a9811380 Change group call notification title and body 2021-04-20 16:04:58 +03:00
Gil Eluard 8e0cf913dd Show / Hide integrations and actions in rooms 
- Initial Build Settings
 2021-04-20 14:57:31 +02:00
Gil Eluard 65db8a2d5f Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
ismailgulek df1e27882b Fix asserted thread 2021-04-20 15:52:13 +03:00
ismailgulek 1bc8fd43ef Do not display group call notification when in the related room 2021-04-20 15:51:46 +03:00
ismailgulek a8058025a9 Merge branch 'voip_group_notification' into voip_design_updates 2021-04-20 15:30:32 +03:00
SBiOSoftWhare 3111672499 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 5d6b656b2e Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe 888813e1e6 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 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
SBiOSoftWhare 24a2b69da4 Update changes 2021-04-20 12:01:55 +02:00
SBiOSoftWhare 6c093ac466 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 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
SBiOSoftWhare 1093711c20 Update changes 2021-04-20 11:31:43 +02:00
SBiOSoftWhare c9f2ccc337 PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
ismailgulek 1323af0c23 Merge branch 'develop' into voip_design_updates 2021-04-20 11:41:53 +03: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
ismailgulek d2dfb48531 Disable sliding animations for call screen 2021-04-19 15:58:30 +03:00