mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 14:38:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
11722 commits 7 branches 121 tags 229 MiB
Commit graph

11722 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
9d43b3cb8b Automatic SchildiChat string correction 
Change-Id: Id7fefdb679b8ea85958c514395b68aea1ca9b969
 2021-10-11 10:39:17 +02:00
SpiritCroc
bba7a691e0 Automatic upstream merge postprocessing 
Change-Id: I28aa960c79bf4807aab871ff8128d2339309342c
 2021-10-11 10:39:16 +02:00
SpiritCroc
ba2ed623c2 [merge-fixup] Fix our send button behaviour 
Change-Id: I119132f0423bf4884e37e4b9f9e5cd204949b269
 2021-10-11 10:38:40 +02:00
SpiritCroc
dffc0c1d65 Merge tag 'v1.3.2' into sc 
Change-Id: I7faf88b02994b10027bbbd00b7ac565a94381cc5

Conflicts:
	.gitignore
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.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/TokenChunkEventPersistor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.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/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
 2021-10-11 09:55:26 +02:00
SpiritCroc
44797fc2dc [TMP] Automatic upstream merge preparation 
Change-Id: I47dbe78febc16601fcd4e43ca4187d7735f709a8
 2021-10-08 18:50:23 +02:00
SpiritCroc
fb34e6fd94 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: If0508074a99f00adef86d0d5d2b1cd827ffeb7ed
 2021-10-08 18:50:23 +02:00
Benoit Marty
7b46796a81 Merge branch 'release/1.3.2' into main 2021-10-08 16:35:44 +02:00
Benoit Marty
612f0c77ea Wait a bit more 2021-10-08 16:26:36 +02:00
Benoit Marty
0a0dd4ee1b Fix crash when opening Identity Server detail from preference 2021-10-08 16:16:35 +02:00
Benoit Marty
bcf6342312 Fastlane changelog 2021-10-08 15:49:58 +02:00
Benoit Marty
9605841a84 Run towncrier 2021-10-08 15:42:29 +02:00
Benoit Marty
e673f31071
Merge pull request #4189 from vector-im/feature/bma/fix_wl_1.3.2 
Feature/bma/fix wl 1.3.2
 2021-10-08 15:29:37 +02:00
Benoit Marty
66d4a48930 Remove unused strings 2021-10-08 15:07:52 +02:00
Benoit Marty
090273da14 Fix lint error 2021-10-08 14:55:50 +02:00
Benoit Marty
b43a8ab9db
Merge pull request #4187 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-10-08 14:50:47 +02:00
Weblate
5c5fc767a4 Merge branch 'origin/develop' into Weblate. 2021-10-08 12:27:26 +00:00
Slimane Selyan AMIRI
5a5832dab7 Translated using Weblate (Kabyle) 
Currently translated at 81.0% (2154 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kab/
 2021-10-08 12:27:19 +00:00
Ihor Hordiichuk
bf219856a5 Translated using Weblate (Ukrainian) 
Currently translated at 91.7% (2440 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-10-08 12:27:18 +00:00
LinAGKar
999a08c0f5 Translated using Weblate (Swedish) 
Currently translated at 98.4% (2617 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-10-08 12:27:13 +00:00
SpiritCroc
2eec10a0c9 Increment version 
Change-Id: I59493d232f89b6d61d442993b6a260c4d5e578b3
 2021-10-08 08:49:37 +02:00
Benoit Marty
b411938644 Add changelog for #4184 2021-10-07 20:58:28 +02:00
Benoit Marty
d6af355335
Merge pull request #4184 from vector-im/feature/adm/is-policy 
Always display identity server policies
 2021-10-07 20:53:03 +02:00
Adam Brown
5365e87777 reducing the discovery policy url text size by using caption style 2021-10-07 17:56:54 +01:00
Adam Brown
cb7260954a renaming xml view to avoid clashing with other file 2021-10-07 17:46:33 +01:00
Adam Brown
259b6d56d7 using singular for the policy copy name to match content 2021-10-07 17:45:30 +01:00
Adam Brown
d00858f83b handling empty policy list by showing empty copy 2021-10-07 17:44:54 +01:00
Adam Brown
cccda9b699 using single action for the updating the policy expanded toggling/state setting 2021-10-07 17:29:50 +01:00
Adam Brown
496a531072 reverting uneedeed text item changes 2021-10-07 13:57:56 +01:00
Adam Brown
791c92c991 launching the discovery page with policy expanded when tapping the policy link from the consent dialog 2021-10-07 13:54:36 +01:00
Adam Brown
7b5972e3cf expanding the discovery polices on recieving a custom payload 
- also meant updating the general link to discovery in order to manually pass the default arguments
 2021-10-07 13:50:43 +01:00
Adam Brown
728f34f53c converting the settings activity payload to a sealed class, this allows us to have custom arguments for the sub settings pages 2021-10-07 13:07:30 +01:00
Adam Brown
05166944d8 navigating to the settings discovery page on policy link clicked from non discovery screens 2021-10-07 12:45:59 +01:00
Adam Brown
c0fd266fc4 using consistent naming for the policy and opening a chrome tab when policy is tapped 2021-10-07 12:39:48 +01:00
Benoit Marty
b71e2de9ac
Merge pull request #4179 from vector-im/feature/bma/typo_klint 
klint -> ktlint
 2021-10-07 12:17:45 +02:00
LinAGKar
f0cc56d95e Translated using Weblate (Swedish) 
Currently translated at 100.0% (31 of 31 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2021-10-07 09:25:40 +00:00
Erik Huizinga
64fb94691b Translated using Weblate (Dutch) 
Currently translated at 65.1% (1732 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-10-07 09:25:39 +00:00
Adam Brown
2f732affa5 updating policy title to include show/hide 2021-10-07 10:15:37 +01:00
Adam Brown
7e8ca29ca7 creating dedicated discovery policy items and displaying within an expandable form item 2021-10-07 10:09:03 +01:00
Benoit Marty
5fdaa45246 klint -> ktlint 2021-10-07 10:36:38 +02:00
Benoit Marty
f5cda678b2
Merge pull request #4177 from vector-im/feature/fga/temporary_dial_pad_fix 
Fix SIP user to native user mapping is wrong
 2021-10-07 10:10:48 +02:00
Benoit Marty
98428c7b29
Merge pull request #4178 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.34 
Bump libphonenumber from 8.12.33 to 8.12.34
 2021-10-07 10:08:51 +02:00
dependabot[bot]
c55598a099
Bump libphonenumber from 8.12.33 to 8.12.34 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.33 to 8.12.34.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.33...v8.12.34)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-06 23:07:32 +00:00
ganfra
0125c7675d Fix SIP user to native user mapping is wrong #4176 (also clear dialpad entry when call is started) 2021-10-06 19:34:04 +02:00
Adam Brown
3111d0b46d updating discovery consent dialog to include policy link which expands the policy urls view 2021-10-06 17:34:02 +01:00
Adam Brown
5a4f320bf9 binding the expanded state as part of the view, allows us to manually control the expansion 2021-10-06 17:20:20 +01:00
Adam Brown
7ce811c227 binding the indentity server policy urls to the discovery page 2021-10-06 17:20:06 +01:00
Adam Brown
04d844b1a9 allowing the expandable scrollbar to be hidden 2021-10-06 16:10:17 +01:00
Adam Brown
a2f64177eb adding the identity terms to the discovery page state 2021-10-06 15:20:33 +01:00
Erik Huizinga
0e498cc838 Translated using Weblate (Dutch) 
Currently translated at 62.6% (1664 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-10-06 08:32:02 +00:00
Evrim
16f6e358dc Translated using Weblate (Dutch) 
Currently translated at 62.6% (1664 of 2658 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-10-06 08:31:28 +00:00