Commit Graph

123 Commits

Author SHA1 Message Date
ismailgulek 26bb9c88e4 Merge branch 'develop' into voip_design_updates 2021-04-27 00:13:32 +03:00
ismailgulek 8e4a324472 Update provisioning profiles 2021-04-26 16:58:20 +03:00
ismailgulek df35ca4367 Merge branch 'develop' into voip_design_updates 2021-04-26 16:06:01 +03:00
manuroe f535ae4ec4 Prepare for new sprint 2021-04-22 12:00:47 +02:00
ismailgulek cd01ee2a71 Merge branch 'develop' into voip_design_updates 2021-04-21 12:49:21 +03:00
Gil Eluard c9967f4461 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-21 09:08:58 +02:00
Gil Eluard 927bfab0b9 Merge branch 'develop' into element_4211
# Conflicts:
#	CHANGES.rst
2021-04-21 08:23:33 +02:00
Gil Eluard 5d187167a1 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00
Gil Eluard c2317951a7 Merge branch 'develop' into element_4211
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:05:20 +02:00
Gil Eluard 8e0cf913dd Show / Hide integrations and actions in rooms
- Initial Build Settings
2021-04-20 14:57:31 +02:00
Gil Eluard 65db8a2d5f Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
ismailgulek df1e27882b Fix asserted thread 2021-04-20 15:52:13 +03:00
manuroe b8a703dc55 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard b9e1de5125 Merge branch 'develop' into element_4242
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 11:52:47 +02:00
Gil Eluard 217e5e0326 Merge branch 'develop' into element_4236
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 10:38:30 +02:00
Gil Eluard b178225617 Enable / Disable VoIP feature in Rooms
- Update after review
2021-04-20 10:36:05 +02:00
Gil Eluard e33f1faf35 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Eric Eastwood bf1f3e8880 Add gitter.im to default list of room directories
Fix https://github.com/vector-im/element-ios/issues/4233
2021-04-19 14:09:45 -05:00
Gil Eluard 2912074002 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 0893a13ba9 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
manuroe 84249051f5 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe 683946fca1 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe ad41830aa0 Prepare for new sprint 2021-04-16 17:03:06 +02:00
Gil Eluard f78261f3c0 Make room settings screen configurable dynamically 2021-04-14 15:52:25 +02:00
manuroe 5a6a10e07c Prepare for new sprint 2021-04-14 12:36:50 +02:00
Gil Eluard 954b1cdf2e Make joining public rooms configurable 2021-04-13 19:21:07 +02:00
manuroe ff15a44854 Prepare for new sprint 2021-04-09 17:56:23 +02:00
manuroe 95a35bbc5c version++ 2021-04-09 17:03:41 +02:00
Gil Eluard 13fbc75ea5 Merge branch 'develop' into element_4181
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-06 15:59:40 +02:00
Gil Eluard 57517d6aac Possibility to lock some room creation parameters from settings
- Update after review
2021-04-06 10:51:07 +02:00
Gil Eluard 90412e3393 Possibility to lock some room creation parameters from settings
- Update after review
2021-04-06 10:47:54 +02:00
Gil Eluard 16937adc62 Possibility to lock some room creation parameters from settings 2021-04-02 15:54:21 +02:00
Gil Eluard a5526415fb Enable / disable external friends invite 2021-04-01 15:02:43 +02:00
Gil Eluard 9b4cb2f94f Make the application settings more configurable
- Update after review
2021-04-01 14:16:06 +02:00
Gil Eluard 550c4033ea Make the application settings more configurable 2021-03-31 19:04:00 +02:00
manuroe cd7d533edd Prepare for new sprint 2021-03-26 17:23:48 +01:00
manuroe d58cfe748d Prepare for new sprint 2021-03-24 17:30:55 +01:00
manuroe c128a81792 Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00
manuroe 8273205ed6 Prepare for new sprint 2021-03-11 14:25:50 +01:00
ismailgulek 48f5195b78 Prepare for new sprint 2021-03-03 23:08:41 +03:00
SBiOSoftWhare c16d1edca7 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare 664eb36331 Config: Fix missing URL scheme application variable. 2021-03-01 18:18:11 +01:00
manuroe 5a1fc3e0d3 Prepare for new sprint 2021-02-26 18:53:47 +01:00
manuroe c911f16834 Prepare for new sprint 2021-02-24 12:09:50 +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 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
manuroe 2967051f84 Merge remote-tracking branch 'origin/develop' into element_3812 2021-02-11 16:19:12 +01:00
manuroe 926d655883 XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig
to better reflect their purpose
2021-02-11 08:56:05 +01:00