 ismailgulek
|
5945f8e4e5
|
Update CHANGES.rst
|
2021-03-09 01:14:30 +03:00 |
|
|
ismailgulek
|
7728cb0988
|
Merge branch 'develop' into voip_virtual_timeline_fix
|
2021-03-09 01:13:23 +03:00 |
|
|
ismailgulek
|
e433003f13
|
Cancel event selection on room if only a selected event exists
|
2021-03-09 01:12:52 +03:00 |
|
 Matthew Hodgson
|
ce15a53ac5
|
spell beginning correctly
|
2021-03-04 13:06:53 +00:00 |
|
 ismailgulek
|
48f5195b78
|
Prepare for new sprint
|
2021-03-03 23:08:41 +03:00 |
|
|
ismailgulek
|
51b33f41b6
|
Merge branch 'master' into develop
|
2021-03-03 23:08:36 +03:00 |
|
|
ismailgulek
|
1d843c9284
|
Merge branch 'release/1.2.5/master'
|
2021-03-03 22:57:29 +03:00 |
|
|
ismailgulek
|
b3f78aab4d
|
finish version++
|
2021-03-03 22:57:29 +03:00 |
|
 ismailgulek
|
bc78711b4f
|
Merge pull request #4100 from vector-im/release/1.2.5/release
Release 1.2.5
|
2021-03-03 22:53:25 +03:00 |
|
|
ismailgulek
|
254f9f7f31
|
version++
|
2021-03-03 22:34:26 +03:00 |
|
 SBiOSoftWhare
|
028e74a6ef
|
Merge pull request #4093 from vector-im/nsfw_filter
Settings: Add option to show NSFW public rooms
|
2021-03-03 17:46:15 +01:00 |
|
 SBiOSoftWhare
|
a7e6413a8a
|
Update changes
|
2021-03-03 16:38:10 +01:00 |
|
|
SBiOSoftWhare
|
e74d61b68a
|
Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed.
|
2021-03-03 16:33:11 +01:00 |
|
|
SBiOSoftWhare
|
b0cd50e77c
|
Settings: Add show NSFW public rooms toggle.
|
2021-03-03 16:32:05 +01:00 |
|
|
SBiOSoftWhare
|
3b166bcd4b
|
PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms.
|
2021-03-03 16:19:01 +01:00 |
|
|
SBiOSoftWhare
|
c16d1edca7
|
Prepare for new sprint
|
2021-03-02 10:23:13 +01:00 |
|
|
SBiOSoftWhare
|
73edb863bc
|
Merge branch 'master' into develop
|
2021-03-02 10:23:08 +01:00 |
|
|
SBiOSoftWhare
|
dfc19026e8
|
Merge branch 'release/1.2.4/master'
|
2021-03-02 10:23:08 +01:00 |
|
|
SBiOSoftWhare
|
18ade838ea
|
finish version++
|
2021-03-02 10:23:08 +01:00 |
|
|
SBiOSoftWhare
|
536fed5ff0
|
Merge branch 'release/1.2.4/master'
|
2021-03-01 18:57:58 +01:00 |
|
|
SBiOSoftWhare
|
91b49968bd
|
finish version++
|
2021-03-01 18:57:58 +01:00 |
|
|
SBiOSoftWhare
|
65f0976cd2
|
Merge pull request #4083 from vector-im/release/1.2.4/release
Release 1.2.4
|
2021-03-01 18:53:12 +01:00 |
|
|
SBiOSoftWhare
|
ecdd3f4924
|
Update changes
|
2021-03-01 18:19:57 +01:00 |
|
|
SBiOSoftWhare
|
664eb36331
|
Config: Fix missing URL scheme application variable.
|
2021-03-01 18:18:11 +01:00 |
|
|
SBiOSoftWhare
|
4e5fe8da43
|
version++
|
2021-03-01 18:06:49 +01:00 |
|
 manuroe
|
5a1fc3e0d3
|
Prepare for new sprint
|
2021-02-26 18:53:47 +01:00 |
|
|
manuroe
|
b42db84a21
|
Merge branch 'master' into develop
|
2021-02-26 18:53:43 +01:00 |
|
|
manuroe
|
b582eb59b5
|
Merge branch 'release/1.2.3/master'
|
2021-02-26 18:53:35 +01:00 |
|
|
manuroe
|
178c7c078d
|
finish version++
|
2021-02-26 18:53:35 +01:00 |
|
 manuroe
|
1d802b354d
|
Merge pull request #4076 from vector-im/release/1.2.3/release
Release 1.2.3
|
2021-02-26 18:52:48 +01:00 |
|
|
manuroe
|
98ce88b44e
|
version++
|
2021-02-26 18:34:28 +01:00 |
|
|
manuroe
|
c911f16834
|
Prepare for new sprint
|
2021-02-24 12:09:50 +01:00 |
|
|
manuroe
|
6d72a476e0
|
Merge branch 'master' into develop
|
2021-02-24 12:09:46 +01:00 |
|
|
manuroe
|
637d168542
|
Merge branch 'release/1.2.2/master'
|
2021-02-24 12:09:38 +01:00 |
|
|
manuroe
|
49b1279d8c
|
finish version++
|
2021-02-24 12:09:38 +01:00 |
|
|
manuroe
|
17d5e7bac5
|
Merge pull request #4066 from vector-im/release/1.2.2/release
Release 1.2.2
|
2021-02-24 11:53:39 +01:00 |
|
|
manuroe
|
f149d5a2a2
|
version++
|
2021-02-24 11:19:54 +01:00 |
|
|
SBiOSoftWhare
|
1a767051a9
|
Merge pull request #4058 from vector-im/element_3776
RoomVC: Add quick actions in timeline on room creation
|
2021-02-23 18:51:45 +01:00 |
|
|
SBiOSoftWhare
|
3c9acb3883
|
Merge branch 'develop' into element_3776
|
2021-02-23 18:51:19 +01:00 |
|
|
SBiOSoftWhare
|
7c81202ba2
|
RoomVC: Present a RoomInfoCoordinator on room creation cell quick actions.
|
2021-02-23 15:52:24 +01:00 |
|
|
SBiOSoftWhare
|
3c7775b99a
|
RoomInfoCoordinator: Add possibility to open an initial specific section.
|
2021-02-23 15:51:23 +01:00 |
|
|
SBiOSoftWhare
|
1731a2a0f3
|
RoomCreationIntroCellContentView: Improve add topic case.
|
2021-02-23 15:46:20 +01:00 |
|
|
manuroe
|
81ff9bef0b
|
Merge pull request #3878 from vector-im/element_3867
enable encryption of contacts, accounts, and crypto DB
|
2021-02-23 12:54:33 +01:00 |
|
|
manuroe
|
966b23c477
|
CHANGES
|
2021-02-23 11:50:35 +01:00 |
|
|
manuroe
|
82b9ca9046
|
Merge remote-tracking branch 'origin/develop' into element_3867
|
2021-02-23 11:48:43 +01:00 |
|
|
manuroe
|
dc445dc128
|
Podfile.lock: Use the right libolm version
|
2021-02-23 11:27:44 +01:00 |
|
|
SBiOSoftWhare
|
41b3dffa1f
|
RoomDataSource: Fix insertRoomCreationIntroCellDataIfNeeded method.
|
2021-02-23 09:34:27 +01:00 |
|
|
SBiOSoftWhare
|
4b8c73a508
|
RoomCreationIntroCell: Remove unused method.
|
2021-02-23 08:48:17 +01:00 |
|
|
SBiOSoftWhare
|
00d6397956
|
RoomDataSource: Add thread safety instructions for bubbles array in insertRoomCreationIntroCellDataIfNeeded.
|
2021-02-23 08:47:50 +01:00 |
|
|
SBiOSoftWhare
|
67ecf5f1a6
|
Merge pull request #4060 from vector-im/element_3775
Home: Show room directory on join room action
|
2021-02-22 20:19:50 +01:00 |
|