Commit graph

831 commits

Author SHA1 Message Date
Gil Eluard
55f95c72a5 Merge branch 'develop' into element_4085 2021-03-19 10:51:40 +01:00
manuroe
ce08dba3ae
Merge pull request #4127 from vector-im/4115_remove_shields_from_room_list
Room lists: Remove shields on room avatars
2021-03-19 09:54:54 +01:00
manuroe
b88d15242d Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00
ismailgulek
c7bc44169b
Update CHANGES.rst 2021-03-17 15:54:50 +03:00
ismailgulek
715ff0c123
Update CHANGES.rst 2021-03-17 10:41:15 +03:00
ismailgulek
63ed682c99
Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-17 10:40:11 +03:00
Gil Eluard
98337af98f Merge branch 'develop' into element_4085 2021-03-15 14:37:46 +01:00
Gil Eluard
95b2e4c296 Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
manuroe
7ae0a2e27c Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint
#4120
2021-03-15 12:25:46 +01:00
manuroe
9be23159d5 Prepare for new sprint 2021-03-11 14:25:50 +01:00
manuroe
bfbf64801b version++ 2021-03-11 13:30:12 +01:00
Gil Eluard
d0e0dc856e Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
ismailgulek
d04ace29bf
Update CHANGES.rst 2021-03-09 01:14:30 +03:00
Gil Eluard
a9c0d5c589 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard
66c4c696d0 Retrying & deleting failed messages
- Updated CHANGES.rst
2021-03-03 21:42:14 +01:00
ismailgulek
90b6ef9878 Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek
e8ed5f4798 version++ 2021-03-03 22:34:26 +03:00
SBiOSoftWhare
8cb4efd08d Update changes 2021-03-03 16:38:10 +01:00
SBiOSoftWhare
a492ee7bf7 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare
49ef6889d7 Update changes 2021-03-01 18:19:57 +01:00
SBiOSoftWhare
0395e009b1 version++ 2021-03-01 18:06:49 +01:00
manuroe
7090f72f35 Prepare for new sprint 2021-02-26 18:53:47 +01:00
manuroe
5b4a92f575 version++ 2021-02-26 18:34:28 +01:00
Gil Eluard
f162adffc1 Updated CHANGES.rst 2021-02-25 18:11:20 +01:00
manuroe
d3d7f329c2 Prepare for new sprint 2021-02-24 12:09:50 +01:00
manuroe
866024ea13 version++ 2021-02-24 11:19:54 +01:00
SBiOSoftWhare
a8f7713a16
Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +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
SBiOSoftWhare
3a7db906ca Update changes 2021-02-22 17:48:42 +01:00
SBiOSoftWhare
ad16c702d3 Update changes 2021-02-22 00:19:49 +01:00
manuroe
22d6d16f79 Merge branch 'develop' into element_3867 2021-02-18 15:35:21 +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
ismailgulek
9f11756034 Prepare for new sprint 2021-02-12 18:19:11 +03:00
ismailgulek
7f454efdb1 version++ 2021-02-12 17:36:53 +03:00
ismailgulek
aa90c4fcf3
Merge branch 'develop' into element_4029 2021-02-12 16:08:57 +03:00
ismailgulek
37dc1783e6 Update CHANGES.rst 2021-02-12 15:48:22 +03:00
ismailgulek
73770a0228 Update CHANGES.rst 2021-02-12 15:30:17 +03:00
manuroe
4f908bd4bf Fastlane: Re-enable parallelised builds
release build takes 6min instead of 6min. It should work better with the 2 previous commits.
2021-02-12 12:26:48 +01:00
manuroe
c435b58948 Fastlane: Use the "New Build System" to build releases
This is mandatory to make $(inherited) work when you include other xcconfig files. Else, build settings are just overwritten.

This lane works now thanks to the previous commit on the Podfile
2021-02-12 12:23:48 +01:00
manuroe
9df8c2c86f Podfile: Use MatrixKit for all targets and remove MatrixKit/AppExtension
MatrixKit/AppExtension is no more useful because DTCoreText does not need anymore a special handling for extensions. It does not use `[UIApplication sharedApplication] openURL:]` anymore.
2021-02-12 12:06:02 +01:00
SBiOSoftWhare
cf207c4e49 Update changes 2021-02-11 15:08:56 +01:00
ismailgulek
8fe054b9dd Prepare for new sprint 2021-02-11 16:18:54 +03:00
ismailgulek
0d40964c81
Update CHANGES.rst 2021-02-11 15:31:52 +03:00
ismailgulek
51b5b120f2 version++ 2021-02-11 15:24:12 +03:00
ismailgulek
f41efd90d9 Merge branch 'voip_2746' into voip_tiles
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek
190e111f66 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek
46f4a4f3d1 Merge branch 'voip_dialpad' into voip_dtmf
# Conflicts:
#	CHANGES.rst
2021-02-10 00:40:22 +03:00
ismailgulek
ab92b8b3f4 Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00