ariskotsomitopoulos
8cc96e27bc
- Add threads to lab settings
...
- Disable thread awareness due to the new fallback mechanism
2022-01-19 12:28:00 +02: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
ariskotsomitopoulos
5e23947419
Enhance filtering to support threads
2022-01-17 19:22:22 +02: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
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
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
Benoit Marty
ed00f9f712
Merge pull request #4848 from vector-im/cgizard/translate_error_message_joining_room
...
Update error message when joining room
2022-01-04 15:27:49 +01:00
Benoit Marty
185afe403f
Rename some string resources
2022-01-04 14:25:36 +01:00
Claire Gizard
63c63bc462
Update error message when joining room
2022-01-04 13:49:18 +01:00
Benoit Marty
108e924783
Remove unused strings
2022-01-04 13:17:41 +01:00
Benoit Marty
ee69ece697
Fix some typo in string resource name
2022-01-04 13:06:02 +01:00
Benoit Marty
eb875823d5
Remove unused class and resource after new poll implementation
2022-01-04 13:02:17 +01:00
Benoit Marty
64e56b0dd7
Remove unused strings
2022-01-04 12:56:36 +01:00
Benoit Marty
99d77c5bca
Reanme some string (and group them together)
2022-01-04 12:51:20 +01:00
Benoit Marty
c3480bfd16
Add summary to the setting
2021-12-31 16:47:46 +01:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths
2021-12-31 16:41:06 +01:00
Benoit Marty
454baf8beb
Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data
2021-12-31 13:02:24 +01:00
ariskotsomitopoulos
cd95fc41e4
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# library/ui-styles/src/main/res/values/dimens.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.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/send/LocalEchoEventFactory.kt
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
# 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/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.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/composer/MessageComposerViewState.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.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/DefaultNavigator.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/permalink/PermalinkHandler.kt
# vector/src/main/res/layout/fragment_room_detail.xml
2021-12-14 20:18:54 +02:00
Benoit Marty
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog
...
Analytics
2021-12-14 09:31:55 +01:00
Benoit Marty
a40e60ba8f
Merge branch 'develop' into feature/bma/posthog
2021-12-13 23:18:14 +01:00
Onuray Sahin
f028f9836b
Merge branch 'develop' into feature/ons/poll_timeline
...
* develop: (49 commits)
Update changelog.d/4592.bugfix
Remove jcenter from here, let's see what the CI will say
Common struct for each maven repo
Rename the file to group them
Add changelog file
Revert PR 4592 for devtools
Enhance include groups implementation by decoupling them to a separate file
Cleanup
Legals: improve API to get homeserver terms
Legals: update setting icon
Auto-review
Add a help section in the settings.
Changelog
Color for links
Use same height than the loading item to avoid dynamic resizing
Legals: only display external URLs.
Legals: Move the 2 copyrights items to the new legal screen
Add some space between the 2 TextViews, and improve the layout
Legals: Move the 3 element links to the new legal screen
Rename some classes
...
# Conflicts:
# vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
# vector/src/main/res/layout/item_timeline_event_poll_stub.xml
2021-12-13 17:44:21 +03:00
