HabitRPG / habitica / 13987 / 2

19%

develop: 19%

push

travis-ci

<a href="https://github.com/HabitRPG/habitica/commit/<a class=hub.com/HabitRPG/habitica/commit/<a class="double-link" href="https://git"><a class=hub.com/HabitRPG/habitica/commit/<a class="double-link" href="https://git"><a class=hub.com/HabitRPG/habitica/commit/<a class="double-link" href="https://git"><a class=hub.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86">7c516b7cb<a href="https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86">&lt;a href=&quot;https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86&amp;amp;quot;&amp;amp;gt;&amp;amp;amp;quot;&amp;amp;amp;gt;Release Mergeback (#8644)

* Remove email addresses from translatable strings (#8448)

* Fix User &amp;amp;amp;amp;gt; Profile showing {getProgressDisplay()}

* Remove bad nextRewardAt check

* 1st iteration of issue #8385 - more pending

* #8385 config and jade fixes, tests pending

* #8385 fixing lint errors

* Fix faqs string and test

* Fix faq.jade and add workaround for faq.js

* Fixing accidental checking for faq.js

* fix emails in faq.js

* fetch emails once in auth.js

* Fixing community manager email in auth.js

(cherry picked from commit &amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/HabitRPG/habitica/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/HabitRPG/habitica/commit/842fbe42a8ada502d09ad5754755bb7c40e64af9&amp;quot;&amp;gt;842fbe42a&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;842fbe42a&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86&quot;&gt;)

* chore(i18n): update locales

(cherry picked from commit &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/HabitRPG/habitica/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/HabitRPG/habitica/commit/b2225f05e52b026d6c476b999943bc9b8094f270&quot;&gt;b2225f05e&lt;/a&gt;&quot;&gt;b2225f05e&lt;/a&gt;&lt;a href=&quot;https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86&quot;&gt;)

* Merge branch &amp;#39;stripe-webhook&amp;#39; into develop

(cherry picked from commit &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/HabitRPG/habitica/commit/&lt;a class="double-link" href="https://github.com/HabitRPG/habitica/commit/30f514e46fb8cc79ca7203c442d72c345ff3a22c">30f514e46</a>">30f514e46</a><a href="https://github.com/HabitRPG/habitica/commit/7c516b7cbb77769cf5bd4a8cb5ba4300f6ad7b86">)

* add recent Grand Gala seasonal special equipment names (#8606)

This is to help translators add good glossary entries now for keeping the current wiki pages consistent with future additions to the website&#39;s seasonal shop.
(cherry picked from commit 4846bc576">4846bc576)... (continued)