Commit Graph

421 Commits

Author SHA1 Message Date
Sabe Jones 8dbbfcd3a1 Scheduling summary line for team Dailies and To Do's (#12439)
* WIP(dailies): summary sentence draft

* fix(dailies): hide summarized fields, handle future Daily start date

* fix(dailies): don't apply summary sentence to Challenges
...for the sake of non-English users

* fix(dailies): tweak date x Challenge logic

* refactor(dailies): use native JS forEach
2020-08-20 14:12:05 -05: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
Sabe Jones 6255c5dcc7 feat(content): golden achievements 2020-08-18 15:13:06 -05:00
Sabe Jones 0f81c5cbdb Merge branch 'develop' into release 2020-08-13 16:21:21 -05:00
Sabe Jones d3fdfe33fb chore(news): Bailey 2020-08-13 16:20:52 -05:00
Sabe Jones cec3e67b16 Merge branch 'release' into develop 2020-08-11 15:44:48 -05:00
Sabe Jones ce32477af7 chore(sprites): compile 2020-08-11 15:43:38 -05:00
Matteo Pagliazzi d7ee1ec4f4 remove modals stack (#12423) 2020-08-10 18:38:24 +02:00
Sabe Jones 8c3a9c6dbc fix(teams): smol tweaks (#12443) 2020-08-10 11:27:19 -05:00
negue d2fc7c0c3d UI: redesign DatePicker (#12418)
* extract datepicker & settings as component + redesign

* fix updating values + fix button styling + popover position

* remove eslint-config-standard / html
2020-08-09 22:25:56 +02:00
Carlton McFarlane 13a5b276e9 fix(quest shop): add an index to v-for loop (#12446) 2020-08-09 19:58:40 +02:00
Rogesson 0a47af4ac3 update group members after accepting the quest (without page reload) (#12358)
* update group members after accepting the quest (without page reload)

* show quest information after starting

* removing quest.progress.up assignment

Co-authored-by: rogesson <rogesson.barboza@locaweb.com.br>
2020-08-09 19:44:46 +02:00
Jalansh c0bf2cffea Casting Chilling Frost and Stealth skill again will not be processed and return an error instead. Fixes #12361. (#12404)
* Added logic for a repeating Chilling Frost skill. Added test case for redundant chilling frost skill cast. Added comments for the logic of repeating Stealth skill because of an error.

* Added logic for a repeating Stealth skill. Avoiding MP reduction still pending because of console error. Test cases pending.

* Completed the logic for a repeated Stealth skill. Added repeated frost skill cast check in common. Removed exclusive test. Test cases are pending.

* Added test case for Stealth skill recast. Fixed lint errors. Fixed a flaw in if statement which led to test case failure.

* Fixed lint errors in test case.

* Added a common JSON entry for skil recasts in three files. Other files remaining. Added Chilling Frost recast check in common code. Modified test cases.

* Added spellDisabled condition in client code.

* Reverted JSON messages for three languages. Added spellAlreadyCast attribute to JSON file in locales/en. Made changes for showing appropriate message in client code.

* Added an import for throwing BadRequest in common code. Modified test case accordingly.

* Update website/common/script/content/spells.js

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>

* Added target and req attributes in cast() method arguments.

* Changed common code test case because of increased function parameters. Moved chilling frost test casse to common tests instead of server tests.

* Changed the test case format in common tests.

* Added a missing done statement.

* Fixed a minor error which led to failing test case. Removed the exclusive test which led to lint error.

* Fixed lint errors.

* Added a class named 'disabled' for the frontend change.

* fix(skills): style cleanup

* fix(skills): unfix

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-08-09 18:25:59 +02:00
Sabe Jones e7af07cebb Merge branch 'develop' into release 2020-08-07 15:22:43 -05:00
Sabe Jones 7daaf04d0d fix(event): client Gala reversions 2020-08-03 13:50:30 -05:00
Sabe Jones 9a0e029491 Merge branch 'release' into develop 2020-08-03 13:27:57 -05:00
Sabe Jones 74244fd3ba chore(event): Splash cleanup and Bailey 2020-08-03 13:26:53 -05:00
Matteo Pagliazzi 65e15e0c1d Fix multiple purchases with Amazon Pay (#12422)
* fix(amazon): logout when modal is closed, prevents issue with multiple order reference ids

* amazon logout when the button is loaded the first time
2020-08-03 15:34:18 +02:00
Sabe Jones 43fb747c8f Merge branch 'release' into develop 2020-07-31 14:45:36 -05:00
Sabe Jones e4c95275ac chore(event): Naming Day news and migration 2020-07-31 14:38:41 -05:00
Carlton 59f4e7f598 fix (task list) replace deprecated cache-busting of computed properties with methods 2020-07-31 11:41:00 +02:00
Sabe Jones 8003632041 fix(modals): remove unnecessary scrollbar (#12416)
Fixes #9863
2020-07-30 15:01:18 -05:00
Sabe Jones 7546733ae9 Merge branch 'release' into develop 2020-07-28 10:01:31 -05:00
Sabe Jones da5bb795ca chore(sprites): compile 2020-07-28 10:00:01 -05:00
Sabe Jones 7280c50963 feat(content): Freshwater Friends cheevo 2020-07-27 14:17:43 -05:00
Matteo Pagliazzi 79c64763ac fix(lint): automatically fix lint warnings 2020-07-25 18:56:19 +02:00
negue aaf32cc09b Teams UI Redesign and A11y Updates (#12142)
* WIP(a11y): task modal updates

* fix(tasks): borders in modal

* fix(tasks): circley locks

* fix(task-modal): placeholders

* WIP(task-modal): disabled states, hide empty options, +/- restyle

* fix(task-modal): box shadows instead of borders, habit control pointer

* fix(task-modal): button states?

* fix(modal): tighten up layout, new spacing utils

* fix(tasks): more stylin

* fix(tasks): habit hovers

* fix(css): checklist labels, a11y colors

* fix(css): one more missed hover issue

* fix(css): lock Challenges, label fixes

* fix(css): scope input/textarea changes

* fix(style): task tweakies

* fix(style): more button fixage

* WIP(component): start select list story

* working example of a templated selectList

* fix(style): more button corrections

* fix(lint): EOL

* fix(buttons): factor btn-secondary to better override Bootstrap

* fix(styles): standardize more buttons

* wip: difficulty select - style fixes

* selectDifficulty works! 🎉 - fix styles

* change the dropdown-item sizes only for the selectList ones

* selectTranslatedArray

* changed many label margins

* more correct dropdown style

* fix(modals): button corrections

* input-group styling + datetime picker without today button

* Style/margins for "repeat every" - extract selectTag.vue

* working tag-selection / update - cleanup

* fix stories

* fix svg color on create modal (purple)

* fix task modal bottom padding

* correct dropdown shadow

* update dropdown-toggle caret size / color

* fixed checklist style

* sync checked state

* selectTag padding

* fix spacing between positive/negative streak inputs

* toggle-checkbox + fix some spacings

* disable repeat-on when its a groupTask

* fix new checklist-item

* fix toggle-checkbox style - fix difficulty style

* fix checklist ui

* add tags label , when there arent any tags selected

* WORKING select-tag component 🎉

* fix taglist story

* show max 5 items in tag dropdown + "X more" label

* fix datetime clear button

* replace m-b-xs to mb-1 (bootstrap) - fix input-group-text style

* fix styles of advanced settings

* fix delete task styles

* always show grippy on hover of the item

* extract modal-text-input mixin + fix the borders/dropshadow

* fix(spacing): revert most to Bootstrap

* feat(checklists): make local copy of master checklist non-editable
also aggressively update checklists because they weren't syncing??

* fix(checklists): handle add/remove options better

* feat(teams): manager notes field

* fix select/dropdown styles

* input border + icon colors

* delete task underline color

* fix checklist "delete icon" vertical position

* selectTag fixes - normal open/close toggle working again - remove icon color

* fixing icons:

Trash can - Delete
Little X - Remove
Big X - Close
Block - Block

* fix taglist margins / icon sizes

* wip margin overview (in storybook)

* fix routerlink

* remove unused method

* new selectTag style + add markdown inside tagList + scrollable tag selection

* fix selectTag / selectList active border

* fix difficulty select (svg default color)

* fix input padding-left + fix reset habit streak fullwidth / padding + "repeat every" gray text (no border)

* feat(teams): improved approval request > approve > reward flow

* fix(tests): address failures

* fix(lint): oops only

* fix(tasks): short-circuit group related logic

* fix(tasks): more short circuiting

* fix(tasks): more lines, less lint

* fix(tasks): how do i keep missing these

* feat(teams): provide assigning user summary

* fix(teams): don't attempt to record assiging user if not supplied

* fix advanced-settings styling / margin

* fix merge + hide advanced streak settings when none enabled

* fix styles

* set Roboto font for advanced settings

* Add Challenge flag to the tag list

* add tag with enter, when no other tag is found

* fix styles + tag cancel button

* refactor footer / margin

* split repeat fields into option mt-3 groups

* button all the things

* fix(tasks): style updates
* no hover state for non-editable tasks on team board
* keep assign/claim footer on task after requesting approval
* disable more fields on user copy of team task, and remove hover states 
for them

* fix(tasks): functional revisions
* "Claim Rewards" instead of "x" in task approved notif
* Remove default transition supplied by Bootstrap, apply individually to 
some elements
* Delete individual tasks and related notifications when master task 
deleted from team board
* Manager notes now save when supplied at task initial creation
* Can no longer dismiss rewards from approved task by hitting Dismiss 
All

* fix(tasks): clean tasksOrder
also adjust related test expectation

* fix(tests): adjust integration expectations

* fix(test): ratzen fratzen only

* fix(teams): checklist, notes

* fix(teams): improve disabled states

* fix(teams): more style fixage

* BREAKING(teams): return 202 instead of 401 for approval request

* fix(teams): better taskboard sync
also re-re-fix checklist borders

* fix(tests): update expectations for breaking change

* refactor(task-modal): lockable label component

* refactor(teams): move task scoring to mixin

* fix(teams): style corrections

* fix(tasks): spacing and wording corrections

* fix(teams): don't bork manager notes

* fix(teams): assignment fix and more approval flow revisions

* WIP(teams): use tag dropdown control for assignment

* refactor(tasks): better spacing, generic multi select

* fix(tasks): various visual and behavior updates

* fix(tasks): incidental style tweaks

* fix(teams): standardize approval request response

* refactor(teams): correct test, use res.respond message param

* fix(storybook): renamed component

* fix(teams): age approval-required To Do's
Fixes #8730

* fix(teams): sync personal data as well as team on mixin sync

* fix(teams): hide unclaim button, not whole footer; fix switch focus

* fix(achievements): unrevert width fix

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-07-25 07:37:10 -05:00
Jake North 7ee6ff18ce Fix height of badges in multiline achievements (#12406)
This fixes the UI bug I reported where achievement names taking up multiple lines cause badges to stretch to fill their container.

Screenshot of bug: https://i.snipboard.io/07GBi4.jpg
Screenshot of fix: https://i.snipboard.io/PKvi8e.jpg
2020-07-25 13:46:06 +02:00
Bart Enkelaar 234258b41e Move from deprecated moment#zone to moment#utcOffset (#12207)
* Issue 10209 - Remove read usages of zone

* Issue 10209 - Add coverage on daysSince and startOfDay cron utility functions

* Issue 10209 - Add unit test for daysUserHasMissed method

* Issue 10209 - Remove usages of deprecated `moment.js#zone` method.

* Issue 10209 - Add helper function to centralise logic

Also simplify timezoneOffsetToUtc function in site.vue

* Issue 10209 - Also add getUtcOffset as method on user

Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com>
2020-07-25 13:22:41 +02:00
Sabe Jones bea77e9520 Merge branch 'develop' into release 2020-07-23 10:44:40 -05:00
Sabe Jones 108201a465 chore(sprites): compile 2020-07-23 10:44:12 -05:00
Sabe Jones 8d9851a489 Merge branch 'release' into develop 2020-07-21 14:58:42 -05:00
Sabe Jones c5e02292c4 feat(content): award yearly Orcas 2020-07-21 14:57:52 -05:00
negue 0261d12bd9 Profile Page: redesign gear label (#12395)
* redesign gear label + lintOnSave not in development environment

* fix lint / build

* fix(lint): remove extra parens

* fix break-word + remove lintOnSave

* remove unneeded styles

Co-authored-by: Sabe Jones <sabrecat@gmail.com>
2020-07-17 12:43:27 +02:00
Sabe Jones 0af5593611 chore(sprites): compile 2020-07-16 15:11:49 -05:00
Sabe Jones e54bd8f242 Merge branch 'develop' into release 2020-07-16 14:58:25 -05:00
Sabe Jones 15753de3a1 feat(content): Seafoam and Amigos 2020-07-14 16:11:34 -05:00
negue 0acc7d19c5 fix filter reset on pinning items - fixes #9500 2020-07-12 20:43:51 +02:00
Sabe Jones 195928e471 Merge branch 'release' into develop 2020-07-10 11:05:31 -05:00
Sabe Jones 9e82ba261b fix(columns): avoid a Vue error on initial load 2020-07-10 10:50:27 -05:00
negue 566dd2b6b1 fix new pm canReceive (#12369) 2020-07-08 11:30:27 +02:00
Sabe Jones 955c41f744 Merge branch 'release' into develop 2020-07-07 14:53:52 -05:00
Sabe Jones 264d6b466a chore(sprites): compile 2020-07-07 14:39:27 -05:00
Matteo Pagliazzi 45a22470fa fix 9351: sync player that casts spells immediately (#12367) 2020-07-05 00:01:02 +02:00
Matteo Pagliazzi 1efcaa4a1d fix #12364, profile of logged in user did not show up correctly 2020-07-03 14:35:29 +02:00
Matteo Pagliazzi cc5e3ed123 fix #12364, profile of logged in user did not show up correctly 2020-07-03 14:17:39 +02:00
Sabe Jones 5a7e1cbc5a Merge branch 'release' into develop 2020-07-01 16:37:22 -05:00
Sabe Jones fb6eacf8f9 chore(news): Bailey 2020-07-01 16:36:51 -05:00
Matteo Pagliazzi 3d5630d5a2 chore: update sub-deps and fix lint 2020-07-01 18:20:18 +02:00
Sabe Jones 40cadba7bf Merge branch 'release' into develop 2020-06-29 15:15:54 -05:00