sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
23324 commits 3 branches 0 tags 1.6 GiB
Commit graph

23324 commits

This branch
This branch
All branches
Author SHA1 Message Date
SabreCat
fb017e1f08 fix(pets): various quest and animation corrections 2022-04-05 16:03:46 -05:00
SabreCat
1ca528eb95 Merge branch 'develop' into 2022-04-wacky-potion-quest 2022-04-05 15:08:18 -05:00
CuriousMagpie
202d74b8c4 Virtual Pet animated images 2022-04-04 17:37:09 -04:00
CuriousMagpie
3498b9ccdf Virtual Pet Hatching Potion Quest Content 2022-04-04 17:29:51 -04:00
SabreCat
39b39387d3 chore(sprites): compile CSS 2022-04-04 14:54:09 -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
CuriousMagpie
df3b871dba questContent.json placeholders 2022-04-04 14:50:22 -04:00
dependabot[bot]
18af9f8b40
build(deps): bump moment from 2.29.1 to 2.29.2 (#13921) 
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-04-04 10:58:05 -04:00
dependabot[bot]
de36afc174
build(deps): bump body-parser from 1.19.2 to 1.20.0 (#13920) 
Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.19.2 to 1.20.0.
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.2...1.20.0)

---
updated-dependencies:
- dependency-name: body-parser
  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>
 2022-04-04 10:57:45 -04:00
dependabot[bot]
fbb40c0d07
build(deps): bump superagent from 7.1.1 to 7.1.2 (#13917) 
Bumps [superagent](https://github.com/visionmedia/superagent) from 7.1.1 to 7.1.2.
- [Release notes](https://github.com/visionmedia/superagent/releases)
- [Changelog](https://github.com/visionmedia/superagent/blob/master/HISTORY.md)
- [Commits](https://github.com/visionmedia/superagent/commits)

---
updated-dependencies:
- dependency-name: superagent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-04-04 10:56:57 -04:00
SabreCat
34d0922bcc Merge remote-tracking branch 'rarysson/update-year-on-footer' into develop 2022-04-01 16:28:04 -05:00
Phillip Thelen
55cf2f9795
Improve flows for social auth users (#13862) 
* Multiple fixes for social authentication flows

* frontend changes

* add missing computed property

* Improvements to social flows

* fix existing email error

* minor fixes

* fix space

* fix test

* fix lint

Co-authored-by: SabreCat <sabe@habitica.com>
 2022-03-31 16:43:16 -05:00
Phillip Thelen
9ff0766910
Fix cron not running if previous run failed (#13892) 
* catch issue where cron wouldn’t run bc previous run failed

* add some more tests for cron middleware

* fix lint
 2022-03-31 16:32:59 -05:00
Natalie L
06d982401a
Update: Revised text string for zodiacZookeeper and birdsOfAFeather achievements (#13884) 
* updated text string for zodiacZooKeeper and birdsOfAFeather

* added peacock and rooster (oops!)
 2022-03-31 15:59:36 -05:00
citrusella
140372a70d
Update faceAvatar.vue so snowman ACTUALLY shows up (#13911) 2022-03-31 15:39:53 -05:00
Weblate
bd9754221b Merge branch 'origin/develop' into Weblate. 2022-03-31 21:48:15 +02:00
SabreCat
d58ca4c998 Merge branch 'release' into develop 2022-03-31 14:47:44 -05:00
SabreCat
7c53f9fd21 4.226.1 2022-03-31 14:47:22 -05:00
SabreCat
ae6918d52e chore(event): canonical duration 2022-03-31 14:41:59 -05:00
Weblate
d367060a82 Translated using Weblate (Japanese) 
Currently translated at 98.6% (2543 of 2579 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (197 of 197 strings)

Translated using Weblate (French)

Currently translated at 100.0% (197 of 197 strings)

Translated using Weblate (French)

Currently translated at 100.0% (2579 of 2579 strings)

Translated using Weblate (French)

Currently translated at 100.0% (131 of 131 strings)

Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/ja/
Translation: Habitica/Achievements
Translation: Habitica/Gear
Translation: Habitica/Subscriber
 2022-03-31 19:36:03 +02:00
Natalie L
8e7ec46c8f
Merge branch 'HabitRPG:develop' into develop 2022-03-31 11:58:23 -04:00
Natalie L
d0d32c0b58
fix: Spring Fling Strings (#13902) 
* fix: spring fling string fixes

* fix: additional spring fling string fixes
 2022-03-30 16:46:35 -05:00
Natalie L
1dd3bc188e
Merge branch 'HabitRPG:develop' into develop 2022-03-30 17:04:21 -04:00
SabreCat
608ae5fc43 feat(event): April Fooly 2022 2022-03-30 15:31:17 -05:00
Weblate
391fa541ef Merge branch 'origin/develop' into Weblate. 2022-03-30 16:47:45 +02:00
SabreCat
bc87e8b400 Merge branch 'release' into develop 2022-03-30 09:46:11 -05:00
SabreCat
5c4b8ce58b 4.226.0 2022-03-30 09:45:06 -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
Weblate
976e8cf242 Translated using Weblate (Spanish) 
Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (206 of 206 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (219 of 219 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (22 of 22 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (German)

Currently translated at 100.0% (206 of 206 strings)

Co-authored-by: Mara Dolichotis <marascherzer@gmail.com>
Co-authored-by: Pardinus <artemisadlg@gmail.com>
Co-authored-by: Sara López <sarayupy@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/es/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/es/
Translate-URL: https://translate.habitica.com/projects/habitica/loginincentives/es/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/de/
Translate-URL: https://translate.habitica.com/projects/habitica/settings/es/
Translation: Habitica/Achievements
Translation: Habitica/Limited
Translation: Habitica/Loginincentives
Translation: Habitica/Settings
 2022-03-30 12:18:52 +02:00
Natalie L
2c566cb9e3
Merge branch 'HabitRPG:develop' into develop 2022-03-29 16:26:27 -04:00
CuriousMagpie
89d7f94fc3 habitica-images 2022-03-29 16:21:38 -04:00
Natalie L
7a15bfc140
Merge branch 'HabitRPG:develop' into develop 2022-03-29 16:12:11 -04:00
CuriousMagpie
265dfbbb98 2022-04 Subscriber Items 2022-03-29 16:08:25 -04:00
Weblate
59bd135e44 Merge branch 'origin/develop' into Weblate. 2022-03-29 21:08:20 +02:00
SabreCat
cf04d9d0be Merge branch 'release' into develop 2022-03-29 14:07:57 -05:00
SabreCat
d16bb83721 4.225.4 2022-03-29 14:07:42 -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
Weblate
f918b4a68c Translated using Weblate (Japanese) 
Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (German)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (French)

Currently translated at 100.0% (131 of 131 strings)

Translated using Weblate (French)

Currently translated at 100.0% (219 of 219 strings)

Translated using Weblate (French)

Currently translated at 99.9% (2572 of 2573 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (219 of 219 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (746 of 746 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 99.2% (130 of 131 strings)

Translated using Weblate (German)

Currently translated at 100.0% (2573 of 2573 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (219 of 219 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (219 of 219 strings)

Translated using Weblate (Ukrainian)

Currently translated at 84.4% (185 of 219 strings)

Translated using Weblate (German)

Currently translated at 100.0% (219 of 219 strings)

Translated using Weblate (German)

Currently translated at 99.9% (2572 of 2573 strings)

Translated using Weblate (Ukrainian)

Currently translated at 72.1% (158 of 219 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (365 of 365 strings)

Translated using Weblate (Ukrainian)

Currently translated at 96.0% (171 of 178 strings)

Translated using Weblate (Ukrainian)

Currently translated at 84.9% (634 of 746 strings)

Translated using Weblate (German)

Currently translated at 99.5% (218 of 219 strings)

Translated using Weblate (Ukrainian)

Currently translated at 79.5% (2048 of 2573 strings)

Translated using Weblate (German)

Currently translated at 99.6% (2565 of 2573 strings)

Translated using Weblate (Ukrainian)

Currently translated at 84.9% (634 of 746 strings)

Translated using Weblate (Ukrainian)

Currently translated at 84.9% (634 of 746 strings)

Co-authored-by: Benoit Hetru <me+hbtc@gahanka.net>
Co-authored-by: Mara Dolichotis <marascherzer@gmail.com>
Co-authored-by: Nazar Paruna <nazarparuna@gmail.com>
Co-authored-by: Sciuridae <sweetvshoney@163.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mattya 226 <worldworld1114@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/front/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/de/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/de/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/fr/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/uk/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/ja/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/uk/
Translation: Habitica/Achievements
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Questscontent
 2022-03-29 19:41:35 +02:00
Natalie L
4070dd7754
Merge branch 'HabitRPG:develop' into develop 2022-03-29 13:15:39 -04:00
Basrara
d44b2fe785
Minor fixes (#13909) 
Updated "resetText2", "transaction_rebirth", and "transaction_reroll" to correct capitalization and eliminate a double space.
 2022-03-29 12:30:16 -04:00
SabreCat
966cc64396 Merge branch 'release' into develop 2022-03-28 16:33:35 -05:00
SabreCat
af3aedc5d4 4.225.3 2022-03-28 16:26:49 -05:00
SabreCat
0a2eceaa73 fix(achievement): correct string for Birds and add to user schema 2022-03-28 16:26:37 -05:00
Natalie L
57cf669a86
Merge branch 'HabitRPG:develop' into develop 2022-03-28 15:01:07 -04:00
dependabot[bot]
278ddfbf54
build(deps): bump stripe from 8.209.0 to 8.212.0 (#13906) 
Bumps [stripe](https://github.com/stripe/stripe-node) from 8.209.0 to 8.212.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v8.209.0...v8.212.0)

---
updated-dependencies:
- dependency-name: stripe
  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>
 2022-03-28 14:52:18 -04:00
dependabot[bot]
0c26d7bcf6
build(deps): bump @parse/node-apn from 5.1.0 to 5.1.3 (#13905) 
Bumps [@parse/node-apn](https://github.com/parse-community/node-apn) from 5.1.0 to 5.1.3.
- [Release notes](https://github.com/parse-community/node-apn/releases)
- [Changelog](https://github.com/parse-community/node-apn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/parse-community/node-apn/compare/5.1.0...5.1.3)

---
updated-dependencies:
- dependency-name: "@parse/node-apn"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-28 14:51:40 -04:00
dependabot[bot]
a20ce7bc42
build(deps): bump apidoc from 0.50.5 to 0.51.0 (#13904) 
Bumps [apidoc](https://github.com/apidoc/apidoc) from 0.50.5 to 0.51.0.
- [Release notes](https://github.com/apidoc/apidoc/releases)
- [Changelog](https://github.com/apidoc/apidoc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apidoc/apidoc/compare/0.50.5...0.51.0)

---
updated-dependencies:
- dependency-name: apidoc
  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>
 2022-03-28 14:51:18 -04:00
CuriousMagpie
f87bb7593e Merge branch 'develop' of https://github.com/CuriousMagpie/habitica into develop 2022-03-25 18:50:14 -04:00