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

3534 commits

Author SHA1 Message Date
SpiritCroc
6d55aa22f0 Revert "Automatic SchildiChat string correction" 
This reverts commit 2e16cc7997.
 2020-09-17 11:57:41 +02:00
SpiritCroc
66ed064d27 Revert "Revert "Revert "Resolve required manual intervention in german strings""" 
This reverts commit 7da51068bc.
 2020-09-17 11:57:41 +02:00
SpiritCroc
9663d8046c Revert "Overview: display the year instead of the weekday for old chats" 
This reverts commit 5e4d9c18be.
 2020-09-17 11:57:33 +02:00
SpiritCroc
1ff602db3b Revert "Setting for unread badge / room summary event visibility" 
This reverts commit b1d96ebba9.

Change-Id: I567628cbf4bbdc059d3c73991bf3053f702730af

Conflicts:
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/values-de/strings_sc.xml
	vector/src/main/res/values/strings_sc.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-09-17 11:51:44 +02:00
Nikita Epifanov
f40d96017b Update strings_sc.xml 2020-09-12 11:15:10 +02:00
SpiritCroc
ccafdeeeeb Move SC string to where it belongs 
Change-Id: I488a92c7665ff34d06375b322aafbb2aebbe1016
 2020-09-12 10:19:02 +02:00
Nikita Epifanov
c17c618f24
Added Russian strings_sc.xml 2020-09-12 00:51:21 +03:00
SpiritCroc
cf24ca90f9 Increment version 
Change-Id: Ice9536342a8eeff003019350a07e27f805426562
 2020-09-10 18:14:11 +02:00
SpiritCroc
1d7681a893 Don't do ABI extra versioning 
Doesn't work with F-Droid automatic update detection

Change-Id: I6bafe05f151e240fee37cd714ab2ac076a7a1a69
 2020-09-10 18:14:06 +02:00
SpiritCroc
1d6fd71adb Make unread-counter for non-notifications a setting 
Change-Id: I6e097ee4577868b1e82a0cd69bd67122cb57a4d4
 2020-09-10 12:01:54 +02:00
SpiritCroc
5e4d9c18be Overview: display the year instead of the weekday for old chats 
i.e. chats that are older than one year

Change-Id: I439e78df1425eb57cf597449f09ef5549e90f9b8
 2020-09-10 10:35:58 +02:00
SpiritCroc
c20a6b8001 Fix mismerge 
Change-Id: I78b7e835c6ce477074aaf3220aef4193a51f3717
 2020-09-08 19:26:49 +02:00
SpiritCroc
7da51068bc Revert "Revert "Resolve required manual intervention in german strings"" 
This reverts commit b9607abbe6.
 2020-09-08 19:17:23 +02:00
SpiritCroc
2e16cc7997 Automatic SchildiChat string correction 
Change-Id: Iaa24753cf4596b31f9127dfc6178dc4d06139ba8
 2020-09-08 19:17:23 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
SpiritCroc
1c8b720ff2 Revert "Automatic SchildiChat string correction" 
This reverts commit d912c5a356.
 2020-09-08 18:29:29 +02:00
SpiritCroc
b9607abbe6 Revert "Resolve required manual intervention in german strings" 
This reverts commit 19260fce65.
 2020-09-08 18:29:29 +02:00
Benoit Marty
f990600aea Cleanup and documentation after #2047 2020-09-08 12:40:21 +02:00
Benoit Marty
22cd6ae239
Merge pull request #2047 from vector-im/feature/universal_link_navigation 
Handle room, user, group, email verification links by converting them to permalinks.
 2020-09-08 12:21:54 +02:00
Benoit Marty
00b53ee577
Merge pull request #2053 from vector-im/feature/fix_poll_reply 
Feature/fix poll reply
 2020-09-08 12:19:32 +02:00
Benoit Marty
f65e96e7b4
Merge pull request #2069 from etherealvisage/develop 
Support data-mx-[bg-]color attribute on <font> tags in formatted messages.
 2020-09-08 10:09:25 +02:00
Valere
a544ae264b Avoid showing debug notice format for event preview 2020-09-08 09:51:35 +02:00
Valere
c895f87e26 Prevent reply to poll local echo (relation to echo not supported yet) 2020-09-08 09:51:35 +02:00
Onuray Sahin
e65558958d Code review refactoring. 2020-09-08 10:45:00 +03:00
ethereal
8291dfc188 Support data-mx-color attribute in <font> tags as well. 2020-09-07 14:52:30 -04:00
Onuray Sahin
3367ed6765 Fix support of riot.im/develop urls. 2020-09-07 20:02:06 +03:00
Benoit Marty
4654e39417 Update after Ganfra's review 2020-09-07 17:14:09 +02:00
Onuray Sahin
6dd4d4d906
Merge branch 'develop' into feature/universal_link_navigation 2020-09-07 17:48:52 +03:00
Benoit Marty
be9a91e3fe Android 6: App crash when read Contact permission is granted (#2064) 2020-09-07 16:33:12 +02:00
Onuray Sahin
fc51097ed8 develop and staging subdomains are added. 2020-09-07 17:17:58 +03:00
Benoit Marty
de8e325193
Merge branch 'develop' into feature/image_compression 2020-09-07 15:21:15 +02:00
Benoit Marty
bc389d371d Move string def to app module instead of SDK (#1994) 2020-09-07 13:38:12 +02:00
Benoit Marty
3756c3a191 Fix lint issues 2020-09-07 13:32:32 +02:00
Benoit Marty
9e3caf603d Lint: "..." -> … 2020-09-07 13:25:11 +02:00
Benoit Marty
74e2ffc4c4 Format string files 2020-09-07 13:24:33 +02:00
Onuray Sahin
4d7cd7319b Handle new mobile config url. 2020-09-07 12:19:34 +03:00
Weblate
edf7761d49 Merge branch 'origin/develop' into Weblate. 2020-09-07 08:57:45 +00:00
Benoit Marty
6c6bba68ff
Merge pull request #2062 from vector-im/feature/fix_no_verif 
Feature/fix no verif
 2020-09-07 10:49:38 +02:00
ethereal
5fbcf348f5 Support data-mx-bg-color attribute on <font> tags in formatted messages. 
Signed-off-by: Kestrel Williams-King <ethereal@ethv.net>
 2020-09-07 01:13:32 -04:00
SpiritCroc
65716c0ee8 Don't restart activity if inactive theme is changed 
Change-Id: I1241b419cf588606af7e465bb1ac8285a026b944
 2020-09-06 15:50:55 +02:00
SpiritCroc
9dca2d433e Hide dark theme on devices older than Q 
Most likely, the don't support it (although theoratically, the -night
resource qualifier has been around for a while).

Change-Id: I54f736c2b06c71bb520727b0c834e687cad09237
 2020-09-06 15:32:45 +02:00
SpiritCroc
35aedafc2f Work around wrap_content bug with italic text 
Change-Id: I82e7750504b7ea78f0a01fb0e5ed44a06e1a8a8c
 2020-09-06 15:07:07 +02:00
SpiritCroc
b212344ad9 Hide trailing newlines in text messages 
Change-Id: I4e11feeb28abd5f186691d6f61bdf65252b2db0d
 2020-09-05 17:59:38 +02:00
SpiritCroc
3a47c1b438 Shorter code here because I'm looking at it 
Change-Id: I444d0fa28fc92f996d58c16f65d9bebbd065ef69
 2020-09-05 17:48:38 +02:00
SpiritCroc
0003dc41ee Redaction item: fix bubble size 
Change-Id: I213cbaf550d62e23566ee048d4f2db868217ad49
 2020-09-05 17:07:45 +02:00
PPNplus
398dcb1036 Translated using Weblate (Thai) 
Currently translated at 66.7% (2 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/th/
 2020-09-05 09:42:47 +00:00
PPNplus
30e7b761ae Translated using Weblate (Thai) 
Currently translated at 4.7% (87 of 1849 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/th/
 2020-09-05 09:42:47 +00:00
Eduardo F
4d105c278b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1849 of 1849 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
 2020-09-05 09:42:44 +00:00
Benoit Marty
f019e4a246
Merge pull request #1995 from notramo/patch-1 
Mention thousands of public servers in Play Store
 2020-09-04 21:35:10 +02:00
Benoit Marty
fd1bb84770 typo 2020-09-04 20:47:19 +02:00