Commit Graph

23 Commits

Author SHA1 Message Date
osiris 4fa16b5601 Merge remote-tracking branch 'upstream/develop' into bugfix-npc-style 2020-01-15 12:41:26 +08:00
Sabe Jones 2c75e0bd49 Merge branch 'release' into develop 2020-01-08 11:13:19 -06:00
Sabe Jones 99c0a9d05d fix(promo): sub page 2020-01-08 11:12:47 -06:00
osiris 98e0e96494 Implemented rework suggestion by adding backer to group aggregation 2020-01-08 17:17:48 +08:00
osiris 2427743d0f Fix bug in NPC style display 2020-01-08 16:35:02 +08:00
Sabe Jones fe9af263dd Merge branch 'release' into develop 2020-01-07 11:48:09 -06:00
Sabe Jones f6ecc1cb84 chore(promo): end g1g1 2020-01-07 10:13:32 -06:00
Timothy 7d2c5ed339 Fixed disappearing email form bug by forcing a refresh after submission, Fixes #11565 (#11614)
* Fixed disappearing form bug by forcing a refresh after submission

* Added reloadPage() to the changeEmail submit button

* Added indentation for the reloadPage() function

* Adjusted changeUser() function (added reloadPage)

Added reloadPage() function to the changeUser() function. This should allow the page to reload after the email is updated instead of before the function gets to finish updating the account's email

* Adjusted changeUser() function

Added  window.location.reload() to the changeUser() function. This should allow the page to reload after the email is updated instead of before the function gets to finish updating the account's email

* Adjusted changeUser function
2019-12-23 17:48:55 +01:00
Glendon Solsberry b9af3fb40e Updates notifications screen to a more consistent UI (#11635) 2019-12-23 17:45:42 +01:00
Sabe Jones c4b16f86db feat(event): Wonderland 2019-20 2019-12-19 16:54:27 -06:00
Sabe Jones 34983f1221 feat(event): turn on G1G1 2019 2019-12-17 14:04:55 -06:00
Matteo Pagliazzi 0e679f0fea settings fixes: show description for other extensions and remove unwanted changes from locales 2019-11-16 17:38:48 +01:00
Matteo Pagliazzi d55d3fc56d Merge branch 'firefox-extension-link' of https://github.com/Markkop/habitica into Markkop-firefox-extension-link 2019-11-16 17:33:10 +01:00
Matteo Pagliazzi 57b9dc374a Intro.js Fixes and better client side logging (#11480)
* fix intro.js button and border for username modal

* fix unhandled error and add better logging
2019-10-27 13:11:40 +01:00
Matteo Pagliazzi 4881d870c7 Merge branch 'develop' into firefox-extension-link 2019-10-20 13:55:34 +02:00
Matteo Pagliazzi a0e5a56bf2 finish linting client 2019-10-13 18:04:04 +02:00
Matteo Pagliazzi f99e3fab8b html format other components 2019-10-12 17:05:15 +02:00
Matteo Pagliazzi 07349c70bc pug to html 2019-10-12 16:33:05 +02:00
Matteo Pagliazzi a625e83b53 client lint first pass 2019-10-11 20:35:49 +02:00
Matteo Pagliazzi e0e9811ab6 lint common 2019-10-09 20:08:36 +02:00
Matteo Pagliazzi b466d12263 migrate remaining paths 2019-10-01 16:00:06 +02:00
Matteo Pagliazzi e69275663b rewrite paths, add deps 2019-10-01 15:38:48 +02:00
Matteo Pagliazzi b44fbdcb14 old client structure 2019-10-01 11:44:38 +02:00