Commit Graph

1027 Commits

Author SHA1 Message Date
SabreCat 8f7e5d544e Merge branch 'develop' into sabrecat/teams-rebase 2022-04-07 14:55:16 -05:00
negue 8cb8411cc6 Show "Next Hourglass" Month (#13860)
* Show "Next Hourglass" Month

* fix lint

* lint,

* lint

* lint..

* linting bad

* ui fixes

* remove additional margin

* show next hourglass date to debug further

* WIP tests - maybe broken logic

* flex:1 doesn't work - so stats columns now at 33% width

* fix(cron): lint and short circuit

* refactor logic

* update test dates using timezone

* also check for the timezone date

* fix timezone for tests

* fixing the test dates?

* fixing the test dates?

* change nextHourglass logic + update gem cap label / value

* fix lint

* dont add gemsBought to it

* remove tooltip

Co-authored-by: SabreCat <sabe@habitica.com>
2022-04-06 16:30:13 -05:00
SabreCat 40113b0458 Merge branch 'develop' into sabrecat/teams-rebase 2022-04-05 13:56:25 -05:00
Natalie L c3278a3baf 2022-04 Backgrounds & Enchanted Armoire Items (#13915)
* 2022-04 Backgrounds & Enchanted Armoire Items

* remove spritesmith-main.css

* adding spritesmith-main.css back in

* css fix
2022-04-04 14:53:34 -05:00
SabreCat 48be0a38bf Merge branch 'develop' into sabrecat/teams-rebase 2022-03-31 14:49:35 -05:00
SabreCat ae6918d52e chore(event): canonical duration 2022-03-31 14:41:59 -05:00
SabreCat 608ae5fc43 feat(event): April Fooly 2022 2022-03-30 15:31:17 -05:00
SabreCat aa81c330af Merge branch 'develop' into sabrecat/teams-rebase 2022-03-30 11:35:33 -05:00
SabreCat 2b93ea3740 chore(sprites): compile 2022-03-30 09:44:36 -05:00
SabreCat 61956ea720 Merge remote-tracking branch 'CuriousMagpie/2022-04-subscriber-items' into release 2022-03-30 09:17:52 -05:00
CuriousMagpie 265dfbbb98 2022-04 Subscriber Items 2022-03-29 16:08:25 -04:00
SabreCat 7283d112f4 Merge branch 'develop' into sabrecat/teams-rebase 2022-03-29 14:10:18 -05:00
SabreCat 93ae36d139 fix(event): add underscore for mobile handling of NPCs 2022-03-29 14:04:37 -05:00
CuriousMagpie 0783ccae24 2022 Spring Fling Potions 2022-03-29 13:54:07 -05:00
SabreCat c5ef803458 Merge branch 'develop' into sabrecat/teams-rebase 2022-03-22 16:29:47 -05:00
SabreCat ad9c468e77 fix(event): CSS build, small fixes 2022-03-22 10:34:44 -05:00
SabreCat e141e2407c Merge remote-tracking branch 'CuriousMagpie/2022-spring-fling-gala' into release 2022-03-22 09:41:59 -05:00
CuriousMagpie c94195129f 2022 Spring Fling Content 2022-03-18 17:24:05 -04:00
SabreCat a24651e395 fix(content): bundle ends March not May 2022-03-15 16:08:53 -05:00
SabreCat 40801c0d32 Merge branch 'develop' into sabrecat/teams-rebase 2022-03-15 15:05:25 -05:00
SabreCat c2d48480a0 chore(content): rerelease cuddle bubbles 2022-03-15 15:00:58 -05:00
SabreCat 5a638ab4b8 Merge branch 'develop' into sabrecat/teams-rebase 2022-03-09 16:37:31 -06:00
SabreCat 7cc17d0369 feat(content): Armoire and Backgrounds 2022-03-09 15:50:31 -06:00
CuriousMagpie 43be5f0490 Add Rooster and Peacock 2022-03-08 16:52:43 -05:00
CuriousMagpie fc4145700c image update! 2022-03-08 13:06:33 -05:00
CuriousMagpie aa1b9a5e94 added achievement Birds of a Feather 2022-03-08 12:43:38 -05:00
SabreCat ef6d92e7af Merge branch 'develop' into sabrecat/teams-rebase 2022-02-28 09:50:07 -06:00
CuriousMagpie 8dbb55f3b7 2022-03 Subscriber Items 2022-02-28 09:37:49 -06:00
SabreCat 0d876472a3 WIP(teams): fix initial assignment sync, add Daily handling 2022-02-17 15:51:26 -06:00
SabreCat 9e527f4f35 WIP(teams): can do To Do's 2022-02-17 15:51:09 -06:00
SabreCat fa99458ca4 WIP(multiassign): resume shared completion implementation 2022-02-17 15:50:23 -06:00
Sabe Jones 072b09e030 feat(teams): quick add
Also fixes issue with lock icons
Also hides task copies from personal task board
2022-02-17 15:46:42 -06:00
Sabe Jones 248e1c6fe9 WIP(teams): reimplement open tasking 2022-02-17 15:43:28 -06:00
Sabe Jones 5bf4e18ce8 WIP(teams): don't damage leader for incomplete team Dailies 2022-02-17 15:41:06 -06:00
SabreCat 70be356968 chore(content): enable Mythical Marvels for end of February 2022-02-17 14:27:17 -06:00
SabreCat 77751223d3 fix(valentines): adjust empty event daterange 2022-02-14 15:20:37 -06:00
CuriousMagpie d1ef90db29 Fixed end dates to Feb 18 2022-02-14 15:03:38 -06:00
CuriousMagpie 79cda5d1f6 updates for 2022-02 magic hatching potions & valentine's week 2022-02-14 15:03:32 -06:00
SabreCat fd4d139fc2 Merge remote-tracking branch 'CuriousMagpie/2022-02-backgrounds-armoire' into develop 2022-02-07 10:51:23 -06:00
SabreCat ca4df96902 Merge branch 'release' into develop 2022-02-01 15:29:35 -06:00
SabreCat 82d0251fed fix(event): extend 24h because i derped 2022-02-01 15:21:53 -06:00
SabreCat 269c420bfa fix(zodiac): tiger cubs lol 2022-02-01 15:20:08 -06:00
SabreCat 83c2e1774b Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release 2022-02-01 14:30:02 -06:00
SabreCat 2093932af6 Merge remote-tracking branch 'CuriousMagpie/2022-02-subscriber-items' into release 2022-02-01 14:29:28 -06:00
SabreCat b383574438 fix(event): it's 2022 now, lol 2022-02-01 14:27:08 -06:00
SabreCat c8e949a425 Merge branch 'release' into develop 2022-01-31 19:17:26 -06:00
SabreCat 2ae36f64ad fix(birthday): market cake 2022-01-31 19:17:08 -06:00
Phillip Thelen 6e43d4dc79 Add Transaction log for gem and hourglass changes (#13589)
* Log all gem transactions to database

* Also store hourglass transactions

* Fix tests

* Display transaction history in hall of heroes for admins

* add tests to new API call

* hide transaction settings tab for non admins

* fix(lint): remove console

* fix(lint): various automatic corrections

* fix(transactions): use enum expected pluralizations

* fix api unit tests

* fix lint

* fix failing test

* Fix minor inconsistencies

* Log all gem transactions to database

* Also store hourglass transactions

* Fix tests

* Display transaction history in hall of heroes for admins

* add tests to new API call

* hide transaction settings tab for non admins

* fix(lint): remove console

* fix(lint): various automatic corrections

* fix(transactions): use enum expected pluralizations

* fix api unit tests

* fix lint

* Fix minor inconsistencies

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-01-31 15:36:15 -06:00
Natalie L de70ad65f5 Update Orb of Rebirth to ignore completed todos (#13773)
* added logic to exclude completed tasks from having task.value set to 0

* logic refinement

* fix(rebirth): complete D

Co-authored-by: SabreCat <sabe@habitica.com>
2022-01-31 15:33:11 -06:00
CuriousMagpie f2f3a1f0eb added Zodiac Zookeeper achievement 2022-01-28 17:14:50 -05:00