filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,014 Commits 7 Branches 120 Tags 228 MiB
Commit Graph

15014 Commits

Author SHA1 Message Date
Eric Decanini 10974366fb
Merge pull request #5473 from vector-im/bugfix/eric/voting-ended-poll 
Fixes ended poll voting
 2022-03-24 20:23:38 +01:00
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
ariskotsomitopoulos 3c7495bd60 Thread redaction will now update the thread summary counter 
Root threads with 0 threads replies will become normal messages and removed from thread summaries
 2022-03-24 16:28:49 +02: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
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
ariskotsomitopoulos 3b9cade1a7 Thread list filtering minor UI changes 2022-03-23 15:13:15 +02: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
ariskotsomitopoulos 82a6ea9d85 Change thread list filtering radio buttons color 2022-03-23 13:40:32 +02:00
ariskotsomitopoulos d232c49d65 Remove filter toolbar on thread list while there no threads to display 2022-03-23 13:33:55 +02:00