felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-06 16:07:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,547 Commits 1 Branch 67 Tags
511c37cd5ac2b8bbc22f4052a767dbee0ddb474e
Commit Graph

10547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gil Eluard 511c37cd5a Widget navigation button still visible with settings set to integration disabled 2021-04-23 22:44:23 +02:00
manuroe f535ae4ec4 Prepare for new sprint 2021-04-22 12:00:47 +02:00
manuroe f5f64f1ea9 Merge branch 'master' into develop 2021-04-22 12:00:44 +02:00
manuroe 0d871d84ab Merge branch 'release/1.3.5/master' 2021-04-22 12:00:35 +02:00
manuroe 852d613925 finish version++ 2021-04-22 12:00:35 +02:00
manuroe 85994b36c9 Merge pull request #4256 from vector-im/release/1.3.5/release 
Release 1.3.5
 2021-04-22 11:59:42 +02:00
manuroe c7aded6a65 version++ 2021-04-22 11:23:40 +02:00
ismailgulek d42d88d92c Merge pull request #4250 from vector-im/fix_room_leave 
Fixes on Room Leave
 2021-04-21 14:17:37 +03:00
manuroe b53ca9a887 Merge pull request #4135 from vector-im/gh-actions 
Introduce GitHub Actions
 2021-04-21 13:14:17 +02:00
ismailgulek 7fe194256b Update CHANGES.rst 2021-04-21 12:52:29 +03:00
ismailgulek c57db6e1f7 Hide scroll to bottom when room is left 2021-04-21 12:50:37 +03:00
ismailgulek 93f6ea3063 Pop view controller if pushed before 2021-04-21 12:50:21 +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
manuroe 6423704675 GH Actions: Polish 2021-04-21 09:25: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
manuroe be111689d1 GH Actions: Increase test expectation timeout. Machines are slow 2021-04-21 08:28:45 +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
manuroe 8142e58d44 GH Actions: Use a separate job for tests to save time 2021-04-21 07:38:42 +02:00
manuroe 9950182788 GH Actions: Add cached for bundler and pods 2021-04-20 18:01:45 +02:00
manuroe 2bfe9fcc1b GH Actions: Make tests work probably better 2021-04-20 17:34:59 +02:00
manuroe a8bbb92071 GH Actions: Run tests in another way 2021-04-20 16:55:38 +02:00
manuroe cdc11bacef GH Actions: Run projects tests 2021-04-20 16:13:01 +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
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
manuroe 00b42df6e3 Merge branch 'develop' into gh-actions 2021-04-20 14:30:29 +02: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
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