mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 09:30:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
11433 commits 7 branches 124 tags 230 MiB
Commit graph

11433 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
1019564952 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia971d3f314a302ed77749900c72c82b372ddefec
 2021-09-30 09:19:30 +02:00
SpiritCroc
de0f44307b Switch to own UP FCM fork for now 
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
 2021-09-30 09:18:57 +02:00
SpiritCroc
a7f41e88f3 Fix FCM error always showing, even when it works 
Change-Id: Ic9ed2bf74c252ee8b923f996642285681f504420
 2021-09-30 08:51:48 +02:00
SpiritCroc
f167a00921 Increase gradle/java heap size to fix fdroid build again 
Was 4G before merge, upstream changed from 2G to 3G, which still seems
too small.

Change-Id: I1a9f334a1ea991e9c2d27950a37504e68fee87d2
 2021-09-29 10:34:41 +02:00
SpiritCroc
c53267cfce Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Ie350414fc54f0a54bcc6088da4c15418804ec1d0
 2021-09-29 10:02:36 +02:00
SpiritCroc
0c7981dc26 Revert "Revert "Revert "Use Java 11 source code""" 
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.

Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72

Conflicts:
	attachment-viewer/build.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android-rx/build.gradle
	matrix-sdk-android/build.gradle
	vector/build.gradle
 2021-09-29 09:56:32 +02:00
SpiritCroc
d520e4f5c9 Automatic SchildiChat string correction 
Change-Id: Idb57c1c0d93edb977bac2bc29413417ba337a571
 2021-09-29 09:55:07 +02:00
SpiritCroc
b4439db163 Automatic upstream merge postprocessing 
Change-Id: Ifbee07c8f513672d861096f700749c4f41fb19ff
 2021-09-29 09:55:06 +02:00
SpiritCroc
4f93eb041c Merge tag 'v1.3.0' into sc 
Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68

Conflicts:
	gradle.properties
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/res/layout/reaction_button.xml
 2021-09-29 09:55:02 +02:00
SpiritCroc
19f081ae45 [TMP] Automatic upstream merge preparation 
Change-Id: I7d0c4a91961a4f61bb1fc222384a3903f0abe223
 2021-09-29 09:14:19 +02:00
SpiritCroc
0e8b08145c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ifd2418160a2bfb4203d24516a37c10a0d3643ab7
 2021-09-29 09:14:19 +02:00
SpiritCroc
b51bd743c7 Revert "Revert "Use Java 11 source code"" 
This will make the latest upstream merge easier.

This reverts commit 302b2865264ec94471c59041ce8efdc45d3764f4.
 2021-09-29 09:13:59 +02:00
ntnguyen1234
ac196eca9c Translated using Weblate (Vietnamese) 
Currently translated at 57.5% (65 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/vi/
 2021-09-28 12:06:36 +02:00
Benoit Marty
ccfab3957f Merge branch 'release/1.3.0' into main 2021-09-27 13:09:13 +02:00
Benoit Marty
e544592b70 Merge release 1.3.0 to main 2021-09-27 13:08:54 +02:00
Benoit Marty
0cd3bcaf15 Fastlane changelog 2021-09-27 13:06:52 +02:00
Benoit Marty
7e922d59ea Run towncrier 2021-09-27 13:05:37 +02:00
Benoit Marty
38015fe04d rename file 2021-09-27 13:04:10 +02:00
Benoit Marty
f39d2b141e Wait for emoji to load, it's async now 
Testing before release 1.3.0
 2021-09-27 12:56:05 +02:00
Benoit Marty
53c8862ca2 Change version to 1.3.0 2021-09-27 11:57:23 +02:00
Benoit Marty
e4b66f6967
Merge pull request #4084 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-09-27 11:28:33 +02:00
ntnguyen1234
3567ba8b5d Added translation using Weblate (Vietnamese) 2021-09-27 11:04:53 +02:00
Weblate
28e84d06c4 Merge branch 'origin/develop' into Weblate. 2021-09-27 08:05:09 +00:00
Andrejs
4b5a1d06c3 Translated using Weblate (Latvian) 
Currently translated at 77.9% (2039 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2021-09-27 08:04:59 +00:00
Graeme Power
3aaffc8a8f Translated using Weblate (Irish) 
Currently translated at 7.6% (201 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ga/
 2021-09-26 14:25:54 +00:00
Ihor Hordiichuk
ef5208a0e4 Translated using Weblate (Ukrainian) 
Currently translated at 83.5% (2185 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-09-26 14:25:53 +00:00
Linerly
83b0ada342 Translated using Weblate (Indonesian) 
Currently translated at 79.8% (2089 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-09-26 14:25:51 +00:00
artevaeckt
0b2125afe3 Translated using Weblate (German) 
Currently translated at 99.1% (2594 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-09-26 14:25:30 +00:00
zeritti
cec018915e Translated using Weblate (Czech) 
Currently translated at 100.0% (2615 of 2615 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-09-26 14:25:30 +00:00
SpiritCroc
45c6a4e9ba Restore old hasUnread detection algorithm to include notices 
Change-Id: Ib934a381cad1fec18815e222d61350240ba9d93f
 2021-09-25 17:16:53 +02:00
Benoit Marty
cde6e8cc1b
Merge pull request #4057 from vector-im/feature/bca/quick_invite_card_improvement 
Improve invite bottom sheet
 2021-09-24 20:46:12 +02:00
Benoit Marty
eb104d8758 Clean up 2021-09-24 20:45:50 +02:00
Benoit Marty
b5fadaacab
Merge pull request #4070 from vector-im/tools/adm/benchmark 
Adding benchmarking script to start monitoring build times
 2021-09-24 20:43:40 +02:00
Benoit Marty
045e4bbf76
Merge pull request #4052 from vector-im/feature/adm/email_notification_toggle 
Add email notification toggle
 2021-09-24 20:42:44 +02:00
Benoit Marty
9a30da13b5
Merge pull request #4051 from vector-im/feature/bca/invite_user_by_mail 
Support entering mail in user invite screen
 2021-09-24 20:34:52 +02:00
Valere
1fed27961a Code review 2021-09-24 19:35:49 +02:00
Valere
8318f2d38f fix CI 2021-09-24 18:44:04 +02:00
Valere
0acf90d8cd Code review 2021-09-24 18:12:12 +02:00
Valere
91ba17f71b Code review 2021-09-24 18:12:12 +02:00
Valere
5bb3e22868 cleaning 2021-09-24 18:12:12 +02:00
Valere
d59aaa7611 Support entering mail in user invite screen 2021-09-24 18:12:12 +02:00
Adam Brown
4482cbdaa6 using dedicated pusher removal methods for the different types of pushers 
- also adds a separate removePusher which supports removing any type of pusher
 2021-09-24 17:00:48 +01:00
Adam Brown
7fd794bd7a reusing existing setTextOrHide by adding an additional parameter to hide other views 2021-09-24 15:44:10 +01:00
Adam Brown
95b4f99970 making the add email pusher append parameter configurable by clients, typically we wouldn't want to overwrite other accounts but we can expose the option to clients if they want that behaviour 2021-09-24 15:39:08 +01:00
Benoit Marty
5a8e789435
Merge pull request #4061 from vector-im/feature/bca/spaces_invite_notification_dot 
Fix notif badge for space invite
 2021-09-24 16:20:11 +02:00
waclaw66
9099b2021e Translated using Weblate (Czech) 
Currently translated at 100.0% (113 of 113 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-09-24 16:00:18 +02:00
Benoit Marty
ee59fe660f Improve formatting 2021-09-24 15:53:10 +02:00
SpiritCroc
3563e76432 Update local unreadCount when marking chat as read 
Change-Id: I12718de30fb36b701fe4d5e63ccae96e13b9e34c
 2021-09-24 15:51:49 +02:00
Benoit Marty
3287980109 Cleanup and add changelog 2021-09-24 15:38:08 +02:00
Benoit Marty
8f4609e72b
Merge pull request #4072 from vector-im/dependabot/gradle/com.adevinta.android-barista-4.2.0 
Bump barista from 4.1.0 to 4.2.0
 2021-09-24 12:41:42 +02:00