Commit Graph

930 Commits

Author SHA1 Message Date
ismailgulek 55623fcb8b Merge branch 'develop' into element_4293 2021-05-12 10:34:03 +03:00
ismailgulek abaffae56a Merge pull request #4316 from vector-im/pushkit_crashes
Fixes for Pushkit Crashes
2021-05-12 10:31:54 +03:00
ismailgulek d7e3cf622d Update CHANGES.rst 2021-05-12 01:33:22 +03:00
SBiOSoftWhare 33600f15e8 Merge branch 'develop' into spaces_beta 2021-05-11 22:16:19 +02:00
ismailgulek a4b1925ec3 Update CHANGES.rst 2021-05-11 10:42:11 +03:00
manuroe c3c6cba964 Prepare for new sprint 2021-05-07 16:29:53 +02:00
manuroe 1aee407e1a version++ 2021-05-07 15:41:41 +02:00
SBiOSoftWhare 5e7e07eef0 Merge branch 'spaces_beta' into spaces_feature_unavailable
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.h
2021-05-07 15:08:45 +02:00
SBiOSoftWhare 7511b021c9 Merge develop into spaces_beta 2021-05-07 12:31:59 +02:00
SBiOSoftWhare c29a54daba Merge branch 'spaces_beta' into spaces_feature_unavailable 2021-05-07 12:24:01 +02:00
ismailgulek ff93fb7ae6 Update CHANGES.rst 2021-05-05 15:22:33 +03:00
ismailgulek b4617dcf94 Merge branch 'develop' into attended_call_transfers 2021-05-05 11:02:31 +03:00
ismailgulek bf87f42d38 Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-05-04 19:11:17 +03:00
ismailgulek d8db35edae Update CHANGES.rst 2021-05-04 18:05:23 +03:00
ismailgulek f4761f6557 Update CHANGES.rst 2021-04-30 16:00:53 +03:00
Gil Eluard b4e1c4c526 Scroll to Bottom FAB button 2021-04-29 22:31:38 +02:00
Gil Eluard 4cca705da6 Merge pull request #4286 from vector-im/element_4285
Show / Hide More and Report Content contextual menu from settings
2021-04-29 20:36:48 +02:00
manuroe 102607d46f Merge pull request #4283 from vector-im/element_3158_v2
Jitsi: use HS preferredDomain as Jitsi server to create conference v2
2021-04-29 19:54:45 +02:00
Gil Eluard 08d6f3acda Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard b88deda0ba Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
manuroe df777e6da7 Merge branch 'develop' into element_3158_v2 2021-04-29 17:52:19 +02:00
Gil Eluard 148b52829b Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
SBiOSoftWhare 5d9742a81b Update changes 2021-04-29 16:39:30 +02:00
Gil Eluard 4f7526dfbe Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
SBiOSoftWhare 8823831146 Update changes 2021-04-29 14:47:52 +02:00
SBiOSoftWhare dce9158dbd Update changes 2021-04-29 12:36:55 +02:00
ismailgulek 3326270364 Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-04-29 10:50:20 +03:00
manuroe 9286ff56f5 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 c26d6dd5f0 Notifications: Make them work in debug mode
Fix #4274.

Only the app needs MXUIKitBackgroundModeHandler.
2021-04-29 09:21:16 +02:00
manuroe 4b1feee929 GH Actions: Make jobs use the right version of MatrixKit and MatrixSDK 2021-04-28 17:43:05 +02:00
Gil Eluard df4a615e53 Crash in [RoomViewController setScrollToBottomHidden:] 2021-04-28 16:00:19 +02:00
ismailgulek af4e37f9a5 Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-04-28 14:03:24 +03:00
Gil Eluard 11aede0254 Merge branch 'develop' into element_4261
# Conflicts:
#	CHANGES.rst
2021-04-28 10:07:56 +02:00
ismailgulek ed2e522f42 Update CHANGES.rst 2021-04-27 11:39:45 +03:00
Gil Eluard 0e583ae172 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 0b35a59b2d Update CHANGES.rst
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-04-26 14:14:39 +02:00
Gil Eluard be13a32635 Widget navigation button still visible with settings set to integration disabled 2021-04-23 22:44:23 +02:00
Gil Eluard c9dad4adda clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
manuroe 14d2aa4adc Prepare for new sprint 2021-04-22 12:00:47 +02:00
manuroe e5d5f9e623 version++ 2021-04-22 11:23:40 +02:00
ismailgulek 0fd61eeabc Merge pull request #4250 from vector-im/fix_room_leave
Fixes on Room Leave
2021-04-21 14:17:37 +03:00
manuroe 42da9a8878 Merge pull request #4135 from vector-im/gh-actions
Introduce GitHub Actions
2021-04-21 13:14:17 +02:00
ismailgulek b0791531d7 Update CHANGES.rst 2021-04-21 12:52:29 +03:00
manuroe 07d79e2ffb GH Actions: Polish 2021-04-21 09:25:18 +02:00
Gil Eluard 0aa76f94c4 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-21 09:08:58 +02:00
Gil Eluard 67f86cafe9 Merge branch 'develop' into element_4211
# Conflicts:
#	CHANGES.rst
2021-04-21 08:23:33 +02:00
Gil Eluard 2fff0c8f8d Updated CHANGES.rst 2021-04-20 15:28:46 +02:00
Gil Eluard bc282c7fdb Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00
Gil Eluard b5a7af8b3a Merge branch 'develop' into element_4211
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:05:20 +02:00
Gil Eluard a3cc1849ca Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00