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

15744 Commits

Author SHA1 Message Date
SpiritCroc 972fd9f31a Also give up loading event for M_FORBIDDEN 
Change-Id: Ic21821df4a341257dca99149141855a34edc5101
 2022-03-30 17:41:08 +02:00
SpiritCroc 886cd253ec [merge] Revert back to old section header 
Change-Id: Id7a4a9b31a02acbabff028d8d684e3d02dc1c1ec
 2022-03-30 17:07:24 +02:00
SpiritCroc cb3658859e Improve unread line color on light theme 
Change-Id: I3b4c54354555433fd9b3e6a53ff8440c8c05f359
 2022-03-30 16:40:41 +02:00
SpiritCroc 126dfd7ded Revert "change selected space highlight" 
This reverts commit 33246be2a5.
 2022-03-30 16:34:50 +02:00
SpiritCroc 997f93dd3a Automatic SchildiChat string correction 
Change-Id: I73a591e02f0f08ee1961f066751f4fc1b4b3a343
 2022-03-30 15:53:53 +02:00
SpiritCroc 3322a6fde6 Automatic upstream merge postprocessing 
Change-Id: I2d763d8cb40866f8cf8b21a1750bf487f291c90f
 2022-03-30 15:53:52 +02:00
SpiritCroc dd0897d6e4 Automatic color correction 
Change-Id: I3d2b339669ab717bf5e3a08cfcdfc46762838667
 2022-03-30 15:53:52 +02:00
SpiritCroc d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8 
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.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/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
 2022-03-30 15:53:51 +02:00
SpiritCroc a6c3ae3bb0 [TMP] Automatic upstream merge preparation 
Change-Id: I5c089c587d4c19472de02cb3f704736c9461430d
 2022-03-30 14:57:34 +02:00
SpiritCroc cefb0539bf Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I56dd0cb49f394d099f71048f7e93b85bc9d35da1
 2022-03-30 14:57:34 +02:00
SpiritCroc 59ae8f521b Fix media player play icon color 
Change-Id: Ie858123cedbf22129b9e465a90c30147e8bd2314
 2022-03-30 14:55:40 +02:00
SpiritCroc 39c5cb2280 Load timeline without initial eventId if not found 
Change-Id: Ifab011c7730ddd9eeeef89451dda48b3fcec341b
 2022-03-29 13:08:49 +02:00
ganfra d589758b7b Merge branch 'hotfix/1.4.8' into main 2022-03-28 13:37:42 +02:00
ganfra 9bf54a3750 Update changes 2022-03-28 13:36:17 +02:00
Adam Brown e01c5049f6 updating version to 1.4.8 2022-03-28 09:46:26 +01:00
Adam Brown f5d2ba39f4 moving the live location sharing permission debug only to unblock releases whilst the feature is WIP 2022-03-25 15:07:06 +00:00
ganfra 9ec684f438 Merge branch 'hotfix/1.4.7' into main 2022-03-24 19:33:44 +01:00
ganfra 60ecfd4fc2 Update changes 2022-03-24 19:31:29 +01:00
ganfra 8bcc2f5b0c Fix formating 2022-03-24 19:07:44 +01:00
ganfra 04b136e3e4 RoomList: more fixes on count 2022-03-24 18:50:33 +01:00
ganfra 87438085c6 RoomList: fix count not showing if not collapsable 2022-03-24 18:49:57 +01:00
ganfra 81aa42a8e8
Merge pull request #5616 from vector-im/hotfix/fre/collapse_rooms_section 
Fix rooms section collapsing
 2022-03-24 16:04:16 +01:00
Florian Renaud 3c73ccce7b Add changelog entry 2022-03-24 15:46:16 +01:00
Florian Renaud 1ef1bd81bc Improve room section collapsing 2022-03-24 15:46:16 +01:00
Florian Renaud a97d3eae7e Pass lambda to updateSection method 2022-03-24 15:46:16 +01:00
Florian Renaud a362d5427d Fix arrow visibility on section header 2022-03-24 15:46:16 +01:00
ganfra 745382cdfa RoomList : avoid using flow extension on realm results (leads to frozen object and leaks). 2022-03-24 15:41:42 +01:00
ganfra 70e5698082 Update versions to 1.4.7 2022-03-24 15:41:35 +01:00
ganfra 866a5a7e3a
Merge pull request #5626 from vector-im/feature/fre/collapse_rooms_sections 
Restore #5580 "Do not suggest collapse if there is only one section"
 2022-03-24 15:39:39 +01:00
Florian Renaud 1a0bd3f31e Revert "Revert "Do not suggest collapse if there is only one section"" 
This reverts commit 55b1a60f96.
 2022-03-24 15:27:35 +01:00
ganfra c2d2afbe72
Merge pull request #5624 from vector-im/feature/adm/account-created-celebration-on-sign-in-with-id 
Fixing account creation celebration shown on `sign in with matrix id`
 2022-03-24 11:52:23 +01:00
Adam Brown 4ef0bc9052 fixing wrong account created flag when creating a session from a direct login 2022-03-24 10:19:53 +00:00
ganfra 7c27ce5e88 Merge branch 'release/1.4.6' into main 2022-03-23 16:24:01 +01:00
ganfra 55b1a60f96 Revert "Do not suggest collapse if there is only one section" 
This reverts commit 6787980185.
 2022-03-23 16:09:05 +01:00
ganfra 4755ebfa97 Update Changes 2022-03-23 13:38:33 +01:00
Adam Brown 55b946a019 fixing the onboarding sanity test failing 
- adds tapping the new take me home button within the sanity test
 2022-03-23 12:57:53 +01:00
ganfra 951171cb94
Merge pull request #5607 from vector-im/feature/fga/weblate_1.4.6 
Feature/fga/weblate 1.4.6
 2022-03-22 19:39:00 +01:00
ganfra c06c9ea1d6 Fix lint issues on weblate sync 2022-03-22 18:55:34 +01:00
ganfra 3d3f5444b1
Merge pull request #5606 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-03-22 18:11:28 +01:00
ClaireG 6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00
Weblate 095f06bd89 Merge branch 'origin/develop' into Weblate. 2022-03-22 15:59:34 +00:00
iaiz 8550db9f23 Translated using Weblate (Spanish) 
Currently translated at 95.7% (2065 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-03-22 15:58:54 +00:00
iaiz 707800532f Translated using Weblate (Spanish) 
Currently translated at 66.6% (34 of 51 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/es/
 2022-03-22 15:58:52 +00:00
ganfra 073475854e
Merge pull request #5564 from SpiritCroc/timeline-chunk-double-linking 
Fix another case of read markers not updating: Ensure proper double linking of TimelineChunks
 2022-03-22 15:46:48 +01:00
ganfra 67804da205
Merge pull request #5604 from vector-im/feature/adm/toolbar-icon-positions 
Fixing presence icon anchoring to the middle of the room icon
 2022-03-22 15:16:17 +01:00
ganfra a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users 
Threads Migration
 2022-03-22 14:57:07 +01:00
Adam Brown 1e6e8b546d fixing presence icon anchoring to the middle of the room icon 
- creates a secondary verification shield and aligns to the start of the room title when presence is present
 2022-03-22 13:43:43 +00:00
ariskotsomitopoulos c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
Adam Brown 21e46c5840
Merge pull request #5601 from vector-im/dependabot/gradle/org.json-json-20220320 
Bump json from 20211205 to 20220320
 2022-03-22 11:00:13 +00:00
ariskotsomitopoulos a431d885f0 Increase the thread summaries limit 2022-03-22 11:20:47 +02:00