Commit graph

25741 commits

Author SHA1 Message Date
dependabot[bot]
fa4cd8dd5a
chore(deps): bump tar from 6.2.0 to 6.2.1 (#15191)
Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.2.0...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-25 14:32:59 -04:00
dependabot[bot]
5224e063f7
chore(deps): bump axios from 0.21.4 to 1.6.8 (#15192)
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.8.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.4...v1.6.8)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-25 14:32:36 -04:00
dependabot[bot]
e5e8b9a7ec
build(deps): bump chai from 4.3.7 to 5.1.0 in /website/client (#15144)
Bumps [chai](https://github.com/chaijs/chai) from 4.3.7 to 5.1.0.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md)
- [Commits](https://github.com/chaijs/chai/compare/v4.3.7...v5.1.0)

---
updated-dependencies:
- dependency-name: chai
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-25 14:19:21 -04:00
dependabot[bot]
7cd76c50eb
build(deps): bump axios from 0.27.2 to 0.28.0 in /website/client (#15148)
Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 0.28.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.28.0/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.27.2...v0.28.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-25 14:18:07 -04:00
dependabot[bot]
b520202544
build(deps): bump sass-loader from 8.0.2 to 14.1.1 in /website/client (#15159)
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 8.0.2 to 14.1.1.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.2...v14.1.1)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-25 14:17:17 -04:00
dependabot[bot]
bbae882eda
chore(deps): bump follow-redirects in /website/client (#15179)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-25 14:12:46 -04:00
Sabe Jones
372763c57c fix(shops): various 2024-04-24 17:58:20 -05:00
Sabe Jones
3bf323032c WIP(shops): first full test version 2024-04-24 00:02:41 -05:00
Sabe Jones
7a50b2d2ff Merge branch 'sabrecat/cshop' into subs-private 2024-04-23 10:52:05 -05:00
Sabe Jones
8df326bf92 WIP(shop): add timings to categories 2024-04-23 10:50:45 -05:00
Phillip Thelen
2d6555fe0f fix merge 2024-04-23 17:24:17 +02:00
Phillip Thelen
b0d6f7722b allow non-admins to observe timetravel 2024-04-23 17:20:21 +02:00
Phillip Thelen
aedbe7d333 content schedule tweaks 2024-04-23 17:20:21 +02:00
Phillip Thelen
6079dd4af6 feature items according to content schedule 2024-04-23 17:20:21 +02:00
Phillip Thelen
5c448188cf fix potion scheduling 2024-04-23 17:20:21 +02:00
Phillip Thelen
d7dc878b1c Cleanup pinned items that are no longer for purchase 2024-04-23 17:20:20 +02:00
Phillip Thelen
7baec4e48e Fix assigning end date to content schedule items 2024-04-23 14:40:10 +02:00
Sabe Jones
5cd58d4119 WIP(shops): dates and fixes 2024-04-22 17:52:07 -05:00
Sabe Jones
4cdfefd92b Merge branch 'sabrecat/cshop' into subs-private 2024-04-19 20:12:35 -05:00
Sabe Jones
28b936e2d1 WIP(shops): cShop reconciled to schedule backend 2024-04-19 20:11:17 -05:00
Sabe Jones
e4ec7e3e1e Merge branch 'gsf' into subs-private 2024-04-19 08:42:16 -05:00
Phillip Thelen
3c7ecef6a8
Update cron.js 2024-04-18 18:17:16 +02:00
Sabe Jones
e2a5a1ab39 Merge branch 'sabrecat/cshop' into subs-private 2024-04-17 18:03:11 -05:00
Sabe Jones
5f64b2fb25 WIP(customizations): revised backgrounds modal 2024-04-17 18:02:35 -05:00
Sabe Jones
f2a2d4cde5 Merge branch 'gsf' into subs-private 2024-04-17 09:05:36 -05:00
Sabe Jones
ee93c8bec5 5.23.0 2024-04-08 15:49:20 -05:00
Sabe Jones
c65e93e514 chore(git): update subproject 2024-04-08 15:49:17 -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
76d7f02fe8 5.22.3 2024-04-02 15:20:17 -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
64a500987c fix(packages): move sinon to main 2024-04-02 09:32:44 -05: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