Commit graph

1341 commits

Author SHA1 Message Date
Adam Brown
13fb4e52af extracting hardcoded error message to the resources 2022-03-31 18:07:27 +01:00
Adam Brown
11983443fb replacing hardcoded strings with resources 2022-03-31 17:50:20 +01:00
Adam Brown
7e5c3df7a7 adding combined server selection/sign up fragment 2022-03-31 17:50:20 +01:00
Maxime NATUREL
f34225506a Adding strings resources 2022-03-31 14:43:32 +02:00
Benoit Marty
9a2cc1a4c5
Merge pull request #5664 from vector-im/feature/bma/dep_upgrade
Upgrade Jitsi and ktlint
2022-03-31 11:32:14 +02:00
Adam Brown
9d3d574d28
FTUE - Finalising personalisation journey (#5519)
* enabling the personalisation flow and promoting the strings for translation

* delegating the fake vector features to the static defaults, the fake exists for allowing overrides when needed

* incorporating the personalisation screens into the UI test signup

* adding changelog entry

* removing unused import

* putting the personalisation UI test flow behind the feature flag so that we can keep it disabled

* disabling the personalisation flow, we'll batch enable with other parts of the FTUE flow

* enabling the personalisation feature for registration unit tests which expect it to be enabled
2022-03-30 09:09:46 +01:00
Benoit Marty
4c40615871 Remove Flair Fragment (not used, and part of group, which will be removed) 2022-03-28 16:31:50 +02:00
ariskotsomitopoulos
3ba2419e9b Replace hardcoded string 2022-03-28 14:15:15 +03:00
ariskotsomitopoulos
58cc3931b9 Add beta feedback for threads 2022-03-28 13:53:44 +03:00
ericdecanini
931c0e9826 Improves accessibility talkback on MessageAudioItem 2022-03-28 11:01:31 +02:00
ericdecanini
82cde166db Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
2022-03-24 20:32:28 +01:00
Onuray Sahin
f18a107df8 Merge branch 'develop' into feature/ons/live_location_service
* develop: (152 commits)
  Remove exhaustive.
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  Code review fixes.
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
#	vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
#	vector/src/main/res/values/strings.xml
2022-03-23 16:25:01 +03:00
ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users
Threads Migration
2022-03-22 14:57:07 +01:00
ariskotsomitopoulos
52699357dd Change text constant 2022-03-22 12:27:11 +02:00
ericdecanini
c9946b6dd3 Code cleanup 2022-03-21 19:57:18 +01:00
ericdecanini
5a819bbafa Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
2022-03-21 19:40:14 +01:00
ariskotsomitopoulos
ed2cb5f0fe Enhance text constants 2022-03-21 15:45:08 +02:00
Onuray Sahin
c63fc3d6c2 Start the foreground service when users start live location sharing. 2022-03-21 14:27:15 +03:00
ericdecanini
2e716cb8a0 Adapts special body text for audio messages 2022-03-19 18:26:37 +01:00
ericdecanini
fab78c9a6e Refactors MessageAudioItem to work for both audio files and voice messages 2022-03-19 18:16:51 +01:00
Maxime Naturel
526d11e912 Removing TODO 2022-03-18 14:12:55 +01:00
Maxime Naturel
70ab5354c3 Adding strings of the view 2022-03-18 14:10:57 +01:00
Maxime NATUREL
3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions
Live Location Sharing - Background permission
2022-03-18 12:06:30 +01:00
ariskotsomitopoulos
f00b1f29bf Enhance text context for thread migration notice 2022-03-18 11:58:29 +01:00
Onuray Sahin
33e5a206bd Fix background location permission for Android > 10. 2022-03-17 12:29:46 +03:00
Adam Brown
17d363cf9a
Merge pull request #5389 from vector-im/feature/adm/personalisation-complete
FTUE - Personalisation complete
2022-03-15 17:33:29 +00:00
Maxime Naturel
6f6bb3dbfe Adding method to show dialog when permission is missing 2022-03-15 17:45:36 +01:00
Maxime Naturel
b72c87da44 Renaming "btn" into "button" 2022-03-15 17:09:31 +01:00
Maxime Naturel
40e92842ea Show icon to reset map to user location 2022-03-15 17:09:30 +01:00
Maxime Naturel
a1d155df71 Adding static pin at the center of the map 2022-03-15 17:09:29 +01:00
Adam Brown
e3c3db2964 adding personalization complete screen 2022-03-15 13:07:22 +00:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all
Remove unused resources
2022-03-10 13:03:27 +01: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
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +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
Maxime Naturel
6515e457b5 Ignore unused strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel
046d906f97 Moving view attributes into uikit dedicated file 2022-03-09 09:46:52 +01:00
Maxime Naturel
0707877b3c Using correct string resources for options 2022-03-09 09:45:15 +01:00
Maxime Naturel
3bbb7167f1 Adding icon for live location 2022-03-09 09:45:00 +01:00
Maxime Naturel
a98f502c01 Adding custom view for options picker 2022-03-09 09:44:06 +01:00
Adam Brown
9a02543afd
FTUE - Choose a display picture (#5323)
* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding base choose name fragment with UI

* add click handling for the display name actions

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* adding barebones profile picture fragment with ability to select a user avatar

* extracting uri filename resolving to a class which can be injected
- includes tests

* updating upstream avatar on profile picture save and continue step
- moves the personalisation state to a dedicated model to allow for back and forth state restoration

* adding test case for skipping profile picture setting

* taking the profile loading into account when rendering the onboarding loading

* extracting method for the handling of the profile picture selection

* adding dedicated camera icon for choosing profile picture

* adding toolbar to back to profile picture page
- this toolbar will fade in with the fragment as it sits at the fragment level, probably worth revisiting once more pages have a toolbar

* changing edit/add picture icon based on if we're already selected an image

* making use of debounced clicks to avoid potential extra clicks

* making the avatar height and camera icon relative percentage based
- also makes the avatar itself clicking, including a foreground ripple

* fixing formatting

* making use of fake session id for user id assertion

* using a real  matrix id syntax for the fake session user id

* removing duplicated dimens

* using self closing imageview tag
2022-03-07 14:07:22 +00:00
NIkita Fedrunov
8732c6fe42 Amend spaces menu to have consistent copy 2022-03-07 08:32:31 +01:00
Adam Brown
99e5a8f2fa
FTUE - Choose a display name (#5211)
* adding base choose name fragment with UI

* add click handling for the display name actions

* updating real account display name

* setting the initial disabled state when the view is created

* adding header padding which would have been a toolbar

* exiting the flow on display name updated or skipped, the next PR will introduce the profile picture screen

* updating view model state testing to take all emissions into account

* adding tests around the onboarding view model
- cases for the personalisation and display name actions

* using colorSecondary instead of accent as per quality script rule

* making use of viewevent delegating action for the back handling

* using debounced clicks

* consuming the back action when existing the display name fragment via viewmodel

* making the keyboard imeDone update the display name
2022-03-02 17:59:40 +00:00
Benoit Marty
fd17517675 Remove unused strings 2022-02-25 13:45:24 +01:00
Benoit Marty
7516a1280e template_ is not required anymore 2022-02-24 15:32:24 +01:00
Benoit Marty
5512439d36
Merge pull request #5157 from vector-im/feature/bma/config_poc
Create a new resource in config file for default setting value.
2022-02-24 14:15:19 +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
Benoit Marty
96c2c6f4a4 Move file config.xml to the module vector-config 2022-02-23 18:10:08 +01:00
Benoit Marty
b12c890191 Also add a way to hide the setting to the user 2022-02-23 18:03:12 +01:00
Benoit Marty
5cfcd65b38 Create a new resource in config file for default setting value. First case: message bubbles 2022-02-23 18:03:12 +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
91ab4726ad #3296
- Fixes after review.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-23 11:34:43 +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
Benoit Marty
1ce65d7f87 Use plurals for message_reaction_show_more. Fixes #5227 2022-02-22 16:08:08 +01:00
Benoit Marty
fa66f10075 Create template with the app name 2022-02-22 15:47:15 +01:00
Benoit Marty
9cd4b5d3b8 Create template with the app name 2022-02-22 15:45:47 +01:00
Benoit Marty
e35d6a676a Create template with the app name 2022-02-22 15:44:14 +01:00
Benoit Marty
407394b7fa Create template with the app name 2022-02-22 15:42:29 +01:00
Benoit Marty
98b9f1b1ca Rename some string resources 2022-02-22 15:38:43 +01:00
Benoit Marty
672e798e7c Remove unused string 2022-02-22 15:34:14 +01:00
Benoit Marty
2f048d8f88 Remove unused string 2022-02-22 15:32:39 +01:00
Benoit Marty
ad2ee0e9bc Remove unused string 2022-02-22 15:29:52 +01:00
Adam Brown
06f2ca1379 using en-us copy as that's our default locale 2022-02-22 10:29:48 +00: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
Benoit Marty
6fec56eeaa
Merge pull request #5254 from vector-im/feature/bma/cleanup_config
Cleanup config
2022-02-18 14:22:07 +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
Benoit Marty
e44ff1e303 Update preferred_jitsi_domain value from "jitsi.riot.im" to "meet.element.io" 2022-02-17 18:06:55 +01:00
Benoit Marty
6e68f9a224 Remove piwik configuration, it was not used. 2022-02-17 18:06:55 +01:00
Maxime Naturel
d8e28d7be9 Adding autocomplete for @room (missing correct first letter of avatar) 2022-02-17 11:22:59 +01:00
Maxime Naturel
4641153df0 Making ACL multiple successive events as collapsable 2022-02-16 16:01:31 +01:00
ganfra
911ee97122 Reactions: start handling show more, show less and add more actions in timeline. 2022-02-09 21:29:03 +01:00
Adam Brown
023b32367b adding post account created screen, going to the personalise next steps are still TODO 2022-02-07 09:22:36 +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
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Onuray Sahin
a7678241f2 Fix location rendering in timeline if map cannot be loaded. 2022-02-03 16:17:33 +03:00
Adam Brown
9b3af7cfc9 updating copy split to match designs 2022-02-03 11:28:33 +00:00
Adam Brown
5ed1f34df3 promoting use case strings for translation 2022-02-03 11:28:33 +00:00
Maxime Naturel
8e0f7ca373 Issue-4641: Show search menu item only if available 2022-02-03 09:38:06 +01:00
NIkita Fedrunov
440c5f7516 spaces restricted promo removed 2022-02-02 15:42:28 +01:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads
Threads P0 Release
2022-02-01 15:58:32 +02:00
Timuçin Boldt
5fe270fc9c
adapt strings for space creation 2022-02-01 12:07:53 +01:00
Benoit Marty
8db5b76676 Add TODO for the next Weblate sync 2022-02-01 11:41:59 +01:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Onuray Sahin
50279e3183 Use static map image in timeline. 2022-01-28 18:51:28 +03:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
Benoit Marty
6c79be1c68 Instruction for the next weblate sync 2022-01-26 18:16:35 +01:00
Benoit Marty
b4e5a3a6df Remove unused string 2022-01-25 18:34:06 +01:00
Benoit Marty
d501447544 Remove unused string 2022-01-25 18:33:06 +01:00
Benoit Marty
58b2050baf Rename string 2022-01-25 18:18:47 +01:00
Benoit Marty
f4f0b36b05 Remove unused string 2022-01-25 18:18:11 +01:00
Benoit Marty
fa07271074 Rename some resource: kick -> remove 2022-01-25 18:15:22 +01:00
Benoit Marty
210ef74f62 Remove unused string 2022-01-25 18:13:03 +01:00
Benoit Marty
ece93caae3 Rename some resource: kick -> remove 2022-01-25 18:10:59 +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
f83c2b32bc Add summary to location sharing setting 2022-01-25 17:59:22 +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
Valere
14da9806e2 Put bug report app names in config 2022-01-25 16:35:16 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
Onuray Sahin
43c8624b33 Code review fixes. 2022-01-25 15:31:59 +03:00
Onuray Sahin
04ffb951c3 Code review fixes. 2022-01-25 12:38:11 +03:00
Onuray Sahin
b0b92c062e Undisclosed poll implementation. 2022-01-24 14:31:50 +03:00
Onuray Sahin
7f97e78ba3 Merge branch 'develop' into feature/ons/edit_polls
* develop: (66 commits)
  toolbar management  (#4887)
  adding changelog entry
  adding back periodic flag when scheduling automatic background workers
  Fix enum class warning
  Split long lines Done by https://github.com/matrix-org/matrix-analytics-events/pull/16
  Add new class in analytics plan
  Fix conditional for Delight issue automation
  Add missing import in kdoc
  Update kdoc
  Enable Delight issue automation
  Fix an error in string resource (#4997)
  Changelog
  Add some unit test for the command parser. Not all commands are covered, could add more tests later.
  data class.
  use sealed interface
  Small cleanup
  Command parser is not a static object anymore
  Add changelog
  Use Throwable.isLimitExceededError extension
  Do not automatically retry 429 with a too long delay
  ...
2022-01-23 22:15:36 +03:00
ganfra
1580269857 Bubbles: move settings to timeline section 2022-01-21 16:01:54 +01:00
Onuray Sahin
c3d7a253e4 Allow editing polls. 2022-01-20 17:41:03 +03:00
Benoit Marty
953f34f5e3 Fix an error in string resource (#4997) 2022-01-19 21:40:26 +01:00
Adam Brown
211f184066 updating splash submit copy to use Create account when the I already have an account feature is enabled 2022-01-19 10:38:28 +00:00
ariskotsomitopoulos
8cc96e27bc - Add threads to lab settings
- Disable thread awareness due to the new fallback mechanism
2022-01-19 12:28:00 +02:00
Adam Brown
8f98f3e6d0 promoting wip carousel strings 2022-01-19 10:17:04 +00:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
ganfra
7ff8483592 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-17 19:19:29 +01:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown
7d0b833aa5 using app name template for the carousel content which contains the app name
- also marks the now unused strings for deletion
2022-01-17 09:24:53 +00:00
Adam Brown
982b480613 including updated copy for the carousel
- marked as donottranslate whilst waiting for sign off
- removed the positioning from the naming schema in favour of location of context
2022-01-17 09:24:53 +00:00
Adam Brown
fbe60f5a52 applying english override for the last carousel page copy 2022-01-17 09:24:53 +00:00
Adam Brown
e521fd9059 fixing typo in carousel body 2022-01-17 09:24:53 +00:00
Adam Brown
7c5e7a902d updating splash carousel copy to match latest copy 2022-01-17 09:24:53 +00:00
ariskotsomitopoulos
ff87f07f65 Add empty screen UI on empty thread list 2022-01-14 15:11:20 +02: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
fedrunov
d92e0e48f6 code review changes 2022-01-13 17:50:38 +01:00
ganfra
d06df45e85 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-13 13:17:23 +01:00
ganfra
5ac155285b Bubbles: some clean up 2022-01-13 13:14:37 +01:00
Adam Brown
83af0d7bb9 moving the work in progress strings out of the production strings files to avoid translations before they're signed off 2022-01-13 10:57:04 +00:00
ariskotsomitopoulos
9d48ecea2f Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	.github/workflows/integration.yml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
2022-01-12 18:20:50 +02:00
Adam Brown
3d4caeaa75 extracting use case copy to the resources 2022-01-12 12:06:10 +00:00
fedrunov
9ec662ccdc replace "kick" with "remove" 2022-01-11 16:21:42 +01:00
Valere
57b78a6223 code review 2022-01-11 14:56:31 +01:00
Valere
b10bc7000a Update room badge when e2e misconfigured 2022-01-11 14:56:31 +01:00
Valere
74dfddeeea missing resource 2022-01-11 14:56:31 +01:00
Valere
6b05e7a6bb Support misconfigured room encryption 2022-01-11 14:56:31 +01:00
ariskotsomitopoulos
3bd21d04d8 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
2022-01-11 14:09:49 +02: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
Benoit Marty
51c764c2f3 Remove unused strings 2022-01-11 12:41:37 +01:00
Adam Brown
71eaac39aa fixing typo in carousel title 2022-01-11 11:06:29 +00:00
Valere
bf447afa5a
Remove deprecated restricted lab option (#4889)
Remove deprecated restricted lab option
2022-01-11 09:01:37 +00:00
Valere
be119ea161 Support for lab auto rageshake UISI 2022-01-10 09:41:51 +01:00
ariskotsomitopoulos
50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos
ac5caccdf9 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Adam Brown
a2f780bef4 adding carousel content, images are temporary 2022-01-06 19:54:48 +00:00
Adam Brown
811613fa4d adding I already have an account functionality to the ftue auth splash 2022-01-06 10:03:13 +00:00
Benoit Marty
608e01abf1 Merge branch 'develop' into feature/bma/nick_color_final 2022-01-05 16:33:13 +01: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
Benoit Marty
d07dd154b8 Remove audio item from attachment picker.
Keep some related code for now
2022-01-04 18:50:32 +01:00
Benoit Marty
97459bc822 Update wording of tooltips (Gaelle's review) 2022-01-04 18:43:17 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty
ecc4009689 Add tooltip to explain what are the actions behind the buttons 2022-01-04 16:00:06 +01:00