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

24039 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Renaud
85734c05aa
Merge pull request #8147 from vector-im/dependabot/gradle/flipper-0.182.0 
Bump flipper from 0.178.1 to 0.182.0
 2023-02-23 13:56:42 +01:00
SpiritCroc
476f60bd04 [merge] Fix initial send button color 
Change-Id: I0361ab015bb4f8e1a31c92dcdbc2dec7cc52fb31
 2023-02-23 12:18:45 +01:00
SpiritCroc
4065d21b7e [merge] Disable another new useless reply fallback calculation 
Change-Id: Ia090dac36ce08e7ea8e8bc0fe67a3e316b988bb9
 2023-02-23 12:12:46 +01:00
SpiritCroc
65a1a6e90f Automatic SchildiChat string correction 
Change-Id: I979fcf00b93efd23fffa3f9ee7a53fd13882c5e2
 2023-02-23 11:55:24 +01:00
SpiritCroc
e771157851 Automatic upstream merge postprocessing 
Change-Id: I1899612abed560e8f96288c9dd30827c48c34102
 2023-02-23 11:55:23 +01:00
SpiritCroc
38c8e30541 Merge tag 'v1.5.26' into sc 
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d

Conflicts:
	dependencies.gradle
	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/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/res/drawable/ic_composer_rich_text_editor_close.xml
	vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
	vector/src/main/res/drawable/ic_rich_composer_add.xml
	vector/src/main/res/drawable/ic_rich_composer_send.xml
 2023-02-23 11:55:21 +01:00
SpiritCroc
c92c579eb6 [TMP] Automatic upstream merge preparation 
Change-Id: I1e101e6410585303689b9ee1383587c4d1b1f076
 2023-02-23 11:39:53 +01:00
SpiritCroc
fd0f4e733c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I4d960c3207cfa802fcea0c6659478f848955a7c2
 2023-02-23 11:39:52 +01:00
SpiritCroc
702142f62f Revert "Revert "stop listening timeline collection changes when app is not resumed (#7734)"" 
Upstream fix incoming

This reverts commit 987ca6dec4.

Change-Id: I3cec506b84cf1e469133df5276640d099e3c33de
 2023-02-23 11:29:12 +01:00
SpiritCroc
2542d7de83 GitHub issue template: please check if it's related to a labs setting 
Change-Id: Iffa75319272401f1188a6d0a3e77263629d6a007
 2023-02-23 11:28:55 +01:00
Maxime NATUREL
f782a31592 Fix unit tests 2023-02-23 10:15:34 +01:00
ganfra
60ebc0dccb
Update build.yml to fix checkout on main 2023-02-23 10:05:45 +01:00
Florian Renaud
021babc9b1 Fix notification in encrypted room for poll end event 2023-02-23 09:24:14 +01:00
Florian Renaud
cd648a0b50 Fix unit tests 2023-02-23 09:24:14 +01:00
Florian Renaud
13866c62bf Refresh push rules settings on account data changes 2023-02-23 09:24:14 +01:00
Florian Renaud
8f56f9de46 update doc 2023-02-23 09:24:14 +01:00
Florian Renaud
84ccd30ab7 Fix wrong import 2023-02-23 09:24:13 +01:00
Florian Renaud
552c6fbbd3 Changelog 2023-02-23 09:24:13 +01:00
Florian Renaud
0d28b3a860 Handle errors when updating push rules 2023-02-23 09:24:13 +01:00
dependabot[bot]
f8449f9567
Bump androidx.arch.core:core-testing from 2.1.0 to 2.2.0 
Bumps androidx.arch.core:core-testing from 2.1.0 to 2.2.0.

---
updated-dependencies:
- dependency-name: androidx.arch.core:core-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-22 23:16:01 +00:00
Maxime NATUREL
664fa7f952
Merge pull request #8160 from vector-im/fix/mna/pref-space-setting-visibility 
Space setting category doesn't show up
 2023-02-22 17:59:43 +01:00
ganfra
2aa5e6f7a0 Apply changes 2023-02-22 17:55:50 +01:00
ganfra
a98dc86e34 version++ 2023-02-22 17:51:12 +01:00
ganfra
f637996310 Merge branch 'release/1.5.26' into main 2023-02-22 17:48:04 +01:00
ganfra
a9ebf4fdd6 Adding fastlane file for version 1.5.26 2023-02-22 17:47:59 +01:00
ganfra
93a6bfb0f2 Changelog for version 1.5.26 2023-02-22 17:47:37 +01:00
Maxime NATUREL
8861b36aba Make the setting visible when using old app layout 2023-02-22 16:09:37 +01:00
Maxime NATUREL
7062e0737c Add changelog entry 2023-02-22 16:08:59 +01:00
Maxime NATUREL
af4ab41851 Highlight the badge when there is pending space invite 2023-02-22 15:04:14 +01:00
Maxime NATUREL
1b0265662d Adding changelog entry 2023-02-22 14:50:01 +01:00
Maxime NATUREL
18c7f0d894 Remove unused import 2023-02-22 14:39:44 +01:00
Maxime NATUREL
b78da9824d Adding unit tests for NewHomeDetailViewModel 2023-02-22 14:38:35 +01:00
Weblate
5db9fe6eb6 Merge branch 'origin/develop' into Weblate. 2023-02-22 13:33:42 +00:00
random
04ce186b6b Translated using Weblate (Italian) 
Currently translated at 100.0% (93 of 93 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2023-02-22 13:33:39 +00:00
LinAGKar
8fdc95592f Translated using Weblate (Swedish) 
Currently translated at 100.0% (2606 of 2606 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2023-02-22 13:33:37 +00:00
random
ecfbbb15d6 Translated using Weblate (Italian) 
Currently translated at 100.0% (2606 of 2606 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2023-02-22 13:33:37 +00:00
Priit Jõerüüt
26bf8b94dc Translated using Weblate (Estonian) 
Currently translated at 99.6% (2598 of 2606 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2023-02-22 13:33:36 +00:00
Maxime NATUREL
e8c95551c1 Adding unit tests for GetNotificationCountForSpacesUseCase 2023-02-22 14:19:21 +01:00
Maxime NATUREL
a509da54e8 Adding unit tests for GetSpacesUseCase 2023-02-22 11:58:26 +01:00
Maxime NATUREL
24e1740a8a
Merge pull request #8151 from vector-im/fix/mna/edited-reply-parsing 
[Timeline]: Editing a reply from iOS breaks the "in reply to" rendering (PSG-1168)
 2023-02-22 10:48:25 +01:00
Maxime NATUREL
c74cdb9540 Observe the spaces invites 2023-02-22 10:44:55 +01:00
Maxime NATUREL
7938eac490
Merge pull request #8154 from vector-im/dependabot/gradle/com.otaliastudios-transcoder-0.10.5 
Bump com.otaliastudios:transcoder from 0.10.4 to 0.10.5
 2023-02-22 10:42:46 +01:00
dependabot[bot]
13c8ff4ff5
Bump com.google.firebase:firebase-bom from 31.2.1 to 31.2.2 
Bumps com.google.firebase:firebase-bom from 31.2.1 to 31.2.2.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-22 07:45:40 +00:00
dependabot[bot]
e9a2cf4834
Bump com.posthog.android:posthog from 2.0.1 to 2.0.2 (#8155) 
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/PostHog/posthog-android/releases)
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.1...2.0.2)

---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-22 08:44:53 +01:00
dependabot[bot]
77807de811
Bump com.otaliastudios:transcoder from 0.10.4 to 0.10.5 
Bumps [com.otaliastudios:transcoder](https://github.com/natario1/Transcoder) from 0.10.4 to 0.10.5.
- [Release notes](https://github.com/natario1/Transcoder/releases)
- [Commits](https://github.com/natario1/Transcoder/compare/v0.10.4...v0.10.5)

---
updated-dependencies:
- dependency-name: com.otaliastudios:transcoder
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-21 23:57:25 +00:00
Maxime NATUREL
c36869cd03 Adding knowledge of pending space invites 2023-02-21 17:57:23 +01:00
Maxime NATUREL
0e8a2254f8 Listen for spaces notification count to refresh the badge 2023-02-21 17:44:31 +01:00
Maxime NATUREL
b1b35599b0 Use case to compute the notification counter for spaces 2023-02-21 16:28:30 +01:00
Maxime NATUREL
597081e9a8 Adding unread counter badge view 2023-02-21 15:22:08 +01:00
ganfra
9541d75d3f
Merge pull request #8152 from vector-im/feature/fga/fix_timeline_position_loss 
Fix always jumps to the bottom of the timeline #8090
 2023-02-21 14:51:21 +01:00