filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-10 09:00:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,310 Commits 7 Branches 127 Tags
Commit Graph

9310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SpiritCroc
e40bf1704b Increment version 
Change-Id: If1b871b3ab76544d87e965986a8c53b782692f8e
sc_v1.1.7.sc32 		2021-05-15 10:03:28 +02:00
SpiritCroc
dd85e14223 Footer read receipt image: add missing content description 
Change-Id: Ic385e628e432a457bda8b12ad196d01992103375
 2021-05-14 11:41:16 +02:00
SpiritCroc
9d82829863 Proper color for public room icon 
Change-Id: I090b59b6abe8dc920d04e1c348d34ea613ae98e9
 2021-05-14 11:37:59 +02:00
SpiritCroc
f77cd75530 Fix tint for draft icon 
Change-Id: I3ad22d439151acf7b3cb7a09084f2f652f838f1c
 2021-05-14 11:37:48 +02:00
SpiritCroc
af0108ffc6 Drawer button: reduce size 
This looked out of place, as it was considerably larger then the icon
found in other apps.
22dp would be even closer to other apps, but 24dp will make the unread
counter badge look less detached.

Change-Id: Icecbc1f99da90c2f237dda8a165c3cd8d2644aef
 2021-05-13 15:05:12 +02:00
SpiritCroc
808e381e09 No need to give spaces feedback to us 
Change-Id: Ie169ddff49368e0871036403ff0fab1ccea74f9a
 2021-05-12 16:29:36 +02:00
SpiritCroc
077e1b6896 Fix compile after merge 
Change-Id: I499115f40f75f07cdd0e42dafa2b17695d27e9b5
 2021-05-12 16:16:20 +02:00
SpiritCroc
5c68ccf67d Automatic SchildiChat string correction 
Change-Id: I5dff99fe89769fe352b2ff8d9f7c6b2814d48862
 2021-05-12 16:01:51 +02:00
SpiritCroc
19605b0cdc Automatic upstream merge postprocessing 
Change-Id: Iad909d733876af3c770cd5bad26a971bd5b74dc2
 2021-05-12 16:01:49 +02:00
SpiritCroc
db6cfd3054 Merge tag 'v1.1.7' into sc 
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-05-12 16:01:36 +02:00
SpiritCroc
38b4da547e [TMP] Automatic upstream merge preparation 
Change-Id: I1f5c1f52159efe0485c11056da07d3e8b1aeacba
 2021-05-12 15:45:50 +02:00
SpiritCroc
51b4ebdda7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I8f600d6c60e381d3948645ebe77b35bbc6dc5ae8
 2021-05-12 15:45:49 +02:00
SpiritCroc
2269e0f1ed Merge branch 'spaces' into sc 
Change-Id: Ia2a25202fab4e5be3c4800bb5cb6ab47fc828bac
 2021-05-12 15:44:01 +02:00
Benoit Marty
a9c966b8de Merge branch 'release/1.1.7' into main 2021-05-12 15:14:06 +02:00
Benoit Marty
2f37c703a4 Prepare release 1.1.7 2021-05-12 15:13:51 +02:00
Benoit Marty
b06bd403ca
Merge pull request #3322 from vector-im/feature/bca/spaces_feedback 
Add option to send beta feedback
 2021-05-12 14:55:54 +02:00
Benoit Marty
72e343ad5a Better wording 2021-05-12 14:26:20 +02:00
Benoit Marty
6af9fda7df Fix lint issue 2021-05-12 14:06:59 +02:00
Benoit Marty
5d052cda79 Increase clickable area (no layout rendering change) 2021-05-12 13:55:47 +02:00
Benoit Marty
0d5b66f92b Flatten View hierarchy 2021-05-12 13:53:03 +02:00
Valere
391e952fbd Review + design update 2021-05-12 12:23:14 +02:00
Valere
df3d3b63c8 Code review 2021-05-12 11:04:54 +02:00
Valere
aefcb4841b Cleaning 2021-05-12 10:47:52 +02:00
Valere
eb18b23528 Add option to send beta feedback 2021-05-12 10:47:52 +02:00
Benoit Marty
03f2b516a0 Please the code quality checker 2021-05-12 10:17:33 +02:00
Benoit Marty
56d0699bc7
Merge pull request #3312 from vector-im/feature/bca/spaces_polish 
Spaces various fixes and polish
 2021-05-12 10:09:36 +02:00
Valere
1799dcbd0c Fix lint 2021-05-12 09:20:55 +02:00
Valere
0de56e2993 Code Review 2021-05-11 19:11:15 +02:00
Valere
eb9fadaebf user error when no space support on HS 
remove buggy separators on add room; design update
 2021-05-11 17:34:55 +02:00
Benoit Marty
bdc3f189ee
Merge pull request #3314 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-05-11 15:09:37 +02:00
Valere
91d8ee2a81 Space panel room ordering 2021-05-11 14:45:30 +02:00
SpiritCroc
e9e522603d Message footer: handle small width/height pictures 
Change-Id: Ib8554c5057f09277cb9ef2a29a57d3a85cf35417
 2021-05-11 12:21:41 +02:00
Valere
f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere
14144dc99d Default all in home + lab flag 2021-05-11 10:45:07 +02:00
Valere
24a32f2b7e Subspace more hierarchy depth + fix bad notification count 2021-05-11 10:07:34 +02:00
Weblate
d9ffff70a6 Merge branch 'origin/develop' into Weblate. 2021-05-11 07:55:27 +00:00
Hivaa
631d8510ed Translated using Weblate (Persian) 
Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-05-11 07:53:01 +00:00
Michael Sasser
4e28de2107 Translated using Weblate (German) 
Currently translated at 99.5% (2428 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-05-11 07:52:56 +00:00
Valere
1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Valere
d81d971ce0
Merge pull request #3302 from vector-im/feature/bca/spaces_admin_manage 
Feature/bca/spaces admin manage
 2021-05-11 08:04:27 +02:00
Valere
723f7cc326 VectorEpoxyHolder Form Ext 2021-05-10 20:01:17 +02:00
Valere
80366ee938 Code review 2021-05-10 20:01:17 +02:00
Valere
31b6d9844b Cleaning 2021-05-10 20:01:17 +02:00
Valere
f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +02:00
Valere
5be3faf914 Epoxy Form fixes 2021-05-10 19:59:04 +02:00
Benoit Marty
e6d4f9a1dc
Merge pull request #3298 from vector-im/feature/ypi/join_rules 
Add joinRules field to RoomSummary
 2021-05-10 19:54:44 +02:00
Benoit Marty
0e0cfababf
Merge pull request #3308 from vector-im/feature/fga/fix_timeline_read_marker 
Fix read marker visibility/position when filtering some events
 2021-05-10 19:54:19 +02:00
Benoit Marty
7ec44a5542
Merge pull request #3290 from vector-im/feature/bca/spaces_various_fixes 
Various fixes on spaces explore
 2021-05-10 19:52:45 +02:00
ganfra
bea67bd7fd Join rules: fix migration 2021-05-10 19:03:34 +02:00
ganfra
525cd3edd7
Merge branch 'develop' into feature/fga/fix_timeline_read_marker 2021-05-10 17:33:52 +02:00