diff --git a/.dockerignore b/.dockerignore index 5fcee18d54d84504bba857a26b32f9bf13c0b812..da9bc10fd3bd2dc40781c1fb4094f5530c87aa35 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ node_modules github -public \ No newline at end of file +public +build.sh \ No newline at end of file diff --git a/.gitignore b/.gitignore index 29550455c94e68ff8d6ac1d933d7a3888d7b5cf3..98ec86290716cc8cbfe80e7098be7368e336df1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules data -public \ No newline at end of file +public +build.sh \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d1ed2206a6ba5fc0ffc1347822eec4a838485f84..56860cec367c730e0290d449ba48e8b2a4d2767e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### v1.6.1 (2021-07-28) - Added option to upload custom icons for bookmarks ([#52](https://github.com/pawelmalak/flame/issues/52)) - Fixed custom icons not updating ([#58](https://github.com/pawelmalak/flame/issues/58)) +- Added changelog file ### v1.6 (2021-07-17) - Added support for Steam URLs ([#62](https://github.com/pawelmalak/flame/issues/62)) diff --git a/Dockerfile b/Dockerfile index 8016d8e020c5c50be5876dea6cd4fda1b38dc305..fed0789b7f16de50de42d5c4045af4e428594805 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:14-alpine -RUN apk update && apk add --no-cache nano +RUN apk update && apk add --no-cache nano curl WORKDIR /app diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch index 808b815780d062cf56eab217851dbe15083dc195..20ff6c256b11b31f8953e507f8ea6edb6d8369f8 100644 --- a/Dockerfile.multiarch +++ b/Dockerfile.multiarch @@ -1,6 +1,6 @@ FROM node:14-alpine -RUN apk update && apk add --no-cache nano +RUN apk update && apk add --no-cache nano curl WORKDIR /app diff --git a/client/src/components/Settings/AppDetails/AppDetails.tsx b/client/src/components/Settings/AppDetails/AppDetails.tsx index 90fe2fb3499105741d8707d6fa7fffcac2e1f82d..50fd37f3a8049a3f9981d8b86f0dc14be2c56569 100644 --- a/client/src/components/Settings/AppDetails/AppDetails.tsx +++ b/client/src/components/Settings/AppDetails/AppDetails.tsx @@ -17,6 +17,15 @@ const AppDetails = (): JSX.Element => { {' '} version {process.env.REACT_APP_VERSION}
++ See changelog {' '} + + here + +
) diff --git a/client/src/store/actions/bookmark.ts b/client/src/store/actions/bookmark.ts index 87070623588383fccd80c69af370a8e170d89551..b4b5831b320d3171d4e708edd25752fc89f874f0 100644 --- a/client/src/store/actions/bookmark.ts +++ b/client/src/store/actions/bookmark.ts @@ -72,7 +72,7 @@ export interface AddBookmarkAction { export const addBookmark = (formData: NewBookmark | FormData) => async (dispatch: Dispatch) => { try { const res = await axios.post