Commit Graph

10569 Commits

Author SHA1 Message Date
Gil Eluard 67c5ec4e05 Show / Hide More and Report Content contextual menu from settings
- Update after review
2021-04-29 20:10:07 +02:00
Gil Eluard 14189d2a5c Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard d6a6960a20 Merge pull request #4291 from vector-im/element_4290
Show / hide NSFW and decrypted content options in Settings screen fro…
2021-04-29 19:48:00 +02:00
Gil Eluard 899e8c692f Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
Gil Eluard 7ca8fb5d50 Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
Gil Eluard a53ebaae66 Merge pull request #4282 from vector-im/element_4281
Enable / disable "Hide all messages from this user" of Room Member Sc…
2021-04-29 16:58:52 +02:00
Gil Eluard 8dadd54d5f Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
manuroe a16f876074 Merge pull request #4275 from vector-im/manu/4274_fix_notifications_in_debug
Notifications: Make them work in debug mode
2021-04-29 09:43:49 +02:00
manuroe eabf33df7d Notifications: Make them work in debug mode
Fix #4274.

Only the app needs MXUIKitBackgroundModeHandler.
2021-04-29 09:21:16 +02:00
manuroe e1b03d6847 Merge pull request #4273 from vector-im/manu/gh_actions_branch_switch
GH Actions: Make jobs use the right version of MatrixKit and MatrixSDK
2021-04-29 08:49:01 +02:00
manuroe 430dfbbba5 GH Actions: Make jobs use the right version of MatrixKit and MatrixSDK 2021-04-28 17:43:05 +02:00
Gil Eluard 3f73543237 Merge pull request #4271 from vector-im/element_4270
Crash in [RoomViewController setScrollToBottomHidden:]
2021-04-28 16:19:56 +02:00
Gil Eluard c46935d19e Crash in [RoomViewController setScrollToBottomHidden:] 2021-04-28 16:00:19 +02:00
Gil Eluard 05ea53aacc Merge pull request #4262 from vector-im/element_4261
Widget navigation button still visible with settings set to integrati…
2021-04-28 10:45:31 +02:00
Gil Eluard 85de7ee6eb Merge branch 'develop' into element_4261
# Conflicts:
#	CHANGES.rst
2021-04-28 10:07:56 +02:00
Gil Eluard dcc5b4e64c Merge pull request #4260 from vector-im/element_4259
clear cache support for RiotSettings
2021-04-28 10:06:01 +02:00
Gil Eluard 7c9b1407a5 Users must not be allowed to add or otherwise manage widgets in rooms
- Avoid navigation to integration management using integration popup with settings set to integration disabled
2021-04-26 20:17:43 +02:00
Gil Eluard 0735f59c89 Merge branch 'develop' into element_4261 2021-04-26 20:08:47 +02:00
ismailgulek 24da69ce95 Merge pull request #4266 from vector-im/fix_code_signing
Fix Code Signing
2021-04-26 17:11:15 +03:00
ismailgulek c32dac4a3f Update provisioning profiles 2021-04-26 16:58:20 +03:00
Gil Eluard 3a32dd578e Update CHANGES.rst
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-04-26 14:14:39 +02:00
Gil Eluard 295dcdaa4e Widget navigation button still visible with settings set to integration disabled 2021-04-23 22:44:23 +02:00
Gil Eluard d4a1729e52 clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
manuroe e26dcc0e45 Prepare for new sprint 2021-04-22 12:00:47 +02:00
manuroe 9f2c85d82c Merge branch 'master' into develop 2021-04-22 12:00:44 +02:00
manuroe b1a2016c19 Merge branch 'release/1.3.5/master' 2021-04-22 12:00:35 +02:00
manuroe 4fdeedac98 finish version++ 2021-04-22 12:00:35 +02:00
manuroe 0f525b1ad8 Merge pull request #4256 from vector-im/release/1.3.5/release
Release 1.3.5
2021-04-22 11:59:42 +02:00
manuroe a91052fc37 version++ 2021-04-22 11:23:40 +02:00
ismailgulek f0f1122798 Merge pull request #4250 from vector-im/fix_room_leave
Fixes on Room Leave
2021-04-21 14:17:37 +03:00
manuroe 08b78ee90d Merge pull request #4135 from vector-im/gh-actions
Introduce GitHub Actions
2021-04-21 13:14:17 +02:00
ismailgulek 9638d7a123 Update CHANGES.rst 2021-04-21 12:52:29 +03:00
ismailgulek 8c1cf058a6 Hide scroll to bottom when room is left 2021-04-21 12:50:37 +03:00
ismailgulek 5c7fdd14b7 Pop view controller if pushed before 2021-04-21 12:50:21 +03:00
Gil Eluard 5e68860ce6 Merge pull request #4219 from vector-im/element_4218
Make room settings screen configurable dynamically
2021-04-21 09:40:18 +02:00
manuroe 021b57b5c4 GH Actions: Polish 2021-04-21 09:25:18 +02:00
Gil Eluard 7a15c5ab57 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-21 09:08:58 +02:00
Gil Eluard fc1db08c6a Merge pull request #4212 from vector-im/element_4211
Make joining public rooms configurable
2021-04-21 09:03:17 +02:00
manuroe 7662e877c2 GH Actions: Increase test expectation timeout. Machines are slow 2021-04-21 08:28:45 +02:00
Gil Eluard b6c6e7ffa0 Merge branch 'develop' into element_4211
# Conflicts:
#	CHANGES.rst
2021-04-21 08:23:33 +02:00
Gil Eluard c9ac22320a Merge pull request #4246 from vector-im/element_4245
Show / Hide integrations and actions in rooms
2021-04-21 08:21:41 +02:00
Gil Eluard c43a4eef43 Podfile.lock reverted 2021-04-21 08:16:17 +02:00
Gil Eluard 08e5aabe82 Podfile.lock 2021-04-21 08:15:13 +02:00
manuroe 54a6467658 GH Actions: Use a separate job for tests to save time 2021-04-21 07:38:42 +02:00
manuroe 28bdc15260 GH Actions: Add cached for bundler and pods 2021-04-20 18:01:45 +02:00
manuroe cf0b9b08b6 GH Actions: Make tests work probably better 2021-04-20 17:34:59 +02:00
manuroe 26251557c3 GH Actions: Run tests in another way 2021-04-20 16:55:38 +02:00
manuroe 85c6e1b64a GH Actions: Run projects tests 2021-04-20 16:13:01 +02:00
Gil Eluard 3091b7cea2 Updated CHANGES.rst 2021-04-20 15:28:46 +02:00
Gil Eluard a4fccf4a63 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00