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

10240 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gil Eluard
419efd886a 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
6363e9018f Improve the status of send messages (sending, sent, received, failed) 
- code tweaks
 2021-02-25 11:10:38 +01:00
Gil Eluard
0a931cef6e 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
d3d7f329c2 Prepare for new sprint 2021-02-24 12:09:50 +01:00
manuroe
e43373cef4 Merge branch 'master' into develop 2021-02-24 12:09:46 +01:00
manuroe
ea24225bca Merge branch 'release/1.2.2/master' 2021-02-24 12:09:38 +01:00
manuroe
84a5a1f910 finish version++ 2021-02-24 12:09:38 +01:00
manuroe
3341df1938
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
866024ea13 version++ 2021-02-24 11:19:54 +01:00
Gil Eluard
c2839baf95 Improve the status of send messages (sending, sent, received, failed) 
- Code tweaks
 2021-02-23 22:05:39 +01:00
Gil Eluard
1ff5309f73 Improve the status of send messages (sending, sent, received, failed) 
- Bug fixing and imporvement
 2021-02-23 21:21:15 +01:00
SBiOSoftWhare
d3974fb81d
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
a8f7713a16
Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
manuroe
fd91706cf6
Merge pull request #4064 from vector-im/fastlane_build_version_fix 
Fastlane: Fix update_build_number with the new xcconfig file
 2021-02-23 18:49:29 +01:00
manuroe
ae5761d552 Fastlane: Fix update_build_number with the new xcconfig file 
increment_build_number_in_xcodeproj does not do the job. It does not overwrite what is in the xcconfig file.

Xcodeproj::Config reads xcconfig files well but it breaks the format when saving changes. Hence, the usage of a old good regex :/
 2021-02-23 18:37:22 +01:00
SBiOSoftWhare
d179b201ba RoomVC: Present a RoomInfoCoordinator on room creation cell quick actions. 2021-02-23 15:52:24 +01:00
SBiOSoftWhare
19b87f493e RoomInfoCoordinator: Add possibility to open an initial specific section. 2021-02-23 15:51:23 +01:00
SBiOSoftWhare
a250f4db44 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
manuroe
00d71fbfde
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
4e0fd24333 CHANGES 2021-02-23 11:50:35 +01:00
manuroe
171705d05b Merge remote-tracking branch 'origin/develop' into element_3867 2021-02-23 11:48:43 +01:00
manuroe
c16c988d69 Podfile.lock: Use the right libolm version 2021-02-23 11:27:44 +01:00
SBiOSoftWhare
ce2ef397e1 RoomDataSource: Fix insertRoomCreationIntroCellDataIfNeeded method. 2021-02-23 09:34:27 +01:00
SBiOSoftWhare
e12db6b592 RoomCreationIntroCell: Remove unused method. 2021-02-23 08:48:17 +01:00
SBiOSoftWhare
f9aa3cddee RoomDataSource: Add thread safety instructions for bubbles array in insertRoomCreationIntroCellDataIfNeeded. 2021-02-23 08:47:50 +01:00
SBiOSoftWhare
41e0d88ff6
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
3a7db906ca Update changes 2021-02-22 17:48:42 +01:00
SBiOSoftWhare
c63256ad10 RecentsVC: Handle room directory display. HomeVC now show room directory on join room action. 2021-02-22 17:47:40 +01:00
Gil Eluard
2f774022e2 Improve the status of send messages (sending, sent, received, failed) 
- First implementation
 2021-02-22 13:51:25 +01:00
SBiOSoftWhare
ad16c702d3 Update changes 2021-02-22 00:19:49 +01:00
SBiOSoftWhare
7ac45cfa0f RoomVC: Handle RoomCreationIntroCell./ 2021-02-22 00:12:01 +01:00
SBiOSoftWhare
4d415bbc02 RoomParticipantsViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare
258a27ba2d RoomFilesViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare
5b7fe189d2 RoomDataSource: Handle RoomCreationIntroCell conditional display. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
85aaf28c45 RoomBubbleCellData: Add new tag to handle RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
435063ad96 RoomAvatarView: Add view data. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
2a9103c9b5 Room creation intro: Create RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
7d62f363b6 Room creation intro: Create cell content view. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
e134633cf4 Create room avatar view. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
d451788b35 UIView: Add accessibility commodity method. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
2a3a4b5d38 Room creation intro: Add strings. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
c7d50ac0b9 Room creation intro: New theme color. 2021-02-22 00:11:59 +01:00
SBiOSoftWhare
8c16983c51 Room creation intro: Add assets. 2021-02-22 00:11:59 +01:00
manuroe
19aec16225 EncryptionKeyManager: Enable key for e2e DB 2021-02-18 16:37:58 +01:00
manuroe
8fd123c86e EncryptionKeyManager: Update Xcodegen yml to use it 2021-02-18 16:02:07 +01:00
manuroe
22d6d16f79 Merge branch 'develop' into element_3867 2021-02-18 15:35:21 +01:00
manuroe
478c5f1074
Merge pull request #3858 from vector-im/element_3812 
Project file generation with xcodegen
 2021-02-16 11:56:41 +01:00
manuroe
69fee7d1a2 Merge branch 'develop' into element_3812 2021-02-16 11:44:13 +01:00
manuroe
f8b045d05a XcodeGen: More polishing 2021-02-16 11:29:45 +01:00
manuroe
c376a36626
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