filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-12 09:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,840 Commits 7 Branches 122 Tags 228 MiB
2ea5555036
Commit Graph

18840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Benoit Marty
1fd0fe504d Format file 2022-07-11 12:37:35 +02:00
Florian Renaud
68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
 2022-07-11 12:03:24 +02:00
Cadence Ember
1572e73ba7 Fix HTML entities being displayed in messages 
Initially reported in #6445. Fixes #6445.
This was a regression from #6357.

The fix is to enable Markwon's HTML entities processor.

Change-Id: I65588d6df24257851490161f4672f7461e6e5fc1
 2022-07-10 17:08:13 +02:00
SpiritCroc
b165b40d70 Fix cut display names in bubbles 
Fix guessing text width for bold text

Change-Id: I61d0421c1c159eb92b675166b9cbf6a4f1f609bc
 2022-07-10 17:08:13 +02:00
SpiritCroc
81f0bf2a29 Increase expanded read receipts back to 5 
Change-Id: I41833c23f345688bd17b2c70cbc1390d1ec8e95b
 2022-07-10 17:08:13 +02:00
SpiritCroc
2179720ad5 [merge] Fix compact read receipt layout with SC bubbles 
Change-Id: I7b2c1877e819a6c7a1dd7ff9404d652f17b2b878
 2022-07-10 17:07:56 +02:00
SpiritCroc
c6dcaaead9 [merge] Clean up manifest leftovers from old UP implementation 
Change-Id: If2a09118a830e3f930c9548d6573ed8679fc6752
 2022-07-10 09:40:40 +02:00
SpiritCroc
1fdc67b47d [merge] Catch voice recorder crash on SDK 21 
Better broken voice recording, than chats broken completely

Change-Id: I768c75c4853badb692ca4ab1bff3ead18fb91e05
 2022-07-09 22:08:39 +02:00
SpiritCroc
a6953afc1e [merge] Disable flipper on sdk 21 to fix crash 
Change-Id: I64286edca783ac83ee3531d8017e1d7209e51867
 2022-07-09 21:49:15 +02:00
LinAGKar
38904cc021 Translated using Weblate (Swedish) 
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/sv/
 2022-07-09 19:32:26 +00:00
Ihor Hordiichuk
b7b1a96bc2 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-07-09 19:32:25 +00:00
LinAGKar
b9b261a3a3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-07-09 19:32:25 +00:00
Johan Smits
40949aaf7e Translated using Weblate (Dutch) 
Currently translated at 100.0% (2260 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2022-07-09 19:32:23 +00:00
Mya Rohit
94567510ca Translated using Weblate (Bulgarian) 
Currently translated at 66.6% (1507 of 2260 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2022-07-09 19:32:22 +00:00