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

7611 Commits

Author SHA1 Message Date
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
SpiritCroc ed2ed5bef4 Fix some accent colors 
- Buttons in debug options (debug build only)
- Play button for video previews

Change-Id: I3de5a41ae93d0293e3322dae03a7da4593baee95
 2021-02-05 12:40:32 +01:00
SpiritCroc 29a308b7c2 Automatic SchildiChat string correction 
Change-Id: I9e021a889a4b9a17960897773df7371d3b6a9dc4
 2021-02-04 17:10:26 +01:00
SpiritCroc 8e32c041db Automatic upstream merge postprocessing 
Change-Id: Id3446b2b984430aa7f1fd6cba36410ee80a21c4c
 2021-02-04 17:10:24 +01:00
SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc 
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
 2021-02-04 17:10:15 +01:00
SpiritCroc ad4ba631b9 [TMP] Automatic upstream merge preparation 
Change-Id: I2ae1f63d762d0366be303ba08778a35673f5a3d3
 2021-02-04 17:00:40 +01:00
SpiritCroc ad36a7ca8c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I736ff2eb773f682790e80897bff5e41c84ec7559
 2021-02-04 17:00:39 +01:00
Benoit Marty 391ddf1925 Merge branch 'release/1.0.16' 2021-02-04 13:25:23 +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
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
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
Valere 697b551b9b Cleaning / Code review 2021-02-02 23:10:14 +01:00
Valere 0211197c47 SSO UIA for add 3pid + refactoring move RegistrationFlow to api 2021-02-02 22:25:49 +01:00
Benoit Marty 6ac2717d8b
Merge pull request #2760 from vector-im/feature/fga/fix_multiple_task 
Fix multiple tasks
 2021-02-02 17:55:19 +01:00
ganfra 49aed39711 Fix multiple tasks 2021-02-02 17:11:45 +01:00
Benoit Marty a820443c56 Fix copyright 2021-02-02 13:05:39 +01:00
Benoit Marty 67aa239398
Merge pull request #2755 from vector-im/feature/bma/big_e2e_rooms_2 
Data for Worker overload (#2721)
 2021-02-02 13:04:33 +01:00
Valere 2a3962265b SSO UIA for deactivate account 2021-02-02 12:30:46 +01:00
Benoit Marty e6fc605b08 Data for Worker overload (#2721) 2021-02-02 11:40:52 +01:00
Valere 8129cd0cd3 Cleaning + changelog 2021-02-02 09:32:04 +01:00
Valere 0bc203e0d5 Setup cross signing after initial sync if not yet done 
Use grace period if available, if not fail silently
 2021-02-02 09:02:10 +01:00
Valere 6c9b16088f Secure secrets passed to intent 2021-02-02 08:59:28 +01:00
Valere 76b425ee8a Cleaning 2021-02-01 16:39:14 +01:00
Valere 5b8215a356 Support SSO provider brand + UI fixes 2021-02-01 16:39:14 +01:00
Valere 9c7df25862 Relax rule for e2e by default 2021-02-01 16:39:14 +01:00
Valere da16ec0af3 UIA fixes + better error support 2021-02-01 16:39:14 +01:00
Valere 1244d00b31 SSO UIA 2021-02-01 16:39:14 +01:00
Onuray Sahin 98054815a4
Merge pull request #2749 from vector-im/feature/ons/fix_replace_matrix_widget_id 
Support $matrix_widget_id parameter.
 2021-02-01 18:38:52 +03:00
Onuray Sahin 06be3e691d Support $matrix_widget_id parameter. 2021-02-01 18:13:26 +03:00
Benoit Marty c794843bb2 Inject the context in the constructor 2021-01-26 17:16:55 +01:00
Benoit Marty afa3149504 Use lifecycleScope rather than an Empty ViewModel 2021-01-25 23:09:14 +01:00
Benoit Marty f2f4d325eb Bugfix: remove duplicate "More" section 2021-01-25 20:57:38 +01:00
Benoit Marty fef0404ac7
Merge pull request #2706 from vector-im/feature/ons/fix_url_preview_on_edit 
Update url preview when the event is edited.
 2021-01-25 18:06:04 +01:00
Benoit Marty d6a5b9fb48 fulfill assertion about eventId 2021-01-25 16:42:53 +01:00
Benoit Marty 57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit 2021-01-25 16:05:26 +01:00
Benoit Marty f64db7f5f3 Fix test compilation 2021-01-25 16:03:31 +01:00