Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	website/client/src/components/payments/selectUserModal.vue
#	website/client/src/components/settings/site.vue
#	website/client/src/router/index.js
This commit is contained in:
negue
2023-03-14 21:04:05 +01:00
parent dec1a1159d 377b152ffd
commit 576c80af7e
196 changed files with 3307 additions and 1481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/common/script/content/constants/events.js
+16 -2
View File
@@ -10,11 +10,25 @@ const gemsPromo = {
export const EVENTS = {
noEvent: {
start: '2023-02-08T23:59-05:00',
end: '2023-02-14T08:00-05:00',
start: '2023-02-28T23:59-05:00',
end: '2023-03-21T08:00-05:00',
season: 'normal',
npcImageSuffix: '',
},
bundle202302: {
start: '2023-02-21T08:00-05:00',
end: '2023-02-28T23:59-05:00',
},
potions202302:{
start: '2023-02-13T08:00-05:00',
end: '2023-02-28T23:59-05:00',
},
valentines2023: {
start: '2023-02-13T08:00-05:00',
end: '2023-02-17T23:59-05:00',
season: 'valentines',
npcImageSuffix: '_valentines',
},
birthday10: {
start: '2023-01-30T08:00-05:00',
end: '2023-02-08T23:59-05:00',