 Gil Eluard
|
dd720a68fb
|
Merge branch 'develop' into element_4014
# Conflicts:
# Riot.xcodeproj/project.pbxproj
# Riot/Modules/Room/DataSources/RoomDataSource.m
|
2021-02-25 15:49:53 +01:00 |
|
|
Gil Eluard
|
98d59cacd7
|
Improve the status of send messages (sending, sent, received, failed)
- code tweaks
|
2021-02-25 11:10:38 +01:00 |
|
|
Gil Eluard
|
7a1a0c0c51
|
Improve the status of send messages (sending, sent, received, failed)
- tweaks and new L&F for download progress
|
2021-02-25 11:07:21 +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 |
|
|
Gil Eluard
|
d256c63ba7
|
Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
|
2021-02-23 22:05:39 +01:00 |
|
|
Gil Eluard
|
550d5b316d
|
Improve the status of send messages (sending, sent, received, failed)
- Bug fixing and imporvement
|
2021-02-23 21:21:15 +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 |
|
|
SBiOSoftWhare
|
f69bcaeadc
|
Update changes
|
2021-02-22 17:48:42 +01:00 |
|
|
SBiOSoftWhare
|
93c6b93ab5
|
RecentsVC: Handle room directory display. HomeVC now show room directory on join room action.
|
2021-02-22 17:47:40 +01:00 |
|
|
Gil Eluard
|
c7e3155949
|
Improve the status of send messages (sending, sent, received, failed)
- First implementation
|
2021-02-22 13:51:25 +01:00 |
|
|
SBiOSoftWhare
|
2ee3be024f
|
Update changes
|
2021-02-22 00:19:49 +01:00 |
|
|
SBiOSoftWhare
|
758d3402c8
|
RoomVC: Handle RoomCreationIntroCell./
|
2021-02-22 00:12:01 +01:00 |
|
|
SBiOSoftWhare
|
f723c1ead7
|
RoomParticipantsViewController: Add possibility to display cancel bar button.
|
2021-02-22 00:12:01 +01:00 |
|
|
SBiOSoftWhare
|
30ae1db8c4
|
RoomFilesViewController: Add possibility to display cancel bar button.
|
2021-02-22 00:12:01 +01:00 |
|
|
SBiOSoftWhare
|
763673ecb7
|
RoomDataSource: Handle RoomCreationIntroCell conditional display.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
2b5b4b8f36
|
RoomBubbleCellData: Add new tag to handle RoomCreationIntroCell.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
db488214b3
|
RoomAvatarView: Add view data.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
cbbbb6feb3
|
Room creation intro: Create RoomCreationIntroCell.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
5917d94300
|
Room creation intro: Create cell content view.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
496ddae0d8
|
Create room avatar view.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
59ae552c71
|
UIView: Add accessibility commodity method.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
d2aa72d20e
|
Room creation intro: Add strings.
|
2021-02-22 00:12:00 +01:00 |
|
|
SBiOSoftWhare
|
0f81d6fb2b
|
Room creation intro: New theme color.
|
2021-02-22 00:11:59 +01:00 |
|
|
SBiOSoftWhare
|
6d31f5901a
|
Room creation intro: Add assets.
|
2021-02-22 00:11:59 +01:00 |
|
|
manuroe
|
8ca05ad2d8
|
EncryptionKeyManager: Enable key for e2e DB
|
2021-02-18 16:37:58 +01:00 |
|
|
manuroe
|
a5dac32976
|
EncryptionKeyManager: Update Xcodegen yml to use it
|
2021-02-18 16:02:07 +01:00 |
|
|
manuroe
|
ad0d5f1ade
|
Merge branch 'develop' into element_3867
|
2021-02-18 15:35:21 +01:00 |
|
|
manuroe
|
a2813a6677
|
Merge pull request #3858 from vector-im/element_3812
Project file generation with xcodegen
|
2021-02-16 11:56:41 +01:00 |
|
|
manuroe
|
9e3a9cc55a
|
Merge branch 'develop' into element_3812
|
2021-02-16 11:44:13 +01:00 |
|
|
manuroe
|
a490989820
|
XcodeGen: More polishing
|
2021-02-16 11:29:45 +01:00 |
|
|
manuroe
|
121e8b29ef
|
Merge pull request #4041 from vector-im/element_3812_4
XcodeGen: Remove old files, probably residual from a git mv
|
2021-02-16 11:28:05 +01:00 |
|
|
manuroe
|
4818c88756
|
XcodeGen: Remove old files, probably residual from a git mv
|
2021-02-16 08:44:26 +01:00 |
|
|
manuroe
|
4d8bdaca8a
|
XcodeGen: version++
|
2021-02-15 09:41:49 +01:00 |
|