mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 02:15:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
16087 commits 6 branches 120 tags 229 MiB
Commit graph

16087 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
4c457de2eb Automatic upstream merge postprocessing 
Change-Id: Ia380e6cb16012ca8e2902918eee60a24d893749a
 2022-04-12 11:57:23 +02:00
SpiritCroc
7c35f5fda5 Merge tag 'v1.4.11' into sc 
Change-Id: I454f1ec4f1df6366065d5690d9704eb1bd573c2d

Conflicts:
	dependencies_groups.gradle
	library/ui-styles/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.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/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/res/menu/menu_timeline.xml
 2022-04-12 11:57:16 +02:00
SpiritCroc
97b181997f [TMP] Automatic upstream merge preparation 
Change-Id: Ia7ca6b9e94631fc9ccfa911669376a472f5012d5
 2022-04-12 11:07:58 +02:00
SpiritCroc
1ae13292a5 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I39238d970aeee2af9fafc69604ff5d5dfb7b2b09
 2022-04-12 11:07:57 +02:00
SpiritCroc
096bbb696f Open without reading: remember for rooms opened from room 
Change-Id: I6ea5675b4cfb5d65d0a5a66d41a0cd489fe263b0
 2022-04-12 11:02:43 +02:00
SpiritCroc
d5b0ffacf8 Home pager space swipe: ensure we don't use legacy groups 
Change-Id: Icb7ce90dcb1ae013b999c9db9b7b9a3d984dc83f
 2022-04-12 11:02:40 +02:00
SpiritCroc
1e62bbfdb3 TokenChunkEventPersistor: log sync tokens 
Change-Id: I916808b1839171b8bd96dc5560d97c43c801165b
 2022-04-12 11:02:36 +02:00
SpiritCroc
68c9c5459d ViewPager: Change how initial page is selected 
Change-Id: Id1a7f29526dc6957dfed61ba016c89e9b45638a2
 2022-04-12 11:02:22 +02:00
SpiritCroc
66f5b5c771 Update ViewPager debugging 
Change-Id: I969a649335f069ddc68762975be8e8aad018a37d
 2022-04-12 11:01:05 +02:00
Benoit Marty
aec196564d Merge branch 'hotfix/1.4.11' into main 2022-04-07 18:01:46 +02:00
Benoit Marty
c2bdfe0f19 Fastlane 2022-04-07 17:59:03 +02:00
Benoit Marty
0e1c587eff Version 1.4.11 2022-04-07 17:58:25 +02:00
NIkita Fedrunov
4a2b573ef4 Towncrier 2022-04-07 17:57:51 +02:00
NIkita Fedrunov
190a425aa6 don't leave DMs when leaving all rooms in space 2022-04-07 17:55:33 +02:00
SpiritCroc
48d632cce5 Quicker updates of toolbar title on space swipe 
Change-Id: I89b89ab50aa8dab59e6db719332641e8376f5c76
 2022-04-07 15:34:43 +02:00
SpiritCroc
e4c0883312 Rageshake: add field about what debug settings to expect 
Change-Id: Idd9a1954e80c24ed58bf8e1f2b93ecb7cd211407
 2022-04-07 15:15:29 +02:00
Benoit Marty
e7a2e654e5 Merge branch 'release/1.4.10' into main 2022-04-05 22:35:07 +02:00
Benoit Marty
ee63c75cec fastlane 2022-04-05 22:34:40 +02:00
Benoit Marty
5429521c70 Update generated changelog 2022-04-05 22:33:20 +02:00
Benoit Marty
1ef2b1d05a Towncrier 2022-04-05 22:30:59 +02:00
Benoit Marty
fd76db9616 Update test 2022-04-05 22:16:42 +02:00
Benoit Marty
0f14652932
Merge pull request #5692 from vector-im/feature/aris/threads_beta_infrom_users_on_reply 
Threads Beta opt-in mechanism
 2022-04-05 20:40:16 +02:00
ariskotsomitopoulos
598892de53 Injecting stringProvider instead of context in ThreadsManager class 2022-04-05 20:53:11 +03:00
ariskotsomitopoulos
37dc77cc3e Add isValid check to RealmChangeListener to prevent crashes on deleted objects 2022-04-05 20:36:33 +03:00
ariskotsomitopoulos
59d87df0ca Add string resource comment 2022-04-05 19:44:01 +03:00
ariskotsomitopoulos
5ee2579efc Revert "Remove duplicate learn more string resources" 
This reverts commit 2ac3306382.
 2022-04-05 19:39:13 +03:00
ariskotsomitopoulos
72d4c7612a Revert comment change 2022-04-05 19:39:11 +03:00
Benoit Marty
c76dc7b62f
Update vector/src/main/res/values/strings_login_v2.xml 
Fix typo
 2022-04-05 17:40:27 +02:00
Benoit Marty
fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback 
Feature/aris/threads beta feedback
 2022-04-05 17:25:29 +02:00
Benoit Marty
ca418afcbb
Merge pull request #5614 from vector-im/feature/aris/threads_ui_enhancements 
Feature/aris/threads UI enhancements
 2022-04-05 17:21:53 +02:00
Maxime NATUREL
bebe819c54
Merge pull request #5671 from vector-im/feature/mna/PSF-673-live-loc-share-duration 
#5667: [Location Sharing] - Set duration of live sharing
 2022-04-05 16:13:26 +02:00
Aris Kotsomitopoulos
d484ba07cd
Merge pull request #5594 from vector-im/feature/aris/thread_root_permalink_navigation 
Improve permalink on thread root message
 2022-04-05 16:39:46 +03:00
ariskotsomitopoulos
6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements 
# Conflicts:
#	vector/src/main/res/menu/menu_timeline.xml
 2022-04-05 16:32:49 +03:00
ariskotsomitopoulos
a269aa5046 Remove unused elevation 2022-04-05 16:29:54 +03:00
ariskotsomitopoulos
858623b5a4 Change default threads beta visibility 2022-04-05 16:26:42 +03:00
ariskotsomitopoulos
aef4cce3e7 Format code ordering 2022-04-05 14:51:38 +03:00
ariskotsomitopoulos
b5f8d2c91f Update string resource 2022-04-05 14:50:18 +03:00
Benoit Marty
4ce4ef4631
Merge pull request #5698 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-04-05 13:46:09 +02:00
ariskotsomitopoulos
eecaf9602d Add urls.xml in vector-config 2022-04-05 14:12:32 +03:00
ariskotsomitopoulos
6567628b95 Format code 2022-04-05 14:02:41 +03:00
ariskotsomitopoulos
35a526a482 Improve comment format 2022-04-05 14:02:08 +03:00
ariskotsomitopoulos
e3ac5ad8c1 Remove extra space 2022-04-05 14:01:14 +03:00
ariskotsomitopoulos
2ac3306382 Remove duplicate learn more string resources 2022-04-05 13:56:12 +03:00
Weblate
587752dffe Merge branch 'origin/develop' into Weblate. 2022-04-05 10:55:25 +00:00
Benoit Marty
5f3f31b62c
Merge pull request #5695 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.0.4.1 
Bump dependency-check-gradle from 7.0.3 to 7.0.4.1
 2022-04-05 12:53:03 +02:00
ariskotsomitopoulos
7662abc5f7 Add learn more to string resources 2022-04-05 13:36:44 +03:00
ariskotsomitopoulos
2bb6e77be0 Rename displayThreadsBetaNotice method 2022-04-05 13:10:59 +03:00
SpiritCroc
14d7921f35 Persist swiped space across viewpager recreations 
Change-Id: I8a4010b8eaddcfe2ee906cb559336dc4c2e05bef
 2022-04-05 10:43:19 +02:00
fedrunov
e2481fa8e6
metrics for IA project (#5399) 2022-04-05 09:28:31 +02:00
fedrunov
0664afdf9a
Update Spaces menu ordering and capitalisation (#5539) 2022-04-05 09:27:39 +02:00