Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-24 14:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,047 Commits 530 Branches 158 Tags 486 MiB
a92bc36782
Commit Graph

13047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Linerly
67b2e8378a Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-01-17 19:26:11 +00:00
Priit Jõerüüt
cce8234c6f Translated using Weblate (Estonian) 
Currently translated at 99.9% (2727 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-01-17 19:26:11 +00:00
Felix
5ce2d4bcd3 Translated using Weblate (German) 
Currently translated at 98.9% (2700 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-17 19:26:10 +00:00
Benoit Marty
23eb8ead4f Add case for local or non public homeserver. 2022-01-17 16:30:43 +01:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
Adam Brown
256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update 
Updated splash carousel images and copy
 2022-01-17 15:11:08 +00:00
Benoit Marty
e2e3f72564 Merge branch 'develop' into feature/bca/fix_switch_space_on_tap_notif 2022-01-17 15:28:56 +01:00
Benoit Marty
eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix 
Avoid deleting sent messages on non room events
 2022-01-17 15:26:46 +01:00
Benoit Marty
c59bb5740a Add comment after merge of #4952 2022-01-17 15:24:51 +01:00
Benoit Marty
95b116b8a1
Merge pull request #4952 from abaker/disable_http_2 
Force HTTP/1.1
 2022-01-17 15:20:23 +01:00
ariskotsomitopoulos
52348e399e ktlint fixes 2022-01-17 13:30:59 +02:00
ariskotsomitopoulos
879c4ffef6 Improve logic 2022-01-17 13:00:34 +02:00
Benoit Marty
ab29a15572
Merge pull request #4942 from vector-im/feature/bma/delete_rx 
Remove unused module matrix-sdk-android-rx and do some cleanup
 2022-01-17 11:59:23 +01:00
ariskotsomitopoulos
01ade64f3b fix ktlint format 2022-01-17 12:27:53 +02:00
ariskotsomitopoulos
493374c423 Add changelog 2022-01-17 12:21:22 +02:00
ariskotsomitopoulos
3656896af9 Avoid deleting sent messages on non room events 2022-01-17 12:13:01 +02:00