diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index a7f8d515e5..09b94f28e4 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -91,7 +91,7 @@
  • {{ $t('requestFeature') }}
    • diff --git a/website/client/src/components/groups/tavern.vue b/website/client/src/components/groups/tavern.vue index 449de7baa6..26a7adaec3 100644 --- a/website/client/src/components/groups/tavern.vue +++ b/website/client/src/components/groups/tavern.vue @@ -365,7 +365,7 @@
  • {{ $t('requestFeature') }}
    • diff --git a/website/client/src/components/hall/heroes.vue b/website/client/src/components/hall/heroes.vue index 0fe8dad9b7..719318b8ea 100644 --- a/website/client/src/components/hall/heroes.vue +++ b/website/client/src/components/hall/heroes.vue @@ -61,13 +61,9 @@ 1-7 for normal contributors, 8 for moderators, 9 for staff. This determines which items, pets, and mounts are available, and name-tag coloring. Tiers 8 and 9 are automatically given admin status.  More details (1-7),  - more details (8-9) + >More details
    diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue index 82725160a5..7d2b72ad2d 100644 --- a/website/client/src/components/header/menu.vue +++ b/website/client/src/components/header/menu.vue @@ -323,7 +323,7 @@ {{ $t('requestAF') }} {{ $t('commGuideAKA', {habitName: 'Beffymaroo', realName: 'Beth'}) }}
  • {{ $t('commGuideAKA', {habitName: 'Viirus', realName: 'Phillip'}) }}
  • - {{ $t('commGuideAKA', { - habitName: 'redphoenix', realName: 'Vicky'}) }} ({{ $t('commGuideOnTrello', { - trelloName: 'caffeinatedvee'}) }}, {{ $t('commGuideOnGitHub', { - gitHubName: 'veeeeeee'}) }}) -
    • -
  • - {{ $t('commGuideAKA', { - habitName: 'Lemoness', realName: 'Leslie'}) }} ({{ $t('commGuideOnTrello', { - trelloName: 'lemonesstree'}) }}) + {{ $t('commGuideAKA', {habitName: 'redphoenix', realName: 'Vicky'}) }} + ({{ $t('commGuideOnGitHub', {gitHubName: 'veeeeeee'}) }})
  • {{ $t('commGuideAKA', {habitName: 'SabreCat', realName: 'Sabe'}) }}
  • {{ $t('commGuideAKA', {habitName: 'paglias', realName: 'Matteo'}) }}
    • -
  • {{ $t('commGuideAKA', {habitName: 'TheHollidayInn', realName: 'Keith'}) }}
    • @@ -242,7 +234,6 @@
  • -
  • diff --git a/website/common/locales/en/communityGuidelines.json b/website/common/locales/en/communityGuidelines.json index 259f8d7f46..e5e28a4fdd 100644 --- a/website/common/locales/en/communityGuidelines.json +++ b/website/common/locales/en/communityGuidelines.json @@ -114,7 +114,6 @@ "commGuidePara008": "Mods have dark blue tags marked with stars. Their title is \"Guardian\". The only exception is Bailey, who, as an NPC, has a black and green tag marked with a star.", "commGuidePara009": "The current Staff Members are (from left to right):", "commGuideAKA": "<%= habitName %> aka <%= realName %>", - "commGuideOnTrello": "<%= trelloName %> on Trello", "commGuideOnGitHub": "<%= gitHubName %> on GitHub", "commGuidePara010": "There are also several Moderators who assist the staff members. They were selected carefully, so please give them your respect and listen to their suggestions.", "commGuidePara011": "The current Moderators are (from left to right):", @@ -134,8 +133,7 @@ "commGuideLink01": "    Habitica Help: Ask a Question: a Guild for users to ask questions!", "commGuideLink02": "The Wiki: the biggest collection of information about Habitica.", "commGuideLink03": "GitHub: for bug reports or helping with code!", - "commGuideLink04": "The Main Trello: for site feature requests.", - "commGuideLink05": "The Mobile Trello: for mobile feature requests.", + "commGuideLink04": "The Feedback Form: for site and app feature requests.", "commGuideLink06": "The Art Trello: for submitting pixel art.", "commGuideLink07": "The Quest Trello: for submitting quest writing.", diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json index a9c86e613b..bb136767a4 100644 --- a/website/common/locales/en/faq.json +++ b/website/common/locales/en/faq.json @@ -59,7 +59,7 @@ "faqQuestion11": "How do I report a bug or request a feature?", "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > About > Report a Bug and Menu > About > Send Feedback! We'll do everything we can to assist you.", "androidFaqAnswer11": "You can report a bug, request a feature, or send feedback under About > Report a Bug and About > Send us Feedback! We'll do everything we can to assist you.", - "webFaqAnswer11": "To report a bug, go to [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and read the points above the chat box. If you're unable to log in to Habitica, send your login details (not your password!) to [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Don't worry, we'll get you fixed up soon! Feature requests are collected on Trello. Go to [Help > Request a Feature](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) and follow the instructions. Ta-da!", + "webFaqAnswer11": "To report a bug, go to [Help > Report a Bug](https://habitica.com/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac) and read the points above the chat box. If you're unable to log in to Habitica, send your login details (not your password!) to [<%= techAssistanceEmail %>](<%= wikiTechAssistanceEmail %>). Don't worry, we'll get you fixed up soon! Feature requests are collected via a Google form. Go to [Help > Request a Feature](https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link) and follow the instructions. Ta-da!", "faqQuestion12": "How do I battle a World Boss?", "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and Skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and Skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.fandom.com/wiki/World_Bosses) on the wiki.", diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json index afc364d3a5..951a03210b 100644 --- a/website/common/locales/en/settings.json +++ b/website/common/locales/en/settings.json @@ -2,7 +2,7 @@ "settings": "Settings", "language": "Language", "americanEnglishGovern": "In the event of a discrepancy in the translations, the American English version governs.", - "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit this Trello card.", + "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit the Aspiring Linguists Guild!", "showHeaderPop": "Show your avatar, Health/Experience bars, and party.", "stickyHeader": "Sticky header", "stickyHeaderPop": "Affix the header to the top of the screen. Unchecked means it scrolls out of view.", diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index a6eae81943..e8c51418c3 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -150,8 +150,7 @@ export default new Schema({ }, contributor: { - // 1-9, see https://trello.com/c/wkFzONhE/277-contributor-gear - // https://github.com/HabitRPG/habitica/issues/3801 + // 1-9, see https://habitica.fandom.com/wiki/Contributor_Rewards level: { $type: Number, min: 0,