Skip to content

Commit

Permalink
Merge pull request mgilangjanuar#335 from mgilangjanuar/staging
Browse files Browse the repository at this point in the history
Release v2.2.1
  • Loading branch information
mgilangjanuar authored Apr 20, 2022
2 parents da2877f + b3525fa commit 7d86b14
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
teledrive:
command: bash -c "yarn server prisma migrate deploy && node server/dist/index.js"
command: bash -c "(yarn server prisma migrate deploy || yarn server prisma migrate resolve --applied 20220420012853_init) && node server/dist/index.js"
labels:
traefik.http.routers.server.rule: Host(`teledrive.localhost`)
traefik.port: 4000
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teledrive",
"version": "2.2.0",
"version": "2.2.1",
"repository": "[email protected]:mgilangjanuar/teledrive.git",
"author": "M Gilang Januar <[email protected]>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "server",
"version": "2.2.0",
"version": "2.2.1",
"main": "dist/index.js",
"license": "MIT",
"private": true,
Expand Down
4 changes: 2 additions & 2 deletions server/src/api/v1/Files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ export class Files {
AND: [
{
message_id: {
in: files.map(file => file.id)
in: files.map(file => file.id.toString())
}
},
{ parent_id: parentId as string || null },
Expand Down Expand Up @@ -876,7 +876,7 @@ export class Files {

return {
name,
message_id: file.id,
message_id: file.id.toString(),
mime_type: mimeType,
size,
user_id: req.user.id,
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web",
"version": "2.2.0",
"version": "2.2.1",
"private": true,
"dependencies": {
"@ideasio/add-to-homescreen-react": "^1.0.10",
Expand Down
2 changes: 1 addition & 1 deletion web/src/utils/Constant.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const VERSION = '2.2.0'
export const VERSION = '2.2.1'
export const MAX_UPLOAD_SIZE = 2_000_000_000
export const CHUNK_SIZE = 512 * 1024
export const RETRY_COUNT = 50

0 comments on commit 7d86b14

Please sign in to comment.