Commit Graph

234 Commits

Author SHA1 Message Date
Sabe Jones 07d6969764 Merge branch 'develop' into release 2020-02-27 15:00:46 -06:00
Sabe Jones 5807db9053 chore(news): Last Chance Bailey 2020-02-27 15:00:33 -06:00
Matteo Pagliazzi 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
Sabe Jones 5e31278d2a chore(news): Bailey 2020-02-20 11:57:56 -06:00
Alys 0891908cba Merge remote-tracking branch 'upstream/develop' into apidocs-comment-fixes 2020-02-20 09:47:44 +10:00
Sabe Jones 69179c61b1 feat(content): Cotton Candy Pink Prizes 2020-02-17 11:37:37 -06:00
Sabe Jones c11a384a35 fix(news): link 2020-02-13 12:42:58 -06:00
Sabe Jones 6324ef72df feat(content): Magic Hatching Quest 2020-02-11 16:09:51 -06:00
Alys c5d0ff63a5 make corrections and improvements to apidocs (no code changes) 2020-02-08 14:12:20 +10:00
Sabe Jones 6f7243c049 feat(event): Valentine's 2020 2020-02-07 14:16:25 -06:00
Sabe Jones 99a9bfe62e chore(news): Bailey 2020-02-06 15:13:55 -06:00
Sabe Jones b2cfeaf9bd feat(content): Armoire and Backgrounds 2020-02 2020-02-04 15:42:12 -06:00
Sabe Jones e800cd9a3f chore(event): End Wonderland 2020-02-01 07:20:55 -06:00
Sabe Jones e31de5c8f0 feat(content): Feb 2020 subscriber set 2020-01-31 06:46:56 -06:00
Sabe Jones bc1eb62a35 feat(event): Birthday 2020 2020-01-28 15:39:05 -06:00
Sabe Jones cbac69ab11 chore(news): Bailey 2020-01-23 15:47:53 -06:00
Sabe Jones 8bdd56587e chore(timetrav): Bailey 2020-01-21 15:41:16 -06:00
Sabe Jones 04960f8ff8 chore(news): Bailey 2020-01-16 16:11:40 -06:00
Sabe Jones f47ccfdb6d chore(event): enable winter customizations 2020-01-10 15:32:36 -06:00
Sabe Jones 25809e5c00 feat(content): Armoire, BGs 2020-01-07 11:43:14 -06:00
Sabe Jones 4a0c16065f chore(news): Bailey 2020-01-06 12:12:34 -06:00
Sabe Jones 904dfd3d72 chore(news): Bailey 2020-01-01 14:45:18 -06:00
Sabe Jones 2693d49870 feat(content): NYE 2019-20 etc 2019-12-30 15:05:45 -06:00
Sabe Jones da9e07d71a chore(news): bailey 2019-12-26 14:20:42 -06: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
Sabe Jones 40ba81a5d9 feat(content): FFFFFF Achievements 2019-12-10 14:41:39 -06:00
Sabe Jones 1224d6d0c9 feat(content): Armoire and BGs 2019-12 2019-12-03 20:25:50 +00:00
Sabe Jones 11ebc6c397 chore(event): end Turkeys, Bailey 2019-12-02 17:15:41 -06:00
Sabe Jones e597906f35 feat(content): Harvest Feast 2019 2019-11-27 15:45:37 -06:00
Sabe Jones 194f2d512a feat(content): Amber Hatching Potion Quest 2019-11-26 15:58:18 -06:00
Sabe Jones e0b8cfbaa7 feat(content): mystery items Nov 2019 2019-11-21 16:17:06 -06:00
Sabe Jones 23bd51d486 chore(news): BlogBailey 2019-11-19 15:25:53 -06:00
Sabe Jones 645f40f7e0 feat(content): Delightful Dinos Bundle 2019-11-14 15:08:45 -06:00
Sabe Jones dc303fb1de feat(content): enable some Magic Hatching Potions 2019-11-12 15:31:17 -06:00
Sabe Jones 3e2a49103e feat(content): Armoire and BGs 2019-11
and disable October Magic Potions
2019-11-05 10:29:39 -06:00
Sabe Jones a2a251b2f1 chore(event): end Fall Festival & Habitoween 2019-11-01 20:13:52 -05:00
Sabe Jones 52719ac685 fix(lint): line length 2019-10-31 15:32:20 -05:00
Sabe Jones d79e0b32d2 feat(event): Habitoween 2019 2019-10-31 15:03:25 -05:00
Sabe Jones 9a4e6a5012 Merge branch 'release' into develop 2019-10-24 15:49:55 -05:00
Sabe Jones 2bcf00fb54 feat(content): Mystery Items 2019-10 2019-10-24 15:36:32 -05:00
Sabe Jones 3031caffe8 fix(tests): bad merge, linting 2019-10-22 12:53:00 -05:00
Sabe Jones 7461a5d509 Merge branch 'release' into develop 2019-10-22 10:37:29 -05:00
Sabe Jones 0dd8cab2a0 feat(content): Zombie color bingo achievements 2019-10-22 10:19:02 -05:00
Matteo Pagliazzi 94b34f1f80 Merge branch 'develop' into client-monorepo 2019-10-18 17:03:41 +02:00
Sabe Jones abfcb4ef44 chore(news): Bailey 2019-10-17 15:06:04 -05:00
Sabe Jones ea9d939577 chore(content): enable Witchy Familiars Bundle 2019-10-15 14:12:18 -05:00
Matteo Pagliazzi 8bae0223bb fix linting for server (except for length of apidoc) 2019-10-10 20:11:50 +02:00
Matteo Pagliazzi 9cd43db401 Merge branch 'develop' into client-monorepo 2019-10-08 23:01:07 +02:00
Sabe Jones e47c3211b0 feat(content): enable Fall customizations 2019-10-08 15:36:24 -05:00