filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,013 Commits 7 Branches 122 Tags 228 MiB
Commit Graph

16013 Commits

Author SHA1 Message Date
Maxime NATUREL 738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Benoit Marty 3a6c03a895 Ah it was used in Gplay variant. Anyway I think we can still remove this now. 2022-05-18 15:05:23 +02:00
Benoit Marty 99d4bbe74b Fix bad copyright 2022-05-18 14:12:44 +02:00
Benoit Marty 98221bab1c
Merge pull request #6085 from vector-im/michaelk/gha_merged_by_needs_login 
Add `.login` to get the username rather than Object in the test failure alerts.
 2022-05-18 14:11:09 +02:00
Maxime NATUREL 4ebd1ea138 Fix parsing of location data in non encrypted room 2022-05-18 13:58:42 +02:00
Michael Kaye 261dadb986 Additionally increment for TimelinePreviousLastForwardTest 2022-05-18 12:37:07 +01:00
dependabot[bot] dc1a4ae3a2
Bump stem-plugin from 2.0.0 to 2.1.1 
Bumps [stem-plugin](https://github.com/LikeTheSalad/android-stem) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/LikeTheSalad/android-stem/releases)
- [Changelog](https://github.com/LikeTheSalad/android-stem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/LikeTheSalad/android-stem/compare/2.0.0...2.1.1)

---
updated-dependencies:
- dependency-name: com.likethesalad.android:stem-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-18 11:28:16 +00:00
Onuray Sahin 3bf9ea5b06 Lint fixes. 2022-05-18 14:13:53 +03:00
Jorge Martin Espinosa 6c8e047030
Merge pull request #5916 from vector-im/defect/jmartin/5724_notify_verification_acceptance 
Notify other devices of acceptance of verification request
 2022-05-18 13:10:52 +02:00
Benoit Marty 328d834851 changelog 2022-05-18 13:09:58 +02:00
Onuray Sahin 7ce093e239 Code review fixes. 2022-05-18 13:39:12 +03:00
Jorge Martín 123ad87eda Notify other devices of acceptance of verification request 2022-05-18 12:31:32 +02:00
Benoit Marty 5c9281bc7e Ensure calling 'fail()' is not caught by the Exception handler 2022-05-18 12:26:09 +02:00
Michael Kaye 5a1545058b Instead of using a magic number, explicitly test for the events we expect. 
This permits a clear error when the events are missing / extra and while
not making the test invulnerable to future changes in events, should be
explicit on what's changed.
 2022-05-18 11:25:07 +01:00
Michael Kaye f7303789a0
Merge pull request #6025 from vector-im/michaelk/skip_tests_failing_on_ci 
Improve test handling in CI
 2022-05-18 09:51:17 +01:00
Maxime NATUREL e9d93194f1 Adding comments on some strings and removing non necessary plural 2022-05-18 09:48:34 +02:00
Benoit Marty adb537006a Remove ShortcutBadger lib and usage (it was dead code) 2022-05-18 09:06:04 +02:00
Benoit Marty 8f7789f269 Version++ 2022-05-17 21:28:11 +02:00
Benoit Marty a1044763ec Merge branch 'release/1.4.16' into develop 2022-05-17 21:27:11 +02:00
Benoit Marty 1d70004165 Fastlane file 2022-05-17 21:26:54 +02:00
Benoit Marty e14b9a445e Towncrier 2022-05-17 21:13:08 +02:00
Michael Kaye 1c7f95c196 Add `.login` to get the username of the PR merger. 
I dispair at the github actions docs.
 2022-05-17 17:40:42 +01:00
Benoit Marty 86d808eb4f Rename folder for the PlayStore 2022-05-17 17:54:02 +02:00
Benoit Marty b6c7a59afc
Merge pull request #6079 from vector-im/feature/bma/fix_strings 
Fix translation
 2022-05-17 17:41:29 +02:00
Benoit Marty 553f8aa37e Remove empty translations 2022-05-17 16:31:15 +02:00
Benoit Marty ff46791df9 Let's keep this one even if not used. 2022-05-17 16:23:48 +02:00
Benoit Marty b33d8fe5e1 Remove unused string `location_share` 2022-05-17 16:04:45 +02:00
Benoit Marty 23d86b55fe Remove unused string `a11y_location_share_icon` 2022-05-17 16:03:51 +02:00
Benoit Marty d2ec615e2f Remove unused string `settings_flair` 2022-05-17 16:02:04 +02:00
Benoit Marty c0c5d21d4f
Merge pull request #6075 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-17 15:59:37 +02:00
Benoit Marty 57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Maxime NATUREL cbf8306c6f Removing live location share data from MessageInformationData structure 2022-05-17 15:09:27 +02:00
Weblate 52a1fcb397 Merge branch 'origin/develop' into Weblate. 2022-05-17 12:51:46 +00:00
Szimszon bc567fd45c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-05-17 12:51:38 +00:00
Benoit Marty 5df0488cf2 Apply ouchadam's suggestion. It's only accessed by the main thread. 2022-05-17 14:44:43 +02:00
Onuray Sahin edd35872f3 Fix ending poll power level condition. 2022-05-17 15:44:39 +03:00
Benoit Marty 46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold 
Direction and track need to be set for hold/unhold
 2022-05-17 14:33:02 +02:00
Onuray Sahin 4c079cc0ac Write unit tests for poll end event aggregation. 2022-05-17 14:59:14 +03:00
Benoit Marty 32573881e4 Renames ids for clarity 2022-05-17 13:42:53 +02:00
Onuray Sahin 00e800459d Write unit tests for poll response event aggregation. 2022-05-17 14:13:38 +03:00
Michael Kaye 868c33a8b4 Correct var -> val for @get:Rules 2022-05-17 12:12:49 +01:00
Aris Kotsomitopoulos 424fb5556d
Merge pull request #5959 from vector-im/feature/aris/threads_post_release_ui_improvements 
Feature/aris/threads post release improvements
 2022-05-17 13:24:19 +03:00
Benoit Marty 2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos 324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Benoit Marty ea1607cf3f Improve preview of the layout in the IDE 2022-05-17 10:28:02 +02:00
Auri B. P 2f03526d37 Translated using Weblate (Catalan) 
Currently translated at 81.8% (1821 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-05-17 02:56:52 +00:00
John Doe 41edd88d03 Translated using Weblate (Spanish) 
Currently translated at 99.8% (2221 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-05-16 17:59:45 +00:00
Ihor Hordiichuk baa5c1319d Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-05-16 17:59:44 +00:00
Maxime NATUREL 1d6083b2c7 Fix missing dot at end of code documentation 2022-05-16 18:07:08 +02:00
Michael Kaye 1f89cfbe44 Lint fixes 2022-05-16 16:55:36 +01:00