SpiritCroc
99b943c737
Automatic SchildiChat string correction
...
Change-Id: I6647eaab5a272cc6450f55df83f1278a632af28b
2020-12-22 12:28:32 +01:00
SpiritCroc
743b72d254
Update correct_strings.sh
...
Change-Id: I055245121f6abb43802aadf375849c0a5f38cc5d
2020-12-22 12:28:12 +01:00
SpiritCroc
4a726db856
Revert "Automatic SchildiChat string correction"
...
This reverts commit 40e3f9f097
2020-12-22 12:18:00 +01:00
SpiritCroc
d3700cecc3
Properly reserve space in URL-previews for time footer
...
Change-Id: Iee60d34086a8b1e2b9b70674eb77df2220dff1e5
2020-12-22 11:27:15 +01:00
SpiritCroc
c01d4cdc9c
Fix tertiary color with sc dark themes
...
Change-Id: I643110fd429f62381f84905bcb1cd8384c935f8f
2020-12-22 10:06:54 +01:00
SpiritCroc
40e3f9f097
Automatic SchildiChat string correction
...
Change-Id: I5a0039645e21bf4132f1d707d7a7774500450bec
2020-12-22 09:25:30 +01:00
SpiritCroc
c775fa73ea
Automatic upstream merge postprocessing
...
Change-Id: I3093ec9e4f74fe91ef1894b130b3cd188e5670d5
2020-12-22 09:24:46 +01:00
SpiritCroc
8da4044de6
Merge tag 'v1.0.13' into sc
...
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
SpiritCroc
d0936d2b25
[TMP] Automatic upstream merge preparation
...
Change-Id: Ic52efb1677b303fc001ee2c63a912d2a3db63c45
2020-12-22 09:18:49 +01:00
SpiritCroc
c30a9b8a57
Move restore_{sc,upstream} to merge_helpers.sh
...
Easier to use manually
Change-Id: Ieb87301e2b0b5d7e1299d3d0c8d49992d4cdde63
2020-12-22 09:15:42 +01:00
SpiritCroc
15f3974b89
Revert "Automatic SchildiChat string correction"
...
This reverts commit 77bfa1a687
2020-12-22 09:14:00 +01:00
SpiritCroc
fa5acb49ca
Align reactions better with message bubbles
...
Change-Id: I128a23009b1636ce10619e17fccc507fc39028d4
2020-12-21 18:29:48 +01:00
SpiritCroc
794325f74e
Unify compose area icon colors
...
Change-Id: I55b197eb15296f0b47565e50e2c2f90178799453
2020-12-21 18:03:56 +01:00
SpiritCroc
a5d96b729e
Make composer layout smaller (as before 1.0.12 merge)
...
Change-Id: I39de8014a113b9673e3899669e72adf0e6cbcb7a
2020-12-21 16:43:54 +01:00
SpiritCroc
4b279f78a3
Replace insert-emoji icon
...
Change-Id: I78a80dee129c0f86573e45505a7dde52b3584b3f
2020-12-21 16:23:49 +01:00
SpiritCroc
04aadb6e5b
SC ic_send does not need background drawable
...
Change-Id: Id4ed497bc7f6deaca9e700269cb1fafc50b92b7b
2020-12-21 16:21:51 +01:00
SpiritCroc
6307bc9909
Notification test: no in-app bug reports for Schildi yet
...
Change-Id: I803e4fbe3c71da87e0d91df767f77c302cc11e37
2020-12-21 16:21:24 +01:00
SpiritCroc
4cb69860fc
Schildify test notification
...
Change-Id: Iaa31d1c00b2cfbd88e259423feeb8549ad5f9ddf
2020-12-21 16:21:20 +01:00
SpiritCroc
68aab3b6d3
alternative_package.sh: Patch store description for test releases
...
Change-Id: Ic81a5753f384c4caa6e4fff21116631c21552f65
2020-12-20 13:11:16 +01:00
SpiritCroc
f689576fbf
Allow to enable URL preview in encrypted rooms
...
Change-Id: Iac2fff47cc86bd77203c44ce0f39ff131c60a16c
2020-12-20 09:33:08 +01:00
SpiritCroc
11ef70d495
increment_version: improve automatic changelog
...
Change-Id: I532751e7650145f8c2aaef42b1a1dbe9468dd013
2020-12-20 09:25:13 +01:00
SpiritCroc
997fcf8fff
Enable URL-previews for m.notice
...
Desktop has those too.
Change-Id: I14fd4b3afff17b23e34ea78a4cd7948b85816a2f
2020-12-19 20:17:25 +01:00
SpiritCroc
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
SpiritCroc
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
Benoit Marty
0412b87ad1
Merge branch 'release/1.0.13'
2020-12-18 10:59:54 +01:00
Benoit Marty
d53650c8ae
Prepare release 1.0.13
2020-12-18 10:59:43 +01:00
Benoit Marty
930b8da3b3
Typo in comment
2020-12-18 09:53:59 +01:00
Benoit Marty
c48f153b0d
Merge pull request #2550 from vector-im/feature/bma/unstable_prefix
...
MSC2858 unstable prefix
2020-12-17 19:09:12 +01:00
Benoit Marty
68cd06f1fb
Improve redirect url, which can be visible to the user: "element://element" -> "element://connect"
2020-12-17 12:11:30 +01:00
Benoit Marty
c7afcf4ff2
Fix compilation issue
2020-12-17 12:10:55 +01:00
Travis Ralston
3491774e7b
Add changelog
2020-12-17 12:09:53 +01:00
Travis Ralston
ea6fde3ed0
Make MSC2858 implementation match the unstable policy of the spec
...
See https://github.com/matrix-org/matrix-doc/pull/2858/files#r543567196
2020-12-17 12:09:34 +01:00
SpiritCroc
77bfa1a687
Automatic SchildiChat string correction
...
Change-Id: Ib449487f435c24214e5856311683d857844d3047
2020-12-15 16:18:37 +01:00
SpiritCroc
a51b44a40d
merge_helpers: allow adding extra args to revert_last
...
Change-Id: I5ef98b8130fe373d5a9f3d469140117c4570906e
2020-12-15 16:05:43 +01:00
SpiritCroc
b0d09313e7
Automatic upstream merge postprocessing
...
Change-Id: I9fbeeeaaf8ad10e2d7dfd585c6f73cd07e361dd0
2020-12-15 15:55:57 +01:00
SpiritCroc
a35e246c4d
Automatic color correction
...
Change-Id: I83f5aed8537cf48dc2f9317b1481b84d63625e64
2020-12-15 15:55:57 +01:00
SpiritCroc
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
SpiritCroc
299902feed
[TMP] Automatic upstream merge preparation
...
Change-Id: I5ffadd9f7366002c522bb2ed126f9eb9878ca197
2020-12-15 15:00:31 +01:00
SpiritCroc
310b7a262c
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I77578d6304946bb60a67134b1b2e034c919d0e73
2020-12-15 15:00:31 +01:00
Benoit Marty
6cdb192955
Version++
2020-12-15 14:18:35 +01:00
Benoit Marty
1946058c8e
Merge branch 'release/1.0.12'
2020-12-15 14:16:17 +01:00
Benoit Marty
2927f1ff1c
Merge branch 'release/1.0.12' into develop
2020-12-15 14:16:15 +01:00
Benoit Marty
e230cd8ee3
Prepare release 1.0.12
2020-12-15 14:16:08 +01:00
Benoit Marty
45225e883e
Merge pull request #2539 from vector-im/feature/bma/cleanup
...
Small cleanup before the release
2020-12-15 14:11:31 +01:00
Benoit Marty
bb9a08d429
/confetti /snow commands: send emote if text is blank (iso Element Web)
2020-12-15 12:19:31 +01:00
Benoit Marty
6ddcd046d4
Import SAS strings
2020-12-15 12:19:31 +01:00
Benoit Marty
88a4dfd094
Ensure the message is understood as a debug indication ( #2509 )
2020-12-15 12:19:31 +01:00
Benoit Marty
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
Benoit Marty
b4b302c1f2
Merge pull request #2535 from vector-im/feature/bca/confetti
...
Chat Effects XMAS PR ❄️ 🎉
2020-12-15 11:41:29 +01:00
Benoit Marty
487ef870f9
Add /snow command
2020-12-15 10:56:05 +01:00
