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

17824 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kaye
f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
SpiritCroc
8c414b48d9 increment_version.sh: also exclude .md changes from changelog 
Change-Id: I20454009a9a078239f279170618debbabbec5d84
 2022-05-18 10:21:16 +02:00
SpiritCroc
77ca4c801d FEATURES.md: upstream reverted onlyAlertOnce behavior, but we have a setting 
Change-Id: I81f98b9d34b9fac08dc05c758adbad028fb20484
 2022-05-18 10:19:40 +02:00
SpiritCroc
7091d7e670 Automatic SchildiChat string correction 
Change-Id: Id32ab1e0825f3e6d3b1ff017379de47c2c069095
 2022-05-18 10:00:21 +02:00
SpiritCroc
e7ffd128dc Automatic upstream merge postprocessing 
Change-Id: Id00a9dd26823196ffca4fbd64513875011bd2969
 2022-05-18 10:00:20 +02:00
SpiritCroc
4f60963741 Merge tag 'v1.4.16' into sc 
Change-Id: Ibfb03ebf80dc1403fa438a390f609f2201602ba9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.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/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-05-18 09:59:01 +02:00
Maxime NATUREL
e9d93194f1 Adding comments on some strings and removing non necessary plural 2022-05-18 09:48:34 +02:00
Benoit Marty
adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
SpiritCroc
360f469c4c [TMP] Automatic upstream merge preparation 
Change-Id: Idb8470d85e1279feb5fdf4f891aaf91c47b78dbc
 2022-05-17 22:06:28 +02:00
SpiritCroc
dee1b0d6ec Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I3b53cdcd58a9a5dc4f30b3cfa29cb7503d90c552
 2022-05-17 22:06:28 +02:00
Benoit Marty
8f7789f269 Version++ 2022-05-17 21:28:11 +02:00
Benoit Marty
4184aaba76 Merge branch 'release/1.4.16' into main 2022-05-17 21:27:12 +02:00
Benoit Marty
a1044763ec Merge branch 'release/1.4.16' into develop 2022-05-17 21:27:11 +02:00
Benoit Marty
1d70004165 Fastlane file 2022-05-17 21:26:54 +02:00
Benoit Marty
e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
Michael Kaye
1c7f95c196 Add .login to get the username of the PR merger. 
I dispair at the github actions docs.
 2022-05-17 17:40:42 +01:00
ericdecanini
03acf4505a Uses second layout to center room summary item title 2022-05-17 18:03:34 +02:00
Benoit Marty
86d808eb4f Rename folder for the PlayStore 2022-05-17 17:54:02 +02:00
Benoit Marty
b6c7a59afc
Merge pull request #6079 from vector-im/feature/bma/fix_strings 
Fix translation
 2022-05-17 17:41:29 +02:00
Benoit Marty
553f8aa37e Remove empty translations 2022-05-17 16:31:15 +02:00
Benoit Marty
ff46791df9 Let's keep this one even if not used. 2022-05-17 16:23:48 +02:00
ariskotsomitopoulos
abbc57429a Add changelog 2022-05-17 17:16:27 +03:00
Benoit Marty
b33d8fe5e1 Remove unused string location_share 2022-05-17 16:04:45 +02:00
Benoit Marty
23d86b55fe Remove unused string a11y_location_share_icon 2022-05-17 16:03:51 +02:00
Benoit Marty
d2ec615e2f Remove unused string settings_flair 2022-05-17 16:02:04 +02:00
Benoit Marty
c0c5d21d4f
Merge pull request #6075 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-17 15:59:37 +02:00
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
ariskotsomitopoulos
a0a7d3e7f6 Enhance reply attack to prevent DUPLICATED_MESSAGE_INDEX while decrypting the same event 2022-05-17 16:28:30 +03:00
Maxime NATUREL
cbf8306c6f Removing live location share data from MessageInformationData structure 2022-05-17 15:09:27 +02:00
Weblate
52a1fcb397 Merge branch 'origin/develop' into Weblate. 2022-05-17 12:51:46 +00:00
Szimszon
bc567fd45c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-05-17 12:51:38 +00:00
Benoit Marty
5df0488cf2 Apply ouchadam's suggestion. It's only accessed by the main thread. 2022-05-17 14:44:43 +02:00
Onuray Sahin
edd35872f3 Fix ending poll power level condition. 2022-05-17 15:44:39 +03:00
Benoit Marty
46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
Onuray Sahin
4c079cc0ac Write unit tests for poll end event aggregation. 2022-05-17 14:59:14 +03:00
Benoit Marty
32573881e4 Renames ids for clarity 2022-05-17 13:42:53 +02:00
Onuray Sahin
00e800459d Write unit tests for poll response event aggregation. 2022-05-17 14:13:38 +03:00
Michael Kaye
868c33a8b4 Correct var -> val for @get:Rules 2022-05-17 12:12:49 +01:00
Aris Kotsomitopoulos
424fb5556d
Merge pull request #5959 from vector-im/feature/aris/threads_post_release_ui_improvements 
Feature/aris/threads post release improvements
 2022-05-17 13:24:19 +03:00
ericdecanini
4adaa20f72 Fixes default visibilities in fragment_home_detail 2022-05-17 12:16:45 +02:00
ericdecanini
520c3e474c Adds changelog file 2022-05-17 12:02:29 +02:00
Benoit Marty
2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
Adam Brown
5f2cb671e2 making comparator override non null as kotlin guards against this 2022-05-17 10:35:14 +01:00
Adam Brown
1ec99ee89e renaming comparator to only specify the matrix.org domain 2022-05-17 10:31:32 +01:00
ericdecanini
bc500a567a Adds back button implementation of navigating up spaces 2022-05-17 11:28:37 +02:00
ericdecanini
e706c5a3c8 Adds up navigation from spaces 2022-05-17 11:09:14 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
SpiritCroc
91cff797f0 unifiedpush/FCM: also allow FCM for SERVICE_VERSION_UPDATE_REQUIRED 
To fix inbuilt FCM on Android 7

Change-Id: Ia2aca76b5718cce3c7828b00a604d58cf9f3676e
 2022-05-17 10:38:55 +02:00
Benoit Marty
ea1607cf3f Improve preview of the layout in the IDE 2022-05-17 10:28:02 +02:00
SpiritCroc
1eed611f4e Allow shorter bug report messages for internal / debug builds 
Change-Id: I0dd84bcca6d28ce9615ae40c06020a65d2401eea
 2022-05-17 10:11:50 +02:00