filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,352 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

7352 Commits

Author SHA1 Message Date
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 391ddf1925 Merge branch 'release/1.0.16' 2021-02-04 13:25:23 +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 ce6d4c4a64 Merge branch 'release/1.0.15' 2021-02-03 17:08:27 +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
Slobodan Simić db6fdcd098 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sr/
 2021-02-03 08:53:28 +00:00
Slobodan Simić 7e3362da61 Translated using Weblate (Serbian) 
Currently translated at 5.9% (122 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
 2021-02-03 08:53:27 +00:00
waclaw66 d9720a5199 Translated using Weblate (Czech) 
Currently translated at 100.0% (2057 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-02-03 08:53:27 +00:00
Auri B. P 3a65037151 Translated using Weblate (Catalan) 
Currently translated at 90.1% (1854 of 2057 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2021-02-03 08:53:26 +00:00
Benoit Marty 424035f56f Better clearing of RealmLists 2021-02-03 09:46:35 +01:00
Valere 2a12cf22f5 fix code quality, line too long 2021-02-03 09:39:26 +01:00
Valere 97daf57b0a cleaning 2021-02-03 09:32:51 +01:00