mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-24 01:48:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
14512 commits 7 branches 124 tags 230 MiB
Commit graph

14512 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
08ac537518 [bubble merge] Some cleanup 
Change-Id: I51bebb93dd4fbf154807be7ac1239516a7b15f64
 2022-02-20 14:59:59 +01:00
SpiritCroc
4f4381a325 [bubble merge] Keep footered time out of code blocks 
Change-Id: I185016a1f014cb774afa0bb28bd8020f2ec2f410
 2022-02-20 14:50:34 +01:00
SpiritCroc
3189093879 [bubble merge] Update SC bubbles for thread previews 
Change-Id: Idba75a44836d04ff928fc1b5aaf8f8c19716466b
 2022-02-20 14:18:30 +01:00
SpiritCroc
faba7ef3ae [bubble merge] Fix longclick message ripple 
Change-Id: I6cdd45d4d21f54ba79037d7968b4a8bc8d44cc98
 2022-02-20 14:09:51 +01:00
SpiritCroc
87ba082411 [bubble merge] Update some attachments in SC bubbles 
Change-Id: I30b45fd3377fd423d47c2e4bd94645ce64c001d6
 2022-02-20 12:54:49 +01:00
SpiritCroc
fd4051d00a [merge] Fix PromptSimplifiedModeFragment crash 
Change-Id: I4fb58e16609304ec658cb0f7fa76b1d8b6090866
 2022-02-20 12:04:30 +01:00
SpiritCroc
fd9032e89c Use legacy login 
Change-Id: I9e5b6cdd85eb5eef0fd650904baab1a1705d8579
 2022-02-20 11:58:11 +01:00
SpiritCroc
1827047c20 [bubble merge] Hide unused pref 
Change-Id: I72e4eb069e0fde3298e32e760be4065a4ac36676
 2022-02-20 11:38:46 +01:00
SpiritCroc
a559c94b3c Automatic SchildiChat string correction 
Change-Id: I0e677e98b9a83a57a8f1ff11f581a06847c1c0c3
 2022-02-20 11:29:32 +01:00
SpiritCroc
62fa413d6f Automatic upstream merge postprocessing 
Change-Id: I4554e89d78a075a40e054aa68fe905fe75f3edb1
 2022-02-20 11:29:31 +01:00
SpiritCroc
ef4c35499c [bubble merge] add back SC bubbles 
Change-Id: Ia884fbc5d83aad8cb79d674ec7c411bff608e4e5
 2022-02-20 11:28:56 +01:00
SpiritCroc
1024761526 [bubble merge] Hook up Element's bubbles to SC setting 
Change-Id: I0948a2d38ba0dcbbee87f465eab59aad321c8468
 2022-02-19 11:56:56 +01:00
SpiritCroc
af202d22be [bubble merge] Revert Schildi bubbles, to be re-implemented 
Change-Id: I86c8c1b7f5a0fad76d7fbec26eceabecacdf202c
 2022-02-19 11:20:33 +01:00
SpiritCroc
ecd28447c9 Merge tag 'v1.4.0' into sc 
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/drawable/ic_filter.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_notice_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/menu/menu_timeline.xml
 2022-02-19 10:55:47 +01:00
SpiritCroc
24ba2296b1 [TMP] Automatic upstream merge preparation 
Change-Id: I982dbbb3a4a0ac816b0df51cc165c94fe308402a
 2022-02-13 18:31:39 +01:00
SpiritCroc
e780aabdbd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I4a369a3217b3a0dce4b47f65b358c4585dc6cddd
 2022-02-13 18:31:39 +01:00
ganfra
d1e49624c7 Merge branch 'release/1.4.0' into main 2022-02-09 12:50:30 +01:00
ganfra
5b83ba9320 Release: update CHANGES 2022-02-09 11:25:11 +01:00
ganfra
a6bf921d64 Release: update versions 2022-02-09 11:18:03 +01:00
ganfra
a75e2d5fa8
Merge pull request #5186 from vector-im/feature/fga/fix_ui_test 
Feature/fga/fix UI test
 2022-02-09 10:13:05 +01:00
ganfra
e72593304f UITests: remove search menu item test case (not visible anymore in E2E room) 2022-02-08 19:35:33 +01:00
ganfra
a19642cd8e Analytics: fix always null identity property 2022-02-08 19:34:41 +01:00
ganfra
8d7e9baf85
Merge pull request #5103 from vector-im/feature/ons/fix_turkish_translations 
Fix Turkish translation errors - TO BE MERGED DURING WEBLATE SYNC
 2022-02-08 18:34:22 +01:00
ganfra
33648963c4 Merge branch 'develop' into feature/ons/fix_turkish_translations 2022-02-08 18:06:10 +01:00
ganfra
96f38637b5
Merge pull request #5184 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-02-08 18:02:37 +01:00
Weblate
d06a0af947 Merge branch 'origin/develop' into Weblate. 2022-02-08 14:47:47 +00:00
Linerly
67be89bad2 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-02-08 14:29:29 +00:00
ganfra
49a0555704
Merge pull request #5176 from vector-im/feature/ons/map_wellknown_support 
Retrieve map style url from .well-known
 2022-02-08 11:57:48 +01:00
Jeff Huang
30f7464797 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (47 of 47 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-02-08 04:26:33 +00:00
LinAGKar
64a0c53405 Translated using Weblate (Swedish) 
Currently translated at 99.9% (2751 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-02-08 04:26:32 +00:00
Jozef Gaal
12f495c9b8 Translated using Weblate (Slovak) 
Currently translated at 91.2% (2512 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-02-08 04:26:32 +00:00
ganfra
b75fd18959
Merge pull request #5142 from vector-im/feature/adm/set-usecase-on-account-creation 
Aligning use case tracking with iOS
 2022-02-07 19:04:07 +01:00
Onuray Sahin
22a03abdc4 Code review fix. 2022-02-07 20:08:31 +03:00
Onuray Sahin
9d83bafa7b Retrieve map style url from .well-known. 2022-02-07 13:38:54 +03:00
Adam Brown
4438d513a2
Merge pull request #5174 from daniellekirkwood/develop 
Fix WTF automation
 2022-02-07 10:21:30 +00:00
daniellekirkwood
a416e76e54
Create 5173.misc 2022-02-07 10:16:16 +00:00
daniellekirkwood
4e355665ed
Fix WTF automation 2022-02-07 10:15:49 +00:00
Adam Brown
ed78e54bce
Merge pull request #5121 from daniellekirkwood/develop 
Update workflow for FTUE issues on FTUE board
 2022-02-07 10:00:25 +00:00
Danial Behzadi
fade3d1d0d Translated using Weblate (Persian) 
Currently translated at 100.0% (47 of 47 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2022-02-06 16:26:55 +00:00
Nikita Epifanov
2478ec41f2 Translated using Weblate (Russian) 
Currently translated at 76.5% (36 of 47 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
 2022-02-06 16:26:54 +00:00
Szimszon
a40ee20c20 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (47 of 47 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2022-02-06 16:26:53 +00:00
LinAGKar
0c43bffb2e Translated using Weblate (Swedish) 
Currently translated at 99.9% (2751 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-02-06 16:26:52 +00:00
Jozef Gaal
00e8cd4fb9 Translated using Weblate (Slovak) 
Currently translated at 84.2% (2318 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-02-06 16:26:51 +00:00
Nikita Epifanov
4bc0dc204a Translated using Weblate (Russian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-02-06 16:26:26 +00:00
Danial Behzadi
ab0c00df74 Translated using Weblate (Persian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-02-06 16:26:17 +00:00
Zet
6283598da0 Translated using Weblate (Arabic) 
Currently translated at 38.1% (1051 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-02-06 16:26:16 +00:00
Adam Brown
3f3cac0489
updating changelog to include analytics prefix 2022-02-04 17:33:43 +00:00
Benoit Marty
ef3baee35b Split long lines 2022-02-04 16:59:20 +01:00
Benoit Marty
150d557d39
Merge pull request #5145 from vector-im/feature/ons/fix_failed_maps_rendering 
Fix location rendering in timeline if map cannot be loaded
 2022-02-04 16:58:04 +01:00
Benoit Marty
792042ea09
Merge pull request #5150 from vector-im/revert-5082-feature/bma/agp_7_1_0 
Revert "AGP 7.1.0"
 2022-02-04 16:56:42 +01:00