Commit Graph

13037 Commits

Author SHA1 Message Date
Tiago Loureiro 6d4a88df9d Merge branch 'fix_4991' of github.com:tgloureiro/element-android into fix_4991 2022-01-19 11:58:10 -03:00
Tiago Loureiro 4dea7131b1 Fix #4991: lifecycle should be at least started 2022-01-19 11:57:12 -03:00
Tiago Loureiro 4ad46ed4a6 Fix: lifecycle should be at least started 2022-01-19 11:56:14 -03:00
Benoit Marty b7587d7e2d
Merge pull request #4993 from vector-im/revert-4982-dependabot/gradle/io.realm-realm-gradle-plugin-10.10.0
Revert "Bump realm-gradle-plugin from 10.9.0 to 10.10.0"
2022-01-19 15:52:07 +01:00
Benoit Marty b71ac4d8fa
Revert "Bump realm-gradle-plugin from 10.9.0 to 10.10.0" 2022-01-19 15:51:51 +01:00
Benoit Marty 9e57263fb6 Changelog 2022-01-19 15:45:59 +01:00
Benoit Marty c0aa0cef62 Analytics: inject analyticsTracker, it has a better scope 2022-01-19 15:24:25 +01:00
Benoit Marty 880b97cc5c Analytics: import latest plan 2022-01-19 15:21:25 +01:00
Benoit Marty c4046990f0 Analytics: track call start and call end 2022-01-19 15:19:19 +01:00
Benoit Marty 69a9643894 Analytics: forgot password screen 2022-01-19 15:19:19 +01:00
Benoit Marty e3c70d1bb1 Analytics: splashscreen 2022-01-19 15:19:19 +01:00
Benoit Marty 1e3733fe8e Analytics: login/register screens 2022-01-19 15:19:19 +01:00
Benoit Marty 54108b8f8d Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty db3353feb5 Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty 13b4a58eaf Analytics: Add more screen
https://github.com/matrix-org/matrix-analytics-events/pull/11
2022-01-19 15:19:19 +01:00
Benoit Marty 67f43550ac Analytics: Fix issue with the drawer 2022-01-19 15:19:19 +01:00
Benoit Marty f307c48dd4 Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty ebd4dc0c5e Analytics: Import the plan again 2022-01-19 15:19:19 +01:00
Benoit Marty dfb807506b Analytics: Track some screen (#4715) 2022-01-19 15:19:19 +01:00
Benoit Marty 0a08a50e11 Analytics: Framework to send screen event 2022-01-19 15:19:19 +01:00
Benoit Marty a8c29f55f5 Analytics: Send JoinedRoom event - room preview (#4716) 2022-01-19 15:19:19 +01:00
Benoit Marty 55a6257cee Analytics: Send JoinedRoom event (#4716) 2022-01-19 15:17:54 +01:00
Benoit Marty 11f176e079 Analytics: Create extension to compute JoinedRoom.RoomSize (#4716) 2022-01-19 15:16:08 +01:00
Benoit Marty 3e125bcccf Analytics: Send the Event `CreatedRoom()` (#4716) 2022-01-19 15:16:08 +01:00
Benoit Marty 7a6f3cbcf7 Analytics: Send the Event `Click(name = Click.Name.SendMessageButton)` (#4717) 2022-01-19 15:12:41 +01:00
Benoit Marty e487621075 Analytics: create AnalyticsTracker interface 2022-01-19 15:12:41 +01:00
Benoit Marty e416f1024a Reformat code using AS 2022-01-19 15:12:41 +01:00
Benoit Marty e73992f5df
Merge pull request #4990 from vector-im/feature/aris/ignore_dependabot_github_script
Update dependabot.yml
2022-01-19 14:06:40 +01:00
Aris Kotsomitopoulos 312c4b1914
Update dependabot.yml
Ignore all versions of github-script while not possible to ignore a specific version
2022-01-19 14:18:16 +02:00
Benoit Marty ec6677643d
Merge pull request #4989 from vector-im/feature/aris/ignore_dependabot_github_script
Ignore dependabot upgrade for @github-script@v3
2022-01-19 12:24:45 +01:00
Adam Brown 3c7f2c5bdf adding tools:text for dynamically set text 2022-01-19 11:18:54 +00:00
ariskotsomitopoulos 8d0299e411 Ignore dependabot upgrade for @github-script@v3 2022-01-19 12:46:22 +02:00
Adam Brown 211f184066 updating splash submit copy to use Create account when the I already have an account feature is enabled 2022-01-19 10:38:28 +00:00
Adam Brown 8f98f3e6d0 promoting wip carousel strings 2022-01-19 10:17:04 +00:00
Adam Brown 36a26fcfd0 replacing the dark carousel background with a solid colour as par design changes 2022-01-19 10:17:04 +00:00
Adam Brown 00f2947636 enabling the splash carousel feature by default 2022-01-19 10:17:04 +00:00
Onuray Sahin 381dd5343a Show edit action for poll messages if it is not voted and closed. 2022-01-19 13:00:21 +03:00
Benoit Marty a05ce81b5b
Merge pull request #4982 from vector-im/dependabot/gradle/io.realm-realm-gradle-plugin-10.10.0
Bump realm-gradle-plugin from 10.9.0 to 10.10.0
2022-01-19 10:16:07 +01:00
Benoit Marty e1dd0b4248
Merge pull request #4981 from vector-im/dependabot/gradle/org.json-json-20211205
Bump json from 20190722 to 20211205
2022-01-19 10:14:56 +01:00
dependabot[bot] 1e99e12857
Bump realm-gradle-plugin from 10.9.0 to 10.10.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.9.0 to 10.10.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.9.0...v10.10.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-18 23:08:13 +00:00
dependabot[bot] 8d37dc5118
Bump json from 20190722 to 20211205
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-18 23:08:02 +00:00
Benoit Marty 488486a74f
Merge pull request #4975 from vector-im/feature/adm/ftue-sanity-test-updates
Including onboarding auth options in sanity test
2022-01-18 19:04:47 +01:00
Adam Brown 70a95fc373 removing unused import 2022-01-18 16:21:37 +00:00
Adam Brown 030d9ef351 extracting inner class to its own file and updating function names relative to their usage 2022-01-18 16:20:33 +00:00
Adam Brown 37c4d94109 adding changelog entry 2022-01-18 16:20:33 +00:00
Adam Brown eb763bb5bb adding onboarding option crawling to the sanity tests 2022-01-18 16:20:33 +00:00
Adam Brown a3dd3a830c fixing wrong wait function being used 2022-01-18 16:20:33 +00:00
Adam Brown 69c05e63d4 only reverting to the combined sign in/sign up screen when the currently login mode isn't supported
- eg for a SSO only flow or unknown/unsupported
2022-01-18 16:20:33 +00:00
Benoit Marty 49761382c6
Merge pull request #4976 from vector-im/feature/bma/cleanup_after_hotfix
Cleanup after hotfix
2022-01-18 16:31:45 +01:00
Benoit Marty 2dfded7326 Remove comment 2022-01-18 14:42:32 +01:00