mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 18:36:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
8037 commits 6 branches 120 tags 229 MiB
Commit graph

8037 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
1e1a974678 Automatic upstream merge postprocessing 
Change-Id: Ia57cedc2fce20341f97c4612adf9e46df93f7cf3
 2021-02-20 15:41:40 +01:00
SpiritCroc
c77e34361a Automatic color correction 
Change-Id: Iafca6ed0e7774dfc3d0f5cf104aa0a9cd8e4c896
 2021-02-20 15:41:40 +01:00
SpiritCroc
ca0b360875 Merge tag 'v1.1.0' into sc 
Change-Id: I73be281134a8a7ea7fdeffa9356ffae0dda8b0d6

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
	vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
	vector/src/main/res/drawable/oval_positive.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
 2021-02-20 15:41:01 +01:00
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
Benoit Marty
bb33a92d27 Merge branch 'release/1.1.0' 2021-02-19 19:30:56 +01:00
Benoit Marty
809c0e720e Prepare release 1.1.0 2021-02-19 19:30:38 +01:00
Benoit Marty
371251c994
Merge pull request #2849 from vector-im/feature/bma/fileLogger 
Cleanup VectorFileLogger.kt
 2021-02-19 19:24:24 +01:00
Benoit Marty
616b02cea8 Cleanup VectorFileLogger.kt 2021-02-19 18:17:53 +01:00
SpiritCroc
fe54d621fd Update correct_strings.sh 
Change-Id: Ie3e4a57b2dc13a09211b67fa972e1252cabbba22
 2021-02-19 15:02:14 +01:00
Benoit Marty
e12cbf92c3
Merge pull request #2836 from vector-im/feature/bma/fix_redirection 
Fix redirection
 2021-02-19 14:43:14 +01:00
Benoit Marty
1294d211d6
Merge branch 'develop' into feature/bma/fix_redirection 2021-02-19 14:43:01 +01:00
SpiritCroc
4418821058 Increment version 
Change-Id: I0a0b686aa4cdbaa636bf06286c8a108ac8d8079b
 2021-02-19 14:39:57 +01:00
Benoit Marty
e8026c6d3f
Naming convention 2021-02-19 13:53:38 +01:00
Benoit Marty
9614d55612
Merge pull request #2844 from vector-im/feature/bma/fix_account_deactivation 
Fix account deactivation crash
 2021-02-19 13:47:30 +01:00
Benoit Marty
8c1b99586b Use resumeWithException() facility (no other change) 2021-02-18 20:44:28 +01:00
Benoit Marty
544c1e4a6a Also fix the problem of cleanup too early (or done several times in case of bad password) for DefaultFinalizeAddingThreePidTask 2021-02-18 19:23:31 +01:00
Benoit Marty
2271ddacf8 Remove unused task and API 2021-02-18 19:05:42 +01:00
Benoit Marty
87dc80d2e6 Fix crash reported by PlayStore (#2707) 
Change-Id: I37a945d56035a398f8f2a05f2a3525b40258402d
 2021-02-18 18:53:26 +01:00
Benoit Marty
9443b80811 Fix test: ensure the session is open 2021-02-18 18:46:23 +01:00
Benoit Marty
5afdc81ce0 Moar cleanup 2021-02-18 18:43:48 +01:00
Benoit Marty
2df9b43abc Make the code a bit easier to understand (no change) 2021-02-18 18:42:55 +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
Benoit Marty
73e93e7d3d Doc and method signature 2021-02-18 17:56:05 +01:00
Benoit Marty
c76ced68e0 Make the code a bit easier to understand (no other change) 2021-02-18 17:47:11 +01:00
Benoit Marty
b9f5863b53 Avoid long lines 2021-02-18 16:14:02 +01:00
Benoit Marty
dea76fd81b Fix test compilation 2021-02-18 15:36:51 +01:00
Benoit Marty
fd94536118
Merge pull request #2830 from vector-im/feature/fga/fix_some_voip_issues 
Feature/fga/fix some voip issues
 2021-02-17 19:01:08 +01:00
Benoit Marty
61ea78a9d9 Merge branch 'feature/bma/improve_script' into develop 2021-02-17 19:00:14 +01:00
Benoit Marty
a4b5f79e8f Add capability to download only one artifact 2021-02-17 18:59:40 +01:00
Benoit Marty
fc1c2bc2c0
Merge pull request #2828 from vector-im/feature/bma/color_step_1 
First step about color cleanup
 2021-02-17 18:27:44 +01:00
Benoit Marty
51fd45d317 typo and doc 2021-02-17 18:18:36 +01:00
Benoit Marty
fcee1f1150 Fix glitch on screen transition 2021-02-17 18:18:36 +01:00
Benoit Marty
0e322630f1 Ignore url override from credential if it is not valid (#2822) 2021-02-17 18:18:36 +01:00
Benoit Marty
d19cedef88 Less code 2021-02-17 18:18:36 +01:00
Benoit Marty
6aa5dc992d Migrate AuthenticationService API to coroutines (#2449) 2021-02-17 18:18:36 +01:00
Benoit Marty
c787de75f5 Cleaup 2021-02-17 10:36:33 +01:00
Benoit Marty
a34c072c48 Rename interface 2021-02-17 10:28:49 +01:00
Benoit Marty
373586c23e Cleanup 2021-02-17 10:25:06 +01:00
Benoit Marty
7115676393
Merge pull request #2832 from vector-im/feature/bma/fix_lint 
Fix lint
 2021-02-16 22:23:42 +01:00
ganfra
754dec949b Remove useless log 2021-02-16 20:45:22 +01:00
Benoit Marty
6115a469eb Fix lint 2021-02-16 19:32:02 +01:00
ganfra
776ebce497 Merge branch 'develop' into feature/fga/fix_some_voip_issues 2021-02-16 16:06:12 +01:00
ganfra
79acf1cc42 Fix copyright 2021-02-16 15:57:23 +01:00
Benoit Marty
9501fd74f0
Merge pull request #2826 from vector-im/feature/bma/fix_crash 
Fix crash reported by PlayStore (#2707)
 2021-02-16 13:10:21 +01:00
Benoit Marty
03735d9213
Merge pull request #2819 from vector-im/feature/bma/lang 
a11y
 2021-02-16 11:41:02 +01:00
Benoit Marty
3ac3f09df0
Merge branch 'develop' into feature/bma/lang 2021-02-16 11:40:24 +01:00
Benoit Marty
b534d4660c Fix other potential crashes 2021-02-16 11:32:16 +01:00
Benoit Marty
bec4af7c87 Fix crash reported by PlayStore (#2707) 2021-02-16 11:23:36 +01:00