filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,285 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

6491 Commits

Author SHA1 Message Date
Benoit Marty a76aedbbc7 Fix clicking on edited message 2021-09-03 17:02:14 +02:00
Benoit Marty 2b1c517f64 Fix test broken sometimes, and test new bottom sheet about room type 2021-09-03 17:02:14 +02:00
Benoit Marty 01dae575de Fix sanity test with new notification V2 screens 2021-09-03 17:02:14 +02:00
Benoit Marty 73881d0813 Upgrade dependency on Barista. 
Should fix #3929

Barista has changed location since 4.0.0
 2021-09-03 17:02:14 +02:00
Benoit Marty fc22376050 Ignore warning in test. 
There is probably a better way than using the GlobalScope, but I'm not sure how to do it now.
 2021-09-03 17:02:14 +02:00
Benoit Marty dbd11c2e8d Remove the useless merge tag 
It was causing crash with `Missing required view with ID: im.vector.app.debug:id/waiting_view`, probably due to a recent change in AGP 7.X.X
 2021-09-03 16:21:55 +02:00
Benoit Marty 377c4e00a3
Merge pull request #3954 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.0.2 
Bump gradle from 4.2.2 to 7.0.2
 2021-09-03 12:11:52 +02:00
Valere 9687a59371 Code review 2021-09-02 11:34:08 +02:00
Valere acf7a226f0 Fix / summary showing roomIds instead of names 2021-09-02 11:34:08 +02:00
Valere c01b36a648 Support summary pagination API in manage space 2021-09-02 11:34:08 +02:00
Valere 5297512f87 Support Space explore pagination 2021-09-02 11:34:08 +02:00
Benoit Marty ec6bae6b1e Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now 
https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only
 2021-09-02 10:43:33 +02:00
Benoit Marty 80f23f1f3c Use Java 11 source code 
https://developer.android.com/studio/releases/gradle-plugin#java-11
 2021-09-02 09:50:34 +02:00
Benoit Marty f37dadc1bb Fix lint issue 
We are now API 21 min
 2021-09-02 09:38:24 +02:00
Valere ec77006ddf FIx / bad format of restricted join rule 2021-09-01 17:15:37 +02:00
Benoit Marty 8189fc0b66
Merge pull request #3920 from vector-im/feature/bma/string_cleanup 
Improve documentation about string resource
 2021-08-30 14:31:24 +02:00
Benoit Marty 23e3241b95
Merge pull request #1809 from dkter/conversation-features 
Support Android 11 Conversation features
 2021-08-30 14:15:42 +02:00
Benoit Marty 2a89e2b4ac
Merge pull request #3908 from vector-im/feature/fga/fix_jitsi_widget 
Fix Jitsi-hosted jitsi conferences not loading
 2021-08-30 13:57:39 +02:00
Benoit Marty b6d3689475 Fix warning as per #3901 2021-08-30 12:30:11 +02:00
Benoit Marty 42915a93db Fix warning "Multiple substitutions specified in non-positional format" 2021-08-30 11:52:43 +02:00
Benoit Marty d349656b34 Remove translations without original source 2021-08-30 11:42:08 +02:00
Weblate ed9e9336e0 Merge branch 'origin/develop' into Weblate. 2021-08-30 09:00:46 +00:00
Benoit Marty 7a766ddb92 Temporary revert to fix Weblate merge conflict 2021-08-30 10:59:49 +02:00
Graeme Power 7ab0e22c51 Translated using Weblate (Irish) 
Currently translated at 7.6% (195 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ga/
 2021-08-30 08:24:01 +00:00
lvre 8ebe6a9989 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2565 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-08-30 08:23:56 +00:00
Benoit Marty 0f2191a8b1 Translated using Weblate (Frisian) 
Currently translated at 38.4% (986 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-08-28 16:25:20 +00:00
David Teresi 15217d98ac Only set SHORTCUT_CATEGORY_CONVERSATION above API 25 2021-08-27 18:49:45 -04:00
Benoit Marty 65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite 
support email invite
 2021-08-27 19:02:42 +02:00
Benoit Marty 5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
Valere 67295c6bdd Fix compilation 2021-08-27 17:55:52 +02:00
Benoit Marty 54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1 
Bump daggerVersion from 2.38 to 2.38.1
 2021-08-27 17:37:03 +02:00
Valere efa9ff0959 unused param 2021-08-27 17:30:32 +02:00
Valere 819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere 69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
Valere 4107d2643c
Merge pull request #3704 from vector-im/feature/bca/promote_restricted 
Promote restricted join rule to admins
 2021-08-27 17:27:57 +02:00
Benoit Marty 6dccc3e752
Merge pull request #3913 from vector-im/feature/bma/3910_fix_crash 
Feature/bma/3910 fix crash
 2021-08-27 17:09:13 +02:00
David Langley 0dd89e650c Remove host pattern. 2021-08-27 16:07:34 +01:00
David Langley 21c2b0b2dd Lint 2021-08-27 15:49:13 +01:00
David Langley 68eaefbc9c Show error dialog rather than toast. Add validation to keyword field for slashes and dots. 2021-08-27 15:48:11 +01:00
Benoit Marty 0046de576e
Merge pull request #3767 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.0 
Bump constraintlayout from 2.1.0-beta02 to 2.1.0
 2021-08-27 16:39:34 +02:00
dependabot[bot] 7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1 
Bumps `daggerVersion` from 2.38 to 2.38.1.

Updates `dagger` from 2.38 to 2.38.1
- [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.38...dagger-2.38.1)

Updates `dagger-compiler` from 2.38 to 2.38.1
- [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.38...dagger-2.38.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 14:33:17 +00:00
Benoit Marty fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1 
Bump timber from 4.7.1 to 5.0.1
 2021-08-27 16:32:29 +02:00
Benoit Marty c6c66ccf31
Merge pull request #3903 from vector-im/feature/ons/fix_voice_message_lollipop_crash 
Crash on opening a room on Android 5.0 and 5.1 - Regression with Voice message
 2021-08-27 16:31:49 +02:00
Benoit Marty 72a6d6c9a6
Update vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt 2021-08-27 16:31:20 +02:00
Benoit Marty 33a3813e87 Fix a crash at start-up if translated string is empty 2021-08-27 16:05:16 +02:00
Valere b9e2374a4c cleaning 
review


fix string warning
 2021-08-27 15:56:07 +02:00
Valere 6f45ba575b post rebase cleaning 2021-08-27 15:56:07 +02:00
Valere e8d01becfe Code review 2021-08-27 15:56:07 +02:00
Valere 1f6b8d2b12 Check that is admin 2021-08-27 15:56:07 +02:00
Valere de6b5af6ba Promote restricted join rule to admins 2021-08-27 15:56:07 +02:00