Skip to content

Commit

Permalink
Merge branch 'sabrecat/report-profile' into delta
Browse files Browse the repository at this point in the history
  • Loading branch information
SabreCat committed Aug 31, 2023
2 parents 2cbea2f + a8f5e25 commit 96dc301
Show file tree
Hide file tree
Showing 58 changed files with 1,278 additions and 1,198 deletions.
2 changes: 1 addition & 1 deletion habitica-images
Submodule habitica-images updated 33 files
+ backgrounds/background_baobab_forest.png
+ backgrounds/background_covered_bridge_in_autumn.png
+ backgrounds/background_moving_day.png
+ backgrounds/icons/icon_background_baobab_forest.png
+ backgrounds/icons/icon_background_covered_bridge_in_autumn.png
+ backgrounds/icons/icon_background_moving_day.png
+ gear/armoire/shield_armoire_bucket.png
+ gear/armoire/shop/shop_shield_armoire_bucket.png
+ gear/armoire/shop/shop_weapon_armoire_cleaningCloth.png
+ gear/armoire/shop/shop_weapon_armoire_mop.png
+ gear/armoire/weapon_armoire_cleaningCloth.png
+ gear/armoire/weapon_armoire_mop.png
+ gear/armor/broad_armor_special_heroicTunic.png
+ gear/armor/shop/shop_armor_special_heroicTunic.png
+ gear/armor/slim_armor_special_heroicTunic.png
+ gear/back/back_special_heroicAureole.gif
+ gear/back/shop/shop_back_special_heroicAureole.png
+ gear/events/mystery_202304/shop_set_mystery_202304.png
+ gear/events/mystery_202309/back_mystery_202309.png
+ gear/events/mystery_202309/headAccessory_mystery_202309.png
+ gear/events/mystery_202309/shop_back_mystery_202309.png
+ gear/events/mystery_202309/shop_headAccessory_mystery_202309.png
+ gear/events/mystery_202309/shop_set_mystery_202309.png
+ gear/headAccessory/headAccessory_special_heroicCirclet.png
+ gear/headAccessory/shop/shop_headAccessory_special_heroicCirclet.png
+ notifications/heroic_set_icon.png
+ notifications/icon_pet_veteran_bear.png
+ notifications/icon_pet_veteran_dragon.png
+ notifications/icon_pet_veteran_fox.png
+ notifications/icon_pet_veteran_lion.png
+ notifications/icon_pet_veteran_tiger.png
+ notifications/icon_pet_veteran_wolf.png
+ stable/pets/Pet-Dragon-Veteran.png
1,486 changes: 536 additions & 950 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "5.2.0",
"version": "5.3.0",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@babel/preset-env": "^7.22.10",
"@babel/register": "^7.22.5",
"@google-cloud/trace-agent": "^7.1.2",
"@parse/node-apn": "^5.1.3",
Expand All @@ -15,7 +15,7 @@
"amplitude": "^6.0.0",
"apidoc": "^0.54.0",
"apple-auth": "^1.0.9",
"bcrypt": "^5.1.0",
"bcrypt": "^5.1.1",
"body-parser": "^1.20.2",
"bootstrap": "^4.6.0",
"compression": "^1.7.4",
Expand Down Expand Up @@ -43,7 +43,7 @@
"image-size": "^1.0.2",
"in-app-purchase": "^1.11.3",
"js2xmlparser": "^5.0.0",
"jsonwebtoken": "^9.0.0",
"jsonwebtoken": "^9.0.1",
"jwks-rsa": "^2.1.5",
"lodash": "^4.17.21",
"merge-stream": "^2.0.0",
Expand All @@ -62,22 +62,22 @@
"paypal-rest-sdk": "^1.8.1",
"pp-ipn": "^1.1.0",
"ps-tree": "^1.0.0",
"rate-limiter-flexible": "^2.4.0",
"rate-limiter-flexible": "^2.4.2",
"redis": "^3.1.2",
"regenerator-runtime": "^0.13.11",
"remove-markdown": "^0.5.0",
"rimraf": "^3.0.2",
"short-uuid": "^4.2.2",
"stripe": "^12.9.0",
"superagent": "^8.0.9",
"superagent": "^8.1.2",
"universal-analytics": "^0.5.3",
"useragent": "^2.1.9",
"uuid": "^9.0.0",
"validator": "^13.9.0",
"vinyl-buffer": "^1.0.1",
"winston": "^3.9.0",
"winston": "^3.10.0",
"winston-loggly-bulk": "^3.2.1",
"xml2js": "^0.6.0"
"xml2js": "^0.6.2"
},
"private": true,
"engines": {
Expand Down Expand Up @@ -115,15 +115,15 @@
"chai": "^4.3.7",
"chai-as-promised": "^7.1.1",
"chai-moment": "^0.1.0",
"chalk": "^5.2.0",
"chalk": "^5.3.0",
"cross-spawn": "^7.0.3",
"expect.js": "^0.3.1",
"istanbul": "^1.1.0-alpha.1",
"mocha": "^5.1.1",
"monk": "^7.3.4",
"require-again": "^2.0.0",
"run-rs": "^0.7.7",
"sinon": "^15.1.2",
"sinon": "^15.2.0",
"sinon-chai": "^3.7.0",
"sinon-stub-promise": "^4.0.0"
},
Expand Down
39 changes: 15 additions & 24 deletions website/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions website/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"bootstrap": "^4.6.0",
"bootstrap-vue": "^2.23.1",
"chai": "^4.3.7",
"core-js": "^3.31.0",
"core-js": "^3.32.1",
"dompurify": "^3.0.3",
"eslint": "^6.8.0",
"eslint-config-habitrpg": "^6.2.0",
Expand All @@ -41,14 +41,14 @@
"habitica-markdown": "^3.0.0",
"hellojs": "^1.20.0",
"inspectpack": "^4.7.1",
"intro.js": "^7.0.1",
"intro.js": "^7.2.0",
"jquery": "^3.7.0",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"nconf": "^0.12.0",
"sass": "^1.63.4",
"sass-loader": "^8.0.2",
"smartbanner.js": "^1.19.2",
"smartbanner.js": "^1.19.3",
"stopword": "^2.0.8",
"svg-inline-loader": "^0.8.2",
"svg-url-loader": "^7.1.1",
Expand Down
Loading

0 comments on commit 96dc301

Please sign in to comment.