filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,752 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

11752 Commits

Author SHA1 Message Date
Ihor Hordiichuk 98ba9d6342 Translated using Weblate (Ukrainian) 
Currently translated at 88.1% (2344 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-10-02 12:26:32 +00:00
Linerly ca64e9511e Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2658 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-10-02 12:26:18 +00:00
Benoit Marty f5375c7af2 Run `./gradlew ktlintFormat` 2021-10-02 11:49:28 +02:00
SpiritCroc 02588b447e Improve visibility of floating action button unread counter badge 
Change-Id: Icd67166b2ed592d04657b067e17ae329e93b7da7
 2021-10-02 09:50:12 +02:00
dependabot[bot] bde45b901f
Bump okhttp-bom from 4.9.1 to 4.9.2 
Bumps [okhttp-bom](https://github.com/square/okhttp) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-4.9.1...parent-4.9.2)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-01 23:07:25 +00:00
dependabot[bot] b7f0efbeb1
Bump org.jlleitschuh.gradle.ktlint from 10.1.0 to 10.2.0 
Bumps org.jlleitschuh.gradle.ktlint from 10.1.0 to 10.2.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-01 23:06:54 +00:00
dependabot[bot] ce014d1196
Bump dagger from 2.39 to 2.39.1 
Bumps `dagger` from 2.39 to 2.39.1.

Updates `dagger` from 2.39 to 2.39.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.39...dagger-2.39.1)

Updates `dagger-compiler` from 2.39 to 2.39.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.39...dagger-2.39.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-10-01 23:06:49 +00:00
Benoit Marty f7af298654
Merge pull request #3972 from vector-im/feature/fga/expose_sync 
Feature/fga/expose sync
 2021-10-01 20:48:46 +02:00
Benoit Marty 1dd2d410e0
Merge pull request #3657 from SpiritCroc/notification_repetition 
Do not notify again for old events
 2021-10-01 18:20:53 +02:00
Benoit Marty 2366227133
Merge pull request #4129 from vector-im/feature/adm/sync-read-notifications 
Fixing notifications not being dismissed when read from other devices
 2021-10-01 18:11:46 +02:00
Benoit Marty d8203ea27b Optimize import 2021-10-01 18:08:48 +02:00
Benoit Marty 7d59cbebf1
Merge branch 'develop' into feature/fga/expose_sync 2021-10-01 18:04:56 +02:00
Benoit Marty 587c634a49
Merge pull request #3957 from vector-im/feature/bma/ktlint_cleanup 
Install ktlint plugin
 2021-10-01 18:03:38 +02:00
Benoit Marty 242b17294d
Merge pull request #4083 from vector-im/feature/bca/spaces_fix_4045 
Fix default encrypted for restricted
 2021-10-01 17:59:47 +02:00
Adam Brown c72f66871f replacing boolean constants with an improved function name + doc around why the events can be missing 2021-10-01 16:22:24 +01:00
Benoit Marty b4247550ec run ktlint after rebase 2021-10-01 17:20:30 +02:00
Benoit Marty 8d7f542e88
Merge pull request #4132 from vector-im/feature/bma/init_sync_dialog 
Ensure initial sync progress dialog is hidden when the initial sync is over
 2021-10-01 15:59:55 +02:00
Benoit Marty 63d71cf56f
Merge branch 'develop' into feature/bma/ktlint_cleanup 2021-10-01 15:54:21 +02:00
Adam Brown f9d2f236a4 using named parameters when the same types are used in close proximity 2021-10-01 14:43:39 +01:00
Benoit Marty 679f0a5940 Ensure initial sync progress dialog is hidden when the initial sync is over 2021-10-01 15:03:23 +02:00
Benoit Marty 8644363005
Merge pull request #4125 from vector-im/feature/fga/text_composer_extract 
Feature/fga/text composer extract
 2021-10-01 14:44:51 +02:00
Benoit Marty 11e7ae3c7e Fix compilation error 2021-10-01 14:24:53 +02:00
Benoit Marty 6983e1be55 Split long lines 2021-10-01 14:24:07 +02:00
Benoit Marty 920f467231 Disqble some check, not true anymore 2021-10-01 14:11:26 +02:00
Benoit Marty ba35c0101e Fix compilation error 2021-10-01 14:09:22 +02:00
Benoit Marty d1e9f3131a Big annoying commit: execute command `./gradlew ktlintFormat` - Fix "colon-spacing" 2021-10-01 13:31:15 +02:00
Benoit Marty a1caccbcc8 Big annoying commit: execute command `./gradlew ktlintFormat` - Fix "chain-wrapping" 2021-10-01 13:31:15 +02:00
Benoit Marty 2ca3c68611 Big annoying commit: execute command `./gradlew ktlintFormat` - Fix "import-ordering" 2021-10-01 13:31:15 +02:00
Benoit Marty 03bdcee3ad Install ktlint plugin 2021-10-01 13:31:15 +02:00
ganfra 45509a68bb TextComposer: fix ktlint 2021-10-01 09:43:57 +02:00
SpiritCroc 381010df70 Fix broken bug report when no push gateway is set 
Change-Id: Ie06e3ec56c6ce5f7700fbe186407942849eb504a
 2021-10-01 09:06:43 +02:00
Adam Brown a3c4f56774 adding changelog entry 2021-09-30 17:31:23 +01:00
Adam Brown 49e332cb1c formatting 2021-09-30 17:30:23 +01:00
Adam Brown 7105a20f4f fixes notifications not being marked as read when the last chunk containing the event is no longer the latest 
- use explict returns constants to attempt to add more documentation
- queries for the existence of the event in all of the chunk history and if a read receipt exists in the latest chunk (which it should if a user has just read on another client) which allows us to mark old notifications events as read
 2021-09-30 17:15:04 +01:00
Benoit Marty 2b38c607b2
Merge pull request #4127 from kittykat/issue-template 
Fix typo in string
 2021-09-30 17:20:01 +02:00
Ekaterina Gerasimova d6da4f7834 Fix typo in string 
Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
 2021-09-30 15:58:22 +01:00
ganfra 845c396f8f Clean code after PR review 2021-09-30 16:43:49 +02:00
Benoit Marty 3719382569
Merge pull request #3953 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.6.0 
Bump work-runtime-ktx from 2.5.0 to 2.6.0
 2021-09-30 14:25:43 +02:00
Benoit Marty 8cfd4bae35
Merge pull request #4120 from vector-im/dependabot/gradle/dagger-2.39 
Bump dagger from 2.38.1 to 2.39
 2021-09-30 14:19:09 +02:00
ganfra be8c6f1836 Merge branch 'develop' into feature/fga/expose_sync 2021-09-30 12:10:38 +02:00
Benoit Marty 3f7e810f14 Handle change from WorkManager 2.6.0. 
https://developer.android.com/jetpack/androidx/releases/work#2.6.0
 2021-09-30 12:06:57 +02:00
ganfra 3df004b035 Merge branch 'develop' into feature/fga/text_composer_extract 2021-09-30 12:02:27 +02:00
ganfra 535a2c931b Clean code and add changelog 2021-09-30 12:02:05 +02:00
Valere 4880df3555 Change call to action in filter room when space selected 2021-09-30 11:58:21 +02:00
ganfra a171f1912a TextComposer: makes animation ok 2021-09-30 11:57:57 +02:00
Benoit Marty 5d51431c60
Merge pull request #4078 from abaker/android_auto 
Add Android Auto notification support
 2021-09-30 11:29:58 +02:00
SpiritCroc 3ca6676629 Fix alternative_package.sh for SchildiChat dependencies 
Do not rename dependencies

Change-Id: I7e1990deaf2f223c929f8cb986bae20f8a5ed685
 2021-09-30 09:49:12 +02:00
SpiritCroc c42d5dd24d Automatic SchildiChat string correction 
Change-Id: I944383417c465fe10bf54d030e3fb58826320517
 2021-09-30 09:30:53 +02:00
SpiritCroc 6464142a91 Automatic upstream merge postprocessing 
Change-Id: I1e1f12676768cf300e99e10e0c4d2a7c70ee859a
 2021-09-30 09:30:52 +02:00
SpiritCroc 38ae03893f Merge tag 'v1.3.1' into sc 
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
 2021-09-30 09:27:15 +02:00