filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-29 11:02:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,102 Commits 7 Branches 124 Tags 229 MiB
927f526c6c
Commit Graph

16102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ericdecanini
927f526c6c Post merge conflict reformatting 2022-05-25 17:35:54 +02:00
ericdecanini
8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-25 17:35:31 +02:00
Valere
8b2d6c8dc2
Merge pull request #6148 from vector-im/feature/bca/fix_decrypt_redacted_event 
Fix decrypting redacted event
 2022-05-25 17:26:54 +02:00
Valere
d7c8abbe98 quick format 2022-05-25 16:52:56 +02:00
Valere
abb335c43d Improve redaction test 2022-05-25 16:52:56 +02:00
Valere
136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere
755da616ed Fix decrypting redacted event 2022-05-25 16:52:56 +02:00
Valere
52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack 
Feature/aris/crypto replay attack
 2022-05-25 16:20:26 +02:00
Michael Kaye
f5b4e897fa
Merge pull request #6099 from vector-im/michaelk/retry_keys_backup_test 
Track number of retries of tests,retry KeysBackupTest, Ignore E2eeSanityTests
 2022-05-25 14:16:47 +01:00
Maxime NATUREL
c8fb034c57
Merge pull request #6128 from vector-im/feature/mna/PSF-999-auto-refresh-db 
[Location sharing] - Update DB entity when a live is timed out (PSF-999)
 2022-05-25 14:59:54 +02:00
Johannes Marbach
f5a621a6d5
Merge pull request #6140 from vector-im/johannes/widget-screen-rotation 
Prevent widget web view from reloading on screen / orientation change (PSF-1034)
 2022-05-25 13:42:24 +02:00
Adam Brown
fdaaed430e
Merge pull request #6131 from vector-im/dependabot/gradle/vanniktechEmoji-0.13.0 
Bump vanniktechEmoji from 0.9.0 to 0.13.0
 2022-05-25 10:14:56 +01:00
Maxime NATUREL
791d4fb1e8 Improve computation of the work name to limit its length 2022-05-25 11:10:54 +02:00
Maxime NATUREL
8864a3cf2c Using replace instead of keep strategy for the worker 2022-05-25 11:06:02 +02:00
Maxime NATUREL
cfdc18d421 Improve code readability in aggregation processor 2022-05-25 11:05:28 +02:00
Maxime NATUREL
b081429725 Replace getOrCreate() by get() in worker 2022-05-25 10:59:08 +02:00
Adam Brown
ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider 
Excluding the gms play-service-location from maplibre for fdroid builds
 2022-05-25 08:59:18 +01:00
Michael Kaye
e1dde0cef1
Merge pull request #6141 from vector-im/michaelk/downgrade_gradle_dependency 
Downgrade gradle from 7.2.0 to 7.1.3
 2022-05-24 18:02:40 +01:00
Michael Kaye
5faa2ff205 Add comment linking to an issue 2022-05-24 16:53:17 +01:00
Michael Kaye
20422a5451 towncrier 2022-05-24 16:40:03 +01:00
Michael Kaye
5766414d79 Downgrade gradle from 7.2.0 to 7.1.3 2022-05-24 16:36:14 +01:00
dependabot[bot]
d4af2a7a87
Bump vanniktechEmoji from 0.9.0 to 0.13.0 
Bumps `vanniktechEmoji` from 0.9.0 to 0.13.0.

Updates `emoji-material` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

Updates `emoji-google` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-24 15:26:52 +00:00
Adam Brown
b4b2b97eb1
Merge pull request #6068 from vector-im/dependabot/gradle/vanniktechEmoji-0.12.0 
Bump vanniktechEmoji from 0.9.0 to 0.12.0
 2022-05-24 16:26:06 +01:00
Johannes Marbach
7913a42664 Add changelog file 2022-05-24 16:36:26 +02:00
Johannes Marbach
f95853a7b3 Prevent widget web view from reloading on screen / orientation change (PSF-1034) 
Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-05-24 16:29:38 +02:00
ericdecanini
c3209d7049 Manually fixes more formatting issues 2022-05-24 15:31:20 +02:00
ericdecanini
6c21a6b48d Separates some method parameters 2022-05-24 15:26:24 +02:00
Adam Brown
bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant 
- fixes fdroid being unable to compile the project due to a non foss dependency
 2022-05-24 10:10:03 +01:00
Adam Brown
a59b8bf50c
Merge pull request #6065 from vector-im/feature/adm/matrix-org-ordering 
FTUE - Only override sign up steps for `matrix.org`
 2022-05-23 21:24:48 +01:00
Maxime NATUREL
b05fc763ae Rely only on isActive field on UI side 2022-05-23 17:34:52 +02:00
Maxime NATUREL
683a9cdfff Schedule work during aggregation 2022-05-23 17:34:52 +02:00
Maxime NATUREL
47eb7173f0 Creation of a worker to deactivate a live after timeout 2022-05-23 17:34:52 +02:00
Maxime NATUREL
d76b93ced3 Adding comment on isActive field 2022-05-23 17:34:51 +02:00
Maxime NATUREL
695c234139 Adding changelog entry 2022-05-23 17:34:51 +02:00
Maxime NATUREL
9a38d59f9a
Merge pull request #6092 from vector-im/feature/mna/PSF-888-navigation 
[Location sharing] - Navigation to Map view from live location message (PSF-888)
 2022-05-23 13:54:04 +02:00
Benoit Marty
fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
Benoit Marty
ff1099667a
Merge pull request #6106 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.4 
Bump constraintlayout from 2.1.3 to 2.1.4
 2022-05-23 12:43:03 +02:00
ericdecanini
3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Adam Brown
98999c754f
Merge pull request #5868 from vector-im/feature/adm/ftue-email-verification 
[FTUE] - Email input and verification
 2022-05-23 11:14:46 +01:00
Maxime NATUREL
7bb73ffb57 Making the layout file more generic 2022-05-23 11:41:33 +02:00
Maxime NATUREL
b331521e93 Improving code in Fragment 2022-05-23 11:30:57 +02:00
Maxime NATUREL
721d7cb6a0 Remove commented code 2022-05-23 11:30:35 +02:00
Maxime NATUREL
c46aaa24a5 Using @AndroidEntryPoint in Fragment 2022-05-23 10:40:52 +02:00
Benoit Marty
0b35ee7c79
Merge pull request #6120 from vector-im/cgizard/fix_issue_number 
Update issue number in changes.md
 2022-05-23 10:38:58 +02:00
Claire G
7e494786d4 update issue number in changes.md 2022-05-23 09:54:16 +02:00
Benoit Marty
71e14ea43b
Merge pull request #6110 from vector-im/defect/jorgem/PSE-613-fix-multi-invites-to-room 
Fix sending multiple invites to a room reaching only one or two people
 2022-05-23 09:39:47 +02:00
Jorge Martín
96e3544a47 Fix sending multiple invites to a room reaching only one or two people 2022-05-23 08:14:32 +02:00
Onuray Sahin
109b381e2e
Merge pull request #6103 from vector-im/feature/ons/fix_live_location_flickering 
Glide - Use current drawable while loading new static map image
 2022-05-20 18:36:12 +03:00
Adam Brown
2d351aa60f applying api changes 2022-05-20 15:20:24 +01:00
ariskotsomitopoulos
85f3592938 PR remarks 2022-05-20 17:03:15 +03:00