mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
15605 commits 161 branches 158 tags 270 MiB
Commit graph

15605 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
77977a0775
Merge pull request #5980 from vector-im/dependabot/gradle/dagger-2.41 
Bump dagger from 2.40.5 to 2.41
 2022-05-09 16:59:33 +02:00
Benoit Marty
9aa251b252
Merge pull request #5979 from vector-im/dependabot/gradle/mockk-1.12.3 
Bump mockk from 1.12.1 to 1.12.3
 2022-05-09 16:58:52 +02:00
Benoit Marty
aad0bb85cc
Merge pull request #5978 from vector-im/dependabot/gradle/jjwt-0.11.5 
Bump jjwt from 0.11.2 to 0.11.5
 2022-05-09 16:58:31 +02:00
Michael Kaye
4cd702a97d
Merge pull request #5994 from vector-im/michaelk/yet_another_pr_to_check_post_pr_check 
noop change to README to test post-pr merging
 2022-05-09 15:50:06 +01:00
Michael Kaye
530aded2b9 noop change to README to test post-pr merging 2022-05-09 15:49:08 +01:00
Michael Kaye
2f39be37a0 Check merged flag from event.pull_request 2022-05-09 15:46:07 +01:00
Michael Kaye
30ee8faaa1
Merge pull request #5993 from vector-im/michaelk/apologies_another_pr_to_test_post_pr 
noop change to test Post PR merging
 2022-05-09 15:41:07 +01:00
Michael Kaye
f7320b6233 noop change to test Post PR merging 2022-05-09 15:38:53 +01:00
Michael Kaye
80263bb790 Use ' not " for quotes, and add more brackets. 2022-05-09 15:35:07 +01:00
Michael Kaye
b73bb3783c
Merge pull request #5992 from vector-im/michaelkaye/noop-change-to-test-post-pr 
noop change to trigger another PR
 2022-05-09 15:17:54 +01:00
Michael Kaye
e74476a997 noop change to trigger another PR 2022-05-09 15:16:30 +01:00
Michael Kaye
66fe792d0e Fix typo .. -> . 2022-05-09 15:15:09 +01:00
Michael Kaye
fa96d2a703
Merge pull request #5991 from vector-im/michaelk/fix_typo_in_post_pr 
Fix typo - pull-request -> pull_request
 2022-05-09 15:13:56 +01:00
Michael Kaye
4d1378d0a1 Fix typo - pull-request -> pull_request 2022-05-09 15:12:29 +01:00
Michael Kaye
f2b4ad4a31
Merge pull request #5990 from vector-im/michaelk/no-op_pr_to_test_build 
noop change to test build system
 2022-05-09 15:10:36 +01:00
Michael Kaye
5bf35f0937 noop change to test build system 2022-05-09 15:02:30 +01:00
Michael Kaye
39c2b08065
Run the PR test after merge and report to channel if it fails (#5962) 
* Fork sonarqube run into a nightly build, report failures back to channel.
* Each PR triggers a build after merge, report failures back to channel.
 2022-05-09 13:49:34 +00:00
Benoit Marty
92cb21ab6e
Merge pull request #5948 from vector-im/feature/bma/user_name 
Add diag request for Synapse
 2022-05-09 15:25:13 +02:00
dependabot[bot]
fc62861b02
Bump dagger from 2.40.5 to 2.41 
Bumps `dagger` from 2.40.5 to 2.41.

Updates `hilt-android-gradle-plugin` from 2.40.5 to 2.41
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.5...dagger-2.41)

Updates `dagger` from 2.40.5 to 2.41
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.5...dagger-2.41)

Updates `dagger-compiler` from 2.40.5 to 2.41
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.5...dagger-2.41)

Updates `hilt-android` from 2.40.5 to 2.41
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.5...dagger-2.41)

Updates `hilt-compiler` from 2.40.5 to 2.41
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.40.5...dagger-2.41)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:23:24 +00:00
dependabot[bot]
ba687addc5
Bump mockk from 1.12.1 to 1.12.3 
Bumps `mockk` from 1.12.1 to 1.12.3.

Updates `mockk` from 1.12.1 to 1.12.3
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.1...1.12.3)

Updates `mockk-android` from 1.12.1 to 1.12.3
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.1...1.12.3)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:22:52 +00:00
dependabot[bot]
f5e3dbb642
Bump jjwt from 0.11.2 to 0.11.5 
Bumps `jjwt` from 0.11.2 to 0.11.5.

Updates `jjwt-api` from 0.11.2 to 0.11.5
- [Release notes](https://github.com/jwtk/jjwt/releases)
- [Changelog](https://github.com/jwtk/jjwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwtk/jjwt/compare/0.11.2...0.11.5)

Updates `jjwt-impl` from 0.11.2 to 0.11.5
- [Release notes](https://github.com/jwtk/jjwt/releases)
- [Changelog](https://github.com/jwtk/jjwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwtk/jjwt/compare/0.11.2...0.11.5)

Updates `jjwt-orgjson` from 0.11.2 to 0.11.5

---
updated-dependencies:
- dependency-name: io.jsonwebtoken:jjwt-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.jsonwebtoken:jjwt-impl
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.jsonwebtoken:jjwt-orgjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 13:22:30 +00:00
Benoit Marty
bb54be5531
Merge pull request #5960 from vector-im/feature/bma/dependabot_reviewers 
Dependabot reviewers
 2022-05-09 15:19:18 +02:00
Benoit Marty
0b00f97879
Merge pull request #5966 from MarcelCoding/fixed-dependabot 
Fixed dependabot
 2022-05-09 11:38:00 +02:00
Michael Kaye
924f73202d
Merge pull request #5949 from vector-im/michaelk/nightly_should_say_why 
Correct public_baseurl for nightly tests.
 2022-05-09 09:59:27 +01:00
Marcel
3f56dad1eb
Fixed dependabot 2022-05-06 18:23:58 +02:00
Aris Kotsomitopoulos
3c9b5d2ec0
Merge pull request #5927 from vector-im/feature/aris/threads_improve_rendering_issue_5151 
Feature/aris/threads improve rendering issue 5151
 2022-05-06 17:19:01 +03:00
Benoit Marty
0138341486 Also assign reviewers for the github-actions update 2022-05-06 15:34:26 +02:00
Benoit Marty
bf8b534c82 Dependabot PR assign to the reviewers team 2022-05-06 15:33:51 +02:00
Eric Decanini
9f9c6fbc5b
Merge pull request #5953 from vector-im/task/eric/reformat-project 
Reformats project based on editorconfig
 2022-05-06 11:43:54 +02:00
Benoit Marty
17c6f7c357
Merge pull request #5955 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.48 
Bump libphonenumber from 8.12.47 to 8.12.48
 2022-05-06 11:25:52 +02:00
ericdecanini
be0be699e4 Fixes formatting errors in ExportEncryptionTest and VectorBaseActivity 2022-05-06 10:10:25 +02:00
dependabot[bot]
6668814ab6
Bump libphonenumber from 8.12.47 to 8.12.48 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.47 to 8.12.48.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.47...v8.12.48)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-05 23:09:00 +00:00
ericdecanini
4266c330de Reverts change to when arrow alignment on some classes 2022-05-05 19:33:45 +02:00
ericdecanini
1cb14d6be7 Adds changelog file 2022-05-05 19:16:53 +02:00
ericdecanini
3fb03e2b2c Reformats project based on editorconfig 2022-05-05 19:10:35 +02:00
Adam Brown
59ab16651b Merge branch 'develop' of github.com:vector-im/element-android into develop 2022-05-05 17:16:17 +01:00
Adam Brown
82edf083f0 Merge branch 'main' into develop 2022-05-05 17:16:08 +01:00
Adam Brown
0683085398 fixing crash on launch 
- due to missing primary key migration in the live location
 2022-05-05 17:11:48 +01:00
Adam Brown
6930923e2b
Merge pull request #5950 from vector-im/bugfix/adm/missing-location-migration 
Fixing crash on launch - Missing migration
 2022-05-05 17:11:33 +01:00
Adam Brown
94f15d109a fixing crash on launch 
- due to missing primary key migration in the live location
 2022-05-05 16:47:30 +01:00
Michael Kaye
fb19d6b83c Try ensuring public_baseurl set correctly. 2022-05-05 14:35:54 +01:00
Benoit Marty
8e319067ad Add diag request for Synapse 2022-05-05 15:34:23 +02:00
ClaireG
c9bd1f32b9
Update notifications rules: make a sound for each notification 2022-05-05 14:02:11 +02:00
ganfra
83f8a8f278 Bump version to 1.4.16 2022-05-05 11:34:12 +02:00
ganfra
a5b007f147 Merge branch 'release/1.4.14' into main 2022-05-05 11:30:59 +02:00
ganfra
47f4db847a Merge tag '1.4.14' into develop 
v1.4.14
 2022-05-05 11:30:59 +02:00
ganfra
9420d309a5 Add changes 2022-05-05 10:38:49 +02:00
ganfra
00ad9ccc2a
Merge pull request #5935 from vector-im/feature/fga/fix_weblate_lint 
Feature/fga/fix weblate lint
 2022-05-04 19:07:16 +02:00
Benoit Marty
330d802079
Merge pull request #5907 from vector-im/feature/bma/currentTimeMillis 
Use Clock interface
 2022-05-04 18:27:04 +02:00
ganfra
f2c35adb60 Fix TODO on strings 2022-05-04 18:19:03 +02:00