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

15241 commits

This branch
This branch
All branches
Author SHA1 Message Date
ariskotsomitopoulos
15fe9edfbd Fix conflicts 2022-01-31 16:21:46 +02:00
Adam Brown
986d9f92e9
Merge pull request #5009 from vector-im/feature/adm/storing-use-case 
Storing and tracking the onboarding messaging use case
 2022-01-31 14:15:39 +00:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release." 
This reverts commit 2efa67e587.
 2022-01-31 14:53:43 +01:00
Benoit Marty
f187216f3c Merge branch 'release/1.3.17' into main 2022-01-31 14:52:29 +01:00
Benoit Marty
af83073965 Merge branch 'release/1.3.17' into develop 2022-01-31 14:52:28 +01:00
Benoit Marty
c296b076cc fastlane 2022-01-31 14:51:49 +01:00
Benoit Marty
7d463cc9bc Towncrier 2022-01-31 14:51:09 +01:00
Benoit Marty
2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash 
Fix location crash
 2022-01-31 14:42:53 +01:00
Benoit Marty
f2d927079d
Merge pull request #5102 from vector-im/feature/adm/notification-logging 
Increased push rules logging
 2022-01-31 14:39:44 +01:00
artevaeckt
64cc337b9d
adapt changelog to pr# 2022-01-31 14:07:07 +01:00
ariskotsomitopoulos
f07c23fdda Formating & remove unused comments 2022-01-31 14:52:09 +02:00
ariskotsomitopoulos
ec9b6aa993 Fix error in unit test 2022-01-31 14:50:57 +02:00
Onuray Sahin
b3288c5acc Fix translation errors. 2022-01-31 15:49:18 +03:00
Onuray Sahin
a584cb876b Fix translation errors. 2022-01-31 15:26:54 +03:00
Adam Brown
9119cf059f adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications 2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3 ktlint format 2022-01-31 13:56:17 +02:00
ariskotsomitopoulos
14e56b8f7d MessageComposerViewModel format 2022-01-31 13:53:49 +02:00
Benoit Marty
8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00
Benoit Marty
4e3c730940 Changelog 2022-01-31 12:49:08 +01:00
Benoit Marty
ecd41d3826 network "not live" lcoation can be more accurate than GPS "not live" location. So do not ignore them. Not sure how if this is a universal rule... 2022-01-31 12:47:17 +01:00
ariskotsomitopoulos
d91f3d2de6 Enhance SlashCommandNotSupportedInThreads 2022-01-31 13:42:20 +02:00
ariskotsomitopoulos
cb3501ea17 Lazy load notSupportedThreadsCommands to improve performance 2022-01-31 13:08:15 +02:00
ariskotsomitopoulos
3253a252fb Introduce ThreadsService by splitting TimelineService 2022-01-31 12:58:19 +02:00
ariskotsomitopoulos
5ff5f762d4 Revert the use of coerceIn 2022-01-31 12:24:28 +02:00
ariskotsomitopoulos
32a982c287 Improve coerceIn format 2022-01-31 12:19:12 +02:00
Benoit Marty
a6ae709fe9
Merge pull request #5101 from vector-im/feature/bma/typos 
Fix some typos
 2022-01-31 11:18:30 +01:00
Benoit Marty
14c4233cdc Fix some typos 2022-01-31 11:01:29 +01:00
Benoit Marty
2228a1b59f
Merge pull request #5100 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-01-31 10:59:06 +01:00
ariskotsomitopoulos
cdd36ce034 Fix IndexOutOfBound crashes while clicking permalinks 2022-01-31 11:56:26 +02:00
Weblate
45360e8d18 Merge branch 'origin/develop' into Weblate. 2022-01-31 08:46:22 +00:00
Benoit Marty
57fc623995
Merge pull request #5098 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-01-31 09:44:00 +01:00
Weblate
da7edde0a2 Merge branch 'origin/develop' into Weblate. 2022-01-31 08:41:51 +00:00
Jozef Gaal
6564146e91 Translated using Weblate (Slovak) 
Currently translated at 72.6% (1999 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-01-31 08:41:44 +00:00
Timuçin Boldt
90c502b16a Make Space creation screens more consistent 
Signed-off-by: Timuçin Boldt <timucin.boldt@udo.edu>
 2022-01-31 09:24:24 +01:00
bmarty
b2bc92eebb Sync analytics plan 2022-01-31 00:02:22 +00:00
SpiritCroc
0a48bc7b91 Automatic SchildiChat string correction 
Change-Id: Ib9786bd0ae9894684b8c29ff9afd5372d471f7dc
 2022-01-29 15:56:26 +01:00
SpiritCroc
be016b253f Automatic upstream merge postprocessing 
Change-Id: I33e1c359a79d9421a689295976d93f5ec0697026
 2022-01-29 15:56:25 +01:00
SpiritCroc
45a5b8ca94 [merge] Further merge fixups 
Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812
 2022-01-29 15:56:13 +01:00
SpiritCroc
7b9da40e52 [merge] Use java 11 again, pt.2 
Change-Id: I136053222ffa1a264ce97a9d6ec51515e10208a0
 2022-01-29 14:59:20 +01:00
SpiritCroc
a9d5700d2b Merge tag 'v1.3.16' into sc 
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.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/DefaultTimeline.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
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.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/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-29 12:18:19 +01:00
SpiritCroc
0eddb5ed75 [TMP] Automatic upstream merge preparation 
Change-Id: I367672d6824d7e49f7393247372314c816d05ceb
 2022-01-29 10:36:12 +01:00
SpiritCroc
a7f1d68f38 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iaff18aadc34781f6d4d4ba93e4017373ee9feb37
 2022-01-29 10:36:12 +01:00
SpiritCroc
beb2b1e8a0 [merge] Use Java 11 again 
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
 2022-01-29 10:35:54 +01:00
Jozef Gaal
84373a3f44 Translated using Weblate (Slovak) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2022-01-29 09:26:32 +00:00
Szimszon
d9cee9f2f1 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2022-01-29 09:26:31 +00:00
libexus
47c9404518 Translated using Weblate (German) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2022-01-29 09:26:30 +00:00
Hasan
ed21744402 Translated using Weblate (Turkish) 
Currently translated at 64.0% (1763 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2022-01-29 09:26:29 +00:00
Szimszon
c3b4e4f2f9 Translated using Weblate (Hungarian) 
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/hu/
 2022-01-29 09:26:17 +00:00