d0936d2b25
[TMP] Automatic upstream merge preparation
...
Change-Id: Ic52efb1677b303fc001ee2c63a912d2a3db63c45
2020-12-22 09:18:49 +01:00
c30a9b8a57
Move restore_{sc,upstream} to merge_helpers.sh
...
Easier to use manually
Change-Id: Ieb87301e2b0b5d7e1299d3d0c8d49992d4cdde63
2020-12-22 09:15:42 +01:00
15f3974b89
Revert "Automatic SchildiChat string correction"
...
This reverts commit 77bfa1a687
2020-12-22 09:14:00 +01:00
fa5acb49ca
Align reactions better with message bubbles
...
Change-Id: I128a23009b1636ce10619e17fccc507fc39028d4
2020-12-21 18:29:48 +01:00
794325f74e
Unify compose area icon colors
...
Change-Id: I55b197eb15296f0b47565e50e2c2f90178799453
2020-12-21 18:03:56 +01:00
a5d96b729e
Make composer layout smaller (as before 1.0.12 merge)
...
Change-Id: I39de8014a113b9673e3899669e72adf0e6cbcb7a
2020-12-21 16:43:54 +01:00
4b279f78a3
Replace insert-emoji icon
...
Change-Id: I78a80dee129c0f86573e45505a7dde52b3584b3f
2020-12-21 16:23:49 +01:00
04aadb6e5b
SC ic_send does not need background drawable
...
Change-Id: Id4ed497bc7f6deaca9e700269cb1fafc50b92b7b
2020-12-21 16:21:51 +01:00
6307bc9909
Notification test: no in-app bug reports for Schildi yet
...
Change-Id: I803e4fbe3c71da87e0d91df767f77c302cc11e37
2020-12-21 16:21:24 +01:00
4cb69860fc
Schildify test notification
...
Change-Id: Iaa31d1c00b2cfbd88e259423feeb8549ad5f9ddf
2020-12-21 16:21:20 +01:00
68aab3b6d3
alternative_package.sh: Patch store description for test releases
...
Change-Id: Ic81a5753f384c4caa6e4fff21116631c21552f65
2020-12-20 13:11:16 +01:00
f689576fbf
Allow to enable URL preview in encrypted rooms
...
Change-Id: Iac2fff47cc86bd77203c44ce0f39ff131c60a16c
2020-12-20 09:33:08 +01:00
11ef70d495
increment_version: improve automatic changelog
...
Change-Id: I532751e7650145f8c2aaef42b1a1dbe9468dd013
2020-12-20 09:25:13 +01:00
997fcf8fff
Enable URL-previews for m.notice
...
Desktop has those too.
Change-Id: I14fd4b3afff17b23e34ea78a4cd7948b85816a2f
2020-12-19 20:17:25 +01:00
5f30336542
Properly hide preview URLs for notices
...
Notices don't have imageContentRenderer and previewUrlRetriever set.
Accordingly, when recycling messages that previously had an URL preview,
we do not want to keep that preview, but actually hide it, instead of
returning early.
Change-Id: I245d4bf5006ffc756fa35196351decb9cdabfb8a
2020-12-19 19:56:47 +01:00
002edb5e36
[WIP] PreviewUrl-fixes for bubble layout
...
- Always use maximum available width for the preview
- TODO reserve footer for time
- TODO fix upstream bug which comes more apparent on Schildi:
fast scrolling leads to previews attached to wrong messages
Change-Id: Ie8447b7a9dbace54e38c14fc7d281b7f3887736c
2020-12-19 11:37:15 +01:00
77bfa1a687
Automatic SchildiChat string correction
...
Change-Id: Ib449487f435c24214e5856311683d857844d3047
2020-12-15 16:18:37 +01:00
a51b44a40d
merge_helpers: allow adding extra args to revert_last
...
Change-Id: I5ef98b8130fe373d5a9f3d469140117c4570906e
2020-12-15 16:05:43 +01:00
b0d09313e7
Automatic upstream merge postprocessing
...
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
2020-12-15 15:55:57 +01:00
a35e246c4d
Automatic color correction
...
Change-Id: I83f5aed8537cf48dc2f9317b1481b84d63625e64
2020-12-15 15:55:57 +01:00
38b82fb823
Merge tag 'v1.0.12' into sc
...
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.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/timeline/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/drawable/ic_attachment.xml
vector/src/main/res/layout/item_bottom_sheet_action.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values-v23/theme_status.xml
vector/src/main/res/values/array.xml
vector/src/main/res/values/theme_status.xml
Note to self: need to check if URL preview works with wrap_content
Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
2020-12-15 15:55:14 +01:00
299902feed
[TMP] Automatic upstream merge preparation
...
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
2020-12-15 15:00:31 +01:00
310b7a262c
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I77578d6304946bb60a67134b1b2e034c919d0e73
2020-12-15 15:00:31 +01:00
1946058c8e
Merge branch 'release/1.0.12'
2020-12-15 14:16:17 +01:00
e230cd8ee3
Prepare release 1.0.12
2020-12-15 14:16:08 +01:00
45225e883e
Merge pull request #2539 from vector-im/feature/bma/cleanup
...
Small cleanup before the release
2020-12-15 14:11:31 +01:00
bb9a08d429
/confetti /snow commands: send emote if text is blank (iso Element Web)
2020-12-15 12:19:31 +01:00
6ddcd046d4
Import SAS strings
2020-12-15 12:19:31 +01:00
88a4dfd094
Ensure the message is understood as a debug indication ( #2509 )
2020-12-15 12:19:31 +01:00
7828e3f501
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_events
...
Fix UTD when hiding member state events.
2020-12-15 12:16:27 +01:00
b4b302c1f2
Merge pull request #2535 from vector-im/feature/bca/confetti
...
Chat Effects XMAS PR ❄️ 🎉
2020-12-15 11:41:29 +01:00
487ef870f9
Add /snow command
2020-12-15 10:56:05 +01:00
6957768567
PR Review
2020-12-15 10:21:12 +01:00
7da8b13cde
Chat Effects
2020-12-15 09:39:16 +01:00
a027ef29e5
Merge pull request #2484 from vector-im/feature/bca/social_login
...
Social Login
2020-12-14 18:19:23 +01:00
211c158e23
Remove bad translation
2020-12-14 17:42:52 +01:00
338650cea7
Merge pull request #2537 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2020-12-14 17:37:51 +01:00
2d4eeb64c5
Translated using Weblate (French)
...
Currently translated at 98.2% (1982 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-12-14 16:37:12 +00:00
4f98031c6d
Merge pull request #2536 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2020-12-14 17:27:10 +01:00
3813f6d659
Merge branch 'origin/develop' into Weblate.
2020-12-14 15:45:20 +00:00
6687a74f5c
Translated using Weblate (Albanian)
...
Currently translated at 98.0% (206 of 210 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
2020-12-14 15:35:36 +00:00
545e13c843
Translated using Weblate (Ukrainian)
...
Currently translated at 48.0% (955 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2020-12-14 15:35:35 +00:00
995ec25990
Translated using Weblate (Albanian)
...
Currently translated at 99.4% (1975 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
2020-12-14 15:35:35 +00:00
09040b7095
Clear history ( #1933 )
2020-12-14 16:22:22 +01:00
5a69b33600
Move style for social login to a dedicated file
2020-12-14 15:53:16 +01:00
c8c4e10822
Cleanup layout
2020-12-14 15:46:31 +01:00
2f616cb6c5
Add some constants
2020-12-14 15:41:33 +01:00
776d7699bc
Do not modify the DB in debug mode, and add to history only if valid
2020-12-14 15:33:32 +01:00
f3578e2538
Cleanup
2020-12-14 15:17:07 +01:00
8022430f0d
Remove useless override
2020-12-14 15:14:46 +01:00
SpiritCroc
Benoit Marty
Benoit Marty
Valere
Benoit Marty
Weblate
Besnik Bleta
Ihor Hordiichuk