filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,768 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

5768 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 f217ece630 Revert "Exclude state-events from room summaries and unread indicators" 
This reverts commit 72d2b1c9f1.

Change-Id: I412f846cd82d953fa25d761ca5804b5a216e2dff
 2020-09-17 11:53:56 +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
SpiritCroc 9a61361e3e Revert "Hide redactions from the overview except for "show all events" setting" 
This reverts commit 2995375586.
 2020-09-17 11:47:43 +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 73e377eebd Added Russian 40100250.txt 2020-09-12 10:13:36 +02:00
Nikita Epifanov 346a2ec67e
Added Russian short_description.txt 2020-09-12 01:32:06 +03:00
Nikita Epifanov dbe58a6c61
Added Russian full_description.txt 2020-09-12 01:30:16 +03:00
Nikita Epifanov 9147cc37dd
Add title.txt 2020-09-12 01:28:54 +03: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 91c7e39d50 Add increment_version.sh 
Change-Id: Id52547142003e34a68645655835b842cab19a869
 2020-09-10 11:33:20 +02:00
SpiritCroc 8cba674d01 merge_helpers.sh: Fix some tagging logic 
Change-Id: I81ae8acd49b8069b658b4cc5acfef0e9e2b35825
 2020-09-10 11:11:22 +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 a82ee6bc74 Automatic upstream merge postprocessing 
Change-Id: I6f2814261df91b8b4e2aeb0698cc39ea54a2899a
 2020-09-08 19:17:22 +02:00
SpiritCroc 7d467d622a Update merge helpers 
Change-Id: I2da35a52c6f7209acc822c7fd878255df082bc52
 2020-09-08 19:17:15 +02:00
SpiritCroc bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
SpiritCroc cc2058a58c Add merge_helpers.sh 
Change-Id: Ia11bf326b360a9845c8df65d386c239b7b3eb414
 2020-09-08 18:38:11 +02:00
SpiritCroc 700ff022d5 [TMP] Automatic upstream merge preparation 
Change-Id: I55e22241e686b30ee1f1674095004ea6fdb6d280
 2020-09-08 18:29:29 +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
SpiritCroc cd7fb3e164 Add pre_merge.sh merge helper 
Change-Id: Ic1cbd5f124a6a56dd7cd384b5177f739f5085f73
 2020-09-08 18:29:26 +02:00
Benoit Marty 0da106ba36 Merge branch 'release/1.0.6' 2020-09-08 17:47:17 +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