Commit graph

7300 commits

Author SHA1 Message Date
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
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
Benoit Marty
ad187f99bf
Merge pull request #2779 from vector-im/feature/bca/fix_join_by_alias_deferation
Join room other federation via alias error
2021-02-05 18:48:23 +01:00
Benoit Marty
2fdd3a78eb Clean 2021-02-05 18:47:01 +01:00
Benoit Marty
d949e0cced Do not finish the Activity if there is an error, Jitsi is probably displaying a popup to the user (#2729) 2021-02-05 18:40:11 +01:00
Benoit Marty
e27c5c4507 Robustness 2021-02-05 13:56:11 +01:00
Benoit Marty
bfd974f698 URL Decode 2021-02-05 13:53:58 +01:00
Benoit Marty
dbe14ce0bb ElementWeb does not pass confId as a URL parameter anymore (and so does Element Android) 2021-02-05 13:50:13 +01:00
Benoit Marty
6ecd63bf5d Fix a new bug 2021-02-05 13:25:58 +01:00
Benoit Marty
94ea7d322d Add some logs 2021-02-05 13:04:58 +01:00
Benoit Marty
cf9d99ee8b forward the theme to all widgets 2021-02-05 12:32:09 +01:00
Benoit Marty
afd2ecd384 Remove duplicated method 2021-02-05 12:10:25 +01:00
Benoit Marty
6d53d0e12f Give theme to the integration manager as per Element Web
https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/ScalarAuthClient.js#L277
2021-02-05 12:08:24 +01:00
Benoit Marty
557a5c715a Widget URL: properly encode parameters 2021-02-05 11:47:35 +01:00
Benoit Marty
b068dc39eb Update doc 2021-02-05 11:36:12 +01:00
Benoit Marty
47f1ec78d4 Follow what's in https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/utils/WidgetUtils.ts#L469 2021-02-05 11:35:55 +01:00
Benoit Marty
5b3065730e Widget: avoid empty user display name 2021-02-05 09:36:29 +01:00
Benoit Marty
0f55291089
Merge pull request #2780 from vector-im/feature/weblate_fixes
Feature/weblate fixes
2021-02-04 21:46:14 +01:00
Benoit Marty
dd0be54b05 Fix lint issue and typo 2021-02-04 20:19:02 +01:00
Benoit Marty
8d6136cde1 Do not let Weblate handle technical strings 2021-02-04 18:39:12 +01:00
Benoit Marty
0c613e36f1 Fix lint issue 2021-02-04 18:10:57 +01:00
Valere
6d5f89b65b Fixes #2778 2021-02-04 18:06:35 +01:00
Benoit Marty
34fd5e7191 Upgrade build tools 2021-02-04 18:02:47 +01:00
Benoit Marty
c4a89a5da1
Merge pull request #2769 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-02-04 17:55:18 +01:00
Valere
64694a4eda Fix duplicate thumbs reactions 2021-02-04 16:13:57 +01:00
Benoit Marty
d11ed8c4ef Version++ 2021-02-04 15:17:46 +01:00
Benoit Marty
205feeaf10 Merge branch 'release/1.0.16' into develop 2021-02-04 13:25:22 +01:00
Benoit Marty
e51f2b8bc1 Prepare release 1.0.16 2021-02-04 13:25:12 +01:00
Benoit Marty
2d5f57591f
Merge pull request #2775 from vector-im/feature/bma/fix_crash_1015
Fix crash on API < 30 and light theme (#2774)
2021-02-04 13:18:45 +01:00
Benoit Marty
3c06517d9e Fix crash on API < 30 and light theme (#2774) 2021-02-04 12:32:13 +01:00
Weblate
63fb5809bf Merge branch 'origin/develop' into Weblate. 2021-02-03 16:36:51 +00:00
Benoit Marty
a65f846929 Version++ 2021-02-03 17:09:32 +01:00
Benoit Marty
4ee6273f2e Merge branch 'release/1.0.15' into develop 2021-02-03 17:08:26 +01:00
Benoit Marty
061f3c6919 Prepare release 1.0.15 2021-02-03 17:07:49 +01:00
Benoit Marty
9b13381938
Merge pull request #2762 from vector-im/feature/bma/track
Improvements
2021-02-03 17:02:25 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth
Feature/bca/sso reauth
2021-02-03 16:12:54 +01:00
Valere
73fccdd6de fix test compilation 2021-02-03 15:38:16 +01:00
Benoit Marty
ad9873c565 Some cleanup 2021-02-03 14:52:58 +01:00
Valere
e976100f1a Fix test compilation error 2021-02-03 14:48:43 +01:00
Valere
289a3ab21f remove dev id for now 2021-02-03 14:36:38 +01:00
Valere
286f00396d Removed unused var 2021-02-03 14:20:58 +01:00
Weblate
cbda0ad37b Merge branch 'origin/develop' into Weblate. 2021-02-03 08:53:37 +00:00