martin f0b328fb6b feat(server, web): smart merge (#5796) ... * pr feedback * fix: tests * update assets statistics * pr feedback * pr feedback * fix: linter * pr feedback * fix: don't limit the smart merge * pr feedback * fix: server code --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>		2024-01-18 01:52:11 +00:00
..
bin	refactor: open api (#6334)	2024-01-12 07:36:27 -05:00
e2e	fix(server): handle 5 digit years (#6457)	2024-01-17 16:08:38 -05:00
resources	feat: postgres reverse geocoding (#5301)	2023-11-25 18:53:30 +00:00
src	feat(server, web): smart merge (#5796)	2024-01-18 01:52:11 +00:00
test	feat(server, web): smart merge (#5796)	2024-01-18 01:52:11 +00:00
.eslintrc.js	chore(server): curly braces (#5361)	2023-11-28 15:09:20 -05:00
.gitignore	feat(web): re-add open graph tags for public share links (#5635)	2023-12-11 13:37:47 -06:00
.prettierignore	refactor: open api (#6334)	2024-01-12 07:36:27 -05:00
.prettierrc	fix(server): lint import order (#3974)	2023-09-04 21:45:59 +02:00
Dockerfile	chore(deps): update base-image to v20240111 (major) (#6355)	2024-01-16 11:09:59 -05:00
nest-cli.json	refactor(server)*: tsconfigs (#2689)	2023-06-08 10:01:07 -05:00
openapitools.json	chore(server): update openapi (#2205)	2023-04-08 21:26:09 -05:00
package-lock.json	fix(deps): update server (#6415)	2024-01-17 18:24:51 +00:00
package.json	fix(deps): update dependency geo-tz to v8 (#6388)	2024-01-15 08:27:59 -05:00
start-microservices.sh	fix: shebangs (#3643)	2023-08-16 22:50:01 -05:00
start-server.sh	fix: shebangs (#3643)	2023-08-16 22:50:01 -05:00
start.sh	fix(server): immich command (#5408)	2023-11-30 14:59:47 -06:00
tsconfig.build.json	fix: exclude e2e format (#3250)	2023-07-13 21:41:16 -05:00
tsconfig.json	fix(server): better fix for the OAuth Discovery errors (#4695)	2023-10-30 13:22:30 -04:00