SpiritCroc
|
f66747e972
|
Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc
Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767
Conflicts:
vector/src/debug/res/layout/activity_debug_menu.xml
vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
vector/src/main/res/color/button_positive_background_selector.xml
vector/src/main/res/color/button_positive_text_color_selector.xml
vector/src/main/res/color/checked_accent_color_selector.xml
vector/src/main/res/color/login_button_tint.xml
vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
vector/src/main/res/drawable/bg_login_server_checked.xml
vector/src/main/res/drawable/bg_send.xml
vector/src/main/res/drawable/highlighted_message_background.xml
vector/src/main/res/drawable/ic_settings_root_advanced.xml
vector/src/main/res/drawable/ic_settings_root_call.xml
vector/src/main/res/drawable/ic_settings_root_flair.xml
vector/src/main/res/drawable/ic_settings_root_general.xml
vector/src/main/res/drawable/ic_settings_root_help_about.xml
vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
vector/src/main/res/drawable/ic_settings_root_labs.xml
vector/src/main/res/drawable/ic_settings_root_notification.xml
vector/src/main/res/drawable/ic_settings_root_preferences.xml
vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
vector/src/main/res/drawable/splash.xml
vector/src/main/res/drawable/vector_tabbar_selected_background.xml
vector/src/main/res/layout/alerter_incoming_call_layout.xml
vector/src/main/res/layout/custom_action_item_layout_badge.xml
vector/src/main/res/layout/dialog_export_e2e_keys.xml
vector/src/main/res/layout/dialog_import_e2e_keys.xml
vector/src/main/res/layout/fragment_home_drawer.xml
vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/layout/fragment_login_server_url_form.xml
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
vector/src/main/res/layout/fragment_login_splash.xml
vector/src/main/res/layout/fragment_public_rooms.xml
vector/src/main/res/layout/fragment_qr_code_scanner.xml
vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
vector/src/main/res/layout/fragment_review_terms.xml
vector/src/main/res/layout/fragment_room_detail.xml
vector/src/main/res/layout/fragment_space_add_rooms.xml
vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
vector/src/main/res/layout/item_bottom_sheet_action.xml
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
vector/src/main/res/layout/item_form_submit_button.xml
vector/src/main/res/layout/item_generic_list.xml
vector/src/main/res/layout/item_generic_with_value.xml
vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
vector/src/main/res/layout/item_notification_troubleshoot.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_settings_centered_image.xml
vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
vector/src/main/res/layout/item_timeline_event_poll_stub.xml
vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
vector/src/main/res/layout/item_verification_action.xml
vector/src/main/res/layout/view_attachment_type_selector.xml
vector/src/main/res/layout/view_bottom_sheet_action_button.xml
vector/src/main/res/layout/view_call_controls.xml
vector/src/main/res/menu/menu_submit.xml
vector/src/main/res/menu/menu_timeline.xml
vector/src/main/res/values/styles_riot.xml
vector/src/main/res/values/theme_dark.xml
|
2021-06-23 11:08:10 +02:00 |
|
SpiritCroc
|
6626c5b600
|
Merge commit '8b138e8ff' into sc
Change-Id: Icbda29234a03a5498d1aa1b9bbf9bba386f7c2cc
Conflicts:
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
|
2021-06-20 09:18:03 +02:00 |
|
SpiritCroc
|
fb2551fc90
|
[TMP] Automatic upstream merge preparation
Change-Id: Ia98cb8dfb432d851e1e2c6bc63449b2341c7e5ac
|
2021-06-20 09:04:09 +02:00 |
|
SpiritCroc
|
5273656c34
|
Automatic revert to unchanged upstream strings, pt.1
Change-Id: Id37357a895b6a6aca2f02c06b03d9bebb14e4739
|
2021-06-20 09:04:08 +02:00 |
|
SpiritCroc
|
99832243a6
|
Increment version
Change-Id: Ia33c739201d13d466f302fce991488d8d850bbfd
|
2021-06-12 10:29:05 +02:00 |
|
Benoit Marty
|
0f4e546e1e
|
Merge pull request #3459 from vector-im/feature/bma/text_styles_and_colors
Feature/bma/text styles and colors
|
2021-06-09 15:36:51 +02:00 |
|
Benoit Marty
|
047c59eba0
|
Rework colors management
|
2021-06-09 15:36:20 +02:00 |
|
Benoit Marty
|
8b138e8ff4
|
Merge pull request #3469 from vector-im/dependabot/gradle/com.nulab-inc-zxcvbn-1.5.2
Bump zxcvbn from 1.5.0 to 1.5.2
|
2021-06-09 14:24:56 +02:00 |
|
Benoit Marty
|
d4f48da7f0
|
Merge pull request #3435 from vector-im/feature/bma/debounced_click
Debounced click
|
2021-06-08 19:12:03 +02:00 |
|
SpiritCroc
|
4d4d29f049
|
Fix picture size for non-bitmaps (i.e. GIFs) when not known a priori
Change-Id: Idcab1e3a4c99af5e51cbfc955eb5524bac3f7982
|
2021-06-08 17:52:16 +02:00 |
|
dependabot[bot]
|
b8c10312d1
|
Bump zxcvbn from 1.5.0 to 1.5.2
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.5.0 to 1.5.2.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.5.0...1.5.2)
---
updated-dependencies:
- dependency-name: com.nulab-inc:zxcvbn
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-06-08 06:12:38 +00:00 |
|
SpiritCroc
|
e293771dda
|
Hide "Make a suggestion" item
Better to make them either in #schildichat-android, or in github issues.
Change-Id: Ic3d7b8b032ee902159e2968e175305e8454f54db
|
2021-06-05 15:15:46 +02:00 |
|
SpiritCroc
|
625f030f08
|
Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: I31ccb4b2ffff9b0cf444b6f7e86b88b8cb564d9d
|
2021-06-05 11:37:52 +02:00 |
|
Dannylo Xavier
|
8e65eef10d
|
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/pt_BR/
|
2021-06-05 11:37:50 +02:00 |
|
mondstern
|
0b6abfab90
|
Translated using Weblate (Basque)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/eu/
|
2021-06-05 11:37:50 +02:00 |
|
mondstern
|
b3934c6021
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/hu/
|
2021-06-05 11:37:49 +02:00 |
|
mondstern
|
1e548f4936
|
Translated using Weblate (Russian)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
|
2021-06-05 11:37:48 +02:00 |
|
SpiritCroc
|
4cfab03f8b
|
Fix wrong default "marked unread" value
This led to the suggested rooms for the current space section having an
marked as unread badge.
Change-Id: Ifcba015cfc740ceacb8ceeb5e85727aec7e55aae
|
2021-06-05 11:34:44 +02:00 |
|
SpiritCroc
|
c5709543ef
|
Fix join suggested room button style
Change-Id: I486cf6d0fed62fc245aefbfcbc49a3751072366c
|
2021-06-05 09:23:53 +02:00 |
|
Dannylo Xavier
|
320c99f550
|
Added translation using Weblate (Portuguese (Brazil))
|
2021-06-05 01:28:02 +02:00 |
|
mondstern
|
05e61c26d6
|
Added translation using Weblate (Basque)
|
2021-06-04 18:55:16 +02:00 |
|
SpiritCroc
|
0c2171e808
|
Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: Ibf80cb24427fc661cfc0b582d6e7b37335823ba0
|
2021-06-04 11:32:11 +02:00 |
|
Govindas
|
902cc77e7c
|
Translated using Weblate (Lithuanian)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/lt/
|
2021-06-04 11:31:54 +02:00 |
|
SpiritCroc
|
e76245b278
|
increment_version.sh: Exclude translation updates
Change-Id: I6a47969a242ec3dbff3e61ace1dcd51ea2a493df
|
2021-06-04 11:30:11 +02:00 |
|
SpiritCroc
|
75fb2da12d
|
Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: I21e8c0b733a364880d45936561bbd648a0033ad1
|
2021-06-03 19:57:00 +02:00 |
|
mondstern
|
ab37f70bdf
|
Translated using Weblate (Hungarian)
Currently translated at 21.5% (11 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/hu/
|
2021-06-03 19:56:41 +02:00 |
|
mondstern
|
cd094f1fb4
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nl/
|
2021-06-03 19:56:41 +02:00 |
|
mondstern
|
c2368a2f8b
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/et/
|
2021-06-03 19:56:40 +02:00 |
|
mondstern
|
3b3ca8ecd6
|
Translated using Weblate (Slovak)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sk/
|
2021-06-03 19:56:40 +02:00 |
|
SpiritCroc
|
129a34a5ae
|
Added translation using Weblate (Lithuanian)
|
2021-06-03 19:43:26 +02:00 |
|
mondstern
|
fe4e3a0fbb
|
Added translation using Weblate (Hungarian)
|
2021-06-03 19:30:57 +02:00 |
|
mondstern
|
25195d10d6
|
Added translation using Weblate (Dutch)
|
2021-06-03 19:08:02 +02:00 |
|
mondstern
|
0105d46fc1
|
Added translation using Weblate (Estonian)
|
2021-06-03 18:15:51 +02:00 |
|
mondstern
|
a507d0749e
|
Added translation using Weblate (Slovak)
|
2021-06-03 17:59:23 +02:00 |
|
SpiritCroc
|
aae5a99062
|
Update README
Change-Id: I6382d8c141c498a84327e14f6f8110bcefed9722
|
2021-06-03 17:29:27 +02:00 |
|
germe-fur
|
e086b7ebc6
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (51 of 51 strings)
Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/es/
|
2021-06-03 16:36:47 +02:00 |
|
germe-fur
|
05bb2221ce
|
Added translation using Weblate (Spanish)
|
2021-06-03 14:50:13 +02:00 |
|
Benoit Marty
|
8ec22de0b8
|
Merge pull request #3432 from vector-im/dependabot/gradle/com.github.yalantis-ucrop-2.2.7
Bump ucrop from 2.2.6 to 2.2.7
|
2021-06-03 10:13:28 +02:00 |
|
SpiritCroc
|
aaeea9eb54
|
Some strings maintenance
Change-Id: I91864d607d44a44e7f363b9fc3bfd548f49018c3
|
2021-06-03 10:07:11 +02:00 |
|
SpiritCroc
|
dd8ebfbb36
|
Automatic SchildiChat string correction
Change-Id: I426f64988a0d92d9e50d222414a0b54ef7230635
|
2021-06-02 17:49:39 +02:00 |
|
SpiritCroc
|
c01142b813
|
Automatic upstream merge postprocessing
Change-Id: I1c0d40ef25bef54205bb21ef0a9f03a12b427b83
|
2021-06-02 17:49:37 +02:00 |
|
SpiritCroc
|
c00600666e
|
Merge tag 'v1.1.9' into sc
Change-Id: I75baba645677d13f9937643a29630070f1470f9c
Conflicts:
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/session/sync/RoomSyncHandler.kt
vector/build.gradle
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
|
2021-06-02 17:49:34 +02:00 |
|
SpiritCroc
|
8b6e8ad3c5
|
[TMP] Automatic upstream merge preparation
Change-Id: I12f25c8c45e1f120f1e05041fd281f02a3f6392d
|
2021-06-02 17:04:48 +02:00 |
|
SpiritCroc
|
79e869b937
|
Automatic revert to unchanged upstream strings, pt.1
Change-Id: I489bb26bdf4e5ac6a96388e45de3b080eda63c03
|
2021-06-02 17:04:48 +02:00 |
|
SpiritCroc
|
bddc574766
|
Increment version
Change-Id: I03d7c37b12b0f5e6af2a44dedf76c3aff154d716
|
2021-06-02 16:51:11 +02:00 |
|
Benoit Marty
|
26d54eeb8b
|
Explicitly add dep to androidx.transition.transition, before it was a transitive dep from ucrop library.
|
2021-06-02 12:03:46 +02:00 |
|
Benoit Marty
|
83a4f99830
|
Fix compilation warning
|
2021-06-02 11:58:11 +02:00 |
|
Benoit Marty
|
77ffdabd60
|
Version++
|
2021-06-02 11:48:08 +02:00 |
|
Benoit Marty
|
7f96749d63
|
Merge branch 'release/1.1.9' into main
|
2021-06-02 11:47:13 +02:00 |
|
Benoit Marty
|
421ecea259
|
Merge branch 'release/1.1.9' into develop
|
2021-06-02 11:47:12 +02:00 |
|