Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions
6040 commits 11 branches 0 tags 84 MiB
Commit graph

6040 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jorge Martin Espinosa
c6402f3c02 Hide verbose state events from the timeline (#2225) 2024-01-12 21:23:52 +00:00
renovate[bot]
530a0030f0 Update wysiwyg to v2.25.0 (#2222) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-12 17:03:22 +00:00
Benoit Marty
3f7e641c2f Display name disambiguation #2215. 
Applied to:
- timeline message
- detail of timeline message
- reply preview of timeline message
- rendering of state Event
Not applied to:
- room last message
- room member list (we display the MatrixId here)
- room member detail page
 2024-01-12 15:58:33 +01:00
renovate[bot]
62d2695a32 Update dependency io.sentry:sentry-android to v7.2.0 2024-01-12 13:57:13 +00:00
Benoit Marty
5616fe76d4 Fix test. 
The change is due to the new label send to the server.
 2024-01-12 09:20:36 +01:00
Benoit Marty
d311573539 var -> val 2024-01-12 09:16:50 +01:00
Benoit Marty
81078a59a8 Fix gradle task ambiguity. 2024-01-11 22:19:43 +01:00
Benoit Marty
9a8437f4a1 Only call setupKover() for the app, not for minimal. 
minimal does not have the gplay variant.
 2024-01-11 22:03:34 +01:00
Marco Antonio Alvarez
e2ad067ad3 Merge remote-tracking branch 'upstream/develop' into align-cta-button-on-login-flow 2024-01-11 21:53:23 +01:00
Benoit Marty
2b749f7683 Cleanup 2024-01-11 21:42:04 +01:00
Benoit Marty
9b09aaa80f Also export fdroid build as artifact. 2024-01-11 21:42:04 +01:00
Benoit Marty
2dbcec98f4 Add fdroid of gplay to the rageshake data as a label. 2024-01-11 21:42:04 +01:00
Benoit Marty
dfc81c7fb1 Ensure that FDroid build will not include Firebase push provider. 
`allLibrariesImpl()` is also used by the midule uitest, and in this case `gplayImplementation` cannot be found. Since the push provider modules do not contain any ui, it's fine to move the dependency declaration to the app module.
 2024-01-11 21:42:04 +01:00
Benoit Marty
345b7e9ab6 Update gradle tasks and paths regarding the new gplay and fdroid flavor. 2024-01-11 21:42:04 +01:00
Benoit Marty
e4ef00908b Create gplay and fdroid variant 2024-01-11 21:42:04 +01:00
Jorge Martin Espinosa
e859b58f09 Don't apply Kover to projects with AAR libraries (#2211) 
* Don't apply Kover to projects with AAR libraries

* Move the Kover configuration to the `plugins` project
 2024-01-11 21:16:31 +01:00
Marco Antonio Alvarez
5a3cc06157 empty commit 2024-01-11 19:23:54 +01:00
Marco Antonio Alvarez
b4dd0fe422 Merge branch 'align-cta-button-on-login-flow' of github.com:surakin/element-x-android into align-cta-button-on-login-flow 2024-01-11 19:23:51 +01:00
Marco Antonio Alvarez
3fb144f041 empty commit 2024-01-11 19:23:36 +01:00
ElementBot
3ebe66b125 Update screenshots 2024-01-11 17:49:29 +00:00
Marco Antonio Alvarez
cc58f81993 added 825 changelog 
Signed-off-by: Marco Antonio Alvarez <surakin@gmail.com>
 2024-01-11 18:34:52 +01:00
Marco Antonio Alvarez
0d3ce695c7 Adjusted the login flow buttons a little bit 
They were slightly smaller on the onboarding page so I used that everywhere

Signed-off-by: Marco Antonio Alvarez <surakin@gmail.com>
 2024-01-11 18:30:10 +01:00
Benoit Marty
d76ee23514 Merge pull request #2202 from element-hq/feature/bma/removeReadReceiptFlag 
Remove ReadReceipts feature flag.
 2024-01-11 17:13:35 +01:00
Benoit Marty
56b1aa6b49 Merge pull request #2193 from element-hq/feature/bma/sxcludePreviewFromCodeCoverage 
Exclude preview from code coverage
 2024-01-11 16:47:07 +01:00
ganfra
36e6aa774c Merge pull request #2206 from element-hq/renovate/lifecycle 
Update lifecycle to v2.7.0
 2024-01-11 16:42:23 +01:00
Benoit Marty
a926b3d390 Merge branch 'develop' into feature/bma/sxcludePreviewFromCodeCoverage 2024-01-11 16:02:58 +01:00
Benoit Marty
ec6ef6fc8f Merge pull request #2207 from element-hq/feature/bma/ktlint_plugin 
Upgrade ktlint version to 1.1.1
 2024-01-11 16:01:14 +01:00
Benoit Marty
439c2f191b Ensure preview are not impacted when removing the ReadReceipt feature flag. 2024-01-11 15:58:36 +01:00
Benoit Marty
4dcafb6aa6 Remove ReadReceipts feature flag. 2024-01-11 15:57:59 +01:00
Benoit Marty
cd1b80ef18 Merge pull request #2210 from element-hq/renovate/com.posthog-posthog-android-3.x 
Update dependency com.posthog:posthog-android to v3.1.1
 2024-01-11 14:29:53 +01:00
renovate[bot]
851e7b9d6a Update dependency com.posthog:posthog-android to v3.1.1 2024-01-11 12:18:35 +00:00
Benoit Marty
1456cde3a7 Fix detekt issue. 2024-01-11 11:56:50 +01:00
Benoit Marty
72a363c244 Fix moar ktlint issues 2024-01-11 11:24:10 +01:00
Benoit Marty
378692f743 Fix moar ktlint issues 2024-01-11 10:02:10 +01:00
renovate[bot]
b30ff4a6d4 Update lifecycle to v2.7.0 2024-01-10 18:36:08 +00:00
Benoit Marty
d3830af78b Fix ktlint issues 2024-01-10 19:33:39 +01:00
Benoit Marty
246c33589a Ignore ktlint issue for this particular class. 2024-01-10 19:31:36 +01:00
Benoit Marty
7b699d96c0 Ignore ktlint issue for this particular object. 2024-01-10 19:31:36 +01:00
Benoit Marty
3084d71c39 Ignore ktlint issue for this particular val. 2024-01-10 19:31:36 +01:00
Benoit Marty
206a69938f Ignore ktlint issue for this particular class. 2024-01-10 19:31:36 +01:00
Benoit Marty
005db3dc88 Move doc to Kdoc and fix formatting issue. 2024-01-10 19:31:36 +01:00
Benoit Marty
e57da37657 Ktlint: disable rule standard:blank-line-before-declaration. 2024-01-10 19:31:36 +01:00
Benoit Marty
b97b1aa932 Ktlint: disable rule standard:function-naming for Composable function. 
From https://github.com/pinterest/ktlint/issues/2259#issuecomment-1732333419
 2024-01-10 19:31:36 +01:00
Benoit Marty
fe8024d34f Ktlint: disable rule standard:parameter-list-wrapping and standard:indent. 2024-01-10 19:31:36 +01:00
Benoit Marty
5512e7e5b9 Ktlint: disable rule standard:annotation. 2024-01-10 19:31:36 +01:00
Benoit Marty
3643fe151d Ktlint: disable rule standard:function-signature. 
tom
 2024-01-10 19:31:36 +01:00
Benoit Marty
2bc9b25472 Ktlint: disable rule standard:multiline-expression-wrapping. 
Need to also disable rule string-template-indent as a side effect.
 2024-01-10 19:31:36 +01:00
Benoit Marty
e9e3a4738e Update broken link 2024-01-10 19:31:36 +01:00
Benoit Marty
807d869c52 Upgrade ktlint to version 1.1.1. 
Need to disable `ktlint_standard:trailing-comma-on-declaration-site` else got this error:
Skipping rule(s) which are depending on a rule which is not loaded. Please check if you need to add additional rule sets before creating an issue.
  - Rule with id 'RuleId(value=standard:trailing-comma-on-declaration-site)' requires rule with id 'RuleId(value=standard:wrapping)' to be loaded
 2024-01-10 18:27:54 +01:00
renovate[bot]
7e9cda3aa9 Update plugin ktlint to v12.1.0 (#2200) 
* Update plugin ktlint to v12.1.0

* Run `./gradlew ktlintFormat` and fix some issues manually.

* Fix other issues reproted by Ktlint

* Limit false positives, KtLint removes unnecessary curly brace in String templates.

* Remove useless Unit

* Minor improvements over ktlint changes

* Restore `AlertDialogContent` behaviour

* Update screenshots

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Benoit Marty <benoit@matrix.org>
Co-authored-by: Jorge Martín <jorgem@element.io>
Co-authored-by: ElementBot <benoitm+elementbot@element.io>
 2024-01-10 16:22:24 +01:00