Commit Graph

7770 Commits

Author SHA1 Message Date
SpiritCroc 7eb3b7e9cd [TMP] Automatic upstream merge preparation
Change-Id: I813dbf150890acbef690dca516b2e8369aa860da
2021-02-20 15:03:24 +01:00
SpiritCroc 7a34fad74e Automatic revert to unchanged upstream strings, pt.1
Change-Id: I12355718b67e0780eaa976b4e8f38301bb7e3753
2021-02-20 15:03:23 +01:00
SpiritCroc fe54d621fd Update correct_strings.sh
Change-Id: Ie3e4a57b2dc13a09211b67fa972e1252cabbba22
2021-02-19 15:02:14 +01:00
SpiritCroc 4418821058 Increment version
Change-Id: I0a0b686aa4cdbaa636bf06286c8a108ac8d8079b
2021-02-19 14:39:57 +01:00
Benoit Marty 87dc80d2e6 Fix crash reported by PlayStore (#2707)
Change-Id: I37a945d56035a398f8f2a05f2a3525b40258402d
2021-02-18 18:53:26 +01:00
Benoit Marty c71d5b6aef Fix other potential crashes
Change-Id: I6903cc343083837d1f28c95863dd448c0f37f4ed
2021-02-18 18:41:22 +01:00
SpiritCroc 21456c90c5 Hide sending icon also for sent (not only synced) messages
This is what the text coloring does as well.

Change-Id: I92493d36056ac95db20de8591dfebc829e00c31f
2021-02-18 18:27:13 +01:00
SpiritCroc 8da6ec31d8 Automatic SchildiChat string correction
Change-Id: I3aa2777fdb6664f4664bbc97f810296b661ea89f
2021-02-10 11:25:34 +01:00
SpiritCroc 02371a9604 Automatic upstream merge postprocessing
Change-Id: I0a6c3834776a655427847e52bbe6b71928d3c2dc
2021-02-10 11:25:32 +01:00
SpiritCroc debc26efab Update correct_strings.sh
Change-Id: I78d30807196d3b346d0d36249c882e35228d43c0
2021-02-10 11:25:11 +01:00
SpiritCroc 8a44b20a2e Where did these strings go?
Change-Id: I25025637960a0601b01f5d93d3e328599a043301
2021-02-10 11:05:32 +01:00
SpiritCroc 04f4e13230 Merge tag 'v1.0.17' into sc
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt

Note:
Upstream added their own "pass theme to widgets" implementation, which
currently does not respect "black" themes (but treats them as "dark"
themes).
For now, let's integrate our own implementation into the new one.

Change-Id: If99f2f87e20215595fc36996bb530bf5f247b0cb
2021-02-10 11:05:22 +01:00
SpiritCroc b0a6e4cd28 [TMP] Automatic upstream merge preparation
Change-Id: I978bc20a50c282cba36660444d754cd4a4a3f1fa
2021-02-10 10:07:21 +01:00
SpiritCroc 3a8995b7d5 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Id236c8f5505c46ecb91ff3b82a3464ce0c03315e
2021-02-10 10:07:21 +01:00
Benoit Marty fa710ff601 Merge branch 'release/1.0.17' 2021-02-09 21:07:35 +01:00
Benoit Marty a8086ceb43 Prepare release 1.0.17 2021-02-09 21:07:25 +01:00
SpiritCroc bae5921de7 Unify dm and group categories in unread notifications tab
Note: this does not automatically update when the user toggles the
unified list on/off, but unread notifications tab is a lab feature
either way, and the user impact is probably negligible.

Change-Id: I4dcdb0a6800493a7b5a5053ae4f4e8f7fa89f7fb
2021-02-09 18:04:44 +01:00
SpiritCroc 2c22f1e926 Treat manually unread chats as notifications in bottom tabs
Change-Id: I34cea91674843d8d60285295b449d2722cb061e9
2021-02-09 17:48:00 +01:00
SpiritCroc f99398c3cb Neutral colors for empty overview placeholders
These are displayed both on light and dark themes, and tinting might not
work on older Androids

Change-Id: I5cc8a1259dee5d942f9ac537efccf4628b1d408d
2021-02-09 17:29:54 +01:00
SpiritCroc 6624bd4bad Support notification tab with unified overview
Closes https://github.com/SchildiChat/SchildiChat-android/issues/27.

Change-Id: I828f522264aa8a3cae2becfe52805320235002dd
2021-02-09 17:20:12 +01:00
Benoit Marty 39332e153e
Merge pull request #2790 from vector-im/feature/bma/jitsi_in_timeline
Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference)
2021-02-09 10:58:22 +01:00
Benoit Marty fade21de57
Merge branch 'develop' into feature/bma/jitsi_in_timeline 2021-02-08 17:43:49 +01:00
Benoit Marty 4d3262ce41 Ganfra's review 2021-02-08 17:43:11 +01:00
Benoit Marty eecb789603
Merge pull request #2765 from vector-im/feature/bma/big_e2e_rooms
[DANGEROUS PR] Properly delete all objects from Realm, avoid orphaned
2021-02-08 15:44:43 +01:00
Benoit Marty 28fad01be7
Merge pull request #2793 from vector-im/feature/bma/url_preview_fixes
Url preview fixes
2021-02-08 14:33:05 +01:00
Benoit Marty d2c912e5c4
Merge branch 'develop' into feature/bma/url_preview_fixes 2021-02-08 14:32:55 +01:00
Benoit Marty 55f410636f
Merge pull request #2797 from vector-im/feature/bma/app_name
Change app name from "Element (Riot.im)" to "Element"
2021-02-08 14:26:25 +01:00
Benoit Marty f2619df13d Import and cleanup 2021-02-08 14:25:33 +01:00
Benoit Marty 1212bb8d70 Change app name from "Element (Riot.im)" to "Element" 2021-02-08 12:39:35 +01:00
Benoit Marty 30be440774 Sugar: defined extensions fo deleteOnCascade() methods, as they have to be called in a transaction 2021-02-08 12:37:38 +01:00
Benoit Marty 93890343b6
Merge pull request #2786 from vector-im/feature/bma/rtl
Feature/bma/rtl
2021-02-08 11:52:06 +01:00
Benoit Marty 8363eba32e Better test of a reply 2021-02-08 10:12:01 +01:00
Benoit Marty b0e5d5d3e5 Copyright 2021-02-07 20:21:31 +01:00
Benoit Marty af30ff50f0 Naming convention 2021-02-07 15:28:07 +01:00
Benoit Marty 07220d7a59 URL preview on reply fallback (#2756) 2021-02-07 15:28:07 +01:00
Benoit Marty ed99b503f5 Open image from URL Preview (#2705) 2021-02-07 15:00:07 +01:00
Benoit Marty f6ad67f1c8 Use the navigator facility 2021-02-07 14:29:27 +01:00
Benoit Marty 6ee6b0cad9 Ensure no invisible displayName will be used 2021-02-07 12:00:33 +01:00
Benoit Marty d47ba6bd11 Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference) 2021-02-06 16:52:46 +01:00
Benoit Marty 7984d021f6
Merge pull request #2788 from vector-im/gradlew-update-6.8.2
Update Gradle Wrapper from 6.8.1 to 6.8.2
2021-02-06 11:19:54 +01:00
Benoit Marty 57cb45d31e
Merge pull request #2781 from vector-im/feature/bma/widget_url_robustness
Fix a bunch of bugs and feature parity for Widget
2021-02-06 11:19:31 +01:00
Benoit Marty d903dfb40b
Merge branch 'develop' into feature/bma/widget_url_robustness 2021-02-06 11:19:15 +01:00
Benoit Marty 99f5949ee1 Improve layout preview and format file 2021-02-06 11:11:35 +01:00
Benoit Marty 4a2557dbcd Apparently EW still provide `confId` in the URL, I can't figure out where in the react SDK, but do the same, maybe not to break EI 2021-02-06 11:03:55 +01:00
gradle-update-robot 426729b34c Update Gradle Wrapper from 6.8.1 to 6.8.2.
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2021-02-06 00:46:22 +00:00
Benoit Marty 41e4e823fb HTML unescaping for URL preview (#2766) 2021-02-05 20:40:57 +01:00
Benoit Marty 5e2e6dcfc3 Fix another RTL issue 2021-02-05 20:01:24 +01:00
Benoit Marty 407134a89f RTL: some arrows should be rotated in RTL (#2757) 2021-02-05 19:56:39 +01:00
Benoit Marty 60f221dc37
Merge pull request #2777 from vector-im/feature/bca/fix_duplicate_thumbs
Fix duplicate thumbs reactions
2021-02-05 18:49:03 +01:00
Benoit Marty 627d3b5b79
Merge branch 'develop' into feature/bca/fix_duplicate_thumbs 2021-02-05 18:48:56 +01:00