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

18859 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
6ab85cc7bc [TMP] Automatic upstream merge preparation 
Change-Id: I19731ba36867ffda85f7faf5cab3f10573fcee6e
 2022-07-29 15:17:20 +02:00
SpiritCroc
6aac16aeb2 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia6fc39919f9b73c5da97e8be22c365ac9ef72125
 2022-07-29 15:17:20 +02:00
pixelcode
f93faaf394 Translated using Weblate (German) 
Currently translated at 98.0% (149 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-07-29 15:08:52 +02:00
Hiajen
6e8c8633b4 Translated using Weblate (German) 
Currently translated at 94.0% (143 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-07-29 15:08:52 +02:00
SpiritCroc
fe599576b5 Ensure we don't stick-to-bottom while paginating 
Change-Id: I7e8a434ed1699ac238c0711c52499f0a124f60ab
 2022-07-22 20:07:31 +02:00
SpiritCroc
1785e09e5a Remove old UP strings from weblate merge again 
Change-Id: Ia7bebfe5a74f7d31e6bff093c56027226e627d82
 2022-07-22 20:07:24 +02:00
SpiritCroc
5ac4ca2ca2 Make read avatars less compact again 
We have that space.

Change-Id: I445f809260bfc90b2e7c264954ad2796f45637c2
 2022-07-22 19:05:47 +02:00
SpiritCroc
75f486a0f5 Collapse details tags 
Change-Id: I545958f06e412819c0f1cdb9037abc69c1442808
 2022-07-22 18:49:59 +02:00
SpiritCroc
47fb27c822 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Iee76c18089fd7467256ca175390c713e01f92393

Conflicts:
	vector/src/main/res/values-cs/strings_sc.xml
	vector/src/main/res/values-de/strings_sc.xml
	vector/src/main/res/values-id/strings_sc.xml
	vector/src/main/res/values-sv/strings_sc.xml
 2022-07-22 09:21:49 +02:00
SpiritCroc
ef55a8450f Fix crash on no camera app found 
Change-Id: I09888ed8192fae484a8c19f92cedfcca0e6498a9
 2022-07-17 19:03:54 +02:00
SpiritCroc
98924094fb Automatic SchildiChat string correction 
Change-Id: I8081e37b8814c4bec409ebcbdfb1e697ab30b823
 2022-07-17 18:55:04 +02:00
SpiritCroc
e125d0614b Update string correction 
Change-Id: I8c272207967bc6a01d157716c3aa0fcefd17fb21
 2022-07-17 18:55:04 +02:00
SpiritCroc
2ea5555036 Automatic upstream merge postprocessing 
Change-Id: Id1f5d78f899dc188eb6e13aa0bb933d094415e13
 2022-07-17 18:52:57 +02:00
SpiritCroc
9f3a83deb5 Automatic color correction 
Change-Id: I130145727363147bcb75c5b1063eed5082233335
 2022-07-17 18:52:57 +02:00
SpiritCroc
dec61e7a35 Merge tag 'v1.4.28' into merge-v1.4.28 
Change-Id: I623898b2034f132f23d2ac2dfeedb02fee16cd10

Conflicts:
	fastlane/README.md
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.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/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
 2022-07-17 18:52:55 +02:00
SpiritCroc
0d9fbb0ce7 [TMP] Automatic upstream merge preparation 
Change-Id: I2965d09aae5a200cbb9230dae676ef4009c9cc2c
 2022-07-15 09:35:12 +02:00
SpiritCroc
3145c0fd25 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I874fb62bbda9062afb5477d55c8848ffe9b832f2
 2022-07-15 09:35:12 +02:00
Benoit Marty
f16302c34d Merge branch 'release/1.4.28' into main 2022-07-13 12:45:40 +02:00
Benoit Marty
f117d41374 fastlane file 2022-07-13 12:43:25 +02:00
Benoit Marty
9b60bc0ad4 Command changed with towncrier 21.9.0 2022-07-13 12:42:20 +02:00
Benoit Marty
a85ebbfc34 Run towncrier 2022-07-13 12:42:20 +02:00
Benoit Marty
9d89c60177
Merge pull request #6533 from vector-im/feature/bma/post_weblate 
Delete unused key `error_attachment`
 2022-07-13 11:58:48 +02:00
Benoit Marty
384f95a180 Generated file by fastlane 2022-07-13 11:40:53 +02:00
Benoit Marty
4c31bd0639 Reduce title length. 2022-07-13 11:40:18 +02:00
Benoit Marty
3a80880ac7 Delete unused key error_attachment 2022-07-13 11:33:54 +02:00
Benoit Marty
e40b646adb
Merge pull request #6527 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-07-13 11:30:05 +02:00
Adam Brown
257f41dbf1
Merge pull request #6471 from vector-im/feature/adm/sharing-tests 
Adding tests around the share intent handling
 2022-07-13 10:12:09 +01:00
Weblate
39a41f6b4e Merge branch 'origin/develop' into Weblate. 2022-07-13 08:52:01 +00:00
Linerly
484606bfa4 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (68 of 68 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2022-07-13 08:51:54 +00:00
Florian Renaud
909ce290c8
Merge pull request #6051 from vector-im/feature/fre/start_dm_on_first_msg 
Start DM on first message (UI)
 2022-07-12 15:12:17 +02:00
Adam Brown
a5bf25f2b4
Merge pull request #6511 from vector-im/feature/rooms-in-space-default 
Fixes inconsistent rooms in home behaviour
 2022-07-12 13:25:58 +01:00
Florian Renaud
b8cdf9dcaa Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop:
  Comment the GHA towncrier, there is a syntax error
 2022-07-12 11:56:46 +02:00
Linerly
435b751838 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (165 of 165 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2022-07-12 11:04:31 +02:00
waclaw66
597bd622d5 Translated using Weblate (Czech) 
Currently translated at 100.0% (165 of 165 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-07-12 11:04:31 +02:00
Adam Brown
6266b2019b removing legacy migration flag from 12 months ago 2022-07-12 09:57:48 +01:00
Benoit Marty
7ab7d7cc80 Comment the GHA towncrier, there is a syntax error 2022-07-12 10:29:49 +02:00
Florian Renaud
53eb852e3a Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop:
  Group if together
  io.element.android:opusencoder:1.0.3 - should fix lint false positive issues
  Indentation, move comment above the block.
  Do the check on towncrier only for PR targeting develop branch
  Format file
  io.element.android:opusencoder:1.0.1
  Add a VectorFeatures to force usage of the library OpusEncoder
  Add dependency to opusencoder and remove module from this project
  shorter name
  Add GitHub action to check for a towncrier file
 2022-07-12 09:14:58 +02:00
Benoit Marty
a806991e88
Merge pull request #6489 from vector-im/feature/bma/lib_opusencoder 
Add dependency to opusencoder and remove module from this project
 2022-07-11 22:39:53 +02:00
Benoit Marty
de3a070710
Merge pull request #6482 from vector-im/feature/bma/check_towncrier 
Add GitHub action to check for a towncrier file
 2022-07-11 17:03:52 +02:00
Benoit Marty
d524f1a7d4 Group if together 2022-07-11 17:03:09 +02:00
Benoit Marty
a7ed2114be io.element.android:opusencoder:1.0.3 - should fix lint false positive issues 2022-07-11 17:00:17 +02:00
Florian Renaud
fca4df3522 Revert "Ensure that Realm is up to date before returning the roomId" 
This reverts commit 8a5a47c6a5.
 2022-07-11 16:44:32 +02:00
Florian Renaud
fdb9ed80d4 Change method visibility 2022-07-11 16:22:49 +02:00
Florian Renaud
a10a8ce5ca Add margin after the action button of the user list toolbar 2022-07-11 16:19:27 +02:00
Florian Renaud
fb87d31ce4 Update the title of the local room timeline 2022-07-11 15:24:48 +02:00
Coruna
a69c1fa584 Translated using Weblate (German) 
Currently translated at 100.0% (68 of 68 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2022-07-11 11:32:29 +00:00
Coruna
6ab746d8be Translated using Weblate (German) 
Currently translated at 99.6% (2251 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-07-11 11:32:27 +00:00
Ultimator14
10796f1fa0 Translated using Weblate (German) 
Currently translated at 99.6% (2251 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-07-11 11:32:22 +00:00
Benoit Marty
6feca4badf Indentation, move comment above the block. 2022-07-11 12:41:17 +02:00
Benoit Marty
63419fcf5e Do the check on towncrier only for PR targeting develop branch 2022-07-11 12:38:45 +02:00