Commit Graph

25 Commits

Author SHA1 Message Date
Matteo Pagliazzi 869d2df4fa Merge #12654
Fixes #12417
Squashed commit of the following:

commit 1f074175c480a638cf61e2c72ca57cdc6f8699b6
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date:   Mon Oct 26 10:57:23 2020 +0100

    fix(i18n): remove unused string questLevelTooHigh

commit 12cc74002ec87c14cc000b008454f34475fd3636
Merge: 4fc260e552 ad9b551de3
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date:   Mon Oct 26 10:50:39 2020 +0100

    Merge branch 'feature/level-locked-quests-should-be-used-at-any-level' of https://github.com/hamboomger/habitica into hamboomger-feature/level-locked-quests-should-be-used-at-any-level

commit ad9b551de3
Author: hamboomger <hamboomger@gmail.com>
Date:   Thu Oct 8 13:34:19 2020 +0300

    fix(quests): Quests that are level-locked for purchase can now be used at any level
2020-10-26 10:58:50 +01:00
RaitheOfDureya b42875e2e1 Removed unused I18N strings from the quests.json files (related to issue #9957) (#12558)
* Removed unused I18N strings from the `quests.json` file (locales/en)

* Remove whereAreMyQuests, yourQuests and getMoreQuests (locales/en)

* Removed unused I18N `quests.json` strings from all the others languages

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
2020-09-25 11:47:17 +02:00
Matteo Pagliazzi 9a07ba7417 Better XSS Fix (#12483)
* Revert "fix(test): adjust expectations"

This reverts commit 205436d5b1.

* Revert "fix(escaping): global inoffensive apostrophe"

This reverts commit 2b8f94b244.

* change <%- to <%=

* fix interpolation only where necessary

* remove unused variable
2020-08-20 13:41:46 -05:00
Matteo Pagliazzi b7964a411c fix(i18n): html-escape all interpolated strings where html is not necessary 2020-08-11 21:33:24 +02:00
Sabe Jones f9db432794 chore(i18n): update locales 2018-07-05 15:12:59 +00:00
Sabe Jones 8db99be017 chore(i18n): update locales 2018-05-10 18:51:37 +00:00
Sabe Jones ab7459f4f3 chore(i18n): update locales 2018-04-05 21:08:53 +00:00
Sabe Jones 163d56afe9 chore(i18n): update locales 2018-02-14 20:54:50 +00:00
Sabe Jones 5495acea96 chore(i18n): update locales 2018-02-02 00:46:45 +00:00
Sabe Jones 9435a3089a chore(i18n): update locales 2017-12-20 02:43:00 +00:00
Sabe Jones 401067bfed chore(i18n): update locales 2017-12-05 19:46:40 +00:00
Sabe Jones af961ff16c chore(i18n): update locales 2017-10-16 23:11:52 +00:00
Sabe Jones fd430e95b2 chore(i18n): update locales 2017-10-14 01:45:08 +00:00
Sabe Jones 5c429d0328 chore(i18n): update locales 2017-09-28 01:07:43 +00:00
Matteo Pagliazzi 18b04e713e Revert "chore(i18n): update locales"
This reverts commit 6754c43317.
2017-07-27 17:41:23 +02:00
Matteo Pagliazzi 6754c43317 chore(i18n): update locales 2017-07-27 17:35:14 +02:00
Sabe Jones bd9618e1c6 chore(i18n): update locales 2017-05-18 02:08:40 +00:00
Matteo Pagliazzi 89279c8aed chore(i18n): update locales 2016-12-28 09:53:20 +01:00
Matteo Pagliazzi f929d36e1a chore(i18n): update locales 2016-11-28 19:43:06 +01:00
Blade Barringer 3ff7692528 chore(i18n): update locales 2016-11-11 08:08:46 -06:00
Blade Barringer 4e3c984baf chore(i18n): update locales 2016-10-17 17:14:59 -05:00
Blade Barringer aeee29f5fa chore(i18n): update locales 2016-10-11 18:04:25 -05:00
Blade Barringer eb0e234afa chore(i18n): update locales 2016-09-28 07:44:30 -05:00
Blade Barringer fb8ec7677c chore(i18n): update locales 2016-09-20 07:49:20 -05:00
Blade Barringer 81b7eeeb71 Common reorg (#8025)
* Re-organize common folder

* fix: Correct paths in tests

* fix: move new content to proper folder

* chore: Move audio folder to assets

* Move sprites to sprites assets directory

* Move css sprites to assets directory

* Split out readmes for common code and sprites

* Move images to assets directory

* Move destinatin of shared browserified file

* remove unused file

* move compiled js to client-old

* Fix karma tests

* fix: Correct paths for sprites
2016-09-16 17:18:07 +02:00