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

592 Commits

Author SHA1 Message Date
SpiritCroc c38ece586e Increment version 
Change-Id: I70c18491f03854898fa9989add666530dbc0b668
 2021-09-13 16:20:06 +02:00
SpiritCroc 741ac9f3f6 Merge tag 'v1.2.2' into sc 
Change-Id: Icda1859305bac1e48f3d1889282a23049dd83c29
 2021-09-13 15:37:54 +02:00
Benoit Marty cccf812906 Version++ (1.2.2) 2021-09-13 15:25:56 +02:00
SpiritCroc 3be0b85dcf Actually, this is 1.2.1 now 
Change-Id: I13a84dc84c37892cf5d18c549bc305f9a6b1e7ce
 2021-09-09 16:21:19 +02:00
SpiritCroc 133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.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/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
SpiritCroc 832f0e0e5b Increment version 
Change-Id: Ia225fd512fb1bccd7a2277a2e6f423c8f7ef8969
 2021-09-09 09:39:24 +02:00
Benoit Marty 73881d0813 Upgrade dependency on Barista. 
Should fix #3929

Barista has changed location since 4.0.0
 2021-09-03 17:02:14 +02:00
Benoit Marty ec6bae6b1e Lint now check all the modules, but is does not check all the variants. Let's keep it like that for now 
https://developer.android.com/studio/releases/gradle-plugin#running_lint_on_default_variant_only
 2021-09-02 10:43:33 +02:00
Benoit Marty 80f23f1f3c Use Java 11 source code 
https://developer.android.com/studio/releases/gradle-plugin#java-11
 2021-09-02 09:50:34 +02:00
Benoit Marty 5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
Benoit Marty 54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1 
Bump daggerVersion from 2.38 to 2.38.1
 2021-08-27 17:37:03 +02:00
Benoit Marty 0046de576e
Merge pull request #3767 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.0 
Bump constraintlayout from 2.1.0-beta02 to 2.1.0
 2021-08-27 16:39:34 +02:00
dependabot[bot] 7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1 
Bumps `daggerVersion` from 2.38 to 2.38.1.

Updates `dagger` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

Updates `dagger-compiler` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 14:33:17 +00:00
Benoit Marty fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1 
Bump timber from 4.7.1 to 5.0.1
 2021-08-27 16:32:29 +02:00
ganfra fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
David Langley ce9acd440e Enabled Notifications V2 2021-08-25 17:54:23 +01:00
Benoit Marty f843712d7e
Merge pull request #3825 from vector-im/feature/dla/room_notification_settings 
Room Notification Settings V2
 2021-08-25 15:20:43 +02:00
dependabot[bot] 8988ea8997
Bump libphonenumber from 8.12.30 to 8.12.31 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.30 to 8.12.31.
- [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.30...v8.12.31)

---
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-08-24 23:09:52 +00:00
David Langley 4d4d370b8f checks and remove build settings 2021-08-24 22:33:32 +01:00
David Langley f8114dd7a1 Fix HomeList error snackbar and add dialog for bottom sheet errors 2021-08-24 22:28:31 +01:00
ganfra 42bfa129b3 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-24 16:21:35 +02:00
dependabot[bot] 3a03b5b63c
Bump timber from 4.7.1 to 5.0.1 
Bumps [timber](https://github.com/JakeWharton/timber) from 4.7.1 to 5.0.1.
- [Release notes](https://github.com/JakeWharton/timber/releases)
- [Changelog](https://github.com/JakeWharton/timber/blob/trunk/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/timber/compare/4.7.1...5.0.1)

---
updated-dependencies:
- dependency-name: com.jakewharton.timber:timber
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 13:12:59 +00:00
dependabot[bot] 9659bcf3e0
Bump constraintlayout from 2.1.0-beta02 to 2.1.0 
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.0-beta02 to 2.1.0.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/commits)

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 13:12:18 +00:00
Benoit Marty 49f2ac26ad
Merge pull request #3783 from vector-im/dependabot/gradle/big_image_viewer_version-1.8.1 
Bump big_image_viewer_version from 1.8.0 to 1.8.1
 2021-08-23 15:09:29 +02:00
Benoit Marty 20baee2f53
Merge pull request #3794 from vector-im/dependabot/gradle/androidx.media-media-1.4.1 
Bump media from 1.4.0 to 1.4.1
 2021-08-23 15:05:33 +02:00
SpiritCroc 4918b7e7bf Merge branch 'unifiedpush' into sc 
Change-Id: I0d19e4032b0f31cc1dee404cb383046d04a3259e
 2021-08-21 09:21:19 +02:00
SpiritCroc 5f18fce771 Increment version 
Change-Id: Iaee1fa3f6de051c2ea57b0e2cb286de25052e31c
 2021-08-20 10:45:57 +02:00
SpiritCroc cad30d4790 Actually, we're still at 1.2.0 
Got develop in by accident due to unifiedpush, but whatever

Change-Id: I3d15dd820274076e4383aa17467a87dac9eebe31
 2021-08-19 10:42:47 +02:00
SpiritCroc 8475f24f17 Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush 
Change-Id: Ief98ae56d40f0724ba0e5f1f1c6ec09832425e58
 2021-08-18 13:16:37 +02:00
SpiritCroc 3b3e39bbb6 Merge branch 'sc' into unifiedpush 
Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e
 2021-08-18 13:16:19 +02:00
dependabot[bot] fac0198b26
Bump libphonenumber from 8.12.28 to 8.12.30 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.28 to 8.12.30.
- [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.28...v8.12.30)

---
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-08-17 23:05:56 +00:00
ganfra 3b1249c489 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-17 17:10:10 +02:00
S1m c584fa60dd Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-08-16 18:00:33 +02:00
SpiritCroc 8fe2a0021f Increment version 
Change-Id: I5c2d1293f5251d6d4c0cb889195f2db8a509e378
 2021-08-14 14:38:23 +02:00
SpiritCroc cf756b8789 Merge branch 'sc' into unifiedpush 
Change-Id: Ieae8e880360266f2f5e44aac371701e0356419de
 2021-08-12 09:30:41 +02:00
SpiritCroc 58f5310e83 Merge tag 'v1.2.0' into sc 
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-08-12 09:03:42 +02:00
Onuray Sahin 37e722e85d version++ 2021-08-12 02:36:39 +03:00
SpiritCroc 5b7e2fdcaa Merge remote-tracking branch 'p1gp1g/unifiedpush' into unifiedpush-2 
Change-Id: If4c64b14513d70cd376e3e1a9fbaeb1efb0ded12

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2021-08-11 18:08:02 +02:00
David Langley de5b2ad460 simplify logic in bottom sheet and add comment 2021-08-11 15:00:27 +01:00
Onuray Sahin 8216acfd5c version++ 2021-08-11 16:40:45 +03:00
David Langley 92a44cd9d6 add build config, use single variable in grandle file and update source to use feature flag 2021-08-11 13:13:38 +01:00
ganfra bcc9a75bdb Merge branch 'develop' into feature/fga/new_voip_design 2021-08-11 12:37:54 +02:00
David Langley 7f3c4f0073 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-08-10 10:54:22 +01:00
SpiritCroc 677330921d Merge tag 'v1.1.16' into sc 
v1.1.16

Change-Id: Id68bd7e36129c9168cc871d81c5c0935b689e1e9

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
 2021-08-10 09:54:58 +02:00
Onuray Sahin c167c8874d version++ 2021-08-09 00:54:16 +03:00
dependabot[bot] 9006118bc7
Bump media from 1.4.0 to 1.4.1 
Bumps media from 1.4.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: androidx.media:media
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-04 23:10:33 +00:00
dependabot[bot] ef1a66a37c
Bump big_image_viewer_version from 1.8.0 to 1.8.1 
Bumps `big_image_viewer_version` from 1.8.0 to 1.8.1.

Updates `BigImageViewer` from 1.8.0 to 1.8.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1)

Updates `GlideImageLoader` from 1.8.0 to 1.8.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1)

Updates `ProgressPieIndicator` from 1.8.0 to 1.8.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1)

Updates `GlideImageViewFactory` from 1.8.0 to 1.8.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/v1.8.0...v1.8.1)

---
updated-dependencies:
- dependency-name: com.github.piasy:BigImageViewer
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.piasy:GlideImageLoader
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.piasy:ProgressPieIndicator
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.github.piasy:GlideImageViewFactory
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-03 23:06:57 +00:00
SpiritCroc 25ba52115b Merge tag 'v1.1.15' into sc 
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4

Conflicts:
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-08-01 09:37:33 +02:00
Onuray Sahin c7c589354e version++ 2021-07-30 18:01:22 +03:00
Onuray Sahin c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message 
Voice Message
 2021-07-30 17:24:17 +03:00