Skip to content

Commit

Permalink
Merge pull request #107 from davideshay/fixes111
Browse files Browse the repository at this point in the history
Fixes111
  • Loading branch information
davideshay authored Sep 9, 2023
2 parents 7c2a7a3 + f32aff9 commit f789fb9
Show file tree
Hide file tree
Showing 35 changed files with 414 additions and 985 deletions.
4 changes: 2 additions & 2 deletions alexa/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions alexa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alexa",
"version": "1.1.0",
"version": "1.1.1",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -15,21 +15,21 @@
"devDependencies": {
"@types/express": "^4.17.17",
"@types/i18next-sprintf-postprocessor": "^0.2.0",
"@types/lodash": "^4.14.194",
"@types/node": "^18.16.1",
"nodemon": "^2.0.22",
"rimraf": "^5.0.0",
"@types/lodash": "^4.14.198",
"@types/node": "^20.5.9",
"nodemon": "^3.0.1",
"rimraf": "^5.0.1",
"ts-node": "^10.9.1",
"typescript": "^5.0.4"
"typescript": "^5.2.2"
},
"dependencies": {
"ask-sdk": "^2.14.0",
"ask-sdk-core": "^2.14.0",
"ask-sdk-express-adapter": "^2.14.0",
"ask-sdk-model": "^1.67.0",
"axios": "^1.3.6",
"ask-sdk-model": "^1.86.0",
"axios": "^1.5.0",
"express": "^4.18.2",
"i18next": "^22.4.15",
"i18next": "^23.5.1",
"i18next-sprintf-postprocessor": "^0.2.2",
"lodash": "^4.17.21",
"loglevel": "^1.8.1",
Expand Down
3 changes: 1 addition & 2 deletions alexa/src/dbstartup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ export const couchAdminUser = process.env.COUCHDB_ADMIN_USER;
export const couchAdminPassword = process.env.COUCHDB_ADMIN_PASSWORD;
export const couchUserPrefix = "org.couchdb.user";
export const logLevel = (process.env.LOG_LEVEL == undefined) ? "INFO" : process.env.LOG_LEVEL.toUpperCase();
import nanoAdmin, { DocumentListResponse, MangoResponse, DocumentScope,
MangoQuery, MaybeDocument } from 'nano';
import nanoAdmin, { DocumentScope } from 'nano';
const nanoAdminOpts = {
url: couchdbInternalUrl,
requestDefaults: {
Expand Down
4 changes: 2 additions & 2 deletions client/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
// version code -- if version is xx.yy.zz, code is xxyyzz00 -> xxyyzz99
// so "1.0.7" is 01.00.07.00 -> 1000700
versionCode 1010000
versionName "1.1.0"
versionCode 1010100
versionName "1.1.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
Loading

0 comments on commit f789fb9

Please sign in to comment.