Commit graph

14695 commits

Author SHA1 Message Date
ariskotsomitopoulos
2938fa92c0 Rename countThreads method 2022-03-29 11:58:11 +03:00
dependabot[bot]
6269a3357b
Bump peter-evans/create-or-update-comment from 1 to 2
Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 1 to 2.
- [Release notes](https://github.com/peter-evans/create-or-update-comment/releases)
- [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peter-evans/create-or-update-comment
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 23:04:38 +00:00
dependabot[bot]
01bb49d963
Bump peter-evans/find-comment from 1 to 2
Bumps [peter-evans/find-comment](https://github.com/peter-evans/find-comment) from 1 to 2.
- [Release notes](https://github.com/peter-evans/find-comment/releases)
- [Commits](https://github.com/peter-evans/find-comment/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peter-evans/find-comment
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 23:04:35 +00:00
dependabot[bot]
a7cd03d578
Bump peter-evans/create-pull-request from 3 to 4
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 23:04:32 +00:00
Benoit Marty
ff1fb63bf6 Fix some ktlint issues, ignore some others 2022-03-28 18:22:04 +02:00
ganfra
ebee66cfaf Update versions to 1.4.10 2022-03-28 16:37:24 +02:00
Benoit Marty
4c40615871 Remove Flair Fragment (not used, and part of group, which will be removed) 2022-03-28 16:31:50 +02:00
Benoit Marty
2b3951fe04 Force ktlint to version 0.45.1. The ktlint plugin is using 0.42.1 2022-03-28 16:17:27 +02:00
Benoit Marty
5499854ec0 Set up org.owasp.dependencycheck
See https://github.com/jeremylong/DependencyCheck
2022-03-28 15:49:17 +02:00
ganfra
3cf7765aaf Merge tag '1.4.8' into develop
no message
2022-03-28 13:37:42 +02:00
ganfra
d589758b7b Merge branch 'hotfix/1.4.8' into main 2022-03-28 13:37:42 +02:00
ganfra
9bf54a3750 Update changes 2022-03-28 13:36:17 +02:00
Onuray Sahin
08476a91e4
Merge pull request #5595 from vector-im/feature/ons/live_location_service
Live Location Sharing - Foreground Service
2022-03-28 12:50:35 +03:00
Onuray Sahin
9b271e4ffd Trigger github actions. 2022-03-28 12:11:22 +03:00
Benoit Marty
bb19987314 is Loading has been replaced by Uninitialized, is Loading in when statements, which is not strictly equivalent
This commit revert those changes.
2022-03-28 11:09:15 +02:00
Adam Brown
e01c5049f6 updating version to 1.4.8 2022-03-28 09:46:26 +01:00
ClaireG
a9b87de7a3
[Subscribing] Blank display name 2022-03-28 10:34:22 +02:00
bmarty
ee9c8d8626 Sync analytics plan 2022-03-28 00:03:23 +00:00
Adam Brown
f5d2ba39f4 moving the live location sharing permission debug only to unblock releases whilst the feature is WIP 2022-03-25 15:07:06 +00:00
Onuray Sahin
bdbdfe52cd Cancel timers when service is destroyed. 2022-03-25 14:24:42 +03:00
Adam Brown
776cf24516 adding changelog entry 2022-03-25 11:15:05 +00:00
Adam Brown
cfb3aa8a22 adding direct login error path tests 2022-03-25 11:15:05 +00:00
Adam Brown
230c37597c adding happy path tests for the direct login use case 2022-03-25 11:15:05 +00:00
Adam Brown
88197991e1 extracting the direct login logic to its own use case along with viewmodel test case
- will ensure we emit account sign in when going via direct login flow
2022-03-25 11:15:05 +00:00
Onuray Sahin
7285bc6889 Code review fixes. 2022-03-25 13:58:48 +03:00
Onuray Sahin
79afdf724f Code review fixes. 2022-03-25 13:48:20 +03:00
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
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