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
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
