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

16528 commits

This branch
This branch
All branches
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
SpiritCroc
af73df3ed4 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I06c0936f3ec8e0ec1b2c5c8de2127b0f4ab7b037
 2022-04-24 10:47:15 +02:00
SpiritCroc
30db09cea3 Split existing timeline loops 
Change-Id: I116b77df62601138da35efee9dc2ab40a8f32856
 2022-04-24 10:46:45 +02:00
SpiritCroc
fe4ec79214 Attempt to prevent timeline loops 
This doesn't fix existing loops, and I'm not sure if this will lead to
missing messages (but probably still better than timeline looping...?).

Change-Id: I9c14da58736d61b89d09458168eb2d33e9f21d80
 2022-04-24 10:46:45 +02:00
SpiritCroc
b3599aac23 Put redactions into bubbles, no matter what the original type was 
Change-Id: I6b7e424a29b1f8eb54862fc0a58102dcfaa8642c
 2022-04-24 10:46:45 +02:00
SpiritCroc
06ab920ef8 Unread marker: follow accent color 
Change-Id: I9fe33ed237146105297ebac26afa4bce279152ff
 2022-04-24 10:46:45 +02:00
SpiritCroc
51aec8551b Use Schildi-blue for notifications, unread marker, links 
Change-Id: I84eff79001020ceba6c4eb42e36093d25b09330c
 2022-04-24 10:46:45 +02:00
Adam Brown
3a9bacd7a8 Merge branch 'release/v1.4.12' 2022-04-20 14:44:43 +01:00
Adam Brown
903c402cf5 generating changelog 2022-04-20 14:08:58 +01:00
Adam Brown
7c7822a28a
Merge pull request #5792 from vector-im/bugfix/eric/realm-write-async 
Replaces monarchy.doWithRealm with monarchy.awaitTransaction
 2022-04-20 12:48:05 +01:00
Adam Brown
518a7585ab
Merge pull request #5793 from vector-im/feature/adm/weblate_1_4_14 
Weblate 1.4.14
 2022-04-20 11:30:39 +01:00
ericdecanini
8eab24c53d Replaces writeAsync with awaitTransaction 2022-04-20 11:10:01 +02:00
Adam Brown
f70b2a605c
Merge pull request #5791 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-04-20 10:03:06 +01:00
ericdecanini
90b063f0de Replaces doWithRealm with writeAsync 2022-04-20 10:55:06 +02: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
Jozef Gaal
7d4e647b3b Translated using Weblate (Slovak) 
Currently translated at 100.0% (2190 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-04-20 08:15:32 +00:00
ClaireG
e0556cd5e6
Crash: open private room by link. Use RoomId instead of the alias. 2022-04-20 09:17:16 +02:00
Zet
ebf821011b Translated using Weblate (Arabic) 
Currently translated at 37.6% (825 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-19 16:59:37 +00:00
SpiritCroc
bb5af3da7f Remove viewpager debug toasts again 
Change-Id: Ib905adf383ca77290320c157f467edd12aca2618
 2022-04-19 10:28:54 +02:00
SpiritCroc
ed2b05628a Timeline consistency debug: do not toast -1->-1, these seem rather common as well 
Change-Id: I90bc46dddf0760192221c4936111dd8460046c6c
 2022-04-19 10:28:48 +02:00
SpiritCroc
ed891a4445 Use accent color setting for attachments previewer 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/120

Change-Id: Iedcc1808b8408fd82ce8a6ce92c1f0c560b66cc2
 2022-04-19 10:28:44 +02:00
Aris Kotsomitopoulos
abe07c73a4
Merge pull request #5775 from vector-im/feature/aris/threads_after_release_experience 
Enhance user experience when home servers do not support threads.
 2022-04-19 10:59:41 +03:00
fedrunov
48680c3e2d
remove spaces feedback from left panel (#5686) 2022-04-19 09:27:17 +02: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
Jozef Gaal
cb577756f9 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2190 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-04-17 12:59:40 +00:00
Suguru Hirahara
dc4f11a613 Translated using Weblate (Japanese) 
Currently translated at 98.2% (2151 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2022-04-17 12:59:40 +00:00
Glandos
fb3e037ed5 Translated using Weblate (French) 
Currently translated at 100.0% (2190 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-04-17 12:59:38 +00:00
Zet
f8a2b6cdf4 Translated using Weblate (Arabic) 
Currently translated at 35.9% (787 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-17 12:59:38 +00:00
SpiritCroc
616a121ccf Increment version 
Change-Id: I384a270af4f41a76e9aeecd043eb5122b9306489
 2022-04-16 08:58:58 +02:00
Lucas
a17e5010f0 Translated using Weblate (French) 
Currently translated at 99.9% (2189 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-04-15 21:59:34 +00:00
Zet
e1bb4da978 Translated using Weblate (Arabic) 
Currently translated at 32.8% (719 of 2190 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-15 21:59:34 +00:00
Linerly
bd93cb41e6 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2022-04-15 16:55:49 +02:00
waclaw66
ff93586171 Translated using Weblate (Czech) 
Currently translated at 100.0% (148 of 148 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-04-15 16:55:49 +02:00
waclaw66
b228eb9fb7 Translated using Weblate (Czech) 
Currently translated at 100.0% (147 of 147 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-04-15 16:55:49 +02:00
SpiritCroc
35047580ce Accent color for location icons, again 
Change-Id: I792cb73c00fcff7c17948e90644fecac61dad7f0
 2022-04-15 16:49:56 +02:00
ariskotsomitopoulos
1a38b8c3c9 Replace var with val 2022-04-15 16:32:48 +03:00
Benoit Marty
948566c625
Merge pull request #5685 from vector-im/feature/nfe/space_member_spinner_text 
add text to spinner when click on space member (dm)
 2022-04-15 15:14:40 +02:00
ariskotsomitopoulos
d24ba65b5b Enhance user experience when home servers do not support threads. 2022-04-15 14:18:38 +03:00
Eric Decanini
3b454b9ad0
Merge pull request #5727 from vector-im/task/eric/current-code-style-config 
Adds editorconfig for current code style
 2022-04-15 12:07:58 +02:00
Benoit Marty
614c2a347c
Merge pull request #5768 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.6.20 
Bump dokka-gradle-plugin from 1.6.10 to 1.6.20
 2022-04-15 10:17:31 +02:00
dependabot[bot]
aca653170f
Bump dokka-gradle-plugin from 1.6.10 to 1.6.20 
Bumps dokka-gradle-plugin from 1.6.10 to 1.6.20.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-14 23:08:23 +00:00
Adam Brown
e58677a104
Merge pull request #5763 from vector-im/feature/adm/server-selection-errors 
FTUE - Server selection errors
 2022-04-14 17:22:58 +01:00
Benoit Marty
6a6f59a3be
Merge pull request #5757 from ofalvai/bugfix/uploads-order-e2e 
Fix sorting of uploads in encrypted rooms
 2022-04-14 18:11:49 +02:00
Eric Decanini
ace8ae6a37
Merge pull request #5766 from vector-im/bugfix/eric/joining-space-landing 
Changes destination when joining space to explore space rooms
 2022-04-14 17:58:31 +02:00
Adam Brown
dc5902e8f5
Merge pull request #5737 from vector-im/feature/adm/ftue-captcha 
FTUE - Registration Captcha and T&Cs screens
 2022-04-14 16:42:25 +01:00
Benoit Marty
97f2206f2a
Merge pull request #5767 from vector-im/feature/bma/unignore_user 
Unignore user must perform an initial sync
 2022-04-14 17:31:32 +02:00
Benoit Marty
a171a29bf1
Merge pull request #5762 from vector-im/feature/bma/dokka_2 
Make some data class immutable
 2022-04-14 17:17:55 +02:00