Commit Graph

978 Commits

Author SHA1 Message Date
Onuray Sahin dd3178c36e Merge branch 'develop' into feature/ons/poll_tests
* develop: (150 commits)
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  extracting method for the handling of the profile picture selection
  ...
2022-03-15 14:39:51 +03:00
ClaireG 5de7873755
Merge pull request #5532 from vector-im/cgizard/ISSSUE-5514
Read receipt in wrong order
2022-03-14 17:39:30 +01:00
Adam Brown 82e1afdb72
Merge pull request #5375 from vector-im/feature/adm/display-personalisation-based-on-capabilities
FTUE - Capability based personalisation flow
2022-03-14 13:34:21 +00:00
Adam Brown c06d3ff809 Updating changelog copy
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-03-14 11:54:42 +00:00
Adam Brown 7e79d7ed0e adding changelog entry 2022-03-14 11:54:42 +00:00
ariskotsomitopoulos d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
Maxime Naturel 134d7b2bf8 Adding changelog entry 2022-03-14 11:15:16 +01:00
Claire G 025dcc8d88 Fix bug: readReceipt in wrong order 2022-03-14 10:28:42 +01:00
NIkita Fedrunov 84bd205014 "Add space" copy is replaced with "create space" in left sliding panel 2022-03-14 09:34:54 +01:00
ericdecanini f24d8c2ada Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-13 20:13:03 +01:00
Onuray Sahin 635be17d46 Changelog added. 2022-03-11 19:23:41 +03:00
chagai95 f68d3f2b03
Merge branch 'vector-im:develop' into add-presence-indicator-online 2022-03-11 17:13:20 +01:00
chagai95 04aaed7210
Change log line 2022-03-11 17:12:58 +01:00
Benoit Marty c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint
Changes room hierarchy endpoint to stable
2022-03-11 17:05:13 +01:00
ericdecanini 6db1c377c4 Reverts to fix by removing event timestamp condition 2022-03-10 19:16:22 +01:00
ariskotsomitopoulos 34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Benoit Marty 26617988f2 Add colors for shield vector drawable 2022-03-10 17:15:19 +01:00
Benoit Marty 66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448
Fix missing messages when forward paging with chunks > 50 messages
2022-03-10 15:08:58 +01:00
Claire G 8f0d6a1adc use colorPrimary for tint 2022-03-10 14:30:15 +01:00
Benoit Marty 551b827753
Merge pull request #5384 from p1gp1g/bubble-space
Add padding before first own message
2022-03-10 14:09:23 +01:00
Benoit Marty c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight
change selected space highlight
2022-03-10 13:28:08 +01:00
ariskotsomitopoulos 21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
2022-03-10 12:55:13 +02:00
SpiritCroc 6c4e404ba1 Fix updating unread marker if not to latest chunk
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.
2022-03-09 18:02:53 +01:00
Adam Brown ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Maxime NATUREL f12afe0ef0
Merge pull request #5411 from vector-im/feature/mna/PSF-735-sharing-options-view
#5395: Location sharing options view
2022-03-09 16:10:46 +01:00
SpiritCroc 884ae1cedd Add changelog.d/5475.bugfix 2022-03-09 13:50:49 +01:00
Onuray Sahin 9b7e329000 Fix lint error. 2022-03-09 13:31:29 +03:00
Benoit Marty 02ba09900f
Merge pull request #5434 from vector-im/feature/nfe/space_unread_count_dm
include dms number in space unread number badge
2022-03-09 11:16:07 +01:00
Benoit Marty e0914781fc
Merge pull request #5435 from vector-im/feature/nfe/space_menu_amend_copy
Amend spaces menu to have consistent copy
2022-03-09 11:13:46 +01:00
Benoit Marty 20c1886fed Support both unstable and stable prefixes.
Author: Onuray
2022-03-09 10:40:43 +01:00
Maxime Naturel 1c6b31001f Adding changelog entry 2022-03-09 09:44:06 +01:00
sim 17d58f24d2 Add padding before our first message
Signed-off-by: sim <git@sgougeon.fr>
2022-03-08 17:26:23 +01:00
ericdecanini 510206aa8a Adds changelog file 2022-03-08 16:54:05 +01:00
Benoit Marty b867e5f072 Iterate on badge / unread indicator color (#5332) 2022-03-08 14:52:10 +01:00
Onuray Sahin 83ff898ce5 Changelog added. 2022-03-08 14:14:45 +03:00
SpiritCroc 768262094c Fix missing messages when forward paging with chunks > 50 messages
- offsets() was not limiting in the right direction when loading
  messages forwards
- after fixing offsets(), more recent messages would not be loaded due
  to the isLastForward() check, so better prioritize the SUCCESS
  LoadMoreResult over the REACHED_END here
2022-03-08 10:54:27 +01:00
NIkita Fedrunov 33246be2a5 change selected space highlight 2022-03-07 09:58:40 +01:00
NIkita Fedrunov a3dcee55e4 include dms number in space unread number badge 2022-03-07 08:35:53 +01:00
NIkita Fedrunov 8732c6fe42 Amend spaces menu to have consistent copy 2022-03-07 08:32:31 +01:00
Ahmed Radhouane Belkilani bcdf004082
Update the top bar in a room (#5213)
Remove typing message notification from room toolbar.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-03-04 16:38:53 +01:00
Onuray Sahin 2c611790db
Merge branch 'develop' into feature/ons/voice_message_scrubbing 2022-03-04 18:03:44 +03:00
Onuray Sahin e09b123a91 Changelog added. 2022-03-04 17:21:00 +03:00
ClaireG 2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402
[Create private room] Picture doesn't not displayed
2022-03-03 22:40:26 +01:00
Benoit Marty 1690a0b2cf
giving avatar/display name error dialogs human readable error messages (#5419)
- reuses the ErrorDialog logic which translates exceptions to human readable strings
2022-03-03 18:29:39 +01:00
Adam Brown 54e23a2c55 giving avatar/display name error dialogs human readable error messages
- reuses the ErrorDialog logic which translates exceptions to human readable strings
2022-03-03 16:37:59 +00:00
Yoan Pintas 6e6b04c57e
Merge pull request #4498 from vector-im/yostyle/fix_strandhogg
Override task affinity to prevent unknown activities running in our app tasks.
2022-03-03 15:05:29 +01:00
ariskotsomitopoulos e4282e5f29 Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
2022-03-03 13:56:59 +02:00
Adam Brown 0c628905de
Lifting debug overrides to their own abstraction (#5361)
* separating the debug overrides to their own abstraction
- rather than sharing the user facing vector data store

* inlining the debug flow getters and declarations
- also replaces funs with vals as the references are immutable

* adding changelog entry
2022-03-02 10:08:43 +00:00
Benoit Marty 7e909de31c
Merge pull request #5392 from vector-im/eric/update-material-library-version
Upgrades to Material 1.5.0 (dependency only)
2022-03-01 18:37:20 +01:00
Tiago Loureiro 9a4d37b5cc Add changelog 2022-03-01 13:26:51 -03:00
ericdecanini b1c2bccdd0 Adds changelog file 2022-03-01 15:17:22 +01:00
Benoit Marty 781a477056
Merge pull request #5292 from vector-im/feature/mna/4319-dm-space-members-list
#4319: Fix DM navigation in member profile screen
2022-02-28 21:37:09 +01:00
Benoit Marty 9cc35644a3
Merge pull request #5379 from vector-im/feature/aris/cleanup_threads_build_config
Cleanup enabling threads from buildConfig
2022-02-28 21:10:20 +01:00
Benoit Marty 71aac37ec7
Merge pull request #5330 from vector-im/feature/fga/more_realm_fixing
Feature/fga/more realm fixing
2022-02-28 21:02:10 +01:00
ariskotsomitopoulos f0f98ce019 Add changelog file 2022-02-28 17:44:53 +02:00
ariskotsomitopoulos f6ad06b82b Add changelog 2022-02-28 17:43:18 +02:00
ganfra e32e006b85 Add SDK changelog. 2022-02-28 15:12:15 +01:00
Maxime Naturel 1ef26e6c12 Adding changelog entry 2022-02-28 14:58:58 +01:00
Benoit Marty 80bc3af5fa
Merge pull request #5349 from vector-im/feature/mna/5005-save-image
#5005: Add save media icon in gallery
2022-02-28 14:23:17 +01:00
Benoit Marty 27905064e0
Merge pull request #5325 from vector-im/feature/eric/registration-feature-flag
#5307 Adds ForceLoginFallback feature flag to Login and Registration
2022-02-28 14:20:00 +01:00
Benoit Marty 957413c9df Add changelog 2022-02-25 18:21:19 +01:00
Benoit Marty b8a0aa724e
Merge pull request #5357 from vector-im/cgizard/ISSUE-5326
[Export e2ee keys] use appName instead of element
2022-02-25 12:03:56 +01:00
Maxime Naturel 4260d2f155 Updating Changelog entry 2022-02-24 17:39:41 +01:00
Maxime Naturel b525259bec Adding changelog entry 2022-02-24 17:39:40 +01:00
Benoit Marty 00423f8ea1 Changelog 2022-02-24 15:48:09 +01:00
ariskotsomitopoulos 8b254212af Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-02-24 12:45:08 +02:00
ganfra fd48fc9103 Add changelog 2022-02-23 19:30:34 +01:00
Benoit Marty 93131da61a
Merge pull request #5320 from vector-im/feature/adm/space-ui-failures
Tentatively fixing space menu items not being clicked on during sanity test
2022-02-23 19:22:59 +01:00
Benoit Marty 93de61e61f
Merge pull request #5206 from vector-im/arb/issues/3296
#3296 Typing Notification update
2022-02-23 18:57:14 +01:00
Claire G f63cd57567 use appName instead of "element" in e2ee file name 2022-02-23 17:45:54 +01:00
Michael Kaye 5bfb8fe294
Merge pull request #5315 from vector-im/michaelk/notify_channel_on_sanity_test
Notify channel on sanity test result
2022-02-23 16:36:33 +00:00
ericdecanini 64e074840b Merge remote-tracking branch 'origin/develop' into feature/eric/registration-feature-flag
# Conflicts:
#	vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
2022-02-23 17:31:43 +01:00
ericdecanini 137d804cfa adds changelog file 2022-02-23 17:26:50 +01:00
Benoit Marty 9e9dc1defd
Merge pull request #5318 from vector-im/erikj/log_since_token
Also record `next_batch` on `/sync` response
2022-02-23 13:47:48 +01:00
Adam Brown 5a9cf0c978 adding changelog entry 2022-02-23 12:14:31 +00:00
Benoit Marty a2f3b43683
Merge pull request #5316 from vector-im/feature/fga/update_reaction_button_layout
#5313: Update reaction button layout.
2022-02-23 12:36:54 +01:00
Erik Johnston 10b07c35a0 Newsfile 2022-02-23 11:24:47 +00:00
Benoit Marty 3707b4e2ca
Merge pull request #5312 from vector-im/erikj/log_since_token
Log `since` token when doing an incremental sync
2022-02-23 12:02:15 +01:00
Benoit Marty 276c526cef
Merge pull request #5158 from vector-im/feature/adm/ftue-post-account-creation
FTUE - Account created screen
2022-02-23 11:54:02 +01:00
Ahmed Radhouane Belkilani da9fdf1b18 #3296
- Adding a typing message notification view at the bottom of the timeline in rooms.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-23 11:34:39 +01:00
Michael Kaye bd8d71c420 Notify channel on sanity test result 2022-02-23 10:26:46 +00:00
ganfra e3b67fe30b #5313: Update reaction button layout. 2022-02-23 11:26:21 +01:00
Erik Johnston 6eae151e78 Newsfile 2022-02-23 10:26:02 +00:00
ariskotsomitopoulos a9b3882bf6 Add changelogs 2022-02-23 12:06:35 +02:00
Benoit Marty 924a4f8c94
Merge pull request #5309 from vector-im/feature/eric/modules-to-subfolder
#5289:  Moves modules to subfolders under library
2022-02-22 22:58:14 +01:00
Benoit Marty 6e7aa01437
Merge pull request #5303 from vector-im/feature/fga/improve_bubble_layout
Feature/fga/improve bubble layout
2022-02-22 22:56:09 +01:00
Benoit Marty b746321bad Towncrier 2022-02-22 21:21:40 +01:00
Benoit Marty 6fd14c9ebc Typo in the filename 2022-02-22 21:21:24 +01:00
ericdecanini 44452c9fcd adds changelog file 2022-02-22 20:03:00 +01:00
Benoit Marty 5dced8b6bd
Merge pull request #5258 from vector-im/feature/mna/5218-crash-at-registration
#5218: Fix crash at registration when redirecting to Web View
2022-02-22 18:12:35 +01:00
ganfra 9911233038 Bubbles: clean and add changelog 2022-02-22 18:05:47 +01:00
Benoit Marty 79b511b44d
Merge pull request #5297 from vector-im/feature/fga/fix_bad_realm_usages
Improve usage of realm
2022-02-22 15:21:14 +01:00
Benoit Marty 6d45886e1c
Merge pull request #5294 from vector-im/feature/eric/roomlist-green-to-grey
Changes unread marker in item_room.xml
2022-02-22 14:27:40 +01:00
ganfra 4cc80162ca Clean and add Changelog 2022-02-22 14:23:45 +01:00
Benoit Marty 33e5a9c2ef
Merge pull request #5257 from vector-im/feature/nfe/track_screen_on_enter
track screen event when user enters the screen
2022-02-22 14:22:04 +01:00
Benoit Marty 77c48f2c48
Merge pull request #5296 from vector-im/feature/adm/crash-when-reading-qr
Fixing crash adding room by QR code
2022-02-22 14:04:37 +01:00
Benoit Marty 211e1c2ce9
Merge pull request #5276 from vector-im/feature/adm/limit-inmemory-image-caches
Reducing bitmap memory footprint
2022-02-22 13:58:58 +01:00
Adam Brown 16e3723043 adding changelog entry 2022-02-22 11:55:44 +00:00
Sonia0912 ff0b0f293b adds changelog file 2022-02-22 11:45:51 +01:00
Onuray Sahin a858e89ca1 Changelog added. 2022-02-22 12:15:37 +03:00
Adam Brown 5bbb3f28b1 adding changelog entry 2022-02-21 17:30:45 +00:00
Benoit Marty cf252b060c
Merge pull request #5136 from vector-im/feature/bca/crypto_ensure_e2e_defensive
Defensive coding to ensure encryption when room was once e2e
2022-02-21 17:50:50 +01:00
Benoit Marty a89e8d0434
Merge pull request #5104 from noantiq/develop
Make Space creation screens more consistent
2022-02-21 16:53:56 +01:00
Maxime Naturel 4713fd96bf Adding changelog entry 2022-02-18 17:05:29 +01:00
ClaireG 95b3afd148
#3771: When accepting an invite, expecting to see the room (#5247)
Open the room when user accepts an invite from the room list
2022-02-18 16:45:01 +01:00
Maxime Naturel bfc6cd04a6 Updating changelog entry 2022-02-18 14:43:46 +01:00
Maxime Naturel 3ad7701ad7 Adding changelog entry 2022-02-18 14:42:56 +01:00
Benoit Marty 6fec56eeaa
Merge pull request #5254 from vector-im/feature/bma/cleanup_config
Cleanup config
2022-02-18 14:22:07 +01:00
NIkita Fedrunov bda92a9ab4 track screen event when user enters the screen instead of when user leaves the screen 2022-02-18 12:03:46 +01:00
Benoit Marty 3b0856bf8e
Merge pull request #5249 from vector-im/feature/mna/2782-collapse-acl-events
#2782: Collapse server ACLs update events
2022-02-18 10:54:46 +01:00
Valere 9c9695546c update change log 2022-02-18 10:01:09 +01:00
Benoit Marty bee7025fbb Changelog 2022-02-17 18:20:20 +01:00
Benoit Marty ec2021d6f2
Merge pull request #5253 from vector-im/feature/mna/4643-filter-icon
#4643: Home screen: replacing the search icon by a filter icon in the menu
2022-02-17 16:50:46 +01:00
Benoit Marty 6784caab9c
Merge pull request #5239 from vector-im/feature/adm/missing-pre-consent-identity-values
Fixing missing identify properties
2022-02-17 16:35:15 +01:00
Benoit Marty d1d26a98af
Merge pull request #5237 from vector-im/feature/mna/5123-room-tag-suggestion
#5123: @room tag suggestion
2022-02-17 15:40:54 +01:00
Benoit Marty ac9f138fc0
Merge pull request #5185 from vector-im/feature/adm/decouple-matrix-creation
Decoupling Matrix creation from Application
2022-02-17 15:35:09 +01:00
Maxime Naturel 41bd516ca9 Updating changelog entry 2022-02-17 14:50:12 +01:00
Maxime Naturel 6736bebc9c Changing changelog entry type to feature 2022-02-17 11:23:00 +01:00
Maxime Naturel d214ef34df Updating changelog entry name 2022-02-17 11:23:00 +01:00
Maxime Naturel 1d1dc8b1fd Adding changelog entry 2022-02-17 11:22:59 +01:00
Maxime Naturel b346a73243 Adding more details in changelog 2022-02-17 11:03:04 +01:00
Maxime Naturel 4fe3b409d2 Replacing the search icon by a filter icon 2022-02-17 10:27:59 +01:00
Maxime Naturel 0a04ff9aa6 Adding changelog entry 2022-02-16 13:46:06 +01:00
Adam Brown 343b8bf08d
Incrementing schema version - fixes pre-release launch crash (#5245)
* updating the schema version to 25 to reflect the latest migration
* adding changelog entry
2022-02-16 12:29:08 +00:00
Adam Brown 3c226002a0 adding changelog entry 2022-02-15 16:24:22 +00:00
Benoit Marty 6c4f389342
Merge pull request #5203 from vector-im/feature/dla/fix_consult_transfer
Call transfer with consult fails to make outgoing consultation call.
2022-02-14 19:54:09 +01:00
Adam Brown 95df3e7e2b deprecating the Matrix.initialize and Matrix.getInstance entry points in favour of clients controlling their own instances 2022-02-14 16:04:47 +00:00
Benoit Marty 43d6a29ff3
Merge pull request #5208 from vector-im/feature/adm/personalisation-capabilities
MSC3283 - Supporting additional homeserver capabilities
2022-02-14 14:27:26 +01:00
Adam Brown d6a08a9249
Merge pull request #5210 from vector-im/michaelk/standardise_emulator_usage
Standardise configuration options for emulators in GHA integration tests
2022-02-11 17:11:58 +00:00
Adam Brown d19e6d290f
Merge pull request #5209 from vector-im/michaelk/reduce_debug_logging_loop
Reduce verbosity of CleanupSession debug logs.
2022-02-11 16:28:26 +00:00
Michael Kaye d173a8d15f changelog.d 2022-02-11 15:32:33 +00:00
Michael Kaye edd95464ea changelog.d 2022-02-11 14:31:28 +00:00
Adam Brown ea13f1c879
Merge pull request #5189 from vector-im/arb/issues/4640
#4640 : The notification badge jumps around
2022-02-11 14:18:41 +00:00
ganfra f1376eac82
Merge pull request #5204 from vector-im/feature/fga/reactions_ui_improvements
Feature/fga/reactions UI improvements
2022-02-11 15:17:44 +01:00
Adam Brown 83cc88060a adding changelog entry 2022-02-11 12:48:42 +00:00
Ahmed Radhouane Belkilani 85414fa92e #4640
- update changelog file.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-11 11:45:39 +01:00
Ahmed Radhouane Belkilani a9a1532e01 #4640
- change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
 - change unread badge color state for dark and light theme to align with iOS.
 - add changelog file related to the issue.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-11 11:45:39 +01:00
ganfra 56338c22dd
Merge pull request #5195 from abaker/fix_crash_detection
Set PREFS_CRASH_KEY synchronously
2022-02-10 19:21:17 +01:00
ganfra f08b10b2c5
Merge pull request #5199 from vector-im/feature/dla/fix_timeline_from_virtual_rooms
Rooms with virtual rooms do not render the merged timeline with call events.
2022-02-10 19:20:01 +01:00
ganfra c690bada0d Clean code and add changelog. 2022-02-10 19:13:35 +01:00
David Langley 11986ec9ef Intent information that is pass to attachViewRenderers is not present on intent then onNewIntent called. 2022-02-10 17:23:38 +00:00
David Langley eb90268cf5 Updates getAccountDataEvents function to match it's description. 2022-02-10 10:30:47 +00:00
fedrunov 06b5563ff6
join and leave methods moved from MembershipService to RoomService an… (#5183) 2022-02-10 10:05:03 +01:00
Alex Baker a4b50d2a78 Set PREFS_CRASH_KEY synchronously
Sometimes the app dies before this preference gets written to disk, and
then the crash dialog is not displayed to the user

Signed-off-by: Alex Baker <alex@beeper.com>
2022-02-09 17:09:48 -06:00
Onuray Sahin e71063222b
Merge pull request #5179 from vector-im/feature/ons/fix_poll_option_animation
Remove redundant highlight on add poll option button
2022-02-09 22:24:54 +03:00
Adam Brown c62b9949f2 adding changelog entry 2022-02-08 16:00:38 +00:00
ganfra 49a0555704
Merge pull request #5176 from vector-im/feature/ons/map_wellknown_support
Retrieve map style url from .well-known
2022-02-08 11:57:48 +01:00
ganfra b75fd18959
Merge pull request #5142 from vector-im/feature/adm/set-usecase-on-account-creation
Aligning use case tracking with iOS
2022-02-07 19:04:07 +01:00
Onuray Sahin 7e182ed662 Remove redundant highlight on add poll option button. 2022-02-07 17:35:26 +03:00
Onuray Sahin 9d83bafa7b Retrieve map style url from .well-known. 2022-02-07 13:38:54 +03:00
daniellekirkwood a416e76e54
Create 5173.misc 2022-02-07 10:16:16 +00:00
Adam Brown ed78e54bce
Merge pull request #5121 from daniellekirkwood/develop
Update workflow for FTUE issues on FTUE board
2022-02-07 10:00:25 +00:00
Adam Brown 8983bfa36c adding changelog entry 2022-02-07 09:22:36 +00:00
Adam Brown 3f3cac0489
updating changelog to include analytics prefix 2022-02-04 17:33:43 +00:00
Onuray Sahin fbc8866394 Merge branch 'develop' into feature/ons/fix_failed_maps_rendering
* develop: (54 commits)
  Bubbles: add CHANGELOG file
  Bubble: get LayoutDirection (RTL) from current Locale
  Version++
  fastlane
  towncrier
  Version 1.3.18
  changelog
  Improve missing state event detection to missing state events only one joined rooms (ignore LEFT room) Should reduce the number of initial sync Co-authors: ganfra and billcarsonfr
  Changelog added.
  taking the use case screen into account when accessing the sign up flows in the sanity tests
  updating copy split to match designs
  applying design feedback
  promoting use case strings for translation
  enabling the use case feature by default
  Code review fixes.
  ktlint
  Bubbles: clean up after review
  Sync: avoid deleting root event of CurrentState on gappy sync
  Code review fixes.
  Support generic location pin.
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
#	vector/src/main/res/layout/item_timeline_event_location_stub.xml
2022-02-04 14:54:39 +03:00
ganfra 02de636955 Bubbles: add CHANGELOG file 2022-02-03 17:57:10 +01:00
daniellekirkwood a44f49fa34
Create 5148.misc 2022-02-03 16:39:47 +00:00
daniellekirkwood 0dce0ad0bb
Merge branch 'vector-im:develop' into develop 2022-02-03 16:37:46 +00:00
Benoit Marty dba9a47c63
Merge pull request #5127 from vector-im/feature/ons/generic_location_pin
Support generic location pin
2022-02-03 16:02:38 +01:00
Onuray Sahin a57ad92d51 Changelog added. 2022-02-03 16:32:39 +03:00
Onuray Sahin a7678241f2 Fix location rendering in timeline if map cannot be loaded. 2022-02-03 16:17:33 +03:00
Adam Brown 26beb97f1e adding changelog entry 2022-02-03 11:34:09 +00:00
Maxime Naturel 8e0f7ca373 Issue-4641: Show search menu item only if available 2022-02-03 09:38:06 +01:00
Benoit Marty 6ebba4e3dd
Merge pull request #5131 from vector-im/feature/nfe/spaces_promo_removal
spaces restricted promo removed
2022-02-03 00:44:07 +01:00
Benoit Marty 17a0c17dde
Merge pull request #5132 from vector-im/feature/adm/missing-notifications
Fixing google play variant push notifications being skipped
2022-02-02 18:42:51 +01:00
Adam Brown 96efeaefed adding changelog entry 2022-02-02 16:59:05 +00:00
Benoit Marty 2ffc89d863
Merge pull request #5125 from vector-im/feature/nfe/space_card_layout
space and room card layout changed in explore rooms, space invite dia…
2022-02-02 16:08:24 +01:00
Benoit Marty c479073583
Merge pull request #5129 from vector-im/feature/aris/threads_fallback_permalink
Fix fallback permalink when threads are disabled
2022-02-02 16:06:34 +01:00
Adam Brown 6406e97d4b adding changelog entry 2022-02-02 14:46:43 +00:00
NIkita Fedrunov 440c5f7516 spaces restricted promo removed 2022-02-02 15:42:28 +01:00
fedrunov 65fd5489a3
"Invite users to space" dialog now closed when user choose invite method (#5126) 2022-02-02 12:54:45 +01:00
ariskotsomitopoulos 36f0283d96 Fix fallback permalink when threads are disabled 2022-02-02 13:51:45 +02:00
Benoit Marty 407e065b90
Merge pull request #5041 from vector-im/feature/nfe/qr_scanner_fragments_merge
qr scanner fragments merged into one
2022-02-02 12:24:28 +01:00
Benoit Marty 54fb28c912
Merge pull request #5089 from vector-im/feature/dla/fix_incorrect_call_status
CallTileTimelineItem.CallStatus.MISSED renders both missed and reject…
2022-02-02 12:06:11 +01:00
NIkita Fedrunov 664c05757e changelog added 2022-02-02 10:51:25 +01:00
daniellekirkwood a6636b8188
Add changelog entry 2022-02-01 17:57:53 +00:00
ariskotsomitopoulos 8e90864e1f add changelog file for threads feature 2022-02-01 17:37:05 +02:00
ariskotsomitopoulos 57f3b132cb add changelog file for threads feature 2022-02-01 16:20:14 +02:00
Benoit Marty 7d463cc9bc Towncrier 2022-01-31 14:51:09 +01:00
artevaeckt 64cc337b9d
adapt changelog to pr# 2022-01-31 14:07:07 +01:00
Benoit Marty 8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00
Benoit Marty 4e3c730940 Changelog 2022-01-31 12:49:08 +01:00
Timuçin Boldt 90c502b16a Make Space creation screens more consistent
Signed-off-by: Timuçin Boldt <timucin.boldt@udo.edu>
2022-01-31 09:24:24 +01:00
Adam Brown 2eeeefdf49 adding changelog entry 2022-01-28 12:11:54 +00:00
David Langley 235f2c78f8
Merge pull request #5083 from vector-im/feature/dla/hold_call_for_transfer_selection
Hold call for transfer selection
2022-01-28 09:14:26 +00:00
David Langley e9ae76da9c CallTileTimelineItem.CallStatus.MISSED renders both missed and rejected calls. Logic should be !answered. 2022-01-28 08:57:19 +00:00
David Langley a5df52ce28
Update changelog.d/5081.bugfix
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-01-27 15:39:47 +00:00
David Langley 79b11623b5 Call transfer should put other side on hold while the transfer is being selected and unhold when the user cancels selection. 2022-01-27 15:16:46 +00:00
Benoit Marty ff6810f1f4
Merge pull request #5062 from vector-im/feature/bma/location_sharing_fix
Ensure mapbox legal mention are displayed on the map
2022-01-27 15:35:52 +01:00
Benoit Marty c6ee513ba1
Merge pull request #5069 from vector-im/feature/ons/fix_end_poll
Allow ending polls if user created it
2022-01-27 14:09:18 +01:00
Benoit Marty 1518a08c29 Fix towncrier mistake due to file extension change 2022-01-27 12:17:25 +01:00
Benoit Marty 62a554b5e2 Changelog 2022-01-26 17:01:52 +01:00
Onuray Sahin db1152cb72 Allow ending polls if user created it. 2022-01-26 17:50:31 +03:00
Benoit Marty bf1ef3ce56 Towncrier 2022-01-25 21:42:37 +01:00
Benoit Marty f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location
Static Location Sharing
2022-01-25 18:03:17 +01:00
Benoit Marty 871b05b641
Merge pull request #5019 from vector-im/feature/bca/auto_uisi_update
Quick fixes on auto uisi RS
2022-01-25 16:41:01 +01:00
Benoit Marty bca65281b6
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode
Updating use case icons to match designs
2022-01-25 16:06:40 +01:00
Benoit Marty 1ee29555c6 Merge branch 'develop' into feature/ons/static_location 2022-01-25 16:01:16 +01:00
Benoit Marty 63b3def667
Merge pull request #5008 from SpiritCroc/globstar
Speed up event match regex evaluation for big messages
2022-01-25 15:52:55 +01:00
Benoit Marty b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
fedrunov b6eb27f8a1 qr scanner fragments merged into one 2022-01-24 15:27:22 +01:00
Onuray Sahin 95020a81c5 Changelog added. 2022-01-24 14:32:40 +03:00
Adam Brown 3866cfeabc adding changelog entry 2022-01-21 17:21:00 +00:00
fedrunov f7aedff418
toolbar management (#4887)
Toolbar management rework and toolbar style alignment
2022-01-21 13:38:27 +01:00
Valere f0dfb1dc02 add changelog 2022-01-21 12:11:43 +01:00
Benoit Marty a085b4db21
Merge pull request #5012 from vector-im/feature/adm/fdroid-broken-background-sync
Missing fdroid notifications
2022-01-21 09:29:46 +01:00
Adam Brown 28130489c7 adding changelog entry 2022-01-20 17:12:59 +00:00
Benoit Marty 9bfeb6f814
Merge pull request #4734 from vector-im/feature/bma/analytics_next
Implement analytics plan
2022-01-20 18:12:46 +01:00
Benoit Marty af43890fab
Merge pull request #4041 from vector-im/feature/bca/fix_switch_space_on_tap_notif
Fix switch to best space when tapping notification
2022-01-20 16:54:06 +01:00
Benoit Marty d82743eeab
Merge pull request #4995 from vector-im/feature/fre/fix_retry_delay_on_429
Do not auto-retry on 429 in case of too long retry delay
2022-01-20 14:31:29 +01:00
SpiritCroc af34399135 Speed up event match regex evaluation for big messages
`regex.containsMatchIn()` for `.*@room.*` can take significantly longer
than checking for `@room` (some real-world events I was getting took
around 15 seconds with this, significantly slowing down the sync
parsing).

Checking `containsMatchIn()` does not lead to different results when
having leading and trailing stars however, it will match in the same
cases as when these are omitted.

For testing purposes, I sent myself some Lorem Ipsum with 5000 words
(not containing any @room).
Without this change, the regex evaluation takes about 16 seconds.
With this change, the regex evaluation now takes significantly less then
a second.
2022-01-20 12:16:34 +01:00
Benoit Marty c40fc52ef5
Merge pull request #4999 from vector-im/feature/bma/zero_vote
Fix an error in string resource (#4997)
2022-01-20 10:38:33 +01:00
Benoit Marty 953f34f5e3 Fix an error in string resource (#4997) 2022-01-19 21:40:26 +01:00
Benoit Marty e9f9c7e739 Changelog 2022-01-19 21:13:00 +01:00
Florian Renaud 9ebcb3ed52 Add changelog 2022-01-19 17:04:00 +01:00
Adam Brown 491044b0c5
Merge pull request #4964 from vector-im/feature/adm/splash-carousel-review
Enabling FTUE splash carousel
2022-01-19 15:52:25 +00:00
Tiago Loureiro 3c4fbce440 Add changelog 2022-01-19 12:02:47 -03:00
Benoit Marty 9e57263fb6 Changelog 2022-01-19 15:45:59 +01:00
Benoit Marty ec6677643d
Merge pull request #4989 from vector-im/feature/aris/ignore_dependabot_github_script
Ignore dependabot upgrade for @github-script@v3
2022-01-19 12:24:45 +01:00
ariskotsomitopoulos 8d0299e411 Ignore dependabot upgrade for @github-script@v3 2022-01-19 12:46:22 +02:00
Adam Brown 00f2947636 enabling the splash carousel feature by default 2022-01-19 10:17:04 +00:00
Adam Brown 37c4d94109 adding changelog entry 2022-01-18 16:20:33 +00:00
Ekaterina Gerasimova 8af92a4091 Sync issue automation with element-web
Add automation for
* labelling Labs issues
* adding design and product issues to boards
* adding design and product PRs to boards
* adding UISI issues to Crypto team board

Fixes issue #4949
2022-01-18 13:24:58 +00:00
Adam Brown 256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update
Updated splash carousel images and copy
2022-01-17 15:11:08 +00:00
Benoit Marty e2e3f72564 Merge branch 'develop' into feature/bca/fix_switch_space_on_tap_notif 2022-01-17 15:28:56 +01:00
Benoit Marty eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix
Avoid deleting sent messages on non room events
2022-01-17 15:26:46 +01:00
Benoit Marty 95b116b8a1
Merge pull request #4952 from abaker/disable_http_2
Force HTTP/1.1
2022-01-17 15:20:23 +01:00
Benoit Marty ab29a15572
Merge pull request #4942 from vector-im/feature/bma/delete_rx
Remove unused module matrix-sdk-android-rx and do some cleanup
2022-01-17 11:59:23 +01:00
ariskotsomitopoulos 493374c423 Add changelog 2022-01-17 12:21:22 +02:00
Adam Brown 1528238a2f adding changelog entry 2022-01-17 09:27:04 +00:00
Benoit Marty f025554612
Merge pull request #4953 from vector-im/feature/adm/in-dev-category
In development release notes category
2022-01-14 17:48:16 +01:00
Benoit Marty 9232206947
Merge pull request #4948 from vector-im/feature/bma/alerter_analytics_optin
Prevent Alerts to be displayed on the analytics opt-in screen
2022-01-14 17:46:32 +01:00
Adam Brown 37aadf4dbf using .wip extension and updates the docs for more clarity 2022-01-14 14:51:19 +00:00
Valere 1d7ce1c794 Fix switch to best space when tapping notification 2022-01-14 15:39:49 +01:00
Adam Brown 13c34865f2 adding .dev changelogs for the currently merged wip tasks 2022-01-14 11:25:22 +00:00
Benoit Marty 31e487b073
Merge pull request #4911 from vector-im/feature/nfe/rename_kick_command
Remove "X kicked X" terminology when removing people from a room
2022-01-14 08:42:18 +01:00
Alex Baker 7e4e8339e6 Force HTTP/1.1
Signed-off-by: Alex Baker <alex@beeper.com>
2022-01-13 17:50:24 -06:00
Benoit Marty 4cdf55e7dd Prevent Alerts to be displayed in the automatically displayed analytics opt-in screen (#4933) 2022-01-13 21:53:42 +01:00
Adam Brown b62693cbb0 adding changelog entry 2022-01-13 17:28:27 +00:00
Benoit Marty f2165201eb Remove unused module matrix-sdk-android-rx and do some cleanup 2022-01-13 17:54:25 +01:00
fedrunov d92e0e48f6 code review changes 2022-01-13 17:50:38 +01:00
Benoit Marty 457534b1df
Merge branch 'develop' into feature/bca/spaces_fix_3932 2022-01-13 12:04:47 +01:00
Benoit Marty 1b24b9d764
Merge pull request #4895 from vector-im/feature/bma/empty_state_key
Avoid allowing null String for state_key.
2022-01-13 12:00:48 +01:00
Benoit Marty a16a6a6eeb
Merge pull request #4935 from vector-im/feature/bma/fix_legals
Fix #4919
2022-01-13 11:59:46 +01:00
Benoit Marty 5095514ecd
Merge pull request #4928 from vector-im/feature/aris/stuck_local_echo_issue_516
Potential fix stuck local echo events at the bottom of the screen
2022-01-13 10:44:56 +01:00
Benoit Marty 18359fedb3 Fix #4919 2022-01-12 18:08:37 +01:00
Benoit Marty f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement
Trying to fix integration tests
2022-01-12 17:11:16 +01:00
ariskotsomitopoulos b92cb753f9 Fix stuck local echo events at the bottom of the screen 2022-01-12 15:31:54 +02:00
Benoit Marty ea6347b1c7 Add signing config for the release buildType. No secret added
To be able to test the release build sooner during the release process.
2022-01-12 14:07:51 +01:00
Benoit Marty 7eb7d51759 changelog 2022-01-12 12:48:13 +01:00
Benoit Marty a35fec245d Add changelog 2022-01-12 12:13:11 +01:00
Benoit Marty 12018aaee5 Changelog 2022-01-11 17:22:06 +01:00
fedrunov 9ec662ccdc replace "kick" with "remove" 2022-01-11 16:21:42 +01:00
Valere 6b05e7a6bb Support misconfigured room encryption 2022-01-11 14:56:31 +01:00
Onuray Sahin 9ea30445ef Merge branch 'develop' into feature/ons/static_location
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
2022-01-11 14:42:11 +03:00
Valere bf447afa5a
Remove deprecated restricted lab option (#4889)
Remove deprecated restricted lab option
2022-01-11 09:01:37 +00:00
Benoit Marty 008034895b
Merge pull request #4893 from vector-im/feature/ons/fix_create_poll_recyclerview
Workaround to not to reuse poll option cells
2022-01-11 10:00:16 +01:00
Benoit Marty 3bdb05f7b4 Changelog 2022-01-10 17:49:47 +01:00
Valere ff4bbf0a8a Add "Create room" shortcut in Explore Space screen 2022-01-10 17:00:32 +01:00
Onuray Sahin 5feafbdbf1 Workaround to not to reuse poll option cells. 2022-01-10 17:28:07 +03:00
Benoit Marty ae8d1d1429 Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 2022-01-10 15:10:08 +01:00
Benoit Marty f368ec15d8
Merge pull request #4892 from vector-im/feature/bma/analytics_opt_in
Revert "Disable automatic opt-in screen display."
2022-01-10 15:03:19 +01:00
Benoit Marty 5d70aa9947 Changelog 2022-01-10 14:33:47 +01:00
ariskotsomitopoulos 71fbc3c5c7 - Do not add GitHub comments on successful ktlint runs
- Remove already existing comments when ktlint succeed
2022-01-10 13:07:18 +02:00
Benoit Marty d14dadde27
Merge branch 'develop' into feature/dla/fix_reply_and_quote_newlines 2022-01-07 14:43:41 +01:00
Benoit Marty bcebfff1a2
Merge pull request #4864 from vector-im/feature/aris/linter_github_actions_improvement
Enhance Linter Github Actions Reporting
2022-01-07 14:25:29 +01:00
Benoit Marty 401479f140 Since the change are in the SDK, use the .removal extension for a better future changelog. 2022-01-06 21:07:57 +01:00
Benoit Marty b46b76c22a
Merge pull request #4753 from vector-im/feature/fre/tagged_events
Support tagged events in Room Account Data (MSC2437)
2022-01-06 21:06:44 +01:00
Benoit Marty 3f9bea308a
Merge pull request #4872 from vector-im/feature/adm/enabling-ftue-already-have-account
Enabling FTUE_AUTH onboarding variant
2022-01-06 20:57:51 +01:00
Benoit Marty b852b9de9c
Merge pull request #4871 from vector-im/feature/nfe/qr_scanner_toolbar
Toolbar is added to a views with QR code scan
2022-01-06 20:55:06 +01:00
Adam Brown 0ea7fc2f10 adding changelog entry 2022-01-06 17:39:17 +00:00
Adam Brown f24c962a4a
Merge pull request #4668 from vector-im/feature/adm/i-already-have-an-account
FTUE Auth - I already have an account
2022-01-06 17:11:44 +00:00
fedrunov 6bfd9d07a9 Toolbar is added to a views with QR code scan 2022-01-06 17:11:23 +01:00
Benoit Marty 296929e179
Merge pull request #4790 from vector-im/feature/adm/emoji-recycling
Timeline recycling crash
2022-01-06 14:55:29 +01:00
Adam Brown 443d15518f adding changelog entry 2022-01-06 10:03:13 +00:00
ariskotsomitopoulos 33a4eac7d2 - Fix github actions ktlint reports
- Publish results on PR via commenting
- Support for all modules along with tests
- Code format & emoticons
2022-01-06 00:26:47 +02:00
ariskotsomitopoulos 6a24e0286e Increase adbtimeout to prevent ShellCommandUnresponsiveException exception 2022-01-05 23:45:07 +02:00
Benoit Marty 1490854b4c
Merge pull request #4799 from vector-im/feature/adm/inconsistent-outgoing-call-output
Outgoing call ringtone using wrong audio device
2022-01-05 22:05:23 +01:00
Benoit Marty 17e485fde1
Merge pull request #4826 from vector-im/feature/bma/nick_color_final
Nick color
2022-01-05 22:01:03 +01:00
Valere e5431d9fb4 Track decryption failures 2022-01-05 16:43:05 +01:00
Benoit Marty 608e01abf1 Merge branch 'develop' into feature/bma/nick_color_final 2022-01-05 16:33:13 +01:00
Adam Brown 0df07d0a1e adding changelog entry 2022-01-05 09:58:47 +00:00
Benoit Marty 5fc1efb542
Merge pull request #4852 from vector-im/feature/bma/tooltip
Add tooltip to explain what are the actions behind the icons
2022-01-05 09:47:12 +01:00
Florian Renaud f008abde4f Merge branch 'develop' into feature/fre/tagged_events 2022-01-04 17:23:04 +01:00
Benoit Marty 7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty 0797860e4f Update changelog 2022-01-04 16:02:16 +01:00
Benoit Marty 39ff9da3c1
Merge pull request #4846 from vector-im/feature/dla/fix-unread-message-indicator-no-messages
Fix unread messages indicator on room list if no messages
2022-01-04 15:57:26 +01:00
Claire Gizard 63c63bc462 Update error message when joining room 2022-01-04 13:49:18 +01:00
David Langley 9f13a9df54 If latestPreviewableEvent is null we should return false(no messages in room). 2022-01-04 12:20:56 +00:00
Benoit Marty 279f9e00a3
Merge pull request #4837 from vector-im/feature/bma/safe_epoxy_char_sequence
Safe epoxy char sequence
2022-01-04 09:53:49 +01:00
Benoit Marty d670d3e872
Merge pull request #4405 from vector-im/feature/fga/timeline_chunks_rework
Feature/fga/timeline chunks rework
2022-01-03 20:20:42 +01:00
ganfra 91215854f4 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2022-01-03 16:07:05 +01:00
ganfra 12b775c26d Timeline : clean after PR reviews 2022-01-03 16:06:48 +01:00
Benoit Marty 4642299572 Changelog 2022-01-03 14:30:14 +01:00
Tobias Preuss 74363ff823 Let ShareCompat.IntentBuilder create the chooser intent for sharing content.
+ Although the system's intent chooser normally takes care of cases when
  no app is found we still keep the safeguard here to be prepared for
  exotic devices behaving different.

Signed-off-by: Tobias Preuss <tobias.preuss@googlemail.com>
2021-12-31 22:37:42 +01:00
Benoit Marty 95b1ae9488
Merge branch 'develop' into maths 2021-12-31 16:41:06 +01:00
Onuray Sahin 4d6eec8972 Rate limited maptiler key is added. 2021-12-31 15:12:46 +03:00
Benoit Marty 1d3cc52991 Changelog new management 2021-12-31 13:05:06 +01:00
Benoit Marty ce0a582b3e
Merge pull request #4823 from vector-im/feature/ons/attachment_picker
Attachment Picker UI Improvements
2021-12-31 11:43:49 +01:00
Onuray Sahin cc8da82d02 New attachment picker implemented. 2021-12-30 16:28:50 +03:00