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

20559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Brown
cda50dca8c trigger CI 2022-08-25 09:05:57 +02:00
dependabot[bot]
d130dd5e1b
Bump com.autonomousapps.dependency-analysis from 1.12.0 to 1.13.1 
Bumps com.autonomousapps.dependency-analysis from 1.12.0 to 1.13.1.

---
updated-dependencies:
- dependency-name: com.autonomousapps.dependency-analysis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-24 23:09:05 +00:00
dependabot[bot]
829c2482d5
Bump org.jlleitschuh.gradle.ktlint from 10.3.0 to 11.0.0 
Bumps org.jlleitschuh.gradle.ktlint from 10.3.0 to 11.0.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-24 23:06:26 +00:00
ericdecanini
64894d4443 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-24 20:25:02 +02:00
ericdecanini
e9120c8e33 Changes content description of chevron based on expanded state 2022-08-24 20:22:46 +02:00
Benoit Marty
66a6018a93 Detekt 2022-08-24 14:06:35 +02:00
Benoit Marty
5d711793ad Changelog 2022-08-24 12:39:58 +02:00
Benoit Marty
2b5920e451
Merge pull request #6894 from vector-im/feature/bma/remove_fragment_module 
Remove fragment module
 2022-08-24 12:30:02 +02:00
SpiritCroc
16ca0951ca Move viewpager debugging visual feedback to own pref 
Visual feedback probably not needed for the remaining viewpager issues.

Change-Id: I9931c37b9d0c79ba9fd2f27782d0c0eaa5dfd318
 2022-08-24 10:22:57 +02:00
Benoit Marty
2c63dee86a Avoid trying to log formatted Json if Http bodies are not logged. 2022-08-24 10:16:57 +02:00
SpiritCroc
a3786cde1b Automatic SchildiChat string correction 
Change-Id: I18c187e75dbc237429a64c4a685098472a9afb9c
 2022-08-24 10:14:39 +02:00
SpiritCroc
84e56ef043 Automatic upstream merge postprocessing 
Change-Id: Ia74f735f2a81e1ff7f26cfa3c557fd23c9668017
 2022-08-24 10:14:38 +02:00
SpiritCroc
e6023c6bae Merge tag 'v1.4.34' into sc 
Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838

Conflicts:
	vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
	vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-24 10:14:36 +02:00
Benoit Marty
8cec528ac7 Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
SpiritCroc
569365c0d8 [TMP] Automatic upstream merge preparation 
Change-Id: I9cdd7da590aded7c7500f4df87d84781033211bb
 2022-08-24 09:35:36 +02:00
SpiritCroc
1e4c6993db Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ib51951e6254af4a3a6cb30af918effae5b4974fc
 2022-08-24 09:35:36 +02:00
Jeff Huang
e523699cfe Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-08-24 04:43:05 +00:00
Benoit Marty
4c2f8537e1 Changelog 2022-08-23 18:51:14 +02:00
Benoit Marty
d7b2cc095a Format fixes. 2022-08-23 18:49:16 +02:00
Benoit Marty
c494644abf Inject AvatarRenderer normally. 2022-08-23 18:49:16 +02:00
Benoit Marty
80b3c45928 Create a GalleryOrCameraDialogHelperFactory 2022-08-23 18:49:16 +02:00
Benoit Marty
8555758911 Remove the FragmentFactory reference 2022-08-23 18:49:16 +02:00
Benoit Marty
22db6b4619 Use @AndroidEntryPoint for all Fragment 2022-08-23 18:49:16 +02:00
Benoit Marty
997336ec5d No need to Inject constructor 2022-08-23 18:47:23 +02:00
Benoit Marty
5f0b26ae39 Remove FragmentModule 2022-08-23 18:47:23 +02:00
Benoit Marty
d85a16482e
Merge pull request #6700 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-08-23 17:14:02 +02:00
Benoit Marty
f6e382572e
Merge pull request #6893 from vector-im/dependabot/gradle/flipper-0.161.0 
Bump flipper from 0.157.0 to 0.161.0
 2022-08-23 17:09:37 +02:00
Benoit Marty
a869a7208c
Merge pull request #6913 from vector-im/dependabot/github_actions/danger/danger-js-11.1.2 
Bump danger/danger-js from 11.1.1 to 11.1.2
 2022-08-23 17:09:01 +02:00
Benoit Marty
8e853fe091
Merge pull request #6914 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.1.2 
Bump dependency-check-gradle from 7.1.1 to 7.1.2
 2022-08-23 17:07:53 +02:00
Benoit Marty
973a5f1d6e Version++ 2022-08-23 17:02:24 +02:00
Benoit Marty
ba6f7c4288 Merge branch 'release/v1.4.34' into main 2022-08-23 17:00:11 +02:00
Benoit Marty
6c47635a87 Merge branch 'release/v1.4.34' into develop 2022-08-23 17:00:10 +02:00
Benoit Marty
6c2885ff39 Granfra's review 2022-08-23 16:36:39 +02:00
Onuray Sahin
248c05f4e2 Create other session item layout. 2022-08-23 17:20:37 +03:00
Onuray Sahin
ec5d950b7b Fix current session device name. 2022-08-23 17:20:01 +03:00
Onuray Sahin
2648771196 Create custom view for other sessions. 2022-08-23 17:19:03 +03:00
Benoit Marty
adcb3c594a fastlane 2022-08-23 16:09:36 +02:00
Benoit Marty
34fef8d197 reorder changelog 2022-08-23 16:08:52 +02:00
Benoit Marty
033557dba4 Towncrier 2022-08-23 16:07:57 +02:00
Benoit Marty
58954ed590 Fix Exception: java.lang.IllegalArgumentException: Configurations cannot be different if used to open the same file. 
See for instance https://github.com/matrix-org/element-android-rageshakes/issues/41975
 2022-08-23 15:36:17 +02:00
Benoit Marty
203a262c66 Add a step in the recipe 2022-08-23 15:21:44 +02:00
Benoit Marty
7883a6c617 Rename gl to gl-ES to be PlayStore compatible, and unignore this language. 2022-08-23 15:16:12 +02:00
Benoit Marty
1c8fccad30
Merge pull request #6908 from vector-im/feature/bma/fix_crash 
Fix crash when signing out.
 2022-08-23 15:07:55 +02:00
Benoit Marty
94e755552c
Merge pull request #6888 from vector-im/feature/adm/change-server-on-error 
FTUE - Allow changing server on onboarding start error
 2022-08-23 15:05:51 +02:00
Benoit Marty
074a9e0da6
Merge pull request #6916 from vector-im/feature/bma/weblate_sync_1_4_34 
Feature/bma/weblate sync 1 4 34
 2022-08-23 15:03:47 +02:00
Onuray Sahin
d072ab1f37 Create layout for other session list. 2022-08-23 14:36:00 +03:00
Benoit Marty
9e0340bbea Remove unused strings 2022-08-23 12:13:47 +02:00
Benoit Marty
aa750cccbf typo 2022-08-23 12:03:25 +02:00
Benoit Marty
1a79828aa5 Update comment 2022-08-23 12:01:43 +02:00
Benoit Marty
5c02290ad4 Fix logging issue 2022-08-23 12:00:27 +02:00