Commit Graph

769 Commits

Author SHA1 Message Date
CuriousMagpie c086d7b91d update sprites 2022-04-06 12:15:39 -05:00
CuriousMagpie 5b93199f35 fix(quest): moving gif into right folder /facepalm 2022-04-06 12:15:05 -05:00
Phillip Thelen 3b82bb9494 Update sprites.css 2022-04-06 12:14:52 -05:00
CuriousMagpie 1c347fc4b8 fix(quest): virtualPet.gif to virtualpet.gig 2022-04-06 12:14:42 -05:00
SabreCat fb017e1f08 fix(pets): various quest and animation corrections 2022-04-05 16:03:46 -05:00
SabreCat 1ca528eb95 Merge branch 'develop' into 2022-04-wacky-potion-quest 2022-04-05 15:08:18 -05:00
CuriousMagpie 202d74b8c4 Virtual Pet animated images 2022-04-04 17:37:09 -04:00
SabreCat 39b39387d3 chore(sprites): compile CSS 2022-04-04 14:54:09 -05:00
SabreCat 34d0922bcc Merge remote-tracking branch 'rarysson/update-year-on-footer' into develop 2022-04-01 16:28:04 -05:00
Phillip Thelen 55cf2f9795 Improve flows for social auth users (#13862)
* Multiple fixes for social authentication flows

* frontend changes

* add missing computed property

* Improvements to social flows

* fix existing email error

* minor fixes

* fix space

* fix test

* fix lint

Co-authored-by: SabreCat <sabe@habitica.com>
2022-03-31 16:43:16 -05:00
citrusella 140372a70d Update faceAvatar.vue so snowman ACTUALLY shows up (#13911) 2022-03-31 15:39:53 -05:00
SabreCat 608ae5fc43 feat(event): April Fooly 2022 2022-03-30 15:31:17 -05:00
SabreCat 2b93ea3740 chore(sprites): compile 2022-03-30 09:44:36 -05:00
SabreCat d6e64482d6 chore(sprites): update CSS 2022-03-22 16:52:48 -05:00
SabreCat ad9c468e77 fix(event): CSS build, small fixes 2022-03-22 10:34:44 -05:00
SabreCat 52d1480844 chore(sprites): build CSS 2022-03-09 16:16:44 -06:00
CuriousMagpie aa1b9a5e94 added achievement Birds of a Feather 2022-03-08 12:43:38 -05:00
SabreCat 05a54e505c chore(mystery): update images, run sprites 2022-02-28 09:49:21 -06:00
SabreCat 81363feb26 revert Bailey datetime PR 2022-02-09 11:17:15 -06:00
SabreCat 9e740e7092 fix(heroes): still more indents 2022-02-08 11:10:39 -06:00
SabreCat 169634f205 fix(heroes): remove broken td and correct indentation 2022-02-08 11:09:05 -06:00
SabreCat 094cf899d8 fix(heroes): remove duplicated column 2022-02-08 10:39:11 -06:00
SabreCat fd4d139fc2 Merge remote-tracking branch 'CuriousMagpie/2022-02-backgrounds-armoire' into develop 2022-02-07 10:51:23 -06:00
Rarysson Guilherme 492824ac90 Add automatic year detection on appFooter 2022-02-05 12:26:17 -03:00
SabreCat ca4df96902 Merge branch 'release' into develop 2022-02-01 15:29:35 -06:00
SabreCat 9e5948df64 chore(sprites): compile 2022-02-01 15:21:03 -06:00
SabreCat 83c2e1774b Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release 2022-02-01 14:30:02 -06:00
SabreCat fb73ec3ad9 Merge remote-tracking branch 'Lyqst/news-post-datetime' into develop 2022-01-31 15:41:33 -06:00
SabreCat e7dc233fc9 Merge remote-tracking branch 'origin/feature/sprites-cdn' into develop 2022-01-31 15:40:27 -06:00
Phillip Thelen 6e43d4dc79 Add Transaction log for gem and hourglass changes (#13589)
* Log all gem transactions to database

* Also store hourglass transactions

* Fix tests

* Display transaction history in hall of heroes for admins

* add tests to new API call

* hide transaction settings tab for non admins

* fix(lint): remove console

* fix(lint): various automatic corrections

* fix(transactions): use enum expected pluralizations

* fix api unit tests

* fix lint

* fix failing test

* Fix minor inconsistencies

* Log all gem transactions to database

* Also store hourglass transactions

* Fix tests

* Display transaction history in hall of heroes for admins

* add tests to new API call

* hide transaction settings tab for non admins

* fix(lint): remove console

* fix(lint): various automatic corrections

* fix(transactions): use enum expected pluralizations

* fix api unit tests

* fix lint

* Fix minor inconsistencies

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2022-01-31 15:36:15 -06:00
Vanathi G 5beb29305d Fix selection highlight in avatar editor (#13746) 2022-01-31 15:35:17 -06:00
SabreCat de477ebb4a Revert "Revert "Revert "Prerequisites to removing Facebook authentication (#13683)"""
This reverts commit e3ffd7acbc.
2022-01-31 14:52:22 -06:00
SabreCat ba9a65c500 chore(sprites): compile 2022-01-31 10:58:02 -06:00
CuriousMagpie f2f3a1f0eb added Zodiac Zookeeper achievement 2022-01-28 17:14:50 -05:00
SabreCat 1a76ad5dca fix(news): use Moment timezone package 2022-01-27 15:54:03 -06:00
SabreCat 988f594298 Merge branch 'develop' into news-post-datetime 2022-01-27 15:34:18 -06:00
SabreCat e3ffd7acbc Revert "Revert "Prerequisites to removing Facebook authentication (#13683)""
This reverts commit b3c466ad5a.
2022-01-27 14:50:04 -06:00
CuriousMagpie 8637d55d2b changed a few stray 2021s to 2022 2022-01-26 16:45:54 -05:00
SabreCat b3c466ad5a Revert "Prerequisites to removing Facebook authentication (#13683)"
This reverts commit 1177ad8b8c.
2022-01-25 09:30:37 -06:00
Phillip Thelen 1177ad8b8c Prerequisites to removing Facebook authentication (#13683)
* Don't sign in user when trying to connect a social account that was already created

* Log social users into matching local auth accounts

If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account

* If possible set local authentication email for social users

* Allow password reset emails to be sent to social login users

* lint fixes

* Fix issues and tests

* fix tests

* Fix lint error.
2022-01-21 15:15:58 -06:00
SabreCat f01c352969 fix(chat): Enter key improvement by @maryketa 2022-01-21 14:55:34 -06:00
negue 21a3a81d5b Sprites: only create the css which points to the CDN 2022-01-07 22:12:43 +01:00
SabreCat 586801a1cf chore(sprites): compile 2022-01-06 16:28:29 -06:00
SabreCat 82ad85e564 feat(content): Armoire and Backgrounds Jan 2022 2022-01-06 16:28:16 -06:00
SabreCat 8824f6ac16 fix(sprites): add habitica-images as submodule 2021-12-31 13:03:02 -06:00
SabreCat 2e09f2d4fb chore(sprites): compile 2021-12-30 13:34:11 -06:00
SabreCat e2b506eb3c chore(sprites): compile 2021-12-28 14:38:54 -06:00
SabreCat c299e2e4d3 chore(sprites): compile 2021-12-21 15:32:20 -06:00
SabreCat 391a9bd91b feat(promo): G1G1 2021
Also refactors a number of places on web client to start using event 
list from world state instead of singular currentEvent
2021-12-15 16:20:43 -06:00
Lyqst fd4115ffcf Remove date from News title, add posting time in EST 2021-12-15 11:48:57 -03:00