felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-25 19:10:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,069 Commits 1 Branch 67 Tags
cc9ba7674ef0d069328480bc55f0299b4fd95682
Commit Graph

403 Commits

Author SHA1 Message Date
Gil Eluard 4cca705da6 Merge pull request #4286 from vector-im/element_4285 
Show / Hide More and Report Content contextual menu from settings
 2021-04-29 20:36:48 +02:00
manuroe 1a1e3bd7d2 Merge pull request #4283 from vector-im/element_3158_v2 
Jitsi: use HS preferredDomain as Jitsi server to create conference v2
 2021-04-29 19:54:45 +02:00
manuroe 102607d46f Merge pull request #4283 from vector-im/element_3158_v2 
Jitsi: use HS preferredDomain as Jitsi server to create conference v2
 2021-04-29 19:54:45 +02:00
Gil Eluard 14189d2a5c Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard 08d6f3acda Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard 899e8c692f Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
Gil Eluard b88deda0ba Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
manuroe 99457cc959 Merge branch 'develop' into element_3158_v2 2021-04-29 17:52:19 +02:00
manuroe df777e6da7 Merge branch 'develop' into element_3158_v2 2021-04-29 17:52:19 +02:00
Gil Eluard 7ca8fb5d50 Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
Gil Eluard 148b52829b Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
Gil Eluard 8dadd54d5f Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
Gil Eluard 4f7526dfbe Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
SBiOSoftWhare ce3a9869ae WidgetManager: Update Jitsi domain retrieval. 2021-04-29 12:37:27 +02:00
SBiOSoftWhare bb26fed073 WidgetManager: Update Jitsi domain retrieval. 2021-04-29 12:37:27 +02:00
Gil Eluard 7a15c5ab57 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-21 09:08:58 +02:00
Gil Eluard 0aa76f94c4 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-21 09:08:58 +02:00
Gil Eluard b6c6e7ffa0 Merge branch 'develop' into element_4211 
# Conflicts:
#	CHANGES.rst
 2021-04-21 08:23:33 +02:00
Gil Eluard 67f86cafe9 Merge branch 'develop' into element_4211 
# Conflicts:
#	CHANGES.rst
 2021-04-21 08:23:33 +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
Gil Eluard bc282c7fdb Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:27:27 +02:00
Gil Eluard 591cd261e5 Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
Gil Eluard b5a7af8b3a Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
Gil Eluard 1c455ed4d9 Show / Hide integrations and actions in rooms 
- Initial Build Settings
 2021-04-20 14:57:31 +02:00
Gil Eluard faa9d920fe Show / Hide integrations and actions in rooms 
- Initial Build Settings
 2021-04-20 14:57:31 +02:00
Gil Eluard 5a29506407 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
Gil Eluard a3cc1849ca Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
manuroe 6af4652c72 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
manuroe 9cd4e58062 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +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 c9f561f8c0 Merge branch 'develop' into element_4242 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 11:52:47 +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 0fbb61c4e8 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 2551c34d1b 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 4d8b2de5b8 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02: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
Eric Eastwood 8e0616aa2f 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 78fa1d0219 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard c001314e26 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 61abfd0e70 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
Gil Eluard a2794f404c Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
Gil Eluard 09e0c95c8a Make room settings screen configurable dynamically 2021-04-14 15:52:25 +02:00
Gil Eluard 1282fc104c Make room settings screen configurable dynamically 2021-04-14 15:52:25 +02:00
Gil Eluard 7da3bd1296 Make joining public rooms configurable 2021-04-13 19:21:07 +02:00
Gil Eluard c4fe2f9fa7 Make joining public rooms configurable 2021-04-13 19:21:07 +02:00
Gil Eluard cbb4ae7233 Merge branch 'develop' into element_4181 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-06 15:59:40 +02:00
Gil Eluard 098c083b1e Merge branch 'develop' into element_4181 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-06 15:59:40 +02:00
Gil Eluard da038f34d4 Possibility to lock some room creation parameters from settings 
- Update after review
 2021-04-06 10:51:07 +02:00