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

236 Commits

Author SHA1 Message Date
SpiritCroc 96aa885819 Increment version 
Change-Id: I68a3f7a7806795a2f5ae7a1b582bb6d9e572872b
 2020-09-30 12:23:15 +02:00
SpiritCroc 1cc4c7177f Increment version 
Change-Id: I1f2ddbb0e8ff82db6f3f321dc073f29426e8d5ac
 2020-09-27 14:11:52 +02:00
SpiritCroc 43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
 2020-09-27 13:55:40 +02:00
Benoit Marty f271968238 Upgrade library PFLockScreen-Android 2020-09-24 08:20:17 +02:00
SpiritCroc 7bdc4c30ec Increment version 
Change-Id: I1c958f87747b78f856a7a6ad502a4ebc75f4af05
 2020-09-22 10:22:29 +02:00
SpiritCroc 2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-09-17 12:03:17 +02:00
Benoit Marty 216138394f Version++ 2020-09-17 09:32:35 +02:00
SpiritCroc cf24ca90f9 Increment version 
Change-Id: Ice9536342a8eeff003019350a07e27f805426562
 2020-09-10 18:14:11 +02:00
SpiritCroc 1d7681a893 Don't do ABI extra versioning 
Doesn't work with F-Droid automatic update detection

Change-Id: I6bafe05f151e240fee37cd714ab2ac076a7a1a69
 2020-09-10 18:14:06 +02:00
ganfra c2880a5832 Strict mode: add a build entry to enable whenever we want to check 2020-09-09 11:52:05 +02:00
SpiritCroc bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
Benoit Marty bf0b6d738a Version++ 2020-09-08 17:49:26 +02:00
SpiritCroc 372ae6e162 Increment version 
Change-Id: I7de06d933fdddf3b4cd05538f0c5b3f29066b6c8
 2020-09-02 11:58:48 +02:00
Valere 9d2ea19d7d Upgrade to worker 2.4.0 2020-08-31 16:20:12 +02:00
Benoit Marty 59fa2e28c2 Fix sonar analysis version name issue 2020-08-27 18:15:53 +02:00
Onuray Sahin 776d892d27 Increase version of uCrop library which supports Android 10. 2020-08-26 12:27:12 +03:00
SpiritCroc c7ae49df1b Increment version 
Change-Id: I2e30e69f149fa363d8a0391fd4c4682575a234ae
 2020-08-24 17:54:08 +02:00
SpiritCroc 3b23ed9830 Increment version 
Change-Id: Ia0033b834c7b1a9145ead4247fe70d427ef53ae9
 2020-08-24 15:56:04 +02:00
SpiritCroc 4dfdfba42c Increment version 
Change-Id: I2b9b613775e1698a9b4339e153eb9b677f0898c7
 2020-08-24 11:35:41 +02:00
Benoit Marty 328dc9ea5b
Merge pull request #1979 from vector-im/feature/update_dependencies 
Update some dependencies, including coroutines for working debugging
 2020-08-24 10:11:57 +02:00
SpiritCroc 5b5cfa5bf1 Increment version 2020-08-23 15:27:39 +02:00
SpiritCroc 7b4b5be759 Merge tag 'v1.0.5' into sc 
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
 2020-08-22 11:23:45 +02:00
SpiritCroc c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc 
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
 2020-08-22 09:52:54 +02:00
ganfra 1f890324b4 Update some dependencies, including coroutines for working debugging 2020-08-21 17:17:51 +02:00
Benoit Marty 04fa7d9628 Version++ 2020-08-21 17:04:05 +02:00
Benoit Marty 4cba1388f9 Add support for biometrics (not only Fingerprint) 2020-08-20 14:11:23 +02:00
SpiritCroc 72faa81e2a Increment version 2020-08-18 15:17:34 +02:00
Benoit Marty 05ecbf0f86 Build Jitsi lib version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988 
And host it in https://github.com/vector-im/jitsi_libre_maven/tree/master/android-sdk-2.9.3
 2020-08-14 21:33:25 +02:00
SpiritCroc 17430b06a2 Increment version 2020-08-14 10:45:38 +02:00
Valere 42a24300a1 Initial commit jitsi 2020-08-14 09:31:24 +02:00
SpiritCroc 2a5342087d gplay version: ignore branch for version suffix 2020-08-09 17:02:17 +02:00
SpiritCroc 8602aba2a5 Increment version 2020-08-09 16:41:50 +02:00
SpiritCroc 459e20aac9 Merge tag 'v1.0.4' into sc 2020-08-07 12:34:18 +02:00
Valere 33f6e7e337 Version ++ 2020-08-03 14:04:31 +02:00
Valere db6045778e Update change log 2020-08-03 12:11:50 +02:00
ganfra 995c552f2a
Merge branch 'develop' into feature/pin_code 2020-07-31 11:41:42 +02:00
SpiritCroc 9f7bf14a22 Merge tag 'v1.0.3' into sc 
1.0.3

Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/values/styles_login.xml
 2020-07-31 11:22:57 +02:00
Valere 531623178a Version ++ 2020-07-31 00:52:22 +02:00
ganfra eb0d350097 Merge branch 'develop' into feature/pin_code 2020-07-30 17:24:48 +02:00
Valere b732ea6c69 Version ++ 2020-07-29 11:39:23 +02:00
Valere 9197275343 version++ 2020-07-29 09:00:29 +02:00
ganfra ecdef52829 Continue PIN code library integration (fork required) 2020-07-28 20:22:59 +02:00
SpiritCroc adaed3fd64 Increment version 2020-07-28 13:55:09 +02:00
SpiritCroc 6170800f9c Increment version 2020-07-24 12:10:03 +02:00
SpiritCroc af7cbeea11 Increment version 2020-07-20 16:46:11 +02:00
SpiritCroc fea41d3901 Increment version 2020-07-20 15:55:18 +02:00
SpiritCroc 95850440bd Merge remote-tracking branch 'upstream/master' into sc 
Conflicts:
	vector/build.gradle
	vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/res/drawable/bg_login_server.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
 2020-07-17 13:39:52 +02:00
ganfra f5fbb2bc4f Setup screens for Pin 2020-07-17 13:29:18 +02:00
SpiritCroc e37769aae4 SchildiChat 2020-07-17 11:35:40 +02:00
Benoit Marty 53f0b77fb0 Version++ 2020-07-15 14:32:15 +02:00