Commit graph

23810 commits

Author SHA1 Message Date
Benoit Marty
e8ea5388b9
Merge pull request #8123 from vector-im/hughns/msc3903-v2
Support for v2 of MSC3903
2023-02-16 09:36:40 +01:00
Benoit Marty
ad7e466fb8
Merge pull request #8133 from vector-im/dependabot/gradle/org.jlleitschuh.gradle.ktlint-11.2.0
Bump org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0
2023-02-15 16:59:33 +01:00
SpiritCroc
f437a1a7ad Update store description
Change-Id: Iec370a43041070194ed83ae716155877c6d36355
2023-02-15 15:53:59 +01:00
SpiritCroc
d0750aae5d Update README
Change-Id: Ibe788fa5c7ff4aea692b0a50481ace121a6536a0
2023-02-15 15:53:56 +01:00
SpiritCroc
db0c0e8400 Automatic SchildiChat string correction
Change-Id: I0b757f54364d5c205bdbd8e438b0ae449d6c2675
2023-02-15 15:53:07 +01:00
SpiritCroc
a187bb4c47 Automatic upstream merge postprocessing
Change-Id: I1e1e35826455a93de37b68150accb293ff981054
2023-02-15 15:53:06 +01:00
SpiritCroc
daacdd038c Merge tag 'v1.5.25' into sc
Change-Id: I45d2198b25e7ebee157f4836596ef59ddb1fbe8e
2023-02-15 15:53:00 +01:00
SpiritCroc
4468b0efcf [TMP] Automatic upstream merge preparation
Change-Id: I689f1ff8d7d21247f60a4007e35c77fec5b8bc56
2023-02-15 15:52:50 +01:00
SpiritCroc
387e73b379 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I92d9aa8f50be6a2ec94755c3fc35a7d8211aa300
2023-02-15 15:52:50 +01:00
Benoit Marty
f74a885aa1 Merge branch 'hotfix/1.5.25' into main 2023-02-15 15:26:03 +01:00
Benoit Marty
067e316969 Merge branch 'hotfix/1.5.25' into develop 2023-02-15 15:26:02 +01:00
Benoit Marty
3a25743ded Merge hotfix 1.5.25 2023-02-15 15:25:40 +01:00
Benoit Marty
4cf78795bd Add extra cases. 2023-02-15 15:06:34 +01:00
Benoit Marty
f6711a3d16 Fix issue on timer when recording/playing voice message or voice broadcast. All the seconds were not properly displayed. 2023-02-15 12:23:12 +01:00
Benoit Marty
671435c7f7 fastlane 2023-02-15 10:49:06 +01:00
Maxime NATUREL
068a43e1f4 Fix code style issue 2023-02-15 10:37:10 +01:00
Maxime NATUREL
e8f37dc916 Special rendering for poll end event when poll start is not available 2023-02-15 10:36:02 +01:00
Benoit Marty
1edfefa71e Towncrier 2023-02-15 10:24:47 +01:00
Benoit Marty
bb08def69b Hotfix 1.5.25 2023-02-15 10:18:02 +01:00
Benoit Marty
afe133ed7a
Merge pull request #8127 from vector-im/bugfix/fre/fix_countuptimer_stackoverflow
Fix StackOverFlow exception when stop action is called within the tick event
2023-02-15 09:30:29 +01:00
dependabot[bot]
7980dccc9d
Bump org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0
Bumps org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.2.0.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-14 23:57:19 +00:00
Hugh Nimmo-Smith
e8f196a6f1 Deduplicate error messages 2023-02-14 17:53:02 +00:00
Florian Renaud
529f640554 Changelog 2023-02-14 17:56:30 +01:00
Florian Renaud
5bb78c995e Add unit test for UpdatePushRulesIfNeededUseCaseTest 2023-02-14 17:56:30 +01:00
Florian Renaud
1f4c098d8b Synchronize polls and message push rules after creation 2023-02-14 17:56:30 +01:00
Florian Renaud
0a0ad2d91e Add todo 2023-02-14 17:54:27 +01:00
Florian Renaud
2cb1ea95dc Allow notifications for poll end event 2023-02-14 17:52:23 +01:00
Florian Renaud
6aa4eb5e04 Fix lint issues 2023-02-14 17:52:23 +01:00
Florian Renaud
c8fda158a3 Changelog 2023-02-14 17:52:22 +01:00
Florian Renaud
25d49806cc Improve view events and add unit tests 2023-02-14 17:52:22 +01:00
Florian Renaud
71455706cb Sync poll rules with messages rule 2023-02-14 17:52:22 +01:00
Florian Renaud
1c47983a99 Rename notification settings objects 2023-02-14 17:52:22 +01:00
Florian Renaud
40119733b9 Add ViewModel for push rules settings fragment 2023-02-14 17:52:22 +01:00
Maxime NATUREL
28089618a3 Adding fallback text on Poll end message 2023-02-14 17:01:57 +01:00
Maxime NATUREL
cf609e5fe3 Adding changelog entry 2023-02-14 16:46:54 +01:00
Florian Renaud
225f51d3fd Update comment wording 2023-02-14 12:27:39 +01:00
Florian Renaud
450d3d2238 Add changelog 2023-02-14 12:25:38 +01:00
Florian Renaud
68712513b3 Fix StackOverFlow exception when stop action is called within the tick event 2023-02-14 12:16:24 +01:00
Johannes Marbach
74adab0627
Add EXF issues to the X-Plorer project 2023-02-14 11:53:43 +01:00
SpiritCroc
b65bd730b8 Add some missed read receipt debugging
Change-Id: I431f18d433b49e382b70bc14dc999ca14e8f05f3
2023-02-14 10:49:18 +01:00
Maxime NATUREL
53b369ba38
Merge pull request #8125 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-8.1.0
Bump org.owasp:dependency-check-gradle from 8.0.2 to 8.1.0
2023-02-14 09:11:16 +01:00
dependabot[bot]
ffce999cba
Bump org.owasp:dependency-check-gradle from 8.0.2 to 8.1.0
Bumps org.owasp:dependency-check-gradle from 8.0.2 to 8.1.0.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-13 23:59:48 +00:00
Hugh Nimmo-Smith
f43c9bf4d0
Spelling 2023-02-13 17:40:50 +00:00
Maxime NATUREL
6034085244 Adding unit test 2023-02-13 18:08:08 +01:00
Maxime NATUREL
454ce1c095 Aggregate poll response events even when the poll start event has been received yet 2023-02-13 18:08:07 +01:00
Maxime NATUREL
67c2f0d288 Adding changelog entry 2023-02-13 18:08:07 +01:00
Maxime NATUREL
552af673ff
Merge pull request #8069 from vector-im/feature/mna/poll-history-details
[Poll] History list: details screen of a poll (PSG-1041, PSG-1151)
2023-02-13 17:47:54 +01:00
Hugh Nimmo-Smith
3a40223bf7 Lint 2023-02-13 16:34:56 +00:00
Hugh Nimmo-Smith
117eceb8b0 Changelog 2023-02-13 16:32:06 +00:00
Hugh Nimmo-Smith
2db75e2a62 Support for v2 of MSC3903
Improves the feedback in case of valid code but of unsupported algorithm or transport.
Added some test cases.
2023-02-13 15:07:44 +00:00