Commit graph

14810 commits

Author SHA1 Message Date
Michael Kaye
3182c60d13 Quoe 'schedule' correctly. 2022-03-24 13:42:25 +00:00
Michael Kaye
164ac0ee80
Update nightly.yml
Clean up formatting of if
2022-03-24 13:40:52 +00:00
ericdecanini
edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
2022-03-24 14:40:28 +01:00
Michael Kaye
3525d82733 Make test use quoted strings 2022-03-24 13:39:28 +00:00
Эдуард Гера
516e548fcd Translated using Weblate (Hebrew)
Currently translated at 95.5% (2075 of 2171 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
2022-03-24 13:16:51 +00:00
ravit
481274088c Translated using Weblate (Hebrew)
Currently translated at 95.5% (2075 of 2171 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
2022-03-24 13:16:51 +00:00
ganfra
c2d2afbe72
Merge pull request #5624 from vector-im/feature/adm/account-created-celebration-on-sign-in-with-id
Fixing account creation celebration shown on `sign in with matrix id`
2022-03-24 11:52:23 +01:00
Adam Brown
84b34f75de
Merge pull request #5517 from vector-im/feature/adm/ftue-single-loading-state
FTUE - Single loading state
2022-03-24 10:36:07 +00:00
Adam Brown
4ef0bc9052 fixing wrong account created flag when creating a session from a direct login 2022-03-24 10:19:53 +00:00
Onuray Sahin
7a575ed062 Lint fixes. 2022-03-24 13:10:06 +03:00
Adam Brown
af90adadf3 adding changelog entry 2022-03-23 17:29:06 +00:00
Adam Brown
e7a1c20132 handling the username in use as a username field error 2022-03-23 17:29:06 +00:00
Adam Brown
5aa35899bc extracting error cases to extensions and handles invalid username as a specific case 2022-03-23 17:29:06 +00:00
Adam Brown
373385b29f moving the not accepting registration error handling to the login fragment 2022-03-23 17:29:06 +00:00
Adam Brown
11cc284bcc reusing showFailure from the base fragment instead of resubscribing to the view events 2022-03-23 17:29:05 +00:00
Adam Brown
7d80cfed0b replacing async reset password,mail and homeserver requests with shared isLoading with error view events 2022-03-23 17:25:10 +00:00
Adam Brown
2227df479c replacing async login/register state with separate failure view event and shared isLoading 2022-03-23 17:20:47 +00:00
Adam Brown
e3df9c4cef using isLoading boolean instead of stateless async result for the display name and profile picture updates 2022-03-23 16:48:07 +00:00
ganfra
adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
ganfra
8d4830975d Merge tag '1.4.6' into develop
v1.4.6
2022-03-23 16:24:02 +01:00
ganfra
7c27ce5e88 Merge branch 'release/1.4.6' into main 2022-03-23 16:24:01 +01:00
Michael Kaye
f7f115e4dc Be clearer on which test run we're running & don't run sonarqube on release branches. 2022-03-23 15:19:30 +00:00
Michael Kaye
669d00c02a Only run sonar on nightly runs 2022-03-23 15:15:30 +00:00
ganfra
55b1a60f96 Revert "Do not suggest collapse if there is only one section"
This reverts commit 6787980185.
2022-03-23 16:09:05 +01:00
Onuray Sahin
5f74442f57 Reorder functions. 2022-03-23 16:34:45 +03:00
Onuray Sahin
f18a107df8 Merge branch 'develop' into feature/ons/live_location_service
* develop: (152 commits)
  Remove exhaustive.
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  Code review fixes.
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
#	vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
#	vector/src/main/res/values/strings.xml
2022-03-23 16:25:01 +03:00
Onuray Sahin
96a2bc9ce4 Changelog added. 2022-03-23 15:47:40 +03:00
ganfra
4755ebfa97 Update Changes 2022-03-23 13:38:33 +01:00
Onuray Sahin
3fa4aea506 Navigate to room list when user clicks to the sticky notification. 2022-03-23 15:37:44 +03:00
Adam Brown
55b946a019 fixing the onboarding sanity test failing
- adds tapping the new take me home button within the sanity test
2022-03-23 12:57:53 +01:00
Onuray Sahin
6d0b823b66
Merge pull request #5404 from vector-im/feature/ons/voice_message_scrubbing
Voice Message Playback Scrolling Support
2022-03-23 14:32:58 +03:00
Onuray Sahin
7ead3f93f4 Remove exhaustive. 2022-03-23 13:52:53 +03:00
Onuray Sahin
c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
2022-03-23 13:32:36 +03:00
ganfra
20b2af4432
Merge pull request #5610 from vector-im/feature/adm/account-creation-sanity-test-update
Sanity test getting stuck on account created screen
2022-03-23 11:03:46 +01:00
Benoit Marty
d5a89fc4aa
Merge pull request #5599 from vector-im/dependabot/github_actions/actions/cache-3
Bump actions/cache from 2 to 3
2022-03-23 10:23:29 +01:00
Benoit Marty
e549ce15af
Merge pull request #5600 from vector-im/dependabot/github_actions/michaelkaye/setup-matrix-synapse-0.4.0
Bump michaelkaye/setup-matrix-synapse from 0.3.0 to 0.4.0
2022-03-23 10:22:39 +01:00
Benoit Marty
c6fe084507
Merge pull request #4471 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0
Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED
2022-03-23 10:08:53 +01:00
Adam Brown
5bbc9dc102 fixing the onboarding sanity test failing
- adds tapping the new take me home button within the sanity test
2022-03-23 09:02:37 +00:00
Denys Nykula
a8969b6dfa Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2171 of 2171 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-03-22 22:35:40 +00:00
Weblate
65732f3720 Merge branch 'origin/develop' into Weblate. 2022-03-22 18:39:56 +00:00
Denys Nykula
17d4e6c745 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2022-03-22 18:39:56 +00:00
lvre
720d830f5f Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2022-03-22 18:39:55 +00:00
libexus
41de155fb5 Translated using Weblate (German)
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
2022-03-22 18:39:54 +00:00
waclaw66
040180478d Translated using Weblate (Czech)
Currently translated at 100.0% (52 of 52 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2022-03-22 18:39:52 +00:00
ganfra
951171cb94
Merge pull request #5607 from vector-im/feature/fga/weblate_1.4.6
Feature/fga/weblate 1.4.6
2022-03-22 19:39:00 +01:00
ganfra
c06c9ea1d6 Fix lint issues on weblate sync 2022-03-22 18:55:34 +01:00
ganfra
3d3f5444b1
Merge pull request #5606 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-03-22 18:11:28 +01:00
Adam Brown
fdf3cc36ce fixing view model tests not collecting flow results
- the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
2022-03-22 17:01:34 +00:00
ericdecanini
bfd31de05e Renames call option to be more agnostic 2022-03-22 17:56:07 +01:00
ClaireG
6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00