Commit Graph

10240 Commits

Author SHA1 Message Date
ismailgulek 475b16ccdb Adjust button sizes 2021-03-09 17:02:37 +03:00
ismailgulek 25cb6d5a86 Move chat button to the bottom left of the screen 2021-03-09 16:57:25 +03:00
ismailgulek 1861efb5f5 Merge branch 'develop' into voip_design_updates 2021-03-09 15:52:55 +03:00
Matthew Hodgson 7e54faf057 spell beginning correctly 2021-03-04 13:06:53 +00:00
ismailgulek 3ec09aa68f Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek 6bc8be3506 Merge branch 'master' into develop 2021-03-03 23:08:36 +03:00
ismailgulek 262e465ba8 Merge branch 'release/1.2.5/master' 2021-03-03 22:57:29 +03:00
ismailgulek 48e06d256b finish version++ 2021-03-03 22:57:29 +03:00
ismailgulek b604bb6ed0 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 f88b7fa28f version++ 2021-03-03 22:34:26 +03:00
SBiOSoftWhare db804b0384 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 8e0743ffbf Update changes 2021-03-03 16:38:10 +01:00
SBiOSoftWhare 7a94aa4213 Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
SBiOSoftWhare 104f516a7f Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
SBiOSoftWhare d4b1c32140 PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms. 2021-03-03 16:19:01 +01:00
SBiOSoftWhare 34201cf3a2 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare 41ef4fb442 Merge branch 'master' into develop 2021-03-02 10:23:08 +01:00
SBiOSoftWhare ee7f4d6ad0 Merge branch 'release/1.2.4/master' 2021-03-02 10:23:08 +01:00
SBiOSoftWhare 14c659087e finish version++ 2021-03-02 10:23:08 +01:00
SBiOSoftWhare b34fdfcef6 Merge branch 'release/1.2.4/master' 2021-03-01 18:57:58 +01:00
SBiOSoftWhare 99d9a3aa73 finish version++ 2021-03-01 18:57:58 +01:00
SBiOSoftWhare f532da1665 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 078ce9480b Update changes 2021-03-01 18:19:57 +01:00
SBiOSoftWhare 1f12f11d0f Config: Fix missing URL scheme application variable. 2021-03-01 18:18:11 +01:00
SBiOSoftWhare 0c181b012a version++ 2021-03-01 18:06:49 +01:00
manuroe 451aaa968d Prepare for new sprint 2021-02-26 18:53:47 +01:00
manuroe 9d5939e8ac Merge branch 'master' into develop 2021-02-26 18:53:43 +01:00
manuroe 8835340808 Merge branch 'release/1.2.3/master' 2021-02-26 18:53:35 +01:00
manuroe 7f965ccc5e finish version++ 2021-02-26 18:53:35 +01:00
manuroe 3639c75cf6 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 06d01a26a6 version++ 2021-02-26 18:34:28 +01:00
manuroe d51b975d36 Prepare for new sprint 2021-02-24 12:09:50 +01:00
manuroe 17328d10d6 Merge branch 'master' into develop 2021-02-24 12:09:46 +01:00
manuroe db3543ea36 Merge branch 'release/1.2.2/master' 2021-02-24 12:09:38 +01:00
manuroe b1a654a4f8 finish version++ 2021-02-24 12:09:38 +01:00
manuroe 938186d9ab 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 7ed3032c75 version++ 2021-02-24 11:19:54 +01:00
SBiOSoftWhare ca3279d6b9 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 26065e27b2 Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
SBiOSoftWhare ac701e6467 RoomVC: Present a RoomInfoCoordinator on room creation cell quick actions. 2021-02-23 15:52:24 +01:00
SBiOSoftWhare 75dcfd43e9 RoomInfoCoordinator: Add possibility to open an initial specific section. 2021-02-23 15:51:23 +01:00
SBiOSoftWhare 1f551b20f9 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
manuroe 47d7094998 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 500926318e CHANGES 2021-02-23 11:50:35 +01:00
manuroe fd03ac8fc5 Merge remote-tracking branch 'origin/develop' into element_3867 2021-02-23 11:48:43 +01:00
manuroe 0f0f9f6fb7 Podfile.lock: Use the right libolm version 2021-02-23 11:27:44 +01:00
SBiOSoftWhare 892df6ef50 RoomDataSource: Fix insertRoomCreationIntroCellDataIfNeeded method. 2021-02-23 09:34:27 +01:00
SBiOSoftWhare 2d80fd7a15 RoomCreationIntroCell: Remove unused method. 2021-02-23 08:48:17 +01:00
SBiOSoftWhare 2824cfc5a7 RoomDataSource: Add thread safety instructions for bubbles array in insertRoomCreationIntroCellDataIfNeeded. 2021-02-23 08:47:50 +01:00
SBiOSoftWhare 22885213cb 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