watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'analytics' into dev

Browse source 
# Conflicts:
#	.gitignore
#	src/app/api/share/[slug]/route.ts
#	src/app/share/[...shareId]/SharePage.tsx
This commit is contained in:
Mike Cao 2026-01-22 17:44:45 -08:00
commit adea3e9b1c
7 changed files with 148 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

93
.gitignore vendored
View file

@ -1,46 +1,47 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
node_modules
.pnp
.pnp.js
.pnpm-store
package-lock.json
# testing
/coverage
# next.js
/.next
/out
# production
/build
/public/script.js
/geo
/dist
/generated
/src/generated
pm2.yml
# misc
.DS_Store
.idea
.yarn
*.iml
*.log
.vscode
.tool-versions
# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# local env files
.env
.env.*
*.env.*
*.dev.yml
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
node_modules
.pnp
.pnp.js
.pnpm-store
package-lock.json
# testing
/coverage
# next.js
/.next
/out
# production
/build
/public/script.js
/geo
/dist
/generated
/src/generated
pm2.yml
# misc
.DS_Store
.idea
.yarn
*.iml
*.log
.vscode
.tool-versions
.claude
# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# local env files
.env
.env.*
*.env.*
*.dev.yml