Skip to content
Snippets Groups Projects
Commit 12ce7f39 authored by Taras's avatar Taras
Browse files

Merge branch 'release/v1.0.18' into develop

parents bb367bca 4624f1d1
No related branches found
No related tags found
No related merge requests found
......@@ -11,8 +11,8 @@ android {
applicationId "org.futo.circles"
minSdk rootProject.ext.min_sdk_version
targetSdk rootProject.ext.sdk_version
versionCode 27
versionName "1.0.17"
versionCode 28
versionName "1.0.18"
archivesBaseName = "circles-v${versionName}"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
......@@ -19,7 +19,7 @@ class ValidateEmailDataSource @Inject constructor(
mapOf(
TYPE_PARAM_KEY to REGISTRATION_EMAIL_REQUEST_TOKEN_TYPE,
EMAIL_PARAM_KEY to email,
SUBSCRIBE_TO_LIST to subscribeToUpdates
//SUBSCRIBE_TO_LIST to subscribeToUpdates
)
)
......
......@@ -117,6 +117,7 @@
android:checked="true"
android:text="@string/receive_email_updates"
android:textAppearance="@style/body"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnSendCode" />
......
v1.0.18
- "Help" menu item for Groups and Circles
- New share room url formatting
- Knock requests "reason" message
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment