Commit Graph

1937 Commits

Author SHA1 Message Date
Alys d464b98d9b add words to list of banned swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2022-02-06 15:50:25 +10:00
SabreCat ca4df96902 Merge branch 'release' into develop 2022-02-01 15:29:35 -06:00
SabreCat 83c2e1774b Merge remote-tracking branch 'CuriousMagpie/zodiac-zookeeper' into release 2022-02-01 14:30:02 -06:00
SabreCat b383574438 fix(event): it's 2022 now, lol 2022-02-01 14:27:08 -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
SabreCat de477ebb4a Revert "Revert "Revert "Prerequisites to removing Facebook authentication (#13683)"""
This reverts commit e3ffd7acbc.
2022-01-31 14:52:22 -06:00
SabreCat 5937635b3f feat(event): award to new users today
Also correct filename of 2022 migration
2022-01-31 10:57:49 -06:00
CuriousMagpie f2f3a1f0eb added Zodiac Zookeeper achievement 2022-01-28 17:14:50 -05:00
SabreCat e3ffd7acbc Revert "Revert "Prerequisites to removing Facebook authentication (#13683)""
This reverts commit b3c466ad5a.
2022-01-27 14:50:04 -06: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
Alys 6c841fbe17 add adult terms to list of swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2022-01-05 15:31:14 +10:00
SabreCat 5973bca327 feat(event): New Year's Eve 2021 2021-12-30 13:34:04 -06:00
SabreCat f2cfc2744d fix(Slack): improve subscription notif logic 2021-12-22 14:58:15 -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
negue a1cddcaf17 Feature: new "report a bug" modal (#13530)
* WIP: report a bug api/ui

* fix lint

* add USER_USERNAME

* extend sendTxn tests / checks + fix bug report email

* fix lint

* add more checks to sendTxn - fix bug-report variables

* fix lint / ci

* fix test: reset email config url

* fix test stub

* fix tests

* refactor the variables checks

* lint.

* move bug-report page as a modal

* send user_email to the email

* show true/false instead 1/0

* fix issues

* fix footer report bug email if not logged in

* fix styles/margins

* prefill user's email

* show facebook email if local email not existing

* bugReportSuccessModal.vue

* add BROWSER_UA to mail properties

* extract bugReportLogic to its own lib file for unit test

* test api validators

* fix lint
2021-12-14 19:16:50 -06:00
Natalie L 9e0e805d35 Fix: Updated challenge.js to allow shortName to be editable by party leader (#13654)
* updated challenge.js to allow shortName to be editable

* fix api-v3 integration test error
2021-12-14 15:54:57 -06:00
SabreCat 466aa38999 fix(lint): comma 2021-11-24 11:51:00 -06:00
SabreCat d20271e91f feat(content): Harvest Feast 2021 2021-11-24 11:23:09 -06:00
SabreCat cd5044e780 Revert "Revert "Set cache to private for the language resources""
This reverts commit c6d1954153.
2021-11-24 07:41:55 -06:00
SabreCat c6d1954153 Revert "Set cache to private for the language resources"
This reverts commit 90a14ee871.
2021-11-18 15:18:53 -06:00
SabreCat 31469a2d70 Revert "Make the linter happy"
This reverts commit df28670d16.
2021-11-18 15:18:30 -06:00
agares df28670d16 Make the linter happy 2021-11-18 19:28:44 +01:00
agares 90a14ee871 Set cache to private for the language resources 2021-11-18 19:14:00 +01:00
Alys 4951e82c8d add adult term to list of swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2021-11-10 15:05:30 +10:00
Alys e4c4e8c5e6 add an adult term to list of banned swear words - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2021-11-07 19:06:04 +10:00
Natalie L 5d87c2af13 fix: I18n string update (#13588)
* i18n string updates (issue #9210)

* change offHand to offHandCapitalized

* added removeTasks to challenge.json

* added hairBangs back to character.json

* added hairBangs back to character.json

* more hairBangs nonsense

* added hairBangs to hair-settings.vue, removed same from character.json

* changed levelUp to levelup in levelUp.vue and achievements.json

* fix duplicate string values

* fixed different strings with same content in different files

* updated test/api/v3 and test/api/v4 with messageTaskNotFound

* Delete POST-tasks_taskId_checklist_itemId_score.test.js

File got copied to a new directory, doesn't need to be here.

* fix: userID token in patrons.vue and heroes.vue

* removed: unused clock of code

* Restored eggsItemType to inventory.json

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-11-04 16:33:08 -05:00
Sabe Jones b39b42b3c2 Merge branch 'develop' into release 2021-10-28 13:55:11 -05:00
Sabe Jones 5e71abe64f feat(content): Habitoween 2021
Royal Purple Jack-O-Lantern Mount, Candy, Spooky Gem Sale, Subscriber 
Mystery Items for November
2021-10-28 13:52:46 -05:00
Matheus Lima Cunha 72a0313fb2 Prevent Cron from incorrectly updating loggedIn (#13559)
* Prevent Cron from incorrectly updating loggedIn

* fix(lint): missing comma

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-10-21 17:39:16 -05:00
Benja Appel c6e7b18e8b Api task streak default value (#13557)
* Default value for task streak (fix #13372)

* Truncate task streak value decimals on update
2021-10-21 15:47:17 -05:00
Sabe Jones 496153b6e9 Merge branch 'release' into develop 2021-10-21 10:50:05 -05:00
Sabe Jones d2ddb743b6 feat(content): Shade pet/mount collection achievements 2021-10-21 10:49:22 -05:00
Sabe Jones 823a35b859 fix(cron): remove now-erroneous function call 2021-10-14 15:26:28 -05:00
Sabe Jones 0480681006 chore(ABtest): remove vestigial drop cap A/B test code 2021-10-14 15:04:14 -05:00
KoRnoliX d2a0d4194a Fix casting items on parties that exceed it limit by showing Load More Button (#13509)
* Fixed party size and notification when inviting

Fixed party limit to 30 members (previously 31) and pop-up when trying
to invite someone, when party has already reached it's members limit, to properly
show members number.

* Fixed View Party button in header

Fixed View Party button in header to properly show Load More button
when party size exceeds party limit.

* Fixed View Party button to properly open party

Fixed View Party button to properly open party members list on refreshing the main page, this bug was
caused by previous commit.

* Fixed SelectMembersModal to properly show Load More button

Fixed SelectMembersModal (the modal that apperas when casting
cards/specials on party member) to properly show Load More button when party size exceeds party limit

* fix(test): limit now technically 29 plus leader

* fix(test): adjust for tweakage

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2021-10-07 15:41:22 -05:00
Seth Falco 72fc134a88 chore: replace http wiki links with https (#13528) 2021-10-01 17:58:09 -05:00
Sabe Jones 60f251a8c7 fix(apidoc): change path in middleware and lintignore 2021-09-24 11:18:06 -05:00
Benja Appel c5b0833bf2 fix cloned challenge task order (#13328) (#13506)
* fix cloned challenge task order (#13328)

* fix lint errors
2021-09-17 16:33:42 -05:00
Melvin 22db983f40 Improve the checklists in the apidocs (#13476) 2021-09-01 18:47:35 -05:00
Sabe Jones 0fb1fd5756 Merge branch 'release' into develop 2021-08-30 16:26:28 -05:00
Sabe Jones 40bf664f20 chore(analytics): various updates to analytics tracking 2021-08-30 16:21:05 -05:00
negue 53424d548a Rework Notifications: separate and bundle to an amount of 4 (#13300)
* WIP notifications only show 2 at once

* separate and bundle notifications to pairs

* notification fadein/-out/move animations - remove notifications on an interval instead of calculated timeouts

* easier way to import all sprite css files

* add stories + fix sizes / paddings + click to hide + animation fixes

* keep notification at the top but always under the toolbars

* change animations to ease-in 0.25s + add prop to change the delay between deletion and add

* fix adding logic in a rare case of added notifications when only one item is currently visible + add debug mode

* disable lint for notification console

* add more notification example trigger buttons

* potential fix of animation / queue

* increase amount of notifications to 4

* fix sanity

* fix test:unit call again

* new notification styles - fix animations

* keep error notifications visible until manually removed + refactor adding/removal logic

* fix margins

* prevent multiple filling + different delay on filling

* stop and restart removal timer on new notifications

* reduce line-height / apply different margin for icons

* move sprites.scss out and use it in app.vue as well

* update sprites back to 31
2021-08-26 19:56:41 -05:00
Nat Welch 7870ffece8 fix(cors): Allow all origins to support 3rd party tools (#13383) 2021-08-26 18:12:11 -05:00
Jon Wolverton f86bb98ccd Collection quest ignoring items (#13401)
* update tests to check for issue #12664

* rewrite processCollectionQuest to allocate quest items proportionally

Removes need to check for excess items, fixing issue #12664

* move test for this bug to the correct context section & remove redundant test

* refactor processCollectionQuest more

* tweak confusing comments
2021-08-26 16:33:29 -05:00
Sabe Jones 48f1bec83a feat(content): Time Traveler quest, achievement 2021-08-24 15:42:40 -05:00
Phillip Thelen cca1565b99 Send group ID with @mention push notifications (#13440)
This allows the apps to open the correct group page directly
2021-08-12 16:19:01 -05:00
Phillip Thelen e830e676c3 Add additional data about dailies to task history (#13444) 2021-08-12 15:38:11 -05:00
Sabe Jones 9e9a301f04 chore(analytics): open the task firehose 2021-07-02 14:52:45 -05:00
PitiTheGrey 1037510c9d Add 'questOwner' to the return data of a 'questActivity' webhook. (#13277)
* Update webhook.js

Add `questOwner: group.quest.leader,` to webhook.js

* Update POST-groups_groupId_quests_invite.test.js

Test if questOwner contains the correct data

* Update POST-groups_groupId_quests_invite.test.js

* Update webhooks.test.js
2021-05-28 16:59:14 -05:00