SabreCat
cbaa3180cc
Merge branch 'develop' into sabrecat/unsociable
2023-07-25 15:17:13 -05:00
Natalie L
08ac059a7f
feat(content): add August 2023 subscriber items ( #14784 )
...
* feat(content): add June subscriber items
* feat(content): add August subscriber items
2023-07-25 14:14:28 -05:00
SabreCat
f8a8b61726
Merge branch 'phillip/chat-skill-merge' into release
2023-07-18 10:33:55 -05:00
SabreCat
08a5bff815
Merge branch 'release' into sabrecat/unsociable
2023-07-17 16:11:14 -05:00
SabreCat
106a0c9ed8
fix(chat): collapse repetitive spells for real now
2023-07-11 17:01:17 -05:00
SabreCat
578083dde6
chore(faq): sync up
2023-07-11 14:15:27 -05:00
SabreCat
9706d7ac64
Merge branch 'natalie/antisocial' into sabrecat/unsociable
2023-07-11 12:04:50 -05:00
CuriousMagpie
93564c5d52
WIP(faq): contributor gear date correction
2023-07-11 11:33:41 -04:00
Phillip Thelen
74ba5c0b27
bring merging to MVP
2023-07-11 15:10:50 +02:00
SabreCat
2e94bfc489
fix(faq): updated Linguist vebiage
...
by @CuriousMagpie
2023-07-06 15:28:08 -05:00
SabreCat
1deb903186
Merge branch 'release' into sabrecat/chat-warning
2023-07-06 15:23:46 -05:00
CuriousMagpie
5c8a3f7771
WIP(faq): correct Linguist guidelines link
2023-07-06 13:20:10 -04:00
Natalie L
c562c93158
feat(content): add July 2023 backgrounds and Enchanted Armoire ( #14733 )
...
* feat(content): add June subscriber items
* feat(content): add July backgrounds and Enchanted Armoire Items
* Update backgrounds.json
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-07-04 13:23:06 -05:00
CuriousMagpie
8ac03e311b
WIP(faq): update Linguists section
2023-06-30 12:56:39 -04:00
SabreCat
7a430889a8
Merge branch 'develop' into sabrecat/chat-warning
2023-06-29 14:53:15 -05:00
SabreCat
f84b5f163c
Merge branch 'develop' into sabrecat/unsociable
2023-06-29 14:53:00 -05:00
Natalie L
77a490283c
feat(content): add July 2023 subscriber items ( #14732 )
...
* feat(content): add June subscriber items
* feat(content): add July subscriber items
2023-06-29 14:35:05 -05:00
CuriousMagpie
ad118095ef
WIP(faq): add link to translate.habitica.com to sunsetFaqPara14
2023-06-21 11:45:23 -04:00
SabreCat
7ecad94a51
fix(faq): remove timezone
2023-06-20 17:28:54 -05:00
CuriousMagpie
81f7fbc2d5
WIP(faq): rawr why css no work?
2023-06-20 18:07:21 -04:00
SabreCat
52abf8acf3
Merge remote-tracking branch 'private/natalie/antisocial' into sabrecat/unsociable
2023-06-20 15:14:43 -05:00
SabreCat
bc61443246
Merge remote-tracking branch 'private/natalie/string-sweep' into sabrecat/unsociable
2023-06-20 15:14:06 -05:00
CuriousMagpie
cd8594a8b9
Merge branch 'sabrecat/unsociable' into natalie/antisocial
2023-06-20 16:13:10 -04:00
CuriousMagpie
f3600f64e8
WIP(faq): add date
2023-06-20 16:10:56 -04:00
SabreCat
752cd57bb1
Merge branch 'natalie/antisocial' into sabrecat/unsociable
2023-06-19 19:06:05 -05:00
SabreCat
5d6bf131f4
fix(sunset): update layouts and links
2023-06-19 19:04:07 -05:00
SabreCat
8445f45b31
Merge branch 'release' into sabrecat/unsociable
2023-06-19 18:14:22 -05:00
SabreCat
df84d7c7b1
Merge branch 'release' into develop
2023-06-19 16:36:39 -05:00
Natalie L
c7ed693e18
feat(gala): Add 2023 Summer Splash Gala Items ( #14712 )
...
* feat(content): add June subscriber items
* feat(gala): add images
* feat(gala): add code
* feat(gala): text strings
* feat(gala): testing and final updates
* feat(gala): fixed a couple of typos
* fix(event): proofread strings and dates
Also replace empty descriptions for Rogue and Healer
* fix(event): NO EGG
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-06-19 16:36:05 -05:00
Ash
e72a25ad02
Fixes #14438 : a11y: add semantic roles to habit and todo controls ( #14467 )
...
* a11y: add aria roles to habit control
* a11y: add role to todo checkboxes
* a11y: add aria-labels to score buttons
Helps with screen readers
* add i18n to aria-labels
2023-06-19 17:00:16 -04:00
CuriousMagpie
7dab47db16
WIP(string-sweep): inn complete
2023-06-15 14:05:00 -04:00
CuriousMagpie
a88ca5a1a8
WIP(string-sweep): tavern complete
2023-06-15 13:59:36 -04:00
CuriousMagpie
c91d115793
WIP(string-sweep): guild/s complete
2023-06-15 13:47:14 -04:00
CuriousMagpie
e3502bd280
Merge remote-tracking branch 'private/sabrecat/unsociable' into natalie/string-sweep
2023-06-15 12:42:13 -04:00
SabreCat
3ac260026b
WIP(sunset): fixes
2023-06-14 17:11:52 -05:00
CuriousMagpie
80e7fda8ef
WIP(string-sweep): de-guildify more strings
2023-06-14 18:05:29 -04:00
CuriousMagpie
9c889a42aa
Merge remote-tracking branch 'private/sabrecat/unsociable' into natalie/string-sweep
2023-06-14 17:45:03 -04:00
SabreCat
952b99599b
Merge branch 'sabrecat/chat-warning' into sabrecat/unsociable
2023-06-14 16:41:37 -05:00
CuriousMagpie
5e04040f5f
WIP(faq): initial round of edits
2023-06-14 12:09:49 -04:00
Natalie L
ab68e8a5fe
feat(content): add June pet quest bundle ( #14694 )
...
* feat(content): add June subscriber items
* feat(content): add June pet quest bundle
* fix(bundle): correct timing and visual issues
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-06-12 15:01:34 -05:00
CuriousMagpie
2fc9480ae9
WIP(string-sweep): first smol batch
2023-06-12 14:56:07 -04:00
SabreCat
429afc1e71
feat(404): route retired links
2023-06-09 16:33:27 -05:00
SabreCat
80da313844
chore(cg): update Guidelines
2023-06-08 17:20:56 -05:00
SabreCat
de057dc1b2
WIP(sunset): close X, CG revisions
2023-06-07 17:03:07 -05:00
SabreCat
ff860b04fc
Merge remote-tracking branch 'private/natalie/antisocial' into sabrecat/chat-warning
2023-06-07 15:02:11 -05:00
CuriousMagpie
658a02bfc3
WIP(faq): add Daniel to sidebar
2023-06-06 15:26:31 -04:00
SabreCat
e1398e8d7c
Merge branch 'develop' into sabrecat/unsociable
2023-06-06 09:22:37 -05:00
SabreCat
0185a1fbd6
Merge branch 'develop' into sabrecat/chat-warning
2023-06-06 09:22:23 -05:00
Natalie L
bb28bb5969
feat(content): add June backgrounds and Enchanted Armoire items ( #14684 )
...
* feat(content): add June subscriber items
* feat(content): add July backgrounds and Enchanted Armoire items
* feat(fix): correct sizing for aquarium background
* fix(strings): JSON formatting
* fix(sprites): add missing broad variant
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-06-06 09:17:22 -05:00
SabreCat
7e2a35d7a9
WIP(sunset): fix private Guild and report form
2023-06-05 16:36:00 -05:00
SabreCat
84e5c00be1
WIP(announcement): correct layout and close X
2023-06-05 16:16:19 -05:00
SabreCat
187029f44f
Merge remote-tracking branch 'private/natalie/antisocial' into sabrecat/chat-warning
2023-06-05 15:54:41 -05:00
CuriousMagpie
efbc7d1460
WIP(faq): sidebar formatting
2023-06-05 16:53:48 -04:00
SabreCat
cf0e45c68c
Merge branch 'natalie/antisocial' into sabrecat/chat-warning
2023-06-02 16:14:20 -05:00
CuriousMagpie
93d9038765
WIP(faq): initial formatting of main text, started on sidebar
2023-06-02 17:00:13 -04:00
SabreCat
f4e8bf9c2e
feat(form): Ask a Question mode on bug report
2023-06-02 15:58:24 -05:00
SabreCat
09695f637e
Merge branch 'release' into natalie/antisocial
2023-06-02 14:12:52 -05:00
CuriousMagpie
97c8138340
feat(content): minor updates
2023-06-02 11:31:43 -04:00
SabreCat
8d73e2949a
Merge branch 'release' into sabrecat/unsociable
2023-06-01 15:42:47 -05:00
SabreCat
739016ba01
WIP(chat): add warning banner
2023-05-30 16:25:29 -05:00
Natalie L
867eed176e
feat(content): add June subscriber items ( #14669 )
...
Co-authored-by: SabreCat <sabe@habitica.com>
2023-05-30 15:26:16 -05:00
SabreCat
deba7b6220
feat(faq): update for mobile workflows
2023-05-30 14:50:13 -05:00
SabreCat
2448f401f2
Merge branch 'increment-component' into release
2023-05-25 14:42:42 -05:00
CuriousMagpie
9ef13dad68
feat(content): starting add styling, string updates
2023-05-25 12:25:08 -04:00
CuriousMagpie
14fa69719b
feat(content): static page created and strings in place
2023-05-24 16:18:31 -04:00
SabreCat
9228b070fa
Merge branch 'release' into sabrecat/unsociable
2023-05-24 14:17:49 -05:00
CuriousMagpie
929b0196a4
add strings
2023-05-24 13:24:44 -04:00
SabreCat
a7bde80349
Squashed commit of the following:
...
commit 27287ac3aab594de7fbd96cd9c6a169289979bea
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon May 22 15:59:20 2023 -0400
fix(typo): typos fixed
commit a4df8097cfbcaf6497119e2922f2a55cdabe200e
Author: CuriousMagpie <eilatan@gmail.com>
Date: Mon May 22 15:57:17 2023 -0400
feat(content): add migration script
commit 23ff7845c1f03153f2b0688fafea686760b278a2
Merge: d02644e21b 8ba7117fa58ba7117fa5#14662 )
Bumps [stripe](https://github.com/stripe/stripe-node ) from 12.5.0 to 12.6.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/v12.5.0...v12.6.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>
commit fe5d4a0551#14661 )
Bumps [sinon](https://github.com/sinonjs/sinon ) from 15.0.4 to 15.1.0.
- [Release notes](https://github.com/sinonjs/sinon/releases )
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md )
- [Commits](https://github.com/sinonjs/sinon/compare/v15.0.4...v15.1.0 )
---
updated-dependencies:
- dependency-name: sinon
dependency-type: direct:development
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>
commit d02644e21b3e2b76829e72b96b3a69b8ec8ea34d
Author: CuriousMagpie <eilatan@gmail.com>
Date: Wed May 17 11:36:28 2023 -0400
feat(content): add dinosaur dynasty achievement
2023-05-22 15:13:49 -05:00
SabreCat
8d9602fb16
WIP(chat): first pass deprecation
2023-05-17 16:33:44 -05:00
negue
e3a1ea6180
save task column filter ( #14587 )
...
* save task column filter
* remove old setting
* fix tests
2023-05-15 16:01:32 -05:00
Natalie L
453bf3a961
feat(content): add May Backgrounds and Enchanted Armoire items ( #14628 )
2023-05-09 10:26:00 -05:00
CuriousMagpie
06ac6ae80c
fix(html): fix behavior of buyModal when gems are being purchased; typo correction
2023-05-02 13:23:31 -04:00
CuriousMagpie
4a32a29bea
Merge branch 'develop' into increment-component
2023-05-02 11:03:46 -04:00
SabreCat
e9e4265545
Squashed commit of the following:
...
commit 00affb306655a543f5d29b3af6361e686b577a97
Author: SabreCat <sabe@habitica.com>
Date: Tue May 2 09:47:25 2023 -0500
fix(tests): account for invite limit changes
commit 47661117f9fd661b8bc8f63b7cc7c8d5f8fa0fd7
Author: SabreCat <sabe@habitica.com>
Date: Mon May 1 17:39:29 2023 -0500
fix(lfp): final polish
commit 6a1e5af1db0dd90be3ced7e223f53c9183a206f5
Merge: 728ed2ddad 9e0777bb42c8adf20804229ed464257ede3acd0153c536b525027e61a93ea16098ccda0b6b967753f327795761
2023-05-02 09:51:33 -05:00
Natalie L
76845f5f20
feat(content): add May subscriber items ( #14613 )
...
Co-authored-by: SabreCat <sabe@habitica.com>
2023-04-28 16:18:45 -05:00
SabreCat
a2d209a34b
Merge branch 'release' into external-link-modal
2023-04-17 14:41:59 -05:00
Sabe Jones
de132c59ea
fix(typo): .
2023-04-10 16:54:15 -05:00
CuriousMagpie
360c17c56e
feat(content): add April backgrounds and enchanted armoire item
2023-04-06 15:37:32 -04:00
CuriousMagpie
c0362c614e
feat(content): add April fool day potions
2023-04-04 17:14:25 -04:00
CuriousMagpie
5de2921d22
Merge branch 'develop' into increment-component
2023-03-30 08:33:24 -04:00
SabreCat
2322f7e342
Merge branch 'release' into external-link-modal
2023-03-29 16:00:53 -05:00
Natalie L
e8501f5cf8
feat(content): Add April 2023 subscriber items ( #14562 )
...
* feat(content): add April Subscriber items
* feat(content): add slim armor version to April subscriber items
2023-03-29 14:53:51 -05:00
Natalie L
fc49015ff0
chore(content): update press kit faq and third party app list in settings ( #14554 )
...
* Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (405 of 405 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (2781 of 2781 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (135 of 135 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (217 of 217 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (13 of 13 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (112 of 112 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (131 of 131 strings)
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (405 of 405 strings)
Translated using Weblate (Portuguese)
Currently translated at 81.7% (331 of 405 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (214 of 214 strings)
Translated using Weblate (Portuguese)
Currently translated at 62.5% (5 of 8 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (61 of 61 strings)
Translated using Weblate (Portuguese)
Currently translated at 63.8% (1777 of 2781 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (182 of 182 strings)
Translated using Weblate (Portuguese)
Currently translated at 71.6% (43 of 60 strings)
Translated using Weblate (Portuguese)
Currently translated at 79.7% (609 of 764 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (375 of 375 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (47 of 47 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (770 of 770 strings)
Translated using Weblate (Portuguese)
Currently translated at 100.0% (146 of 146 strings)
Translated using Weblate (German)
Currently translated at 100.0% (404 of 404 strings)
Translated using Weblate (German)
Currently translated at 79.5% (97 of 122 strings)
Translated using Weblate (German)
Currently translated at 97.7% (753 of 770 strings)
Translated using Weblate (German)
Currently translated at 100.0% (146 of 146 strings)
Translated using Weblate (Portuguese)
Currently translated at 77.0% (94 of 122 strings)
Translated using Weblate (Indonesian)
Currently translated at 76.7% (310 of 404 strings)
Translated using Weblate (Portuguese)
Currently translated at 76.2% (93 of 122 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 85.6% (2381 of 2781 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (60 of 60 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (217 of 217 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (112 of 112 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (267 of 267 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (404 of 404 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (182 of 182 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 95.8% (732 of 764 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (122 of 122 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (375 of 375 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (770 of 770 strings)
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (146 of 146 strings)
Translated using Weblate (Portuguese)
Currently translated at 74.5% (91 of 122 strings)
Translated using Weblate (Portuguese)
Currently translated at 72.1% (88 of 122 strings)
Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Andressa Murari Sudré <andressa@sudre.com.br>
Co-authored-by: Cachinhos <cachnhos@gmail.com>
Co-authored-by: Falzart Werefox <muh_fauzi_ramadhan@yahoo.co.id>
Co-authored-by: Jay <fallacyofwildlifeconservation@gmail.com>
Co-authored-by: Jerry Chen <minecjraft@qq.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Yu-Wei Tien <a38498987911@gmail.com>
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/de/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/achievements/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/de/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/backgrounds/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/de/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/communityguidelines/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/content/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/content/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/contrib/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/faq/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/front/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/front/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/gear/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/generic/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/de/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/id/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hans/
Translate-URL: https://translate.habitica.com/projects/habitica/groups/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/limited/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/messages/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/npc/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/overview/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/pets/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/questscontent/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/rebirth/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/spells/pt/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/pt_BR/
Translate-URL: https://translate.habitica.com/projects/habitica/subscriber/zh_Hant/
Translate-URL: https://translate.habitica.com/projects/habitica/tasks/pt/
Translation: Habitica/Achievements
Translation: Habitica/Backgrounds
Translation: Habitica/Communityguidelines
Translation: Habitica/Content
Translation: Habitica/Contrib
Translation: Habitica/Faq
Translation: Habitica/Front
Translation: Habitica/Gear
Translation: Habitica/Generic
Translation: Habitica/Groups
Translation: Habitica/Limited
Translation: Habitica/Messages
Translation: Habitica/Npc
Translation: Habitica/Overview
Translation: Habitica/Pets
Translation: Habitica/Questscontent
Translation: Habitica/Rebirth
Translation: Habitica/Spells
Translation: Habitica/Subscriber
Translation: Habitica/Tasks
* update press kit and third party app list in settings
---------
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Ana Beatriz <anabeatriz.augusto06@yahoo.com>
Co-authored-by: Andressa Murari Sudré <andressa@sudre.com.br>
Co-authored-by: Cachinhos <cachnhos@gmail.com>
Co-authored-by: Falzart Werefox <muh_fauzi_ramadhan@yahoo.co.id>
Co-authored-by: Jay <fallacyofwildlifeconservation@gmail.com>
Co-authored-by: Jerry Chen <minecjraft@qq.com>
Co-authored-by: Yu-Wei Tien <a38498987911@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2023-03-28 16:52:15 -05:00
CuriousMagpie
09a0d2b3b8
change spacing on buyModal
2023-03-23 16:01:33 -04:00
CuriousMagpie
bfc13bc21b
Merge branch 'develop' into increment-component
2023-03-22 12:14:04 -04:00
SabreCat
573de80a91
Merge remote-tracking branch 'CuriousMagpie/external-link-modal' into external-link-modal
2023-03-21 15:17:21 -05:00
CuriousMagpie
b264e539f4
add crtl/cmd instructions to skip modal
2023-03-21 14:49:43 -04:00
CuriousMagpie
cc81629f09
updates to buyModal styling
2023-03-18 17:18:41 -04:00
SabreCat
c35afb7cfe
fix(string): add missing party invite text
2023-03-17 17:24:49 -05:00
SabreCat
3a4620976e
Merge branch 'release' into external-link-modal
2023-03-17 15:59:28 -05:00
Natalie L
a363e68080
feat(cont): 2023 Spring Fling content ( #14525 )
...
* feat(cont): 2023 Spring Fling
* feat(content): 2023 Spring Fling (attempt to add Jungle Buddies Quest Bundle)
* fix(event): various typos and date ranges
* fix(event): correct countdown on Shiny Seed
* fix(quests): correct TypeError in featured list
* feat(content): update Spring gear to canon desc
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-03-17 15:05:04 -05:00
CuriousMagpie
e83db7a28a
Merge branch 'develop' into increment-component
2023-03-17 11:47:17 -04:00
SabreCat
199ce3e6f7
fix(text): update description of group task approval by @CuriousMagpie
2023-03-16 12:51:51 -05:00
CuriousMagpie
c481354f78
feat(content): add new achievement, Plant Parent
2023-03-15 15:51:04 -05:00
CuriousMagpie
80e193e4ce
Merge branch 'develop' into increment-component
2023-03-15 12:38:07 -04:00
SabreCat
8ff8213954
Merge branch 'sabrecat/invite-notif' into release
2023-03-14 09:25:29 -05:00
Phillip Thelen
8dcacdc92e
Only update user objects that don’t have notification yet ( #14514 )
...
* build(deps): bump stopword from 2.0.5 to 2.0.7 in /website/client (#14504 )
Bumps [stopword](https://github.com/fergiemcdowall/stopword ) from 2.0.5 to 2.0.7.
- [Release notes](https://github.com/fergiemcdowall/stopword/releases )
- [Commits](https://github.com/fergiemcdowall/stopword/commits/v.2.0.7 )
---
updated-dependencies:
- dependency-name: stopword
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>
* build(deps): bump stripe from 11.6.0 to 11.10.0 (#14503 )
Bumps [stripe](https://github.com/stripe/stripe-node ) from 11.6.0 to 11.10.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/v11.6.0...v11.10.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>
* build(deps): bump apidoc from 0.53.1 to 0.54.0 (#14501 )
Bumps [apidoc](https://github.com/apidoc/apidoc ) from 0.53.1 to 0.54.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.53.1...0.54.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>
* build(deps): bump @sideway/formula in /website/client (#14495 )
Bumps [@sideway/formula](https://github.com/sideway/formula ) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sideway/formula/releases )
- [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1 )
---
updated-dependencies:
- dependency-name: "@sideway/formula"
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump validator from 13.7.0 to 13.9.0 in /website/client (#14492 )
Bumps [validator](https://github.com/validatorjs/validator.js ) from 13.7.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/validatorjs/validator.js/compare/13.7.0...13.9.0 )
---
updated-dependencies:
- dependency-name: validator
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>
* build(deps): bump validator from 13.7.0 to 13.9.0 (#14488 )
Bumps [validator](https://github.com/validatorjs/validator.js ) from 13.7.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases )
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/validatorjs/validator.js/compare/13.7.0...13.9.0 )
---
updated-dependencies:
- dependency-name: validator
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>
* build(deps): bump hellojs from 1.19.5 to 1.20.0 in /website/client (#14479 )
Bumps [hellojs](https://github.com/MrSwitch/hello.js ) from 1.19.5 to 1.20.0.
- [Release notes](https://github.com/MrSwitch/hello.js/releases )
- [Changelog](https://github.com/MrSwitch/hello.js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MrSwitch/hello.js/compare/v1.19.5...v1.20.0 )
---
updated-dependencies:
- dependency-name: hellojs
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>
* build(deps): bump ua-parser-js from 0.7.31 to 0.7.33 in /website/client (#14463 )
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js ) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases )
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md )
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33 )
---
updated-dependencies:
- dependency-name: ua-parser-js
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump cookiejar from 2.1.3 to 2.1.4 (#14462 )
Bumps [cookiejar](https://github.com/bmeck/node-cookiejar ) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases )
- [Commits](https://github.com/bmeck/node-cookiejar/commits )
---
updated-dependencies:
- dependency-name: cookiejar
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build(deps): bump glob from 8.0.3 to 8.1.0 (#14448 )
Bumps [glob](https://github.com/isaacs/node-glob ) from 8.0.3 to 8.1.0.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v8.0.3...v8.1.0 )
---
updated-dependencies:
- dependency-name: glob
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>
* build(deps): bump dompurify from 2.4.1 to 2.4.3 in /website/client (#14443 )
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 2.4.1 to 2.4.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.1...2.4.3 )
---
updated-dependencies:
- dependency-name: dompurify
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>
* fixed typo (#14417 )
In "weaponSpecialWinter2023RogueNotes", changed "Incrases" to "Increases"
* Only update user objects that don’t have notification yet
* fix test
* fix spy
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: gwenexner <49045733+gwenexner@users.noreply.github.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2023-03-13 16:24:00 -05:00
SabreCat
f7026b2478
Merge branch 'release' into sabrecat/invite-notif
2023-03-13 14:13:06 -05:00
CuriousMagpie
3f3e0e2ae8
modal essentially complete but for scripts
2023-03-08 15:17:15 -05:00
SabreCat
458aee9a3a
Merge branch 'release' into develop
2023-03-07 11:48:14 -06:00
Natalie L
57f86bac70
feat(content): March backgrounds and Enchanted Armoire items ( #14524 )
...
* feat(content): March backgrounds and Enchanted Armoire
* fix(backgrounds): trivial syntax consistency
* fix(gear): missing verbiage
* fix(gear): correct usage of <%= attrs %>
* fix(backgrounds): broken string tokens
* fix(backgrounds): more broken tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-03-06 16:57:56 -06:00
CuriousMagpie
03f0061c85
Merge branch 'develop' into increment-component
2023-03-01 15:46:04 -05:00
SabreCat
16ae182f34
Merge branch 'release' into develop
2023-02-28 15:37:35 -06:00
SabreCat
8cf5a380da
fix(strings): more silly
2023-02-27 16:17:09 -06:00
SabreCat
80f517f1ad
feat(content): subscriber items March 2023
...
Also fixes Vue templating in one paragraph of the Community Guidelines.
2023-02-24 16:31:50 -06:00
SabreCat
9ec1917e6d
feat(invites): provide link to inviting user in party notif
...
Also changes basic links sitewide to purple-300
2023-02-15 16:54:46 -06:00
CuriousMagpie
7244c1bebc
Merge branch 'develop' into increment-component
2023-02-14 15:30:18 -05:00
gwenexner
2ea023299c
fixed typo ( #14417 )
...
In "weaponSpecialWinter2023RogueNotes", changed "Incrases" to "Increases"
2023-02-13 16:33:10 -06:00
SabreCat
6b95f648c4
Merge remote-tracking branch 'CuriousMagpie/footer-link-updates' into release
2023-02-13 11:28:14 -06:00
Natalie L
a73e4d399e
chore(content): add Pink Marble Magic Hatching Potion ( #14497 )
...
* chore(content): add quest text
* chore(content): add rest of potion quest content
* fix(image): pad quest scroll image
* feat(quest): add Rage action
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-02-12 23:17:56 -06:00
CuriousMagpie
945c19cc80
chore(links): add weblate link to footer and update data display tool
2023-02-10 15:11:36 -05:00
gwenexner
7b4cfee290
Fixed release info for Set 105 ( #14494 )
...
Removed a stray space at the front of "Set 105", changed year to 2023.
2023-02-10 10:30:27 -06:00
Natalie L
0b8f2bc58e
update(content): revise community guidelines ( #14481 )
...
* update(content); revise community guidelines
* fix(CG): remove outdated spoiler advice, remove unneeded string token
* chore(CG): update date line to intended publication
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-02-08 15:04:30 -06:00
CuriousMagpie
7125da4533
Merge branch 'develop' into increment-component
2023-02-07 14:05:48 -05:00
Natalie L
0335eb1f7e
chore(content): add February backgrounds and Enchanted Armoire Items ( #14482 )
...
* chore(content): add February backgrounds and Enchanted Armoire Items
* fix(test): birthday week adjustment
* fix(strings): .
* fix(strings): correct background tokens
---------
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2023-02-07 09:12:19 -06:00
CuriousMagpie
684cb59a7c
buyModal styling/functions
2023-02-06 16:23:20 -05:00
CuriousMagpie
9274fe9a10
Merge branch 'develop' into increment-component
2023-02-06 14:30:34 -05:00
Natalie L
059269f9b0
chore(content): add February subscriber items ( #14466 )
...
* chore(content): add February subscriber items
* fix(strings): month typo
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-01-31 10:33:36 -06:00
Natalie L
cfa85850bf
chore(typos): miscellaneous string fixes ( #14414 )
...
* fix(string): questVice1Notes html changed to a mobile-device friendly format
* fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order
* fix(string): remove extra word from headSpecialSummer2022WarriorNotes
* fix(string): corrected armorSpecialSummer2022MageNotes
* fix: remove duplicated string and adjust upgrade button style
* fix(style): set border radii to 8px on upgrading-group id
* fix(payments): remove duplicate entry from another modal
* chore(fix): restore string inadvertently removed during a refactor
* chore(fix): comma dangle
* chore(typo): who knew, that Y was actually important...
* chore(typo): fix text in questBewilderNotes
* chore(string): clarify polar pets requirements
* couple small changes to the footer as pointed out by users
* chore(fix): correct name of Fabulous Party Hat
---------
Co-authored-by: SabreCat <sabe@habitica.com>
2023-01-31 10:03:06 -06:00
CuriousMagpie
a21f083761
gem modal styling/functions
2023-01-25 16:44:14 -05:00
CuriousMagpie
c7e2834fc6
Merge branch 'develop' into increment-component
2023-01-25 14:35:39 -05:00
SabreCat
ce96f4065d
fix(event): adjust potions end date
2023-01-25 11:08:35 -06:00
SabreCat
efae9429c0
feat(event): adjust dates, add NPC variations
2023-01-24 16:11:16 -06:00
SabreCat
1988ef957d
fix(strings): dedupe jubilantGryphatrice
2023-01-20 16:15:33 -06:00
SabreCat
e5bbde7e97
feat(event): 10th Birthday Bash
...
with @CuriousMagpie and @phillipthelen
2023-01-20 16:14:33 -06:00
Natalie L
a80ac76015
chore(content): add January 2023 Backgrounds and Enchanted Armoire Item ( #14440 )
...
* chore: images & spritesheet
* chore: add january backgrounds and armoire item
* fix(backgrounds): typos and 2023 updates
Co-authored-by: SabreCat <sabe@habitica.com>
2023-01-09 15:39:04 -06:00
SabreCat
e251fad12c
fix(subs): clarity and layout improvements
2023-01-03 17:05:48 -06:00
Natalie L
b1dab729b6
chore(content): january subscriber items ( #14433 )
...
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-29 10:46:17 -06:00
Natalie L
55e7ef138e
chore(content): add NYE party hat and migration script ( #14419 )
...
* chore(content): add NYE party hat and migration script
* chore(subproj): update habitica-images
* chore(sprites): corrected sprite CSS run
* fix(event): unbork migration, add latecomer hook
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-23 15:35:23 -06:00
SabreCat
825baaf7e9
fix(string): winter not spring
2022-12-20 10:05:31 -06:00
Natalie L
fd9d738cc6
chore(content): add winter wonderland items ( #14407 )
...
* chore(content): add winter wonderland items
* chore(typos): dates are hard
* fix(tz): how far back we have fallen
* fix(event): four extra hours for stragglers
* fix(typo): singular snowball spell
* fix(gear): remove stray incorrect event prop
* merge release
* Revert "merge release"
This reverts commit 83e29d028866e1d2ab2c1c181e4c82eeb161b647.
* feat(content): add EN text
* fix(dates): 2022-2023 Winter
* chore(content): add featured quest bundle
* fix(event): delay Snowballs, add quests to Seasonal Shop
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-19 15:53:52 -06:00
CuriousMagpie
24032b57f6
why clicky click no click?
2022-12-15 16:48:59 -05:00
SabreCat
1587827b22
Merge branch 'develop' into release
2022-12-15 14:04:11 -06:00
Sabe Jones
eb2cb9e921
Refactor FAQ ( #14372 )
...
* refactor(faq): fetch from API on web
Also make question list more maintainable, allowing different questions across platforms
* fix(tests): don't return null when function is expected
Also removes the unnecessary default to web in controller
* fix(tests): add new fields to expectation, add placeholders
* refactor(faq): allow reordering
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-15 11:34:07 -06:00
SabreCat
591279c1a8
fix(dates): correct inconsistency
2022-12-15 09:00:12 -06:00
SabreCat
ee91780f20
fix(typo): tomorrow and tomorrow
2022-12-14 14:41:33 -06:00
SabreCat
9c10cb3b88
chore(event): enable G1G1 promo
2022-12-14 14:13:36 -06:00
Natalie L
573c932565
chore(content): add Polar Pro achievement ( #14399 )
...
* chore(content): add Polar Pro achievement
* chore(script): add migration script
* fix(typo): rogue backticks
* fix(capitalization): revert css blurp
* fix(migration): no babby wuff
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-12-13 14:50:53 -06:00
SabreCat
174a4e69f9
fix(backgrounds): we're in December now
2022-12-06 13:34:25 -06:00
Natalie L
1ce060eac6
chore(content): add December 2022 Backgrounds and Enchanted Armoire Items ( #14382 )
...
* chore(content): css and images
* chore(content): add December 2022 Backgrounds and Enchanted Armoire Items
* fix(typos): dots no dip
* fix(typo): capitalize game terms
* fix(typos): GitHub regex find, why
* fix(typo): last one maybe?
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-12-06 13:21:24 -06:00
Natalie L
9bd039b17b
chore(content): add December 2022 Mystery Items ( #14379 )
...
* chore(submodule): images
* chore(content): December Mystery Items
* chore(content): sprites
* fix(typo): whitespace
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-11-28 15:34:18 -06:00
prexio
3f690c24da
Change Wikia to Fandom ( #14291 )
2022-11-18 16:54:12 -06:00
Natalie L
f24d81d895
fix(content): quality of life change for staff and moderators ( #14245 )
...
* fix(content): quality of life change for staff and moderators
* fix(content): quality of life change for staff and moderators, I really mean it this time
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-11-18 16:52:09 -06:00
Sabe Jones
82c5e40b92
Enforce maximum password length ( #14290 )
...
* fix(auth): enforce maximum password length
* fix(auth): line length and better error message
* fix(auth): correctly import/export constant
Co-authored-by: SabreCat <sabe@habitica.com>
2022-11-18 16:49:10 -06:00
SabreCat
fdfa2d6df4
Merge branch 'release' into develop
2022-11-15 19:29:37 -06:00
SabreCat
259131ee3f
feat(transactions): UI updates
...
by @negue
2022-11-15 19:28:36 -06:00
SabreCat
9f52e47011
feat(content): November Quests and Hatching Potions
...
by @CuriousMagpie
2022-11-14 14:13:08 -06:00
Alys
4dca69f14b
change the bannedWordUsed text as discussed with beffymaroo
2022-11-12 18:43:28 +10:00
CuriousMagpie
4c62a48f5d
chore(typo): who knew, that Y was actually important...
2022-11-09 16:11:45 -06:00
Sabe Jones
5c7d537c61
Armoire and Backgrounds 2022/11 ( #14329 )
...
* chore(content): Add November Backgrounds and Enchanted Armoire Items
* fix(strings): typos and fullstops
* fix(style): de-whitespace
Co-authored-by: CuriousMagpie <eilatan@gmail.com>
2022-11-08 10:03:25 -06:00
SabreCat
6c85b1e047
chore(faq): update note on mobile Group Plans
2022-11-01 20:59:32 -05:00
SabreCat
7c553e535c
feat(gifting): restore ability to send gift messages
...
by @CuriousMagpie
2022-11-01 20:56:21 -05:00
Natalie L
3bc82a6692
chore(content): add Bone to Pick achievement ( #14318 )
...
* chore(content): add Bone to Pick achievement
* chore(content): update spritesmith-main.css
* chore(content): add more bone picking
* chore(content): more bone picking
* chore(content): bone picking
* chore(content): i gotta bone to pick here
* chore(content): final bone picking
* chore: add migration script
* chore: update habitica-images
Co-authored-by: SabreCat <sabe@habitica.com>
2022-10-31 14:19:56 -05:00
SabreCat
e39a5a0628
fix(strings): set token typo
2022-10-30 20:15:37 -05:00
Natalie L
b5c950ac96
chore(content): add November 2022 Mystery Items ( #14317 )
...
* chore(content): add November Mystery Items
* chore: merge release into 2022-11-mystery-items
* Revert "chore: merge release into 2022-11-mystery-items"
This reverts commit e12b61d73fb42cad79bbd69af2584c7bb9a96254.
Co-authored-by: SabreCat <sabe@habitica.com>
2022-10-30 19:52:55 -05:00
Natalie L
4d1bbdd8d0
chore(content): add October Backgrounds and Enchanted Armoire Items ( #14266 )
...
* chore(content): add October Backgrounds and Enchanted Armoire Items
* fix(typo): fix a couple of descriptions
* chore(subproject): update images
* fix(typo): keepin our caps consistent
* fix(typo): whitespace, caps
Co-authored-by: SabreCat <sabe@habitica.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-10-11 11:54:24 -05:00
SabreCat
3582e233be
fix(strings): remove duplicate "next" key
2022-09-30 15:09:53 -05:00
SabreCat
57d3fea523
Merge branch 'group-tracking-modal' into release
2022-09-30 14:47:08 -05:00
SabreCat
7db093d2bb
Merge branch 'sabrecat/panel-subscription' into release
2022-09-30 14:46:10 -05:00
SabreCat
06d2ffb37d
Merge branch 'sabrecat/gems-multi-event' into release
2022-09-30 14:45:36 -05:00
Natalie L
a08ecbe044
chore(content): add October 2022 Mystery Items ( #14254 )
2022-09-28 15:04:47 -05:00
SabreCat
535fddf92d
feat(sale): add fine print
2022-09-21 16:28:15 -05:00
SabreCat
4c988691cf
fix(groups): show group task summary modal for site admins
...
also change "Watcher" to "Peeker" in fall healer gear
2022-09-21 14:39:46 -05:00
CuriousMagpie
586897fbfc
Revert "update: remove another duplicate key from groups.json"
...
This reverts commit 014a4b653a
2022-09-20 17:11:09 -04:00
SabreCat
004f1ee2dc
Merge branch 'develop' into sabrecat/panel-subscription
2022-09-20 15:11:29 -05:00
CuriousMagpie
8e9b469d8d
chore: merge develop
2022-09-20 13:11:43 -04:00
Natalie L
f030135c82
chore(content): add 2022 Fall Festival ( #14244 )
...
* chore(submodule): add August 2022 Mystery Items
* update(content): add 2022 Fall Festival content
* update(content): add 2022 Fall Festival content
* update(content): update event dates for release
* fix(lint): remove extra spaces
also correct typo in gear string keys
* feat(content): remaining descriptions
* fix(event): correct spell availability
* fix(test): work around first-match logic
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
Co-authored-by: SabreCat <sabe@habitica.com>
2022-09-19 16:55:53 -05:00
CuriousMagpie
719fab8d4b
chore: merge develop in
2022-09-16 16:12:34 -04:00
Natalie L
9a896470d5
Site Footer Update ( #14134 )
...
* first pass
* second pass
* third pass
* fourth pass, not a lot of progress
* fifth pass, slowly gettin there
* breakpoint nonsense
* flexbox and breakpoint nonsense
* svg updates, css updates
* whitespace
* chore: merge upstream/develop
* style(breakpoints): added responsive breakpoints, social column alignment tweaks
* style(breakpoints): add xs-specific selectors and classes
* style: mobile footer
* style: mobile footer
* style: static landing page footer
* style: small tweaks to social layout
* fix(translations): update website/common/locales/de/gear.json to develop
* update(style): small updates
* update(style): cleaning up code
* update(style): cleaning up code
* update(style): mobile footer updates
* update(style): complete mobile footer & clean up code
* update(style): add tablet breakpoint and remove rogue terms link
2022-09-14 16:35:24 -05:00
CuriousMagpie
014a4b653a
update: remove another duplicate key from groups.json
2022-09-14 17:24:29 -04:00
CuriousMagpie
37e5d6b40a
update: remove duplicate key from groups.json
2022-09-14 17:06:33 -04:00
Natalie L
0f4711c358
chore(content): add 2022-09 Pet Quest bundle ( #14218 )
...
* chore(content): farmFriends quest bundle
* chore(content): 2022-09 Pet Quest Bundle
* fix(date): fix start date
2022-09-13 09:12:24 -05:00
CuriousMagpie
c6ba1d8402
update: success modal
2022-09-08 12:55:53 -04:00
SabreCat
0081bad831
feat(admin): track hourglasses as transactions
2022-09-06 16:15:04 -05:00
CuriousMagpie
61f3d8d61c
Merge branch 'develop' into group-tracking-modal
2022-09-06 15:11:03 -04:00
Natalie L
6df4ce251c
chore(content): add September 2022 Backgrounds and Enchanted Armoire Items ( #14200 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add September 2022 Backgrounds and Enchanted Armoire Items
* fix(typo): periods so people don't grumble
* fix(typo): consistent caps
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-09-06 12:31:55 -05:00
CuriousMagpie
e2bb7fda60
update: success modal
2022-08-30 17:43:36 -04:00
CuriousMagpie
4464464c51
Merge branch 'develop' into group-tracking-modal
2022-08-30 15:44:09 -04:00
SabreCat
11347e5679
Merge branch 'release' into develop
2022-08-30 14:25:25 -05:00
Natalie L
755f51b674
chore(content): add September 2022 Mystery Items ( #14199 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add September 2022 Mystery Items
* fix(typo): verb form
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-30 14:06:06 -05:00
CuriousMagpie
a3e6aff330
update: more work on success modal
2022-08-29 16:12:53 -04:00
CuriousMagpie
a523d0b894
Merge branch 'develop' into group-tracking-modal
2022-08-29 13:33:15 -04:00
Natalie L
3664a1ebb1
fix(tavern): update Pause Damage Description, and Staff list ( #14174 )
2022-08-26 15:51:21 -05:00
CuriousMagpie
9a1266677a
Merge remote-tracking branch 'upstream/develop' into group-tracking-modal
2022-08-25 13:20:54 -04:00
SabreCat
35d963a397
fix(teams): tweak FAQ and fix sync test
2022-08-22 14:43:21 -05:00
SabreCat
631d7111a5
fix(teams): send @username in notifications
2022-08-22 11:39:53 -05:00
SabreCat
89c07529ea
feat(teams): add FAQ entry
...
Also a few client side fixes
2022-08-22 11:27:08 -05:00
SabreCat
f063b9e81c
fix(tests): sanity and common
2022-08-19 16:10:18 -05:00
SabreCat
49a20218a5
fix(onboarding): improve modal launching and clicky behavior
2022-08-19 14:09:41 -05:00
SabreCat
95714599f0
feat(onboarding): welcome modal
2022-08-19 13:04:48 -05:00
SabreCat
5893312d75
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-17 14:28:43 -05:00
Natalie L
f0b5637e9e
chore(content): add Porcelain Magic Hatching Potion ( #14168 )
...
* chore(submodule): add August 2022 Mystery Items
* chore: update habitica-images
* chore(content): add Porcelain Magic Hatching Potion
* chore(content): update moonglow potion availability
* fix(events): no gap between events
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-15 15:14:23 -05:00
CuriousMagpie
e08d0f4016
update: style changes, add upgraded group demographics to success modal, add description counter
2022-08-12 16:44:58 -04:00
CuriousMagpie
f487837b4b
Merge branch 'develop' into group-tracking-modal
2022-08-11 15:02:40 -04:00
SabreCat
1701fc702b
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-09 11:55:46 -05:00
CuriousMagpie
cfd601e7bf
update: styling and some function work
2022-08-08 17:16:41 -04:00
SabreCat
3654e01fee
Merge branch 'develop' into sabrecat/teams-rebase
2022-08-08 12:13:29 -05:00
CuriousMagpie
cff6c5674f
update: add styling
2022-08-04 17:26:04 -04:00
Natalie L
f7b727dc95
chore(content): add Woodland Wizard Achievement and Forest Friends Quest Bundle ( #14159 )
...
* chore(submodule): add August 2022 Mystery Items
* chore(content): add Woodland Wizard achievement
* chore(content): add Forest Friends quest bundle
* fix(typo): whitespace
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-08-04 15:14:27 -05:00
CuriousMagpie
edcb3f4289
update: making dropdown go with PROPS
2022-08-03 12:07:30 -04:00
