mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-22 17:10:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
16845 commits 7 branches 124 tags 230 MiB
Commit graph

16845 commits

This branch
This branch
All branches
Author SHA1 Message Date
LinAGKar
23232f6254 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-04-24 17:00:50 +00:00
Besnik Bleta
2712823273 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2202 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2022-04-24 17:00:50 +00:00
lvre
03cabc0364 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-04-24 17:00:48 +00:00
Sveinn í Felli
e6c54e29f4 Translated using Weblate (Icelandic) 
Currently translated at 82.2% (1823 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
 2022-04-24 17:00:45 +00:00
Danial Behzadi
f473e747ea Translated using Weblate (Persian) 
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-04-24 17:00:45 +00:00
Zet
ce899eae52 Translated using Weblate (Arabic) 
Currently translated at 42.4% (942 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-24 17:00:43 +00:00
SpiritCroc
34ff27307e Update HomeDetailViewModel root spaces logic 
To recent changes in SpaceListViewModel

Change-Id: I4c8a4c07333dd2aeeb5532055913be506c33d59b
 2022-04-24 13:36:58 +02:00
SpiritCroc
448e62b6dd Home pager: only listen to unique state changes 
Change-Id: I1c7a91ce39636e70279874bc9c66b80ab7bbead6
 2022-04-24 13:20:12 +02:00
SpiritCroc
f072ce0787 [merge] .editorconfig: crlf sucks 
Change-Id: Icef61650fcecfccc18845a0454e3a52557d786c7
 2022-04-24 11:53:18 +02:00
SpiritCroc
ed3c26aac6 Revert "Home pager: avoid re-applying space id that we persisted onPause" 
This doesn't work.

This reverts commit 23f4f72ba3.

Change-Id: Ia1d1769deef4fbb9ae8e19ee91e931ac2f859570
 2022-04-24 11:22:58 +02:00
SpiritCroc
b444fb8b53 Automatic SchildiChat string correction 
Change-Id: I4d1ea7a1f4131b56485256098341164d1f8dba6e
 2022-04-24 11:15:57 +02:00
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
ericdecanini
c0da9f6bf0 Fixes lint error 2022-04-22 21:54:21 +02:00
ericdecanini
ab924745de Adds changelog file 2022-04-22 21:53:55 +02:00
ericdecanini
43c2b42a82 Adds suggested tag in explore rooms 2022-04-22 21:33:25 +02:00
Claire G
683cc599ca disable triage-move-review-requests for forks 2022-04-22 16:19:15 +02:00
Jeff Huang
3699a8e97d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2022-04-22 09:59:47 +00:00
Priit Jõerüüt
42d942d501 Translated using Weblate (Estonian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2022-04-22 09:59:46 +00:00
Jeff Huang
81c6b49650 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-04-22 09:59:44 +00:00
Aleksa Sarai
fdc1fa4bd7 Translated using Weblate (Japanese) 
Currently translated at 96.8% (2148 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2022-04-22 09:59:42 +00:00
random
da3322dbc2 Translated using Weblate (Italian) 
Currently translated at 100.0% (2217 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-04-22 09:59:42 +00:00
Priit Jõerüüt
4960cb1c96 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2213 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-04-22 09:59:40 +00:00
Zet
15dd035ee8 Translated using Weblate (Arabic) 
Currently translated at 40.2% (893 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-22 09:59:38 +00:00
TarasSmakula
2839d1467f
Feature/5575 custom auth params for sign up (#5577) 
Add a fun `RegistrationWizard.registrationCustom()` to be able to use any parameters during the registration.
Move terms converter into `api` package.
 2022-04-21 20:02:27 +00:00
Benoit Marty
96350b0ed0
Merge pull request #5813 from vector-im/feature/bma/query 
Improve code in file TimelineEventEntityQueries.kt
 2022-04-21 21:11:30 +02:00
Benoit Marty
3ed6a90fde Fix sanity test after #5773 2022-04-21 21:08:28 +02:00
ariskotsomitopoulos
e368046b84 Add KEYS_WITHHELD error type to analytics 2022-04-21 19:31:12 +03:00
Michael Kaye
2951077979
Merge pull request #5672 from vector-im/michaelkaye/use_hookshot 
Move to using hookshot to send notifications, rather than using matrix client directly.
 2022-04-21 17:27:44 +01:00
Maxime NATUREL
eb844753a5 Adding changelog entry 2022-04-21 16:47:38 +02:00
ariskotsomitopoulos
cc705d5458 Remove unused import 2022-04-21 17:23:00 +03:00
ariskotsomitopoulos
cf8031bbc6 Remove unused comment 2022-04-21 17:14:25 +03:00
Maxime NATUREL
914db8c6be Removing BeaconInfo structure 2022-04-21 15:52:16 +02:00
Onuray Sahin
8eaa2f8dfb
Merge pull request #5811 from vector-im/feature/ons/voip_screen_sharing_permission 
VoIP Screen Sharing Permission
 2022-04-21 16:03:35 +03:00
Benoit Marty
dbc558afbc More cleanup in TimelineEventEntityQueries.kt 2022-04-21 14:37:56 +02:00
Benoit Marty
7f09a37503 Move code to TimelineEventEntityQueries.kt (#5810) 2022-04-21 14:27:17 +02:00
Onuray Sahin
56b3e8aaa4 Merge branch 'develop' into feature/ons/voip_screen_sharing_permission 
* develop: (107 commits)
  Fixes long line and comment lint errors
  Fixes lint errors
  Adds changelog file
  Formats entire project
  Adds changelog file
  Makes MediaType internal
  Bump libphonenumber from 8.12.46 to 8.12.47
  updating release version in preparation for next cycle
  generating changelog
  Replaces writeAsync with awaitTransaction
  Replaces doWithRealm with writeAsync
  Translated using Weblate (Polish)
  Translated using Weblate (Slovak)
  Crash: open private room by link. Use RoomId instead of the alias.
  Translated using Weblate (Arabic)
  Makes MediaFileUtils function internal
  Removes runCatching from TemporaryFileCreator
  using unix end of line character instead of windows as *nix OSes are more common dev environments
  remove spaces feedback from left panel (#5686)
  Translated using Weblate (French)
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
 2022-04-21 15:16:04 +03:00
Onuray Sahin
949d476623 Code review fixes. 2022-04-21 15:09:41 +03:00
Eric Decanini
c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project 
Formats project with new code style
 2022-04-21 12:43:28 +02:00
Benoit Marty
8874f236e4 Changelog 2022-04-21 12:30:34 +02:00
Benoit Marty
863ed2f15d Move GetPushRulesResponse to internal package 2022-04-21 12:30:34 +02:00
Benoit Marty
4def1e6068 Rename internal package from notification to pushrules 2022-04-21 12:30:11 +02:00
Benoit Marty
729a2e6372 Move pushrules package to the session package 2022-04-21 12:30:11 +02:00