mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 11:59:12 +03:00
Code Issues Projects Releases Packages Wiki Activity
14575 commits 161 branches 158 tags 270 MiB
Commit graph

14575 commits

This branch
This branch
All branches
Author SHA1 Message Date
ganfra
3410e75790 Merge tag '1.4.7' into develop 2022-03-24 19:34:14 +01:00
ganfra
9ec684f438 Merge branch 'hotfix/1.4.7' into main 2022-03-24 19:33:44 +01:00
ganfra
60ecfd4fc2 Update changes 2022-03-24 19:31:29 +01:00
ganfra
8bcc2f5b0c Fix formating 2022-03-24 19:07:44 +01:00
ganfra
04b136e3e4 RoomList: more fixes on count 2022-03-24 18:50:33 +01:00
ganfra
87438085c6 RoomList: fix count not showing if not collapsable 2022-03-24 18:49:57 +01:00
ganfra
81aa42a8e8
Merge pull request #5616 from vector-im/hotfix/fre/collapse_rooms_section 
Fix rooms section collapsing
 2022-03-24 16:04:16 +01:00
Florian Renaud
3c73ccce7b Add changelog entry 2022-03-24 15:46:16 +01:00
Florian Renaud
1ef1bd81bc Improve room section collapsing 2022-03-24 15:46:16 +01:00
Florian Renaud
a97d3eae7e Pass lambda to updateSection method 2022-03-24 15:46:16 +01:00
Florian Renaud
a362d5427d Fix arrow visibility on section header 2022-03-24 15:46:16 +01:00
ganfra
745382cdfa RoomList : avoid using flow extension on realm results (leads to frozen object and leaks). 2022-03-24 15:41:42 +01:00
ganfra
70e5698082 Update versions to 1.4.7 2022-03-24 15:41:35 +01:00
ganfra
866a5a7e3a
Merge pull request #5626 from vector-im/feature/fre/collapse_rooms_sections 
Restore #5580 "Do not suggest collapse if there is only one section"
 2022-03-24 15:39:39 +01:00
Florian Renaud
1a0bd3f31e Revert "Revert "Do not suggest collapse if there is only one section"" 
This reverts commit 55b1a60f96.
 2022-03-24 15:27:35 +01: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
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
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
ganfra
4755ebfa97 Update Changes 2022-03-23 13:38:33 +01: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
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
ClaireG
6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00
Weblate
095f06bd89 Merge branch 'origin/develop' into Weblate. 2022-03-22 15:59:34 +00:00
iaiz
8550db9f23 Translated using Weblate (Spanish) 
Currently translated at 95.7% (2065 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-03-22 15:58:54 +00:00
iaiz
707800532f Translated using Weblate (Spanish) 
Currently translated at 66.6% (34 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
 2022-03-22 15:58:52 +00:00
Benoit Marty
012cdf4b4d runBlocking -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:52:18 +01:00
Benoit Marty
86829008c3 runBlockingTest -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:39:39 +01:00