Benoit Marty
824f029e20
"TODO:" is forbidden by Detekt
2022-05-12 17:06:52 +02:00
Benoit Marty
d8cda04e14
We won't use this
2022-05-12 17:05:34 +02:00
Benoit Marty
7d6c27eed5
Ignore rule
2022-05-12 17:05:19 +02:00
Benoit Marty
911bfe2081
Let GA run detekt
2022-05-12 17:02:22 +02:00
Benoit Marty
9834371e18
Detekt: configure and ignore some rules.
2022-05-12 16:56:49 +02:00
Onuray Sahin
817428e295
Refactor ending polls.
2022-05-12 17:53:08 +03:00
Benoit Marty
c02fb87bc9
Set up detekt gradle plugin
2022-05-12 16:41:36 +02:00
Jorge Martin Espinosa
3f8ddbec60
Merge pull request #5817 from vector-im/arb/pse-329
...
Using the same User Avatar and display name for all messages in the timeline
2022-05-12 16:23:11 +02:00
Ahmed Radhouane Belkilani
6a523ccc38
Allow using the latest user avatar and display name for all messages in the timeline
...
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
2022-05-12 15:43:20 +02:00
Benoit Marty
f54c865cf4
Merge pull request #5756 from vector-im/feature/bma/pr_doc_update
...
Update doc about PR
2022-05-12 15:03:03 +02:00
Suguru Hirahara
bea8b3d8d1
Translated using Weblate (Japanese)
...
Currently translated at 96.7% (2152 of 2224 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2022-05-12 12:59:44 +00:00
Stefan Schmidt
284fb639bf
Translated using Weblate (German)
...
Currently translated at 97.3% (2166 of 2224 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-05-12 12:59:43 +00:00
Sveinn í Felli
b95ca0ae53
Translated using Weblate (Icelandic)
...
Currently translated at 81.9% (1823 of 2224 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
2022-05-12 12:59:43 +00:00
ericdecanini
52c404ac9c
Merge remote-tracking branch 'origin/develop' into feature/eric/replace-search-room-subheader
2022-05-12 14:36:04 +02:00
ariskotsomitopoulos
40de685f1a
Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
2022-05-12 14:41:38 +03:00
Benoit Marty
4309fdba7e
Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair
...
Remove remaining dead code about flair
2022-05-12 11:31:42 +02:00
Onuray Sahin
704e86d843
Refactor editing polls.
2022-05-12 12:22:27 +03:00
Adam Brown
e56f6e910c
Merge pull request #6030 from vector-im/dependabot/gradle/mockk-1.12.4
...
Bump mockk from 1.12.3 to 1.12.4
2022-05-12 08:42:33 +01:00
dependabot[bot]
d3ecc8e5c3
Bump mockk from 1.12.3 to 1.12.4
...
Bumps `mockk` from 1.12.3 to 1.12.4.
Updates `mockk` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4 )
Updates `mockk-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases )
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4 )
---
updated-dependencies:
- dependency-name: io.mockk:mockk
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-05-11 23:11:45 +00:00
SpiritCroc
347af40ec0
Update notice rendering depending on layout
...
For SC bubbles: use exact same mechanism as rendering normal text
messages if possible
-> Closes https://github.com/SchildiChat/SchildiChat-android/issues/45
For non-SC-bubbles: use upstream implementation again, so it's possible
to tell apart notices in these as well.
Change-Id: I60c614266d2ae4afdf1e87c649ff484551f961b4
2022-05-11 21:51:06 +02:00
SpiritCroc
a96d27cb81
Floating date
...
Closes https://github.com/SchildiChat/SchildiChat-android/issues/41
Change-Id: I0eb9c6c3800309be40a1f5bc0c4420bd4066c098
2022-05-11 21:50:58 +02:00
SpiritCroc
85a26ae8be
Render image reactions (MSC3746)
...
Some notes:
- Doesn't re-parse reactions already in the db to add the url field - so
may need an initial sync for those.
- Since some clients don't really follow MSC3746, as in: they don't use
the url field, but instead only write and check the key if it is an
mxc-url, support those as well.
- Accordingly, initial sync is likely not required for those reactions
I've seen in the wild so far, as it's common to use the mxc url also
as key.
Change-Id: Ib1c50315425494986fa2e794d165658220a4f342
2022-05-11 21:50:49 +02:00
SpiritCroc
88556658a3
Improve and debug ghost swipe situation
...
Change-Id: Ic6f2956a139516050e2b7e5ec248969326b7ec43
2022-05-11 21:50:44 +02:00
SpiritCroc
b2a6252f94
Blank room list debug / fix attempt
...
Change-Id: Ic0624f530cbe951f5a229d4e5335b8699f559f43
2022-05-11 21:48:48 +02:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop
...
Added themed icon for Android 13
2022-05-11 17:34:38 +02:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0
...
Bump preference-ktx from 1.1.1 to 1.2.0
2022-05-11 16:17:17 +02:00
Benoit Marty
1ef5416b50
Use the correct lint rule to ignore.
2022-05-11 15:02:01 +02:00
Benoit Marty
a963596a59
Merge pull request #6022 from vector-im/feature/bma/gh_pages
...
Gh pages
2022-05-11 14:28:19 +02:00
Michael Kaye
3769dad30e
Github action should refer to result is 'success', not status is "success".
2022-05-11 11:09:01 +01:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share
...
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
2022-05-11 12:05:58 +02:00
Benoit Marty
79982af8d1
Revert "Temporary trigger the doc generation on pull request to check the workflow"
...
This reverts commit 7f2484ca4c
.
2022-05-11 11:47:36 +02:00
Valere
3948f263df
fix method visibility
2022-05-11 11:16:00 +02:00
Benoit Marty
7f2484ca4c
Temporary trigger the doc generation on pull request to check the workflow
2022-05-11 11:15:46 +02:00
Benoit Marty
27dcb6ef9c
Add a note when generated from this project.
...
A change will have to be done on the SDK project to remove this line before generated the documentation.
2022-05-11 11:14:45 +02:00
Benoit Marty
a7d85cf9fd
Setup GitHub action to generate the documentation of the SDK from develop branch
2022-05-11 11:00:24 +02:00
Valere
992f477ab1
use clock time instead of system
2022-05-11 10:58:13 +02:00
Benoit Marty
2ec86fe9e6
Remove remaining dead code about flair
...
Finish the work started at #5664
2022-05-11 10:52:55 +02:00
Valere
546d6fe56d
post merge fix
2022-05-11 10:42:02 +02:00
Maxime NATUREL
b2099b6b31
Updating the no location map background
2022-05-11 10:34:54 +02:00
Benoit Marty
ff386c3de6
Fix lint internal issue: remove object Params
.
...
GetTurnServerTask.kt: Error: Unexpected failure during lint analysis of GetTurnServerTask.kt (this is a bug in lint or one of the libraries it depends on)
2022-05-11 10:22:07 +02:00
Maxime NATUREL
cb5c6ec35e
Decreasing alpha of bottom banner in message view
2022-05-11 09:53:42 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads
...
Remove spec v1.3 check for threads
2022-05-10 14:47:48 -06:00
Travis Ralston
8570a1e0ad
Fix missed test
2022-05-10 14:05:06 -06:00
Travis Ralston
f1de116eff
add changelog
2022-05-10 13:18:12 -06:00
Valere
12ab4787f1
Merge branch 'develop' into feature/bca/crypto_better_key_share
2022-05-10 19:30:52 +02:00
dependabot[bot]
530d43bcbb
Bump kotlinCoroutines from 1.6.0 to 1.6.1
...
Bumps `kotlinCoroutines` from 1.6.0 to 1.6.1.
Updates `kotlinx-coroutines-core` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases )
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md )
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1 )
Updates `kotlinx-coroutines-android` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases )
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md )
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1 )
Updates `kotlinx-coroutines-test` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases )
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md )
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.0...1.6.1 )
---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-05-10 16:25:02 +00:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21
...
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 18:23:51 +02:00
Benoit Marty
a3b6bb3ec3
Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 17:46:59 +02:00
Benoit Marty
f54aa60803
Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 17:00:54 +02:00
Benoit Marty
fe8648c7f8
Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
2022-05-10 16:19:53 +02:00