Commit graph

14426 commits

Author SHA1 Message Date
ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users
Threads Migration
2022-03-22 14:57:07 +01:00
ariskotsomitopoulos
c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
Adam Brown
21e46c5840
Merge pull request #5601 from vector-im/dependabot/gradle/org.json-json-20220320
Bump json from 20211205 to 20220320
2022-03-22 11:00:13 +00:00
ariskotsomitopoulos
a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00
dependabot[bot]
c2e3c63100
Bump json from 20211205 to 20220320
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [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-03-21 23:09:06 +00:00
ganfra
794131d274
Merge pull request #5551 from SpiritCroc/local-echo
Fix local echos not being shown when re-opening rooms
2022-03-21 19:24:07 +01:00
Michael Kaye
4a8aeadbcf
Merge pull request #5471 from vector-im/michaelk/ci_script_improvements
CI Script improvements
2022-03-21 15:06:11 +00:00
Benoit Marty
835497682f
Merge pull request #5572 from p1gp1g/play-sticker
Show stickers on click
2022-03-21 15:51:36 +01:00
Benoit Marty
579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch
Presence indicator theme attribute
2022-03-21 15:45:36 +01:00
Benoit Marty
176895a37d
Merge pull request #5589 from vector-im/sync-emojis
Sync Emojis
2022-03-21 15:42:43 +01:00
Michael Kaye
c687252fb6
Update .github/workflows/nightly.yml 2022-03-21 14:31:17 +00:00
ariskotsomitopoulos
ed2cb5f0fe Enhance text constants 2022-03-21 15:45:08 +02:00
bmarty
ffb007e96d Sync Emojis 2022-03-21 00:03:12 +00:00
Adam Brown
ea9c9ae490
Merge pull request #5408 from vector-im/feature/adm/onboarding-tests
FTUE - Onboarding registration steps unit tests
2022-03-18 15:57:38 +00:00
Maxime NATUREL
4761f7701b
Merge pull request #5579 from vector-im/feature/mna/PSF-664-5571-live-location-indicator
#5571: Live location status bar indicator
2022-03-18 16:30:41 +01:00
Maxime Naturel
d1aba46b52 Using one line per parameter for the custom view 2022-03-18 15:58:42 +01:00
Maxime Naturel
840a224c9f Fixing coding style issue 2022-03-18 15:01:44 +01:00
Adam Brown
ce2c309d72 including verification to ensure no other methods are being called 2022-03-18 14:00:56 +00:00
ariskotsomitopoulos
e574fda099 Remove unused import 2022-03-18 14:55:14 +01:00
ariskotsomitopoulos
06db7e2374 Enhance migration logic & PR remarks 2022-03-18 14:51:06 +01:00
ariskotsomitopoulos
fd4d99d6fc Possible NullPointerException crash fix 2022-03-18 14:50:34 +01:00
Adam Brown
7f943d37fd explicitly declaring the fake registrationb wizard as not relaxed and creating new test instances for each case 2022-03-18 13:15:14 +00:00
Maxime Naturel
526d11e912 Removing TODO 2022-03-18 14:12:55 +01:00
Maxime Naturel
56bffb2657 Adding stop button 2022-03-18 14:11:16 +01:00
Maxime Naturel
67297bbdef Custom View in timeline screen without stop button 2022-03-18 14:11:08 +01:00
Maxime Naturel
70ab5354c3 Adding strings of the view 2022-03-18 14:10:57 +01:00
Maxime Naturel
32f18d5af3 Adding changelog entry 2022-03-18 14:10:47 +01:00
Maxime NATUREL
3547c5acba
Merge pull request #5565 from vector-im/feature/mna/PSF-664-5536-permissions
Live Location Sharing - Background permission
2022-03-18 12:06:30 +01:00
ariskotsomitopoulos
2e5d45ec6e Format code 2022-03-18 12:03:17 +01:00
ariskotsomitopoulos
f00b1f29bf Enhance text context for thread migration notice 2022-03-18 11:58:29 +01:00
Valere
189683a8a1
Merge pull request #5552 from SpiritCroc/timeline-decryptor-crash
Fix crash when closing room during timeline decryption
2022-03-18 11:34:27 +01:00
ariskotsomitopoulos
a0e6dd5f6c Merge branch 'develop' into feature/aris/thread_labs_notice_users
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
#	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
2022-03-18 11:28:21 +01:00
aringenbach
1d74e34362
Merge pull request #5566 from vector-im/feature/aringenbach/presence-sync-build-config
Add a presence sync enabling build config
2022-03-18 09:19:45 +01:00
sim
e5c04d9cc8 Show stickers on click
Play animated stickers

Signed-off-by: sim <git@sgougeon.fr>
2022-03-18 01:03:34 +01:00
ariskotsomitopoulos
61cb7a6ffb Prepare next RC threads migration to all users 2022-03-17 19:09:09 +01:00
ariskotsomitopoulos
2ca3387ab3 Migrate Threads and notify user 2022-03-17 18:51:54 +01:00
Adam Brown
abf62aff47 extracting named function out for cancelling the email validation job, giving more context to the currentjob=null 2022-03-17 17:51:01 +00:00
Adam Brown
192d1c4f2d converting open class to sealed interface for extra type safety 2022-03-17 17:01:16 +00:00
Adam Brown
ba76aac965 removing unused fake helper methods 2022-03-17 16:54:51 +00:00
Adam Brown
d514751ffd avoiding shadowed lambda parameters 2022-03-17 16:52:37 +00:00
Adam Brown
5df2ae9ae2 updating with previous state helper and including javadoc to help explain its usage 2022-03-17 16:50:20 +00:00
Adam Brown
d77061b229 removing fully qualified import 2022-03-17 16:38:42 +00:00
Arnaud Ringenbach
7593f7a2c6 Fix lint issues 2022-03-17 17:15:16 +01:00
Arnaud Ringenbach
bc3cef53fe Re-trigger checks 2022-03-17 17:06:45 +01:00
Onuray Sahin
a13ba13fb5 Code review fixes. 2022-03-17 18:30:39 +03:00
Arnaud Ringenbach
d3459d1d3d Use MatrixConfiguration & move presence sync enabled checks out of view 2022-03-17 14:50:15 +01:00
Arnaud Ringenbach
4bcf31e0c2 Add a presence sync enabling build config 2022-03-17 11:43:07 +01:00
Adam Brown
36564d3657
Merge pull request #5558 from vector-im/feature/adm/crash-when-tapping-verification-item
Fixing crash when tapping timeline verification item
2022-03-17 10:25:52 +00:00
Onuray Sahin
33e5a206bd Fix background location permission for Android > 10. 2022-03-17 12:29:46 +03:00
Adam Brown
4154f036db fixing crash when tapping verification item
- caused by the setArguments being called on the TimelineFragment not the bottomsheet we've just created
2022-03-16 16:19:39 +00:00