Skip to content

Commit

Permalink
Merge branch 'release/2.9.0-alpha16'
Browse files Browse the repository at this point in the history
  • Loading branch information
blavenie committed Apr 16, 2024
2 parents 464334c + fc1c5e5 commit 51a70fb
Show file tree
Hide file tree
Showing 9 changed files with 9,602 additions and 6 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "net.sumaris.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2090015
versionName "2.9.0-alpha15"
versionCode 2090016
versionName "2.9.0-alpha16"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest android:versionCode="2090015" android:versionName="2.9.0-alpha15" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<manifest android:versionCode="2090016" android:versionName="2.9.0-alpha16" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:exported="true" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="net.sumaris.app.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
<intent-filter>
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [[ "_$INSTALL_DIR" == "_" ]]; then
fi

latest_version() {
echo "2.9.0-alpha15" #lastest
echo "2.9.0-alpha16" #lastest
}

api_release_url() {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sumaris-app",
"description": "SUMARiS app",
"version": "2.9.0-alpha15",
"version": "2.9.0-alpha16",
"author": "[email protected]",
"license": "AGPL-3.0",
"readmeFilename": "README.md",
Expand Down
1 change: 1 addition & 0 deletions src/app/trip/trip/trip.form.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
</ion-col>
<ion-col>
<mat-autocomplete-field
*ngIf="loaded; else skeletonText100"
formControlName="samplingStrata"
[placeholder]="'TRIP.SAMPLING_STRATA' | translateContext: i18nSuffix"
[config]="autocompleteFields.samplingStrata"
Expand Down
3,095 changes: 3,095 additions & 0 deletions src/assets/i18n/en-2.9.0-alpha16.json

Large diffs are not rendered by default.

3,095 changes: 3,095 additions & 0 deletions src/assets/i18n/en-US-2.9.0-alpha16.json

Large diffs are not rendered by default.

3,405 changes: 3,405 additions & 0 deletions src/assets/i18n/fr-2.9.0-alpha16.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "SUMARiS",
"short_name": "SUMARiS",
"manifest_version": 1,
"version": "2.9.0-alpha15",
"version": "2.9.0-alpha16",
"default_locale": "fr",
"description": "Data collection tool for fisheries monitoring",
"icons": [
Expand Down

0 comments on commit 51a70fb

Please sign in to comment.