7579bec587
allow another guild to use banned words in appropriate contexts
...
This commit also puts the list of guilds into alphabetical order.
2020-02-26 07:45:31 +10:00
c1e7fed4d4
move a word from slurs to swears as discussed with beffymaroo and mods
2020-02-26 07:44:36 +10:00
0280513a00
improvements to apidocs comments ( #11832 )
...
* make corrections and improvements to apidocs (no code changes)
* make further minor tweaks to apidocs that were previously changed
* make one extra small change for consistency
* fix lines that are too long
Each line was fixed by one of these:
- changing the wording
- breaking into separate lines
- adding eslint-disable-line max-len (necessary for `@api ` lines because
a line break there causes the first part of the text to not be displayed
on the apidocs website)
* apply eslint-disable max-len around block comments that need to have a long line
The `@api ` lines can't have a line break in them because it would
cause the first part of the text to not be displayed on the apidocs
website.
Using `// eslint-disable-line max-len` at the end of an `@api `
line doesn't work, possibly because it's nesting a comment inside
a multi-line comment.
The only way I've found to ignore the `max-len` rule is to put
disable and enable comments around the whole comment block.
2020-02-24 21:22:29 +01:00
5e31278d2a
chore(news): Bailey
2020-02-20 11:57:56 -06:00
0891908cba
Merge remote-tracking branch 'upstream/develop' into apidocs-comment-fixes
2020-02-20 09:47:44 +10:00
6a483edfe1
Resolves #11861 — Makes "quest already started" error descriptive ( #11862 )
...
* Resolves #11861
* Fix unit tests for translation changes
* Remove non-en quest.json locales
2020-02-19 16:07:17 +01:00
f413073d35
Merge branch 'release' into develop
2020-02-18 14:15:21 -06:00
69179c61b1
feat(content): Cotton Candy Pink Prizes
2020-02-17 11:37:37 -06:00
a60022e54d
Merge pull request #11859 from citrusella/apidocfixes
...
Fixing some typos, etc. in the API doc
2020-02-17 14:50:24 +01:00
d3d7ad2693
Add missing quote in values allowed on gem item
2020-02-14 21:37:21 -05:00
9a6f8021e3
Subscription Page Overhaul ( #11823 )
...
* WIP(settings): subscriber page improvements
* WIP(subscriptions): more design build-out
* fix(css): disabled button styles
* fix(css): better Amazon targeting
* WIP(g1g1): notif
* WIP(g1g1): notif cont'd
* WIP(gifting): partial modal implementation
* feat(gifting): select giftee modal
* fix(gifting): notification order, modal dismiss
* fix(modals): correct some repops
* fix(gifting): style updates
* fix(modals): also clean out "prev"
* refactor(modals): hide in dismiss event
* fix(modals): new dismiss logic
* fix(modals): new dismiss no go??
* WIP(subscription): unsubscribed state
* WIP(subscription): partial subscribed
* WIP(subscription): finish subscribed
* feat(subscription): revised sub page RC
* fix(subs): style tweaks
* fix(subs): moar style tweaks
2020-02-13 13:12:45 -06:00
c11a384a35
fix(news): link
2020-02-13 12:42:58 -06:00
80de90cc5f
Attempt to fix typos in the API doc
2020-02-12 15:40:44 -05:00
6324ef72df
feat(content): Magic Hatching Quest
2020-02-11 16:09:51 -06:00
107444043e
Merge branch 'release' into develop
2020-02-11 14:33:25 -06:00
0648f5d412
Prevent server from cancelling still active subs ( #11795 )
...
* Prevent server from cancelling still active subs
* Allow subs to be cancelled before end date
* fix test
* fix test
2020-02-11 12:58:11 -06:00
15976e906a
apply eslint-disable max-len around block comments that need to have a long line
...
The `@api ` lines can't have a line break in them because it would
cause the first part of the text to not be displayed on the apidocs
website.
Using `// eslint-disable-line max-len` at the end of an `@api `
line doesn't work, possibly because it's nesting a comment inside
a multi-line comment.
The only way I've found to ignore the `max-len` rule is to put
disable and enable comments around the whole comment block.
2020-02-08 16:06:00 +10:00
ac52da5be2
fix lines that are too long
...
Each line was fixed by one of these:
- changing the wording
- breaking into separate lines
- adding eslint-disable-line max-len (necessary for `@api ` lines because
a line break there causes the first part of the text to not be displayed
on the apidocs website)
2020-02-08 14:55:21 +10:00
1b39338eec
make one extra small change for consistency
2020-02-08 14:30:48 +10:00
6fe87a8140
make further minor tweaks to apidocs that were previously changed
2020-02-08 14:26:01 +10:00
c5d0ff63a5
make corrections and improvements to apidocs (no code changes)
2020-02-08 14:12:20 +10:00
6f7243c049
feat(event): Valentine's 2020
2020-02-07 14:16:25 -06:00
99a9bfe62e
chore(news): Bailey
2020-02-06 15:13:55 -06:00
b2cfeaf9bd
feat(content): Armoire and Backgrounds 2020-02
2020-02-04 15:42:12 -06:00
e800cd9a3f
chore(event): End Wonderland
2020-02-01 07:20:55 -06:00
728eaecfc8
Merge branch 'develop' into release
2020-01-31 06:47:26 -06:00
e31de5c8f0
feat(content): Feb 2020 subscriber set
2020-01-31 06:46:56 -06:00
82a5bc236f
clarify all "Invalid uuid" messages by making each unique
2020-01-29 15:49:55 +10:00
bc1eb62a35
feat(event): Birthday 2020
2020-01-28 15:39:05 -06:00
cbac69ab11
chore(news): Bailey
2020-01-23 15:47:53 -06:00
1f16891b15
Merge branch 'release' into develop
2020-01-21 15:47:39 -06:00
8bdd56587e
chore(timetrav): Bailey
2020-01-21 15:41:16 -06:00
ca69085e8c
Merge pull request #11549 from Nikosmonaut/bugfix-11522_group_plan_tags
...
Fix can not remove group tag
2020-01-19 12:29:04 +01:00
04960f8ff8
chore(news): Bailey
2020-01-16 16:11:40 -06:00
fcbc87afc2
Merge branch 'release' into develop
2020-01-14 14:59:58 -06:00
e15fdbbe05
fix(nye): no more hats
2020-01-14 14:59:28 -06:00
9510b2345c
Merge pull request #11636 from tsukimi2/bugfix-send-pmsg
...
Fix incorrect error when sending private messages to a player you have blocked (fixes #11612 )
2020-01-14 13:24:05 +01:00
fa9f962e45
Merge pull request #11707 from cvuorinen/11682-quest-invitation-webhook
...
Quest invitation webhook
2020-01-14 13:06:31 +01:00
8b569e2136
PMs rebuild ( #11360 )
...
* feat(messages): big PMs refactor
* add private messages route
* move to page
* WIP - header + begin with the sidebar
* extract userLabel + style sidebar + extract converstation item
* correct conversation item style
* toggle switch style
* add contributor / backer to conversation user-label
* fix shadows
* fix the conversations list (ignoring own sent)
* selected conversation label
* faceAvatar component
* fix message / avatar height
* fix message list / empty messages height
* new message padding/styles/functionality - finished sidebar conversation styling -
* fix loading messages + perfect-scrollbar
* fix load more line
* fix loading label
* open new conversation from outside
* if the user doesn't have avatar-data inside the conversation and does not exist anymore, just load/set the user name
* search bar new icon / style
* block using from conversation context-menu
* fix lint
* fix merge / lint
* fix merge
* first separate page
* fix tooltips + full width private message + card max width + more responsive
* separate conversations methods, to prevent circular deps
* update eslint config
* fix open new private message
* remove unneeded close icon + fix toggle-switch layout
* same content height on empty conversations - remove border / box-shadow
* canLoadMore = false
* remove inbox conditions on chat components
* hide footer / fix empty sidebar
* floating shadow
* remove tooltip on selected conversation user + pm always full-size
* show avatar on empty conversation
* disable face-avatar
* fix faceAvatar + story
* fix loading conversation messages while switching the conversation
* refresh private-messages page when you are already on it
* add countbadge knob to change the example
* fix lint
* fix hide tooltip + align header correctly
* disable perfect scroll
* load messages on refresh event
* fix header label + conversation actions not breaking layout on hover
* add gifting banner to the max height calculation
* correct chunk name
Co-authored-by: negue <negue@users.noreply.github.com >
Co-authored-by: Matteo Pagliazzi <matteopagliazzi@gmail.com >
2020-01-12 19:34:40 +01:00
a487c708be
Add documentation about questActivity and userActivity webhooks
2020-01-11 00:36:45 +02:00
9258f8ad26
Send questInvited webhooks
2020-01-11 00:32:10 +02:00
f47ccfdb6d
chore(event): enable winter customizations
2020-01-10 15:32:36 -06:00
7faf443197
chore(event): enable winter customizations
2020-01-10 15:32:08 -06:00
e6edaca11d
Add questInvited option to webhook model
2020-01-10 20:27:50 +02:00
fe9af263dd
Merge branch 'release' into develop
2020-01-07 11:48:09 -06:00
25809e5c00
feat(content): Armoire, BGs
2020-01-07 11:43:14 -06:00
f6ecc1cb84
chore(promo): end g1g1
2020-01-07 10:13:32 -06:00
d7d5d7e85a
Merge branch 'release' into develop
2020-01-06 12:13:00 -06:00
4a0c16065f
chore(news): Bailey
2020-01-06 12:12:34 -06:00
44bb304119
Merge branch 'release' into develop
2020-01-01 14:45:55 -06:00
Alys