mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 17:40:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
5892 commits 7 branches 124 tags 230 MiB
Commit graph

5892 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
cd7fb3e164 Add pre_merge.sh merge helper 
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
 2020-09-08 18:29:26 +02:00
Benoit Marty
bf0b6d738a Version++ 2020-09-08 17:49:26 +02:00
Benoit Marty
0da106ba36 Merge branch 'release/1.0.6' 2020-09-08 17:47:17 +02:00
Benoit Marty
83a06b9657 Merge branch 'release/1.0.6' into develop 2020-09-08 17:47:15 +02:00
Benoit Marty
9b5bd3e226 Prepare release 1.0.6 2020-09-08 17:47:03 +02:00
Benoit Marty
135fcab558
Merge pull request #2074 from vector-im/feature/cleanup 
Cleanup and documentation after #2047
 2020-09-08 17:39:02 +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
Benoit Marty
f98844db02 Privacy 2020-09-08 10:04:27 +02:00
Benoit Marty
c59665e017 typo 2020-09-08 09:52:51 +02:00
Valere
7fe4148384 update change log 2020-09-08 09:51:55 +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
Valere
eb5088c699 Fix / sending poll event appears forever 2020-09-08 09:32:37 +02:00
Benoit Marty
3755d866b1
Merge pull request #2067 from vector-im/feature/contact_crash 
Android 6: App crash when read Contact permission is granted (#2064)
 2020-09-08 08:46:27 +02:00
ethereal
8291dfc188 Support data-mx-color attribute in <font> tags as well. 2020-09-07 14:52:30 -04:00
Onuray Sahin
c41c91b0e7 Update changelog. 2020-09-07 20:53:11 +03: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
Onuray Sahin
cf3fecd425 Changelog added. 
Fixes #1795
 2020-09-07 17:48:12 +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
751c870a4a
Merge pull request #2049 from vector-im/feature/image_compression 
Image compression
 2020-09-07 15:21:26 +02:00
Benoit Marty
de8e325193
Merge branch 'develop' into feature/image_compression 2020-09-07 15:21:15 +02:00
Benoit Marty
e2feac3dde
Merge pull request #2056 from vector-im/feature/small_doc_change 
Feature/small doc change
 2020-09-07 15:19:55 +02:00
Benoit Marty
d7b0b2f785
Merge pull request #2072 from vector-im/feature/weblate_fixes 
Weblate fixes and other stuff done during locked Weblate
 2020-09-07 15:00:04 +02:00
Benoit Marty
326c863148 Emoji SAS: Step 4: changelog (#1909) 2020-09-07 14:30:21 +02:00
Benoit Marty
c42920d9aa Emoji SAS: Step 3: Make the code compile (#1909) 2020-09-07 14:28:43 +02:00
Benoit Marty
fb5c1bb163 Emoji SAS: Step 2: Run import_sas_strings.py (#1909) 2020-09-07 14:21:10 +02:00
Benoit Marty
4f695a6d8f Emoji SAS: Step 1: Remove legacy strings (#1909) 2020-09-07 14:19:55 +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
Benoit Marty
6e019dbd44
Merge pull request #2071 from RiotTranslateBot/weblate-element-android-element-app 
Update from Weblate
 2020-09-07 13:13:13 +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
LinAGKar
a590bc96cd Translated using Weblate (Swedish) 
Currently translated at 100.0% (235 of 235 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sv/
 2020-09-07 08:57:34 +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
LinAGKar
58f5baa5f6 Added translation using Weblate (Swedish) 2020-09-06 06:49:13 +00: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