mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-31 21:38:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
19774 commits 7 branches 124 tags 230 MiB
Commit graph

19774 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
4a0aa2df0f [TMP] Automatic upstream merge preparation 
Change-Id: I58232d893ced2d2e771d2582c0494ace26c071d5
 2022-08-01 19:39:14 +02:00
SpiritCroc
016f1b3cf0 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ic47993fa7d041234a24712e480531ae6943c4302
 2022-08-01 19:39:13 +02:00
Adam Brown
1411fdd99f Merge branch 'hotfix/v1.4.31' into develop 2022-08-01 18:29:55 +01:00
Adam Brown
dbb999d4b9 Merge branch 'hotfix/v1.4.31' 2022-08-01 17:52:34 +01:00
Adam Brown
e1c572e46c generating 1.4.31 changelog 2022-08-01 17:52:14 +01:00
Adam Brown
fde2aee69a Merge branch 'hotfix/v1.4.31' of github.com:vector-im/element-android into hotfix/v1.4.31 2022-08-01 17:50:22 +01:00
Adam Brown
cf5745e966
Merge pull request #6710 from vector-im/feature/adm/always-initialise-session 
Fixing `IllegalStateException: You should authenticate before using this` when restoring app
 2022-08-01 17:49:55 +01:00
Adam Brown
0c4c695b9c adding missing fullstops in to docs 2022-08-01 17:15:50 +01:00
Adam Brown
e0349b27ed updating version for hotfix release 2022-08-01 16:51:19 +01:00
Adam Brown
9114630bba replacing single context thread with semaphore 
- avoids the need for a dedicated long living thread instance
 2022-08-01 16:23:41 +01:00
Adam Brown
3725921400 using injectable dispatchers instead of direct usage 2022-08-01 16:14:49 +01:00
SpiritCroc
9ea0f88181 Fix cleartext leak in log 
Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e
 2022-08-01 16:11:28 +01:00
Adam Brown
cf247eafb7
Merge pull request #6706 from SpiritCroc/leak 
Fix cleartext leak in log
 2022-08-01 16:08:07 +01:00
Adam Brown
dbe5b35ad4 adding changelog entry 2022-08-01 15:38:51 +01:00
Adam Brown
6b754f3e03 avoiding unneeded main context switch 2022-08-01 15:12:39 +01:00
Adam Brown
410a7b525f reusing the suspend scope 2022-08-01 13:13:00 +01:00
Adam Brown
fedbe048ba creating a dedicated threadsafe Session instance initializer in order to attempt to restore session when they're not yet created in memory 2022-08-01 13:11:19 +01:00
SpiritCroc
3845e1435c Fix cleartext leak in log 
Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e
 2022-08-01 13:00:30 +02:00
SpiritCroc
30eff3f7bc Fix cleartext leak in log 
Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e
 2022-08-01 12:51:02 +02:00
Maxime NATUREL
21e88efaff
Merge pull request #6657 from vector-im/dependabot/gradle/fragment-1.5.1 
Bump fragment from 1.5.0 to 1.5.1
 2022-08-01 10:29:50 +02:00
phardyle
6671a100ad Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2327 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-08-01 03:50:35 +00:00
Fork Liang
91b0465caa Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2327 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-08-01 03:50:33 +00:00
SpiritCroc
4d731f00f7 BugReporter: user ID as label 
Easier to connect related issues this way

Change-Id: I5386532fd6dacb121cdd1e235055c958bad9231e
 2022-07-31 10:37:36 +02:00
Benoit Marty
68cd7d487a
Merge pull request #6524 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.7.10 
Bump dokka-gradle-plugin from 1.7.0 to 1.7.10
 2022-07-29 17:15:45 +02:00
Benoit Marty
302edb44dc
Merge pull request #6659 from vector-im/dependabot/gradle/flipper-0.156.0 
Bump flipper from 0.154.0 to 0.156.0
 2022-07-29 17:14:25 +02:00
SpiritCroc
ebcd7cadb1 Automatic SchildiChat string correction 
Change-Id: I4499dc40189378d0ce21cdd9ad056052e860cb89
 2022-07-29 16:55:34 +02:00
SpiritCroc
17721c5534 Automatic upstream merge postprocessing 
Change-Id: I2822bf81750670f6383ee70f9a87e256c4732a50
 2022-07-29 16:55:33 +02:00
SpiritCroc
9b44975635 Merge tag 'v1.4.30' into sc 
Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.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/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.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/item/DefaultLiveLocationShareStatusItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.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/RoomListViewModel.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/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-07-29 16:55:28 +02:00
Eric Decanini
ddaf1128ac
Merge pull request #6598 from vector-im/task/eric/space-switching-unit-tests 
Space Switching Refactoring and Unit Tests
 2022-07-29 16:21:33 +02:00
ericdecanini
d116d98080 Adds changelog file 2022-07-29 15:48:58 +02:00
ericdecanini
406a67827c Adds scroll behaviour to FABs 2022-07-29 15:48:21 +02:00
Benoit Marty
725ed00759 Change some severities 2022-07-29 15:41:36 +02:00
Benoit Marty
5e19838108
Merge pull request #6691 from vector-im/feature/bma/validateGradleWrapper 
Avoid running this workflow twice on PR. #6690
 2022-07-29 15:32:56 +02:00
Benoit Marty
fa8f110579
Merge pull request #6667 from vector-im/feature/bma/group_cleanup_2 
Group cleanup
 2022-07-29 15:32:05 +02:00
ericdecanini
8e7e320e40 Finalises new layout FABs 2022-07-29 15:28:55 +02:00
dependabot[bot]
a83f714657 Bump lifecycle from 2.5.0 to 2.5.1 
Bumps `lifecycle` from 2.5.0 to 2.5.1.

Updates `lifecycle-common` from 2.5.0 to 2.5.1

Updates `lifecycle-livedata-ktx` from 2.5.0 to 2.5.1

Updates `lifecycle-process` from 2.5.0 to 2.5.1

Updates `lifecycle-runtime-ktx` from 2.5.0 to 2.5.1

---
updated-dependencies:
- dependency-name: androidx.lifecycle:lifecycle-common
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-livedata-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-process
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.lifecycle:lifecycle-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-29 15:23:30 +02:00
dependabot[bot]
c20c3a741a Bump activity from 1.5.0 to 1.5.1 
Bumps activity from 1.5.0 to 1.5.1.

---
updated-dependencies:
- dependency-name: androidx.activity:activity
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-29 15:23:10 +02:00
Benoit Marty
d60695806f Do not require a changelog file for PR created by Dependabot. 2022-07-29 15:18:04 +02:00
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
Benoit Marty
c41f0dd0cf Do not request PR created by Dependabot to include a Sign-off. 
Dependabot includes a sign-off in its commits, but if the team adds extra commits, we will have the warning that a sign off is required.
 2022-07-29 15:13:55 +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
Benoit Marty
619e5dd7d1 Try to use a token from ElementBot, to let PR created from fork be able to run this step. 2022-07-29 14:56:46 +02:00
Benoit Marty
3d722118ca Avoid running this workflow twice on PR. #6690 2022-07-29 13:19:18 +02:00
Benoit Marty
b161e5eb2e Add Kdoc on SpaceListFragment 2022-07-29 13:06:37 +02:00
Benoit Marty
07dc0d2e54 Rename layout for clarity 2022-07-29 13:06:37 +02:00
Benoit Marty
e9aab6331a Improve layout preview, item_group does not exist anymore. 2022-07-29 13:06:37 +02:00
Benoit Marty
59f00cd196
Merge pull request #6637 from vector-im/feature/bma/danger 
Danger
 2022-07-29 12:55:32 +02:00
Benoit Marty
c863b90d42
Merge pull request #6683 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.11.2 
Bump com.autonomousapps.dependency-analysis from 1.9.0 to 1.11.2
 2022-07-29 12:37:53 +02:00