Commit graph

13120 commits

Author SHA1 Message Date
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
ariskotsomitopoulos
8cc96e27bc - Add threads to lab settings
- Disable thread awareness due to the new fallback mechanism
2022-01-19 12:28:00 +02: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
ariskotsomitopoulos
4cff3938e7 - Hide read receipts from thread timeline
- Enhance FetchThreadTimelineTask
2022-01-18 16:05:41 +02:00
Benoit Marty
2dfded7326 Remove comment 2022-01-18 14:42:32 +01:00
Benoit Marty
a38a03c980 Use class from common module 2022-01-18 14:41:35 +01:00
Benoit Marty
1c42df7752 Move the file to the new module. 2022-01-18 14:39:02 +01:00
Benoit Marty
ffad479dad Move the file to the new module. 2022-01-18 14:30:59 +01:00
ariskotsomitopoulos
707397cb9d cleanup 2022-01-18 15:28:44 +02:00
Ekaterina Gerasimova
8af92a4091 Sync issue automation with element-web
Add automation for
* labelling Labs issues
* adding design and product issues to boards
* adding design and product PRs to boards
* adding UISI issues to Crypto team board

Fixes issue #4949
2022-01-18 13:24:58 +00:00
Benoit Marty
194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty
5e96e87bdc fastlane 2022-01-18 14:13:31 +01:00
Benoit Marty
68cd303a59 towncrier 2022-01-18 14:11:01 +01:00
Benoit Marty
ea8465f5f3 Version 1.3.15 for hotfix release 2022-01-18 14:06:02 +01:00
Onuray Sahin
7993ff39a5 Add missing fields to location event content. 2022-01-18 15:33:48 +03:00
Benoit Marty
f0d5260be8 Fix unit test 2022-01-18 12:34:14 +01:00
Benoit Marty
2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
ariskotsomitopoulos
10599aa728 ktlint format 2022-01-18 13:11:52 +02:00
Benoit Marty
e8d71feef1
Merge pull request #4973 from vector-im/feature/adm/ftue-other-sso-crash
Fixing onboarding crash when signing in/up on non `matrix.org` server with SSO
2022-01-18 12:09:14 +01:00
Benoit Marty
bdd30e3b8f Fix crash when viewing source which contains an emoji.
Import source of jsonviewer as a module of this project.
2022-01-18 12:04:06 +01:00
Adam Brown
54a5c3e52a adding changelog entry 2022-01-18 10:51:55 +00:00
Adam Brown
114c60cfed fixing onboarding crash when signing in/up with sso -
handles the sso flows by not forwarding to the signin/signup pages and instead using the previous onLoginFlowRetrieved when the selected server type is other
2022-01-18 10:51:54 +00:00
Onuray Sahin
ede1fe39fc Disable location sharing from build settings. 2022-01-18 13:41:40 +03:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
2022-01-18 12:41:40 +02:00
Onuray Sahin
42dcf52eb0 Use official maptiler key. 2022-01-18 12:34:02 +03:00
Benoit Marty
f5b16b834c Changelog 2022-01-18 09:20:08 +01:00
Benoit Marty
961f821ab9 Create and use removeIfCompat (#4961) 2022-01-18 09:19:52 +01:00
Benoit Marty
13881a589a Remove temporary change on the "NewApi" lint error. 2022-01-18 09:17:51 +01:00
Benoit Marty
a083047888 Fix typo 2022-01-18 09:12:39 +01:00
ganfra
cc89a8fc77 Timeline : fix 4959 2022-01-18 09:11:55 +01:00
Bui Minh Duc
19a3eef137 Translated using Weblate (Vietnamese)
Currently translated at 99.1% (2707 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2022-01-17 19:26:47 +00:00
Johan Smits
039e1dd6ad Translated using Weblate (Dutch)
Currently translated at 93.5% (2553 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-01-17 19:26:47 +00:00