mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-26 10:58:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
10788 commits 7 branches 124 tags 230 MiB
Commit graph

10788 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
cf756b8789 Merge branch 'sc' into unifiedpush 
Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de
 2021-08-12 09:30:41 +02:00
SpiritCroc
2ff3989230 Proper tint for voice message send button 
Change-Id: I25202dea6c794c8dcca3412bca098825b79a01d6
 2021-08-12 09:28:28 +02:00
SpiritCroc
8892248071 Bring back setting to disable voice message recorder button 
Change-Id: I81d647796b82e2034383278da7b169795a092f2e
 2021-08-12 09:22:35 +02:00
SpiritCroc
033c3f7792 Automatic SchildiChat string correction 
Change-Id: Iad534d811812f2a07adbffa4bfc68a73186e3e34
 2021-08-12 09:04:01 +02:00
SpiritCroc
6aba012772 Automatic upstream merge postprocessing 
Change-Id: If4b404091e76ab298085a1151de222f423ce89f7
 2021-08-12 09:04:00 +02:00
SpiritCroc
58f5310e83 Merge tag 'v1.2.0' into sc 
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-08-12 09:03:42 +02:00
SpiritCroc
6443ae4c7d [TMP] Automatic upstream merge preparation 
Change-Id: I042bcc5e6ed6a00473f32d1270b5b620c69a5691
 2021-08-12 09:02:53 +02:00
SpiritCroc
3e368c56ff Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I84ef9d6b2053914fd11cc202c17562d7f351ade6
 2021-08-12 09:02:52 +02:00
Onuray Sahin
37e722e85d version++ 2021-08-12 02:36:39 +03:00
Onuray Sahin
e0b9fddd18 Merge branch 'release/1.2.0' into develop 2021-08-12 02:33:25 +03:00
Onuray Sahin
4f6b6ddfa8 Merge branch 'release/1.2.0' into main 2021-08-12 02:33:02 +03:00
Onuray Sahin
dfc2460189 Changelog added. 2021-08-12 02:32:54 +03:00
SpiritCroc
38212b6410 Fix some UP crashes 
Change-Id: I16f47f86a58c23210cc99c85081da1703bbda5ac
 2021-08-11 22:45:14 +02:00
Onuray Sahin
d8177c4b5d
Merge pull request #3826 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-08-11 22:12:59 +03:00
SpiritCroc
d1379377b1 Change default unifiedpush gateway 
Change-Id: Ib6b4947295e348283067e3996266f8207bca6440
 2021-08-11 20:56:07 +02:00
Onuray Sahin
e215d964ff Translated using Weblate (Indonesian) 
Currently translated at 45.7% (1174 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-08-11 17:40:26 +00:00
Onuray Sahin
64317c420a
Merge pull request #3824 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-08-11 20:34:57 +03:00
SpiritCroc
5b7e2fdcaa Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2021-08-11 18:08:02 +02:00
Weblate
f1ff0a78fc Merge branch 'origin/develop' into Weblate. 2021-08-11 13:46:06 +00:00
Linerly
fdf983a2c8 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2021-08-11 13:45:40 +00:00
Danial Behzadi
a8c8906934 Translated using Weblate (Persian) 
Currently translated at 48.1% (13 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2021-08-11 13:45:40 +00:00
Linerly
35b381e7ea Translated using Weblate (Indonesian) 
Currently translated at 46.0% (1174 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2021-08-11 13:45:39 +00:00
Danial Behzadi
bb4a45a93d Translated using Weblate (Persian) 
Currently translated at 99.6% (2542 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-08-11 13:45:17 +00:00
Onuray Sahin
8216acfd5c version++ 2021-08-11 16:40:45 +03:00
Onuray Sahin
ba83092ebc
Merge pull request #3818 from vector-im/feature/ons/delabs_voice_message 
Enable voice message by default, remove from labs.
 2021-08-11 16:34:37 +03:00
Onuray Sahin
f6477d5e3b
Merge branch 'develop' into feature/ons/delabs_voice_message 2021-08-11 15:44:14 +03:00
Onuray Sahin
ec093e78b0
Merge pull request #3816 from vector-im/feature/ons/fix_voice_message_ui 
Voice Message - UI Improvements
 2021-08-11 15:42:29 +03:00
Onuray Sahin
a8f4b318c1 Fix tice vibration after cancelling the voice record. 2021-08-11 14:59:21 +03:00
Onuray Sahin
c2401e04b4 Fix collapsing mic and send buttons. 2021-08-11 14:54:29 +03:00
David Langley
a538014935
Merge pull request #3673 from vector-im/feature/dla/reorg_account_notification_settings 
Reorganise Account Notification Settings
 2021-08-11 11:44:17 +01:00
David Langley
45077c69f7 remove NotificationIndex Int index 2021-08-11 09:59:23 +01:00
Onuray Sahin
9b011f9fbd Enable voice message by default, remove from labs. 2021-08-10 17:58:41 +03:00
Onuray Sahin
02e3dac1c7 Merge branch 'develop' into feature/ons/fix_voice_message_ui 
* develop: (34 commits)
  version++
  Changelog added.
  Translated using Weblate (German)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (German)
  Translated using Weblate (Russian)
  Translated using Weblate (Russian)
  Fix error when sending encrypted message if someone in the room logs out.
  Translated using Weblate (Russian)
  Translated using Weblate (Russian)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Indonesian)
  Translated using Weblate (French)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Latvian)
  Translated using Weblate (Frisian)
  Translated using Weblate (Albanian)
  add towncrier
  Translated using Weblate (Czech)
  Translated using Weblate (Chinese (Traditional))
  ...
 2021-08-10 15:47:57 +03:00
Onuray Sahin
5cc9c6231b Changelog added. 2021-08-10 15:44:09 +03:00
Onuray Sahin
9f4a459116 Fix cannot draw waveform while recording after onPause. 2021-08-10 15:40:04 +03:00
waclaw66
d2fc32117c Translated using Weblate (Czech) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2021-08-10 12:25:34 +00:00
Jeff Huang
c13f30a5c1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2021-08-10 12:25:33 +00:00
random
871925e340 Translated using Weblate (Italian) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2021-08-10 12:25:32 +00:00
Priit Jõerüüt
bcd1271671 Translated using Weblate (Estonian) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
 2021-08-10 12:25:32 +00:00
LinAGKar
788503bb4d Translated using Weblate (Swedish) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2021-08-10 12:25:31 +00:00
Glandos
3373b7c265 Translated using Weblate (French) 
Currently translated at 100.0% (27 of 27 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-08-10 12:25:30 +00:00
Jeff Huang
3e06a02c7c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2552 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-08-10 12:25:30 +00:00
sr093906
60ec09abb3 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2552 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-08-10 12:25:27 +00:00
LinAGKar
e82dbc5181 Translated using Weblate (Swedish) 
Currently translated at 97.0% (2476 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-08-10 12:25:25 +00:00
Besnik Bleta
e66123686c Translated using Weblate (Albanian) 
Currently translated at 99.5% (2541 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-08-10 12:25:24 +00:00
random
201552e12b Translated using Weblate (Italian) 
Currently translated at 99.8% (2549 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-08-10 12:25:22 +00:00
Glandos
5f65a42855 Translated using Weblate (French) 
Currently translated at 100.0% (2552 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-08-10 12:25:19 +00:00
Priit Jõerüüt
aa24e484ee Translated using Weblate (Estonian) 
Currently translated at 99.2% (2532 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-08-10 12:25:17 +00:00
waclaw66
61304709ac Translated using Weblate (Czech) 
Currently translated at 100.0% (2552 of 2552 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-08-10 12:25:16 +00:00
Onuray Sahin
0cd0484b41 Fix flickering between locking states. 2021-08-10 14:54:03 +03:00