krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,701 Commits 64 Branches 1,226 Tags
75c36e6622e91d7f965e0af9dd71cb15b29b7234
Commit Graph

11840 Commits

Author SHA1 Message Date
Sabe Jones
f2a2d4cde5 Merge branch 'gsf' into subs-private 2024-04-17 09:05:36 -05:00
Sabe Jones
0fd808727c Squashed commit of the following: 
commit 3c3787091a2e8a94857352c3655f60138a3b20b7
Merge: 76a00d6308 76d7f02fe8
Author: Sabe Jones <sabe@habitica.com>
Date:   Mon Apr 8 15:47:35 2024 -0500

    Merge branch 'release' into 2024-04-april-fool-items

commit 76a00d6308997c50ae5f5e9d6170a09a1a8cbac7
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 16:08:39 2024 -0500

    fix(quest): revise rage text

commit c2e13f8af245993f61eb614d6be609c833c2e711
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 12:57:17 2024 -0500

    fix(quest): correct rage and "guscompletion"

commit ecdeb82df998ab75eceae3e877c1758187b1d22c
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Mar 28 08:55:18 2024 -0500

    fix(events): correct dates and times

commit 232de436bbe7ba4c13f04ed66cc3b8a4a794d884
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 09:03:06 2024 -0500

    fix(content): a few more unruly Fungus

commit 955e6e73387788797d1a83a037f73aa472515cec
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 09:00:03 2024 -0500

    feat(content): wacky potions 2024 by @CuriousMagpie

commit 34b72be4f447f00c31169c4cd6e8ba79655adf8a
Author: Sabe Jones <sabe@habitica.com>
Date:   Wed Mar 27 08:56:27 2024 -0500

    feat(event): AF by @CuriousMagpie
 2024-04-08 15:48:32 -05:00
Phillip Thelen
edc3c58876 Fix issue with gift sub processing 2024-04-05 13:30:15 +02:00
Sabe Jones
4277c08324 fix(scheduling): lint and code review 2024-04-04 22:42:28 -05:00
Sabe Jones
424f29a82b fix(lint): curly space 2024-04-04 22:02:31 -05:00
Sabe Jones
e52c7ff9ce WIP(shop): empty states for categories 2024-04-04 22:02:19 -05:00
Sabe Jones
fdc709d1c2 fix(lint): remove console log 2024-04-03 10:33:43 -05:00
Sabe Jones
ea750571a0 fix(packages): add timers-browserify 2024-04-03 10:30:20 -05:00
Phillip Thelen
f8fbea4654 quest shop fix 2024-04-03 16:06:08 +02:00
Phillip Thelen
e0f4a4ecb8 merge in shop schedule loading 2024-04-03 16:06:08 +02:00
Phillip Thelen
5ce12d97be fix errors 2024-04-03 16:06:08 +02:00
Sabe Jones
4fdd064cd6 Merge branch 'sabrecat/customizations' into subs-private 2024-04-03 08:36:25 -05:00
Sabe Jones
37731b236a WIP(shop): add item names and unlocking 2024-04-02 17:58:06 -05:00
Sabe Jones
b06c708480 Merge branch 'release' into sabrecat/customizations 2024-04-02 15:39:58 -05:00
Sabe Jones
5a9f2c610a Revert "fix(content): adjust release dates" 
This reverts commit 0b230b0a87.
 2024-04-02 15:20:04 -05:00
Sabe Jones
8a88d165e6 fix(event): end AF earlier 2024-04-02 11:28:07 -05:00
Phillip Thelen
f8c452ae3f Remove duplicate menu entry 2024-04-02 17:12:38 +02:00
Phillip Thelen
9befbec2b0 Update index.vue 2024-04-02 17:11:18 +02:00
Phillip Thelen
7b46f3bc23 Fix method name 2024-04-02 17:07:28 +02:00
Sabe Jones
92eaece5eb fix(packages): add assert 2024-04-01 19:13:29 -05:00
Sabe Jones
ee73d5b628 fix(packages): add util 2024-04-01 19:10:59 -05:00
Sabe Jones
a7eda1355b fix(packages): add sinon to client 2024-04-01 19:08:07 -05:00
Sabe Jones
8b9b79db8e fix(potions): remove EVENT 2024-04-01 19:04:57 -05:00
Sabe Jones
69c0488335 Merge branch 'sabrecat/customizations' into subs-private 2024-04-01 18:57:36 -05:00
Phillip Thelen
c18e06f071 changes 2024-04-01 18:38:04 -05:00
Phillip Thelen
a50c0eb1e7 fix test 2024-04-01 18:37:57 -05:00
Phillip Thelen
fb56f7df20 Fix various tests 2024-04-01 18:37:46 -05:00
Phillip Thelen
3540a274b3 fix issue with seasonal quest scheduling 2024-04-01 18:36:44 -05:00
Phillip Thelen
fe2c02679e Fix buying some items 2024-04-01 18:36:33 -05:00
Phillip Thelen
bca3e96e9c Implement food seasons 2024-04-01 18:36:24 -05:00
Phillip Thelen
041edb3042 Preen old scheduling code 2024-04-01 18:13:40 -05:00
Phillip Thelen
6e96085f99 add cards to event content cycle 2024-04-01 18:07:41 -05:00
Phillip Thelen
249394b4ad Implement events throughout the year 2024-04-01 18:07:10 -05:00
Phillip Thelen
2a84561e00 fix some date issues with scheduling 2024-04-01 18:06:55 -05:00
Phillip Thelen
962456204e improve updating UI when time traveling 2024-04-01 18:06:00 -05:00
Phillip Thelen
593524905e allow admins to manipulate time on test servers 2024-04-01 18:05:41 -05:00
Phillip Thelen
1b12e9d8b7 proof of concept for time travel 2024-04-01 18:04:38 -05:00
Phillip Thelen
127f105934 typo 2024-04-01 17:56:24 -05:00
Phillip Thelen
2dfe5585eb fix 2024-04-01 17:56:15 -05:00
Phillip Thelen
93011f182f Fix lint and test 2024-04-01 17:56:06 -05:00
Phillip Thelen
d11e95ab26 change mobile filter defaults to a list 2024-04-01 17:55:58 -05:00
Phillip Thelen
f99ddbe60f display customizations in new shop 2024-04-01 17:54:07 -05:00
Phillip Thelen
982069df36 remove logs 2024-04-01 17:52:46 -05:00
Phillip Thelen
db4bec37e3 Implement new schedule system for seasonal shop 2024-04-01 17:52:40 -05:00
Phillip Thelen
736ef16430 simplify schedule matching usage 2024-04-01 17:52:29 -05:00
Phillip Thelen
129cb7627c Implement new content schedule for magic hatching potions 2024-04-01 17:52:21 -05:00
Phillip Thelen
f223b5dd2a Implement schedule for quest bundles 2024-04-01 17:52:12 -05:00
Phillip Thelen
b3521be629 Implement new content schedule for potion and pet quests 2024-04-01 17:52:02 -05:00
Phillip Thelen
17db6a1772 Implement new release schedule for backgrounds 2024-04-01 17:51:47 -05:00
Phillip Thelen
278d9b74f9 Implement new scheduling for time travelers shop 2024-04-01 17:51:38 -05:00