Commit Graph

22229 Commits

Author SHA1 Message Date
Maxime NATUREL 25ca598414 Adding some unit tests 2023-02-17 16:41:03 +01:00
Benoit Marty 4080f1c8b8
Merge pull request #8117 from vector-im/dependabot/gradle/dagger-2.45
Bump dagger from 2.44.2 to 2.45
2023-02-17 16:07:29 +01:00
Benoit Marty 386814eac4
Merge pull request #8142 from vector-im/yostyle/fix_sendbutton_color
Remove hardcoded color on send button
2023-02-17 15:53:11 +01:00
Maxime NATUREL b5af6f5a0f Render user location pin on the live location sharing map preview 2023-02-17 15:31:30 +01:00
Maxime NATUREL de50577ac3
Merge pull request #8136 from vector-im/fix/mna/poll-end-while-no-poll-start
[Poll] Improve rendering of poll end message when poll start event isn't available (PSG-1157)
2023-02-17 13:51:50 +01:00
Florian Renaud 7d16c86f37
Merge pull request #8130 from vector-im/feature/fre/poll_sync_push_rules_after_creation
[Poll] Synchronize polls and message push rules after creation (PSG-1137)
2023-02-17 13:46:13 +01:00
Florian Renaud 8bf46b136a Fix broken test 2023-02-17 12:12:55 +01:00
yostyle 4c12c0dd1f Add changelog 2023-02-17 11:32:51 +01:00
yostyle 835e1f5a4b Remove hardcoded color on send button 2023-02-17 11:17:49 +01:00
Florian Renaud dcd43d6e7f Move push rule ids extensions to vector module 2023-02-17 10:14:33 +01:00
Florian Renaud f887acd854
Merge pull request #8114 from vector-im/feature/fre/poll_new_push_rules
[Poll] Synchronize polls push rules with message push rules (PSG-954)
2023-02-17 10:03:53 +01:00
Kat Gerasimova 3bb19838a4 Don't run tests on changes to .github/*
If a PR is only touching files in the .github directory, there's no need to run tests on the app
2023-02-16 18:22:08 +00:00
Maxime NATUREL f676a65544 Show locate button only when current user is not sharing live location 2023-02-16 17:51:54 +01:00
jonnyandrew a8ba3aa9c1
Build unmerged APKs on pull request (#8044) 2023-02-16 16:49:52 +00:00
Maxime NATUREL 8eff831382 Adding locate button view on the map for live location preview 2023-02-16 17:34:47 +01:00
Maxime NATUREL 2ae6cd40c7
Merge pull request #8126 from vector-im/fix/mna/poll-votes-aggregation
[Poll] Fix votes aggregation process (PSG-1153)
2023-02-16 17:29:45 +01:00
Maxime NATUREL 81cb0d40c6 Updating the pin for user location 2023-02-16 16:47:02 +01:00
Maxime NATUREL a4211d8482 Rendering the user location pin 2023-02-16 16:12:28 +01:00
Maxime NATUREL d23636900f Adding button to get user current location in static location sharing preview 2023-02-16 15:32:02 +01:00
dependabot[bot] 2dd90aa07f
Bump io.sentry:sentry-android from 6.13.0 to 6.14.0 (#8138)
Bumps [io.sentry:sentry-android](https://github.com/getsentry/sentry-java) from 6.13.0 to 6.14.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.13.0...6.14.0)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-16 13:56:19 +01:00
Jorge Martin Espinosa a358644354
Fix ktlint issue that was accidentally merged (#8139) 2023-02-16 11:14:15 +00:00
Maxime NATUREL a3a616d8df Adding changelog entry 2023-02-16 12:02:19 +01:00
Benoit Marty 2453f2cee0
Merge pull request #8115 from luixxiul/localization-3
Replace 'Use Bots' with 'Use bots' for localization experience on Weblate
2023-02-16 10:16:23 +01:00
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
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
dependabot[bot] 9cd3a9e13d
Bump io.element.android:wysiwyg from 1.0.0 to 1.1.1
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.0.0 to 1.1.1.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/1.0.0...1.1.1)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-14 23:57:06 +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