mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 17:05:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
20968 commits 6 branches 120 tags 229 MiB
Commit graph

550 commits

Author SHA1 Message Date
SpiritCroc
3b6821d627 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Ib48a0a3cca605f7c51570b93958ce4204b9cbb1b
 2022-10-09 14:12:19 +02:00
SpiritCroc
d081d9ea5d Automatic SchildiChat string correction 
Change-Id: I9000ce30703ce606f2e24ecc8387cede7296d891
 2022-10-07 20:33:04 +02:00
SpiritCroc
fe785613e7 Merge tag 'v1.5.2' into sc 
Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e

Conflicts:
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
	vector/src/main/res/layout/composer_layout.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
 2022-10-07 20:32:26 +02:00
SpiritCroc
c634bb74e5 Merge tag 'v1.5.1' into sc 
Note: we already had picked the internal v1.5.1 patch for the security
release, but we still do this merge to make git merge happy again for
future merges, and also clean up a little bit of UI things that I did
for that patch but abandonned later.

Change-Id: I51b674093e6f32e19fc9556109fb0d231d8f8f3e
 2022-10-07 19:45:09 +02:00
SpiritCroc
025bf4d0c2 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I8d58ed0e1b87f4eada01b5c11b3d1044a819a354
 2022-10-06 17:19:33 +02:00
joshua
309e77e37c Translated using Weblate (Swedish) 
Currently translated at 100.0% (155 of 155 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
 2022-10-06 17:19:28 +02:00
Benoit Marty
8934eabc99 Remove TODO, the string a11y_create_room is actually used. 2022-10-05 16:33:05 +02:00
Benoit Marty
47457b39d0 Fix typo 2022-10-05 16:03:26 +02:00
Weblate
672ad3a5e5 Merge branch 'origin/develop' into Weblate. 2022-10-05 12:32:46 +00:00
Valere
ec7c8c8b31
Merge pull request #6726 from vector-im/feature/bca/block_unverified 
Per room block unverified devices
 2022-10-05 14:29:59 +02:00
Weblate
d13606bdcc Merge branch 'origin/develop' into Weblate. 2022-10-05 12:28:06 +00:00
Nui Harime
111f77b017 Translated using Weblate (Russian) 
Currently translated at 98.3% (2380 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-10-05 12:27:54 +00:00
lvre
4de0f0a1e8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-10-05 12:27:53 +00:00
Sveinn í Felli
c39e64dfc7 Translated using Weblate (Icelandic) 
Currently translated at 84.5% (2046 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
 2022-10-05 12:27:53 +00:00
Vri
d5f542095c Translated using Weblate (German) 
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-10-05 12:27:39 +00:00
Benoit Marty
a036cc6d75
Merge pull request #7287 from vector-im/feature/bma/en-us 
Use American English by default.
 2022-10-05 11:02:58 +02:00
Benoit Marty
2cd78282d9
Fix typo 
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
 2022-10-05 11:02:33 +02:00
Valere
68d4ac34c7 Move setting to room profile 2022-10-05 10:27:12 +02:00
Valere
8de2fe8917 Update library/ui-strings/src/main/res/values/strings.xml 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-10-05 10:27:12 +02:00
Valere
e9b33f6234 Per room block unverified devices 2022-10-05 10:27:12 +02:00
Benoit Marty
4974fdf905
Merge pull request #6633 from Benjiko99/feature/incognito-keyboard 
Add privacy setting to disable personalized learning by the keyboard
 2022-10-04 18:22:22 +02:00
Benoit Marty
c35fa978a7 Use American English by default. 2022-10-04 15:49:23 +02:00
Paul
d205202e52
[Bugfix] Fix crash on previewing image to upload on Android P (#7184) 
* Fix crash on image upload preview on Android P

Using hardware bitmap allocation on Android framework versions prior to
Android Q causes a crash when decoding a bitmap if GL context wasn't
initialised. The issue is not documented in ImageDecoder reference but
it is mentioned in the comments of glide[1] with a link to internal
google discussion.

[1] f83cc274b4/library/src/main/java/com/bumptech/glide/load/resource/bitmap/HardwareConfigState.java (L22)

Signed-off-by: Paweł Matuszewski <pamat@protonmail.com>
 2022-10-04 15:34:13 +02:00
Benoit Marty
81b5fcdc7d
Merge pull request #5716 from thefirstofthe300/styling-tweaks 
Styling tweaks
 2022-10-04 15:32:32 +02:00
Florian Renaud
8e3b9735c1
Merge pull request #7258 from vector-im/feature/fre/voice_broadcast_feature_flag 
Voice Broadcast - Add a feature flag with the composer action
 2022-10-04 11:25:33 +02:00
Florian Renaud
2bc08069cc Add Voice Broadcast action in the composer 2022-10-03 09:25:03 +02:00
Priit Jõerüüt
28af6bb208 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2411 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-10-02 19:32:53 +00:00
Nui Harime
feff368f85 Translated using Weblate (Russian) 
Currently translated at 98.3% (2380 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2022-10-01 14:33:37 +00:00
Przemysław Romanik
fa66ce1833 Translated using Weblate (Polish) 
Currently translated at 97.8% (2367 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-10-01 14:33:36 +00:00
Anonimas
a2ad855ce2 Translated using Weblate (Lithuanian) 
Currently translated at 80.1% (1940 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2022-10-01 14:33:35 +00:00
Linerly
366d273fc0 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-10-01 14:32:51 +00:00
Lamdarer
f9d9a0c178 Translated using Weblate (German) 
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-10-01 14:32:50 +00:00
Vri
fef2c8519a Translated using Weblate (German) 
Currently translated at 100.0% (2419 of 2419 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-10-01 14:32:50 +00:00
Maxime NATUREL
48439f9071 Reverting remove of end of line from translations 2022-09-29 14:06:45 +02:00
Maxime NATUREL
20a24162f4 Updating texts + other sessions list screen learn more 2022-09-29 14:06:45 +02:00
Maxime NATUREL
acba3f2aa4 Updating learn more strings 2022-09-29 14:06:45 +02:00
Maxime NATUREL
d1bc7d591f Revert changes to translations 2022-09-29 14:06:44 +02:00
Maxime NATUREL
97cdda45d6 Adding close button 2022-09-29 14:06:44 +02:00
Maxime NATUREL
648311e2b1 Show basic bottom sheet when pressing learn more link from other sessions section 2022-09-29 14:06:44 +02:00
Maxime NATUREL
1d11eae0cc Removing learn more link from security header 2022-09-29 14:06:44 +02:00
Maxime NATUREL
70a5093e3d Adding string resources 2022-09-29 14:06:44 +02:00
Benoit Marty
214867ad0e
Merge pull request #7248 from vector-im/feature/bca/hotfix_1.5.1_merge 
Feature/bca/hotfix 1.5.1 merge back from main
 2022-09-29 11:58:36 +02:00
Valere
ce86e29122 Merge branch 'main' into develop 2022-09-28 18:16:39 +02:00
Valere
5c442296ef Security fix CVE-2022-39246 CVE-2022-39248 2022-09-28 16:26:47 +02:00
SpiritCroc
833bb110d8 Automatic SchildiChat string correction 
Change-Id: I6a3d058924b84ab17f4cc548dc09937343488630
 2022-09-28 10:41:17 +02:00
SpiritCroc
87eaf85224 Security patch v1.5.1 
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
 2022-09-28 10:41:00 +02:00
SpiritCroc
ca11f4c4dd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I761ae27a08413c6da4e586d013fdcc802643acf2
 2022-09-28 10:25:21 +02:00
Maxime NATUREL
b2b3ee1fe5 Adding button to trigger sign out 2022-09-27 15:04:33 +02:00
Benoit Marty
4d09f0888d
Merge pull request #7231 from pt2121/pt/12-flip-table 
Add support for `/tableflip` command (#12)
 2022-09-27 11:11:08 +02:00
dependabot[bot]
5246035163
Bump json from 20220320 to 20220924 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20220320 to 20220924.
- [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-09-26 23:10:18 +00:00