negue 576c80af7e Merge remote-tracking branch 'origin/develop' into negue/ui/setting ...

# Conflicts:
#	website/client/src/components/payments/selectUserModal.vue
#	website/client/src/components/settings/site.vue
#	website/client/src/router/index.js

2023-03-14 21:04:05 +01:00

..

controllers

Merge remote-tracking branch 'origin/develop' into negue/ui/setting

2023-03-14 21:04:05 +01:00

libs

fix(purchases): correct hardcoded date range for Gryph

2023-02-03 09:23:21 -06:00

middlewares

fix(cron): don't process group tasks during user cron

2022-08-24 14:18:07 -05:00

models

Merge remote-tracking branch 'origin/develop' into negue/ui/setting

2023-03-14 21:04:05 +01:00

.eslintrc.js

misc, fix client tests

2019-10-15 15:32:53 +02:00

api-doc.js

Adminpanel and revamped permissions (#13843)

2022-05-03 14:40:56 -05:00

index.js

fix(logger): improve logging and make sure no data is lost

2020-03-24 20:29:31 +01:00

server.js

start upgrading eslint

2019-10-08 16:57:10 +02:00