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

20245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxime NATUREL
0515303c8c
Merge pull request #6800 from vector-im/feature/mna/new-device-management-screen 
[Devices management] Add a feature flag and empty screen for future new layout (PSG-676)
 2022-08-11 08:59:57 +02:00
dependabot[bot]
fde0039027
Bump fragment from 1.5.1 to 1.5.2 
Bumps `fragment` from 1.5.1 to 1.5.2.

Updates `fragment-ktx` from 1.5.1 to 1.5.2

Updates `fragment-testing` from 1.5.1 to 1.5.2

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-10 23:11:18 +00:00
Adam Brown
5d1750675b
Merge pull request #6758 from vector-im/gradlew-update-7.5.1 
Update Gradle Wrapper from 7.5 to 7.5.1
 2022-08-10 17:08:58 +01:00
ericdecanini
989471a409 Adds changelog file 2022-08-10 17:44:33 +02:00
ericdecanini
7a50e25bea Unbolds text 2022-08-10 17:34:16 +02:00
Maxime NATUREL
73e437de0b
Merge pull request #6747 from vector-im/fix/mna/notification-lls-poll-start 
[Notification] - Handle creation of notification for live location and poll start (PSG-41)
 2022-08-10 17:14:25 +02:00
SpiritCroc
48e19b85fc Automatic SchildiChat string correction 
Change-Id: I4ce96ab087cc8be8dd573aaaefbb4f4314f48049
 2022-08-10 17:07:16 +02:00
SpiritCroc
cee72d1f54 Automatic upstream merge postprocessing 
Change-Id: I4f2190936999f638ac7950dac87182fadd6d1573
 2022-08-10 17:07:15 +02:00
SpiritCroc
5d1722054e Merge tag 'v1.4.32' into sc 
Change-Id: Ib3724625b1aada2541e030f9fdaf47a032538c85

Conflicts:
	.gitignore
	library/ui-styles/src/main/res/values/styles_toolbar.xml
	vector/build.gradle
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_timeline.xml
 2022-08-10 17:07:09 +02:00
dependabot[bot]
cd929a203e
Bump android-connector from 2.0.0 to 2.0.1 
Bumps [android-connector](https://github.com/UnifiedPush/android-connector) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/UnifiedPush/android-connector/releases)
- [Commits](https://github.com/UnifiedPush/android-connector/compare/2.0.0...2.0.1)

---
updated-dependencies:
- dependency-name: com.github.UnifiedPush:android-connector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-10 14:09:31 +00:00
Adam Brown
bcd038deb2 trigger CI 2022-08-10 14:49:07 +01:00
gradle-update-robot
5120cf7a76 Update Gradle Wrapper from 7.5 to 7.5.1. 
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
 2022-08-10 14:49:07 +01:00
Maxime NATUREL
3a9aa7472a Fixing wrong view reference in title assignment 2022-08-10 15:44:16 +02:00
SpiritCroc
a61b7e91e6 [TMP] Automatic upstream merge preparation 
Change-Id: I4b0e2b2ccbd1888920b14d0a4ff82b62f995d08d
 2022-08-10 15:41:16 +02:00
SpiritCroc
d0a1457181 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I19397ab12322c71978e1d7b28b7f6873f2f22c33
 2022-08-10 15:41:16 +02:00
Maxime NATUREL
a2c39c079a Adding changelog entry 2022-08-10 15:28:51 +02:00
Maxime NATUREL
89f31b093e Handling notifications for beacon_info and poll_start events 2022-08-10 15:28:51 +02:00
Maxime NATUREL
de240b7318 Fixing comment in beacon content model 2022-08-10 15:28:51 +02:00
ericdecanini
4f4d7f111d Adds listeners to FABs 2022-08-10 15:25:33 +02:00
Adam Brown
6526cf3c2e removing unused file, the release flipper proxy instance is provided by the debug module 2022-08-10 14:14:39 +01:00
Maxime NATUREL
2764a6e103 Fixing code formatting issues 2022-08-10 14:57:16 +02:00
Maxime NATUREL
3ff9ab1bc8 Interface for LeakDetector 2022-08-10 14:47:09 +02:00
Maxime NATUREL
250ee1faa1 Moving the new setting inside debug screen 2022-08-10 14:47:08 +02:00
Maxime NATUREL
12405527e1 Adding changelog entry 2022-08-10 14:47:08 +02:00
Maxime NATUREL
36c69a46fd Adding way to enable leak canary at runtime 2022-08-10 14:47:08 +02:00
Maxime NATUREL
31a350eea7 Enabling leakcanary on debug builds 2022-08-10 14:47:08 +02:00
Jorge Martin Espinosa
aecf460c96
Improve tests for lockscreen (#6796) 
* Improve tests

* Address review comments.

* Refactor pin code tests and code to improve testability.

* Fix lint issues
 2022-08-10 12:00:36 +00:00
Adam Brown
fcc7bbadfa Merge branch 'release/v1.4.32' into develop 2022-08-10 12:30:42 +01:00
Adam Brown
defd848363 updating version for next release cycle 2022-08-10 12:30:38 +01:00
SpiritCroc
85562dd995 increment_version.sh: Update sm template variant for betas 
Change-Id: Ifdce2c629aff4de7d1c6225ad4f155ccb4e94d2d
 2022-08-10 12:39:53 +02:00
ericdecanini
527bcf2e6f Adds changelog file 2022-08-10 11:30:15 +02:00
ericdecanini
fd37b31c44 Changes changelog file extension 2022-08-10 11:28:14 +02:00
ericdecanini
c0c0f90b04 Adds NewChatBottomSheet 2022-08-10 11:26:25 +02:00
Maxime NATUREL
b9fa4ddfc8 Renaming v2 setting key 2022-08-10 10:54:16 +02:00
Adam Brown
ce28d7f8a5 Merge branch 'release/v1.4.32' 2022-08-10 09:47:50 +01:00
Maxime NATUREL
ed00685514 Adding changelog entry 2022-08-10 10:40:06 +02:00
Maxime NATUREL
1ebc2a9a8c New empty devices list screen 2022-08-10 10:40:06 +02:00
Maxime NATUREL
db1d0daec0 Adding a new setting entry behind feature flag 2022-08-10 10:40:06 +02:00
Maxime NATUREL
fb0b38bb49 Adding new feature flag for new device management 2022-08-10 10:40:06 +02:00
SpiritCroc
ebe5672b8a Increment version 
Change-Id: I50f02b7bc96181a26eae2e4415cc527e1c63b550
 2022-08-10 10:17:24 +02:00
Adam Brown
e81da5d8b4 generating 1.4.32 changelog 2022-08-10 09:02:04 +01:00
ericdecanini
358ec5a722 Fixes post merge errors 2022-08-10 08:25:51 +02:00
ericdecanini
e87eefb319 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
 2022-08-10 08:24:55 +02:00
ericdecanini
ddaf5397b1 Removes params passed into HomeRoomListFragment and fixes lint error 2022-08-10 08:24:03 +02:00
Eric Decanini
ce4ab78f13
Merge pull request #6693 from vector-im/feature/eric/new_fab 
New App Layout FABs
 2022-08-10 08:13:36 +02:00
ericdecanini
9505d196e4 Changes space title in toolbar 2022-08-10 08:10:33 +02:00
Adam Brown
f9a6839f72
Merge pull request #6793 from vector-im/feature/adm/unsupported-play-language 
Disabling unsupported play store language
 2022-08-09 20:20:36 +01:00
Adam Brown
a2768ccab7 ignoring the gl locale from the play store upload step as it's unsupported 2022-08-09 16:22:21 +01:00
Allan Nordhøy
3e79472aca Translated using Weblate (Norwegian Bokmål) 
Currently translated at 63.8% (97 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/nb_NO/
 2022-08-09 17:08:32 +02:00
joshua
ef7458ed5d Translated using Weblate (Swedish) 
Currently translated at 100.0% (152 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/sv/
 2022-08-09 17:08:31 +02:00