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

10423 commits

Author SHA1 Message Date
Maxime NATUREL
60eb9b428d "Learn more" button with click listener 2022-08-11 12:11:14 +02:00
Maxime NATUREL
8f218ce773 Custom header view without "Learn more" 2022-08-11 12:11:14 +02:00
Maxime NATUREL
2158661e77 Fixing title in the settings entry 2022-08-11 12:11:14 +02:00
Maxime NATUREL
fa8f72c909
Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary 
Add a developer setting to enable LeakCanary at runtime
 2022-08-11 12:10:26 +02:00
Adam Brown
616c16f8c6
Merge pull request #6783 from vector-im/feature/adm/decouple-variants 
Decouple `:vector` variants/build types
 2022-08-11 10:59:42 +01:00
Claire G
ce23303b97 Add inputType for room name creation and settings 2022-08-11 11:53:43 +02:00
Adam Brown
439224e4de using american english for consistency 2022-08-11 09:32:36 +01:00
Maxime NATUREL
0515303c8c
Merge pull request #6800 from vector-im/feature/mna/new-device-management-screen 
[Devices management] Add a feature flag and empty screen for future new layout (PSG-676)
 2022-08-11 08:59:57 +02:00
ericdecanini
7a50e25bea Unbolds text 2022-08-10 17:34:16 +02:00
Maxime NATUREL
3a9aa7472a Fixing wrong view reference in title assignment 2022-08-10 15:44:16 +02:00
Maxime NATUREL
89f31b093e Handling notifications for beacon_info and poll_start events 2022-08-10 15:28:51 +02:00
ericdecanini
4f4d7f111d Adds listeners to FABs 2022-08-10 15:25:33 +02:00
Maxime NATUREL
2764a6e103 Fixing code formatting issues 2022-08-10 14:57:16 +02:00
Maxime NATUREL
3ff9ab1bc8 Interface for LeakDetector 2022-08-10 14:47:09 +02:00
Maxime NATUREL
250ee1faa1 Moving the new setting inside debug screen 2022-08-10 14:47:08 +02:00
Maxime NATUREL
36c69a46fd Adding way to enable leak canary at runtime 2022-08-10 14:47:08 +02:00
Jorge Martin Espinosa
aecf460c96
Improve tests for lockscreen (#6796) 
* Improve tests

* Address review comments.

* Refactor pin code tests and code to improve testability.

* Fix lint issues
 2022-08-10 12:00:36 +00:00
ericdecanini
c0c0f90b04 Adds NewChatBottomSheet 2022-08-10 11:26:25 +02:00
Maxime NATUREL
b9fa4ddfc8 Renaming v2 setting key 2022-08-10 10:54:16 +02:00
Maxime NATUREL
1ebc2a9a8c New empty devices list screen 2022-08-10 10:40:06 +02:00
Maxime NATUREL
db1d0daec0 Adding a new setting entry behind feature flag 2022-08-10 10:40:06 +02:00
Maxime NATUREL
fb0b38bb49 Adding new feature flag for new device management 2022-08-10 10:40:06 +02:00
ericdecanini
358ec5a722 Fixes post merge errors 2022-08-10 08:25:51 +02:00
ericdecanini
e87eefb319 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
 2022-08-10 08:24:55 +02:00
ericdecanini
ddaf5397b1 Removes params passed into HomeRoomListFragment and fixes lint error 2022-08-10 08:24:03 +02:00
Eric Decanini
ce4ab78f13
Merge pull request #6693 from vector-im/feature/eric/new_fab 
New App Layout FABs
 2022-08-10 08:13:36 +02:00
ericdecanini
9505d196e4 Changes space title in toolbar 2022-08-10 08:10:33 +02:00
Weblate
53e396d337 Merge branch 'origin/develop' into Weblate. 2022-08-09 14:27:46 +00:00
Adam Brown
fe61fa844e
Merge pull request #6784 from vector-im/fix/jorgem/lockscreen-device-locked 
Fix lockscreen's 'device locked' crash on Android 12 and 12L devices
 2022-08-09 15:18:28 +01:00
ericdecanini
f94aad65dd Merge branch 'feature/eric/new_fab' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/res/layout/fragment_room_list.xml
 2022-08-09 14:31:39 +02:00
Nikita Fedrunov
6045eac87a
recents carousel for new home screen layout (#6707) 2022-08-09 14:31:26 +02:00
ericdecanini
af04221ad9 Improves content descriptions 2022-08-09 14:30:36 +02:00
ericdecanini
65b7a31728 Fixes toMvRxBundle import 2022-08-09 14:23:56 +02:00
Jorge Martín
9888e15f2a Improve logic to trigger LockScreenViewEvents 2022-08-09 14:04:45 +02:00
Jorge Martín
cc59b9e695 Address review comments. 2022-08-09 14:03:39 +02:00
Jorge Martín
dfc8526b47 Refactor lockscreen implementation. 
Try to fix issues and simplify flow.
 2022-08-09 14:03:39 +02:00
Jorge Martín
2f4725cfe9 Prevent crash while validating biometric key. 2022-08-09 14:03:39 +02:00
Jorge Martín
6e1e31bac1 Avoid crashes from unknown exceptions on lockscreen key migration. 2022-08-09 12:52:28 +02:00
Adam Brown
58d47df37b
Merge pull request #6736 from vector-im/feature/adm/non-ascii-username 
Fixes crash when entering non ascii username during account creation
 2022-08-09 11:52:02 +01:00
Adam Brown
045398d06f fixing import ordering and duplicated documentation 2022-08-09 10:42:44 +01:00
Adam Brown
ed3b73a989 decouples the flavor code / OSS licenses activity launching 2022-08-09 10:32:43 +01:00
ericdecanini
9892c66d27 Fixes lint errors 2022-08-09 10:54:28 +02:00
ericdecanini
7b61460fa2 Merge branch 'feature/eric/new_fab' into feature/eric/space-list-modal 2022-08-09 10:52:39 +02:00
ericdecanini
f2c3b5cb43 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-09 10:51:33 +02:00
Nui Harime
b2d1915227 Translated using Weblate (Russian) 
Currently translated at 99.0% (2306 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-08-08 23:32:32 +00:00
Adam Brown
0c61595ace decoupling the fcm helper from the vector module 2022-08-08 18:05:04 +01:00
Adam Brown
f605e0c479 decoupling the notification test factory from the vector module 2022-08-08 17:51:08 +01:00
Adam Brown
02286b96b0 decoupling the flipper proxy from the vector module 2022-08-08 17:32:23 +01:00
Adam Brown
8156a646a1 moving debug interfaces to debug package 2022-08-08 17:06:57 +01:00
Adam Brown
19c8b2a630 moving debug menu access to only the debug sourceset and providing an injectable interface to decouple from the direct access 2022-08-08 17:02:08 +01:00
Adam Brown
e02cf61f2f decoupling debug receiver from the variants by introducing vector layer interface 2022-08-08 16:57:51 +01:00
Adam Brown
dd496dc1a3
Merge pull request #6748 from vector-im/feature/adm/flaky-verification-test 
Fixing flaky `CantVerifyTest`
 2022-08-08 08:46:29 +01:00
Dinh Quang Tuyen
ac047afd27 Translated using Weblate (Vietnamese) 
Currently translated at 88.6% (2062 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2022-08-06 15:32:50 +00:00
Jeff Huang
77ae291c15 Translated using Weblate (Chinese (Traditional)) 
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_Hant/
 2022-08-06 15:32:50 +00:00
phardyle
ec9199cb18 Translated using Weblate (Chinese (Traditional)) 
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_Hant/
 2022-08-06 15:32:49 +00:00
phardyle
e15e941e49 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-06 15:32:49 +00:00
Ihor Hordiichuk
fde0d81c1e Translated using Weblate (Ukrainian) 
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/uk/
 2022-08-06 15:32:49 +00:00
Jozef Gaal
2aac0c9d64 Translated using Weblate (Slovak) 
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/sk/
 2022-08-06 15:32:48 +00:00
Nui Harime
05816d00ae Translated using Weblate (Russian) 
Currently translated at 99.0% (2306 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-08-06 15:32:47 +00:00
lvre
ee1f294327 Translated using Weblate (Portuguese (Brazil)) 
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/pt_BR/
 2022-08-06 15:32:44 +00:00
Przemysław Romanik
a41ad6625e Translated using Weblate (Polish) 
Currently translated at 99.6% (2319 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-08-06 15:32:43 +00:00
Johan Smits
721c4c0d9c Translated using Weblate (Dutch) 
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/nl/
 2022-08-06 15:32:42 +00:00
random
804880cc9c Translated using Weblate (Italian) 
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/it/
 2022-08-06 15:32:42 +00:00
notramo
8cbdd6e130 Translated using Weblate (Hungarian) 
Currently translated at 98.8% (2301 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-08-06 15:32:41 +00:00
Glandos
4a3b6baaf7 Translated using Weblate (French) 
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/fr/
 2022-08-06 15:32:38 +00:00
Danial Behzadi
dbbdc1791a Translated using Weblate (Persian) 
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/fa/
 2022-08-06 15:32:37 +00:00
Priit Jõerüüt
7b96597d56 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2319 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-08-06 15:32:37 +00:00
Vri
4af4f3f88c Translated using Weblate (German) 
Currently translated at 98.6% (2296 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-08-06 15:32:36 +00:00
waclaw66
a56d8a23f5 Translated using Weblate (Czech) 
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/cs/
 2022-08-06 15:32:33 +00:00
Auri B. P
f33e2fd656 Translated using Weblate (Catalan) 
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/ca/
 2022-08-06 15:32:32 +00:00
Mr.Narsus
c2fbb74e4b Translated using Weblate (Arabic) 
Currently translated at 42.0% (979 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-08-06 15:32:31 +00:00
Adam Brown
20b3dbc6e6 documenting the rule and reflection helper 2022-08-05 17:55:12 +01:00
ericdecanini
1ffa02c287 Merge remote-tracking branch 'origin/feature/eric/new_fab' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
 2022-08-05 17:11:57 +02:00
ericdecanini
1bf36dce92 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-05 17:11:00 +02:00
ericdecanini
41d859dc5b Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-05 17:10:36 +02:00
Adam Brown
81897a179e
Merge pull request #6741 from vector-im/feature/adm/focus-errors 
FTUE - Focus errors showing on wrong page
 2022-08-05 15:12:47 +01:00
ericdecanini
e6508e8a5a Cleans up epoxy class for NewSpaceSummaryItem and adds ellipsize to header 2022-08-05 16:08:05 +02:00
ericdecanini
0567fa3e53 Changes header text of bottom sheet to Change Space 2022-08-05 15:45:53 +02:00
Nikita Fedrunov
03afd2932c
NewHomeDetailFragment now shows correct list fragment (#6740) 2022-08-05 14:51:47 +02:00
ericdecanini
90f2b93763 Appends to comment in SpaceListFragment and refactors SpaceListBottomSheet class name 2022-08-05 12:39:52 +02:00
ericdecanini
a821f34fc0 Adds drag and drop to space list 2022-08-05 12:37:02 +02:00
Adam Brown
b375dd14f7 removing unused line 2022-08-05 11:18:53 +01:00
ericdecanini
0506c9abfd Fixes bottom sheet intermittently not having the correct height 2022-08-05 11:59:22 +02:00
ericdecanini
ff71e69b0e Makes space list work inside spaces 2022-08-05 11:48:11 +02:00
Maxime NATUREL
2dc92caa30
Merge pull request #6712 from vector-im/feature/mna/map-loading-error 
[Location Share] Render fallback UI when map fails to load (PSG-607)
 2022-08-05 11:17:37 +02:00
Maxime NATUREL
65c6e578eb Moving setup of map in onViewCreated + moving reference assignment of MapView 2022-08-04 16:58:28 +02:00
Maxime NATUREL
2b8632ebe7 Adding missing trailing comma 2022-08-04 16:58:28 +02:00
Maxime NATUREL
72377c9e7e Fixing after rebase 2022-08-04 16:58:28 +02:00
Maxime NATUREL
ec5f874a81 Fixing code formatting issues 2022-08-04 16:58:28 +02:00
Maxime NATUREL
008e07d03e Handling map loading error in live location maximized map 2022-08-04 16:58:28 +02:00
Maxime NATUREL
a30076a2ab Creating location.preview package 2022-08-04 16:58:28 +02:00
Maxime NATUREL
6972622bc6 Handling map loading error in timeline 2022-08-04 16:58:28 +02:00
Maxime NATUREL
e0e06c6ac8 Handling map loading error in sharing and preview fragment 2022-08-04 16:58:28 +02:00
Maxime NATUREL
87ca9606b3 Keep the previous loading map error string for timeline 2022-08-04 16:58:28 +02:00
Maxime NATUREL
6572a1a331 Fix missing icon in error view 2022-08-04 16:58:28 +02:00
Maxime NATUREL
b83acf373d Adding error view in preview and sharing fragments 2022-08-04 16:58:28 +02:00
Maxime NATUREL
8f91278d1a Creating custom view for map loading error 2022-08-04 16:58:28 +02:00
Maxime NATUREL
64c25f073c Calling directly the ViewModel clear method instead of using a view action 2022-08-04 16:57:14 +02:00
Maxime NATUREL
81cba3d275 Using ViewModel to handle clearing of audio controller 2022-08-04 16:57:14 +02:00
Maxime NATUREL
8b8a4f3d7b Fixing missing clear on audio tracker listeners 2022-08-04 16:57:14 +02:00
Adam Brown
f40cf13048 fixing login/account creation errors showing when navigating to another screen 
- was caused by the lost focus callback being triggered by onPause, fixed by only triggering if the current view is in the resumed state
 2022-08-04 14:25:05 +01:00
Adam Brown
99de618bed adding edit text ids so that the content can automatically be restored by the fragment manager 2022-08-04 14:18:03 +01:00
Maxime NATUREL
dd69b254f9
Merge pull request #6654 from vector-im/feature/mna/update-sending-period-lls 
[Location share] Update minimum sending period to 5 seconds for a live
 2022-08-04 14:17:00 +02:00
Adam Brown
a4ea47e740 catching username availabilty exceptions and handling as user facing error 2022-08-04 11:58:31 +01:00
ericdecanini
79e6dd074a Makes bottom sheet dismiss on space change 2022-08-04 11:41:00 +02:00
ericdecanini
b4ed380caf Finalises home and add bottom sheet buttons 2022-08-03 22:49:21 +02:00
ericdecanini
5d183654b1 Fixes bug where bottom sheet sometimes renders with the wrong height 2022-08-03 21:54:05 +02:00
Maxime NATUREL
bfd9dcbca2
Merge pull request #6681 from vector-im/fix/mna/leak-tab-layout-mediator 
[FTUE] Memory leak on FtueAuthSplashCarouselFragment
 2022-08-03 14:18:41 +02:00
Adam Brown
4bff816056 fixing auto merge compile error 2022-08-03 08:30:10 +01:00
ericdecanini
aa24debd87 Adds new space list controller 2022-08-02 22:49:58 +02:00
Adam Brown
8aaf185a8e
Merge pull request #6517 from vector-im/feature/adm/build-config 
Avoiding direct `BuildConfig` usage
 2022-08-02 18:07:17 +01:00
ericdecanini
55d8b6a819 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 2022-08-02 18:07:34 +02:00
Maxime NATUREL
ac8597e745
Merge pull request #6676 from vector-im/fix/mna/fix-memory-leaks-lls 
[Location sharing] - Fix the memory leaks (PSG-656)
 2022-08-02 18:01:48 +02:00
Eric Decanini
e2ed4b4ae1
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar 
New App Layout Toolbar
 2022-08-02 17:44:53 +02:00
ericdecanini
ab4eda18bf Adds SpacesBottomSheet 2022-08-02 17:44:27 +02:00
Maxime NATUREL
a53de92b10
Merge pull request #6688 from vector-im/fix/mna/missing-text-on-map-symbol 
[Location sharing] Invisible text on map symbol
 2022-08-02 16:38:11 +02:00
Adam Brown
2ee52f2062 fixing import ordering 2022-08-02 15:31:13 +01:00
Adam Brown
d1a63ccd2d removing unused import 2022-08-02 14:32:12 +01:00
Adam Brown
3c1e183ed6 using low privacy log from the vector module for code within vector, instead of the sdk flag 2022-08-02 14:32:12 +01:00
Adam Brown
9b1def3c1d updating variable casing as they're no longer const val or file level 2022-08-02 14:32:12 +01:00
Adam Brown
8b9d1bb0d8 making use of the existing sdk int provider instead of supplying it via the BuildMeta 2022-08-02 14:32:12 +01:00
Adam Brown
cb59d82846 extracting the notification action ids to their own file 2022-08-02 14:31:46 +01:00
Adam Brown
fe1019f29f using Config strict mode flag directly within the Application as the build meta can't be injected before super application.onCreate 2022-08-02 14:31:46 +01:00
Adam Brown
3d207f93f1 removing unused imports and fixing missing full stop on docs 2022-08-02 14:31:46 +01:00
Adam Brown
cceac66504 moving build flavor information to the build meta 2022-08-02 14:31:46 +01:00
Adam Brown
df02f505ad moving git versioning to the buildMeta abstraction 2022-08-02 14:31:46 +01:00
Adam Brown
d42c27bfe0 lifting the low privacy build config to the config 2022-08-02 14:31:46 +01:00
Adam Brown
811b2e8c75 accessing the notification action ids via a dedicated class which builds upon the application id 2022-08-02 14:31:46 +01:00
Adam Brown
9fe3fc69dd extracting the config models to their own files 2022-08-02 14:31:46 +01:00
Adam Brown
cc4aae0f4a replacing DEBUG build config flag with injectable property 2022-08-02 14:31:46 +01:00
Adam Brown
b6d052e58d lifting voip setting to a voip config 2022-08-02 14:31:46 +01:00
Adam Brown
56afac26ad creating a location sharing config for holding the map tiler key 2022-08-02 14:31:46 +01:00
Adam Brown
012485b8e3 lifting the live location sharing build flag to the config along with debug toggle 2022-08-02 14:31:46 +01:00
Adam Brown
f14aabcd22 ports the key sharing strategy to the config 2022-08-02 14:31:46 +01:00
Adam Brown
e795e9da52 porting the onboarding variant selection to the config 2022-08-02 14:31:45 +01:00
Adam Brown
87a8c786f7 moving the voice message limit to the config module 2022-08-02 14:31:24 +01:00
Adam Brown
274b1a149c moving analytics config to the config module, it's now up to forks to opt out rather than relying on the package name to not be vector 2022-08-02 14:31:23 +01:00
Jorge Martin Espinosa
c848615636
Disable 'Enable biometrics' option if there are not biometric authenticators enrolled. (#6714) 
* Disable 'Enable biometrics' option if there are not biometric authenticators enrolled.

* Improve biometric pref enabled check

* Fix changelog issue

* Address review comments. Add extra catch clauses to key migrations.

* Add tests for key migrators
 2022-08-02 15:31:08 +02:00
ericdecanini
b0a9b482e7 Adds issue numbers to unimplemented FAB clicks 2022-08-02 15:18:45 +02:00
Adam Brown
3fe7a9d8d5
Merge pull request #6588 from vector-im/dependabot/gradle/io.gitlab.arturbosch.detekt-1.21.0 
Bump io.gitlab.arturbosch.detekt from 1.20.0 to 1.21.0
 2022-08-02 12:56:45 +01:00
Maxime NATUREL
c926b4cc69 Fix moving some components to dedicated package 2022-08-02 10:47:38 +02:00
Maxime NATUREL
e311d0e469 Fixing missing cleanUp of the LocationSharingAndroidService 2022-08-02 10:36:32 +02:00
Maxime NATUREL
2c10d9dcaa Fixing missing call to timer.cancel() when view is detached 2022-08-02 10:35:42 +02:00
Maxime NATUREL
f44d8b0b20 Fixing missing call to SymbolManager.onDestroy() 2022-08-02 10:35:42 +02:00
Maxime NATUREL
72e2951c3e Fixing missing cleanUp on RecyclerView 2022-08-02 10:35:42 +02:00
Maxime NATUREL
9781656c1d Fixing leak on bottomSheetController callback 2022-08-02 10:35:42 +02:00
Maxime NATUREL
4f71741107 Fixing leak on OnSymbolClickListener 2022-08-02 10:35:42 +02:00
Maxime NATUREL
49ad37a7f6 Using Duration to have clearer syntax 2022-08-02 09:27:27 +02:00
Maxime NATUREL
004f40bff5 Setting 5 seconds for min period of update for location tracking 2022-08-02 09:13:16 +02:00
Maxime NATUREL
8571fd0ba9 Fix after rebase 2022-08-02 09:09:19 +02:00