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

596 commits

Author SHA1 Message Date
SpiritCroc
a4890457e7 Automatic upstream merge postprocessing 
Change-Id: I90adddf6afb6bd838c7c9b8b70dda654e0247b6d
 2022-04-24 11:15:56 +02:00
SpiritCroc
d44cb85dc7 Merge tag 'v1.4.12' into sc 
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
	vector/src/main/java/im/vector/app/AppStateHandler.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/room/detail/RoomDetailViewEvents.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/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/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/layout/item_space_beta_header.xml
 2022-04-24 11:15:52 +02:00
SpiritCroc
589ce215de [TMP] Automatic upstream merge preparation 
Change-Id: I889085ec4626c8bad3c6eeb4aba0b9d57799d6f2
 2022-04-24 10:47:15 +02:00
Adam Brown
903c402cf5 generating changelog 2022-04-20 14:08:58 +01:00
Adam Brown
73754993a5 Translated using Weblate (Polish) 
Currently translated at 38.5% (22 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-04-20 08:37:20 +00:00
Weblate
a46630fd05 Merge branch 'origin/develop' into Weblate. 2022-04-20 08:16:01 +00:00
Glandos
765bfd0570 Translated using Weblate (French) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2022-04-17 12:59:41 +00:00
SpiritCroc
616a121ccf Increment version 
Change-Id: I384a270af4f41a76e9aeecd043eb5122b9306489
 2022-04-16 08:58:58 +02:00
Szimszon
8a83064f5a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2022-04-14 13:08:58 +00:00
SpiritCroc
4c457de2eb Automatic upstream merge postprocessing 
Change-Id: Ia380e6cb16012ca8e2902918eee60a24d893749a
 2022-04-12 11:57:23 +02:00
SpiritCroc
7c35f5fda5 Merge tag 'v1.4.11' into sc 
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
 2022-04-12 11:57:16 +02:00
SpiritCroc
97b181997f [TMP] Automatic upstream merge preparation 
Change-Id: Ia7ca6b9e94631fc9ccfa911669376a472f5012d5
 2022-04-12 11:07:58 +02:00
Piotr Strebski
44446ce395 Translated using Weblate (Polish) 
Currently translated at 40.0% (22 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-04-09 12:59:38 +00:00
Besnik Bleta
f9a9c72c7b Translated using Weblate (Albanian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2022-04-09 12:59:33 +00:00
Linerly
051cf101d1 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2022-04-07 20:00:03 +00:00
LinAGKar
2b3e3cf7e6 Translated using Weblate (Swedish) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-04-07 20:00:00 +00:00
Jeff Huang
e6e9681856 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-04-07 19:59:58 +00:00
Danial Behzadi
9e85abe8e6 Translated using Weblate (Persian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2022-04-07 19:59:56 +00:00
Jozef Gaal
b2b1e1ca0a Translated using Weblate (Slovak) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2022-04-07 19:59:54 +00:00
Priit Jõerüüt
5f30a66929 Translated using Weblate (Estonian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2022-04-07 19:59:51 +00:00
random
1a6de70d92 Translated using Weblate (Italian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2022-04-07 19:59:50 +00:00
waclaw66
c09cb3358a Translated using Weblate (Czech) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2022-04-07 19:59:40 +00:00
Ihor Hordiichuk
661d95cf29 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2022-04-07 19:59:38 +00:00
lvre
2123112763 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (55 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2022-04-07 19:59:35 +00:00
Piotr Strebski
ff7c19537e Translated using Weblate (Polish) 
Currently translated at 12.7% (7 of 55 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-04-07 19:59:31 +00:00
Benoit Marty
c2bdfe0f19 Fastlane 2022-04-07 17:59:03 +02:00
Benoit Marty
ee63c75cec fastlane 2022-04-05 22:34:40 +02:00
Weblate
587752dffe Merge branch 'origin/develop' into Weblate. 2022-04-05 10:55:25 +00:00
SpiritCroc
3322a6fde6 Automatic upstream merge postprocessing 
Change-Id: I2d763d8cb40866f8cf8b21a1750bf487f291c90f
 2022-03-30 15:53:52 +02:00
SpiritCroc
d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8 
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.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/timeline/action/MessageActionsViewModel.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/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
 2022-03-30 15:53:51 +02:00
SpiritCroc
a6c3ae3bb0 [TMP] Automatic upstream merge preparation 
Change-Id: I5c089c587d4c19472de02cb3f704736c9461430d
 2022-03-30 14:57:34 +02:00
ganfra
9bf54a3750 Update changes 2022-03-28 13:36:17 +02:00
Danial Behzadi
2602c7afb5 Translated using Weblate (Persian) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2022-03-24 21:53:27 +00:00
LinAGKar
37b17932ca Translated using Weblate (Swedish) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-03-24 21:53:23 +00:00
Linerly
d526724eb1 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2022-03-24 21:53:22 +00:00
Jeff Huang
df1cc6a144 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-03-24 21:53:20 +00:00
Priit Jõerüüt
6537f7f69a Translated using Weblate (Estonian) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2022-03-24 21:53:16 +00:00
Besnik Bleta
b2896dd248 Translated using Weblate (Albanian) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2022-03-24 21:53:15 +00:00
Jozef Gaal
56fd8983c9 Translated using Weblate (Slovak) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2022-03-24 21:53:13 +00:00
random
f3deb3e160 Translated using Weblate (Italian) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2022-03-24 21:53:11 +00:00
ganfra
60ecfd4fc2 Update changes 2022-03-24 19:31:29 +01:00
ganfra
4755ebfa97 Update Changes 2022-03-23 13:38:33 +01:00
Denys Nykula
17d4e6c745 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2022-03-22 18:39:56 +00:00
lvre
720d830f5f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
 2022-03-22 18:39:55 +00:00
libexus
41de155fb5 Translated using Weblate (German) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2022-03-22 18:39:54 +00:00
waclaw66
040180478d Translated using Weblate (Czech) 
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2022-03-22 18:39:52 +00:00
Weblate
095f06bd89 Merge branch 'origin/develop' into Weblate. 2022-03-22 15:59:34 +00:00
iaiz
707800532f Translated using Weblate (Spanish) 
Currently translated at 66.6% (34 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
 2022-03-22 15:58:52 +00:00
notramo
777913493f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (51 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2022-03-19 21:38:32 +00:00
SpiritCroc
45d16e16d2 Increment version 
Change-Id: I32ebcef22a33d864d1ed43a161413a9029c5b462
 2022-03-19 11:52:53 +01:00