Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
10623 commits 46 branches 261 tags 144 MiB
Commit graph

10623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gil Eluard
27f51f863b Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:27:27 +02:00
Gil Eluard
5d63f431b0 Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
Gil Eluard
e4b5358f25 Show / Hide integrations and actions in rooms 
- Initial Build Settings
 2021-04-20 14:57:31 +02:00
Gil Eluard
16da1f5648 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
manuroe
a9dcfce626 Merge branch 'develop' into gh-actions 2021-04-20 14:30:29 +02:00
SBiOSoftWhare
db92fb4f25
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
873aa9fd8d
Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe
2cfe9441e5
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
15f983017e
Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard
cafed69c36
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
dff2a7ea15 Update changes 2021-04-20 12:01:55 +02:00
SBiOSoftWhare
55ebed6fae 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
a61cc09e5a Merge branch 'develop' into element_4242 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 11:52:47 +02:00
Gil Eluard
9620cee908
Merge pull request #4237 from vector-im/element_4236 
Enable / Disable VoIP feature in Rooms
 2021-04-20 11:49:07 +02:00
SBiOSoftWhare
924867bf12 Update changes 2021-04-20 11:31:43 +02:00
SBiOSoftWhare
515baf1b2e PublicRoomsDirectoryDataSource: Fix search when NSFW filter is off. 2021-04-20 11:30:14 +02:00
Gil Eluard
575d5c8ee4 Merge branch 'develop' into element_4236 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 10:38:30 +02:00
Gil Eluard
de56297cb6 Enable / Disable VoIP feature in Rooms 
- Update after review
 2021-04-20 10:36:05 +02:00
Gil Eluard
a1d359d5aa Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Gil Eluard
aa51563950
Merge pull request #4235 from vector-im/element_4234 
Show/Hide Home Screen tabs
 2021-04-20 09:46:24 +02:00
Eric Eastwood
55ffff260e
Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Eric Eastwood
70840ade07
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
b229ff6da3 Enable / Disable VoIP feature in Rooms 
- Updated CHANGES.rst
 2021-04-19 20:41:06 +02:00
Gil Eluard
450de18c8c Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard
a3e8c737b3 Show/Hide Home Screen tabs 
- Updated CHANGES.rst
 2021-04-19 18:55:46 +02:00
Gil Eluard
896a75721b Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe
fc72cc3441 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe
40fe3cd871 Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe
7697516863 Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe
8c2a270e36 finish version++ 2021-04-19 18:00:54 +02:00
manuroe
4397945470
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
3eecc0e15c version++ 2021-04-19 15:07:56 +02:00
Gil Eluard
30cb7038d4
Merge pull request #4231 from vector-im/element_4230 
RoomVC: Crash in refreshTypingNotification
 2021-04-19 14:18:13 +02:00
Gil Eluard
25981d805a RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe
0341c47dd2 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe
c1af4941cd Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00
manuroe
9360488822 Merge branch 'release/1.3.3/master' 2021-04-16 17:35:19 +02:00
manuroe
39af431884 finish version++ 2021-04-16 17:35:19 +02:00
manuroe
562a43c27e
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
a6ded4ded1 version++ 2021-04-16 17:13:16 +02:00
manuroe
74f7f08f99 Prepare for new sprint 2021-04-16 17:03:06 +02:00
manuroe
663a5cbf55 Merge branch 'master' into develop 2021-04-16 17:03:02 +02:00
manuroe
13f1268b4d Merge branch 'release/1.3.2/master' 2021-04-16 17:02:55 +02:00
manuroe
a9420a8a9f finish version++ 2021-04-16 17:02:55 +02:00
manuroe
20def42dc8
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
887b5156b1 version++ 2021-04-16 15:54:12 +02:00
manuroe
075f3567d5
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
45f20cf3c4
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
f9bb47716a
Merge pull request #4224 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-04-16 15:39:12 +02:00
Weblate
dcf29093fb Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:56 +00:00