mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-08 17:27:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
5133 commits 7 branches 124 tags 230 MiB
Commit graph

5133 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
cbd22a1257 Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc 
Merge v1.0.5 pt. 2

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
	vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/RoomColor.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-08-22 10:29:31 +02:00
SpiritCroc
c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc 
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
 2020-08-22 09:52:54 +02:00
SpiritCroc
0b8127e21b Only show message bubble tail for messages with shown avatar 2020-08-19 11:01:15 +02:00
SpiritCroc
c01d98d308 Remember low priority expand status across restarts 2020-08-19 10:07:13 +02:00
SpiritCroc
72faa81e2a Increment version 2020-08-18 15:17:34 +02:00
SpiritCroc
72d2b1c9f1 Exclude state-events from room summaries and unread indicators 
Related issue:
https://github.com/vector-im/element-android/issues/588
 2020-08-15 17:13:20 +02:00
SpiritCroc
9f24356d92 Fix bottom sheet accent colors in SC themes 2020-08-14 16:38:50 +02:00
SpiritCroc
17430b06a2 Increment version 2020-08-14 10:45:38 +02:00
SpiritCroc
eeb65e60d5 Point non-existent links to localhost 
Closes SpiritCroc/SchildiChat-android#5.
 2020-08-14 10:43:21 +02:00
SpiritCroc
99b33c42c4 README: it should be "for Android" 2020-08-14 10:34:38 +02:00
SpiritCroc
db6e85b120 Fix SC-Light status for API 21-22 2020-08-12 14:22:44 +02:00
SpiritCroc
23bf6b9ffa Theme legacy icons as well 
We want to prefer the SC accent/design to the Element one on devvices
pre-API-24 as well.

Closes SpiritCroc/SchildiChat-android#4.
 2020-08-12 13:35:31 +02:00
SpiritCroc
aba2d1bd18 Update alternative_package.sh for FCM 2020-08-10 12:16:57 +02:00
SpiritCroc
39c0c562a6 Update .gitignore for gplay builds 2020-08-09 17:02:51 +02:00
SpiritCroc
2a5342087d gplay version: ignore branch for version suffix 2020-08-09 17:02:17 +02:00
SpiritCroc
8602aba2a5 Increment version 2020-08-09 16:41:50 +02:00
SpiritCroc
ba430f94f9 Change piwik url in case it gets used in the future 
We don't want to report stats to upstream.
 2020-08-09 13:39:26 +02:00
SpiritCroc
16f98145b1 Update privacy policy for FCM 2020-08-09 13:39:26 +02:00
SpiritCroc
5888c018e0 Adapt google-services.json package ids 2020-08-09 13:39:12 +02:00
SpiritCroc
459e20aac9 Merge tag 'v1.0.4' into sc 2020-08-07 12:34:18 +02:00
SpiritCroc
01eaed1cef Update README 2020-08-07 11:17:43 +02:00
SpiritCroc
b7424ef92a Fix accent color in bottom navigation icons 2020-08-06 17:30:48 +02:00
SpiritCroc
f0f7ef4dd8 Make single overview page optional 
Allow tabbed layout like element
 2020-08-06 17:30:44 +02:00
Benoit Marty
a1f90abcd2 Rename package im.vector.riotx to im.vector.app (IDE) 2020-08-03 18:46:29 +02:00
Benoit Marty
67fc2feacb Rename package im.vector.riotx.multipicker to im.vector.lib.multipicker 2020-08-03 18:35:02 +02:00
Benoit Marty
d28c091f0a Rename package im.vector.riotx.attachmentviewer to im.vector.lib.attachmentviewer 2020-08-03 18:35:02 +02:00
Benoit Marty
b4af59728c
Merge pull request #1867 from vector-im/feature/cleanup_after_ooo 
Small cleanup, also to be aware of all the changes that occurred during my holidays.
 2020-08-03 17:47:26 +02:00
Benoit Marty
025d5f7b4c Code readability 2020-08-03 17:33:24 +02:00
Benoit Marty
d531e88666 Key is private 2020-08-03 17:33:24 +02:00
Benoit Marty
ac845ad8c9 Hide Flair settings, this is not implemented yet. 2020-08-03 17:33:24 +02:00
Benoit Marty
ace7ff464b Banned users: use the counter as the title 2020-08-03 17:33:24 +02:00
Benoit Marty
562c6fbcce Naming convention 2020-08-03 17:33:24 +02:00
Benoit Marty
8cc12fb8d4 Only one token per request is possible so use header instead of addHeader 2020-08-03 17:33:24 +02:00
Benoit Marty
4cbb2f7d9d Cleanup 2020-08-03 17:33:24 +02:00
Benoit Marty
18c0f53764 Format 2020-08-03 17:33:24 +02:00
Benoit Marty
64d000ec53
Update PULL_REQUEST_TEMPLATE.md 2020-08-03 17:29:07 +02:00
Benoit Marty
8e84c099fa
Merge pull request #1747 from vulet/develop 
fix: invisible toolbar(status.im theme)
 2020-08-03 16:59:30 +02:00
Benoit Marty
707b69e3e2
Merge branch 'develop' into develop 2020-08-03 16:58:52 +02:00
Valere
33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere
ee1d5faf0d Merge branch 'hotfix/fix_crash_invite_user' 2020-08-03 14:01:27 +02:00
Valere
9178fd2b5c Merge branch 'hotfix/fix_crash_invite_user' into develop 2020-08-03 14:01:27 +02:00
Valere
69e499e497 Merge hotfix 2020-08-03 14:00:32 +02:00
Valere
7308c4a15c Merge branch 'hotfix/fix_crash_before_release' 2020-08-03 12:23:55 +02:00
Valere
1370ca7082 Merge branch 'hotfix/fix_crash_before_release' into develop 2020-08-03 12:23:55 +02:00
Valere
db6045778e Update change log 2020-08-03 12:11:50 +02:00
Valere
2810923519 FIx / Crash when opening Invite User screen 2020-08-03 12:00:08 +02:00
SpiritCroc
2712ff9d84 We're on GPlay 2020-08-01 10:36:45 +02:00
SpiritCroc
21bce12f05 Update PRIVACY.md 2020-07-31 11:52:59 +02:00
SpiritCroc
f081874d50 PRIVACY.md: clear markdown from spans 2020-07-31 11:52:46 +02:00
Christian Pauly
fdca5b2f94 Update PRIVACY.md 2020-07-31 11:52:29 +02:00