mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 10:55:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
15403 commits 6 branches 120 tags 229 MiB
Commit graph

15403 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valere
23f32aae84 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-04-27 12:54:41 +02:00
Aris Kotsomitopoulos
942bc13ccc
Merge pull request #5721 from vector-im/feature/aris/fix_account_deactivation_issue 
Fix Account deactivation issues
 2022-04-27 13:05:52 +03:00
ariskotsomitopoulos
780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-27 12:15:36 +03:00
Valere
8920ed3de8 Code review 2022-04-27 09:45:26 +02:00
manuroe
f5973fa840
Merge pull request #5836 from vector-im/feature/manu/pr-2-reviews 
Update the PR process doc with 2 reviewers and a new reviewer team
 2022-04-27 08:47:11 +02:00
Benoit Marty
521fd1fcd7
Merge pull request #5847 from vector-im/bugfix/eric/missing-call-icons 
Fixes Missing Call Icons when threads are enabled
 2022-04-26 22:30:07 +02:00
ericdecanini
9c951687b0 Moves tools ignore AlwaysShowAction to root of menu_timeline 2022-04-26 21:56:56 +02:00
ericdecanini
6548c3cf6f Replaces call title with action_voice_call 2022-04-26 21:54:54 +02:00
ericdecanini
e4cd31d5ab Adds changelog file 2022-04-26 21:13:36 +02:00
ericdecanini
f6a03cdc63 Fixes missing call icons 2022-04-26 21:10:40 +02:00
Valere
728faaee19 Fix missing mapper for incoming key forward trail 2022-04-26 17:31:01 +02:00
Valere
012dfeb715 Change log for SDK apis 2022-04-26 17:31:01 +02:00
Valere
eaf104495d Cleaning, code review 2022-04-26 17:31:01 +02:00
Valere
9385d19ad0 Fix trail display (from instead of to for incoming types) 2022-04-26 17:30:53 +02:00
Valere
058d2e6b72 Fix: ignore key request form self devices 2022-04-26 17:30:53 +02:00
Valere
885f836adb Cleaning, review 2022-04-26 17:30:53 +02:00
Valere
effbc47bd3 FIx unit test compilation 2022-04-26 17:30:53 +02:00
Valere
631ea50bde Move some crypto classes to API + cleaning 2022-04-26 17:30:42 +02:00
Valere
3f5f2dc0f1 Fix tests 2022-04-26 17:30:42 +02:00
Valere
a60171ce29 Reactivate withheld and verification tests 2022-04-26 17:30:42 +02:00
Valere
f9dd3b96d6 Stop using workers for interactive verification 2022-04-26 17:30:20 +02:00
Valere
54fb4ae8db proper initial withheld support 2022-04-26 17:30:20 +02:00
Valere
88cf1a5e67 Fix unneeded re-uploade of key got from backup 
and disabled prompting for untrusted key sharing
 2022-04-26 17:30:20 +02:00
Valere
cc107498eb Fix database migration 2022-04-26 17:30:20 +02:00
Valere
81b114fc82 Add change log + quick quality fix 2022-04-26 17:30:20 +02:00
Valere
1d948d6b20 Add option to disable key gossip, clear key request on trust change 2022-04-26 17:30:20 +02:00
Valere
6a509ce22d fix unused var 2022-04-26 17:30:20 +02:00
Valere
ae6df469e2 Add incoming key forward trail 2022-04-26 17:30:20 +02:00
Valere
b1db6ca180 fix db migration 2022-04-26 17:30:20 +02:00
Valere
9747eb2432 Add share test + fix 
Crypto config to only request to own device. Only cancel request if ratchet index is low enough
 2022-04-26 17:30:20 +02:00
Valere
9177cb11d5 Refactor key and secret request managers 
use megolm backup before sending key request
 2022-04-26 17:27:52 +02:00
Benoit Marty
d694ea16a8
Merge pull request #5816 from vector-im/feature/bma/sdk_doc_update 
Implement a more scoped API to the `Session` interface
 2022-04-26 17:00:29 +02:00
Benoit Marty
8ff7acaec5
Merge pull request #5832 from vector-im/feature/manu/elementx_gh_workflow 
Add a GH workflow to push ElementX issues to the global board
 2022-04-26 16:18:57 +02:00
Benoit Marty
6ee0b62272
Merge branch 'develop' into feature/bma/sdk_doc_update 2022-04-26 16:15:07 +02:00
Benoit Marty
f863bdea37
Merge pull request #5844 from vector-im/cgizard/disable-update-gradle-wrapper 
Disable update-gradle-wrapper for forks
 2022-04-26 16:10:58 +02:00
Claire G
40f3165d7f update comment 2022-04-26 15:13:27 +02:00
Claire G
766059ffd1 disable update-gradle-wrapper for forks 2022-04-26 15:11:18 +02:00
Benoit Marty
f2bd93afe6
Merge pull request #5838 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.6.21 
Bump dokka-gradle-plugin from 1.6.20 to 1.6.21
 2022-04-26 15:02:43 +02:00
dependabot[bot]
66fd100333
Bump dokka-gradle-plugin from 1.6.20 to 1.6.21 
Bumps dokka-gradle-plugin from 1.6.20 to 1.6.21.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-26 13:00:14 +00:00
Benoit Marty
9e8e6c8b18
Merge pull request #5839 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.1.0.1 
Bump dependency-check-gradle from 7.0.4.1 to 7.1.0.1
 2022-04-26 14:59:42 +02:00
Benoit Marty
d4c0575f28 Merge remote-tracking branch 'origin/hotfix/1.4.13' into develop 2022-04-26 11:50:23 +02:00
ariskotsomitopoulos
ba99d5c028 Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-26 12:49:21 +03:00
Benoit Marty
6b5822e3d5 fastlane (same content than for 1.4.12) 2022-04-26 11:35:43 +02:00
Benoit Marty
ebcab189f2 towncrier 2022-04-26 11:31:51 +02:00
Benoit Marty
da656ac470 Changelog 2022-04-26 11:30:53 +02:00
Benoit Marty
b2f9d6778a Version hotfix 1.4.13 2022-04-26 11:29:40 +02:00
Maxime NATUREL
343322ef21
Merge pull request #5814 from vector-im/fix/mna/live-location-beacon-format 
[Live location sharing] - Removing BeaconInfo structure
 2022-04-26 09:57:46 +02:00
dependabot[bot]
17189f2d58
Bump dependency-check-gradle from 7.0.4.1 to 7.1.0.1 
Bumps dependency-check-gradle from 7.0.4.1 to 7.1.0.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-25 23:10:13 +00:00
Benoit Marty
c542619525 We do not need to observe the user here 2022-04-25 18:31:30 +02:00
Benoit Marty
abdfd9deee Format 2022-04-25 18:29:49 +02:00