Commit graph

  • 107444043e Merge branch 'release' into develop Sabe Jones 2020-02-11 14:33:25 -0600
  • e6ba1ccca7 4.132.3 Sabe Jones 2020-02-11 14:30:49 -0600
  • 8edd2cfd14 Merge branch 'sabrecat/valentines-2020' into release Sabe Jones 2020-02-11 14:30:27 -0600
  • 897b192852 fix(profiles): short circuit contributor Attempted fix for #11830 Sabe Jones 2020-02-11 13:51:44 -0600
  • 0648f5d412
    Prevent server from cancelling still active subs (#11795) Phillip Thelen 2020-02-11 19:58:11 +0100
  • 732426c176
    build(deps): bump @vue/cli-plugin-babel in /website/client (#11851) dependabot-preview[bot] 2020-02-11 17:34:59 +0100
  • 4df8022811
    build(deps): bump @vue/cli-service in /website/client (#11850) dependabot-preview[bot] 2020-02-11 17:32:13 +0100
  • b153c6d054
    build(deps): bump @vue/cli-plugin-router in /website/client (#11836) dependabot-preview[bot] 2020-02-11 17:32:03 +0100
  • c0e1a31937
    build(deps): bump @storybook/addon-notes in /website/client (#11841) dependabot-preview[bot] 2020-02-11 17:30:46 +0100
  • 7a13d061d7
    build(deps): bump aws-sdk from 2.610.0 to 2.615.0 (#11854) dependabot-preview[bot] 2020-02-11 17:27:46 +0100
  • ac29d662ef
    build(deps): bump @storybook/addon-links in /website/client (#11846) dependabot-preview[bot] 2020-02-11 17:27:25 +0100
  • 247246b99d
    build(deps): bump @storybook/addon-actions in /website/client (#11837) dependabot-preview[bot] 2020-02-11 17:27:14 +0100
  • 13fa1924ae
    build(deps): bump amplitude-js from 5.8.0 to 5.9.0 in /website/client (#11838) dependabot-preview[bot] 2020-02-11 17:25:56 +0100
  • d55400cc80
    build(deps): bump @vue/cli-plugin-eslint in /website/client (#11839) dependabot-preview[bot] 2020-02-11 17:25:44 +0100
  • 100c7c4395
    build(deps): bump rimraf from 3.0.1 to 3.0.2 (#11840) dependabot-preview[bot] 2020-02-11 17:25:25 +0100
  • 53510e3ea7
    build(deps): bump @storybook/vue in /website/client (#11843) dependabot-preview[bot] 2020-02-11 17:25:08 +0100
  • c643f6a16c
    build(deps): bump bcrypt from 3.0.7 to 3.0.8 (#11847) dependabot-preview[bot] 2020-02-11 17:24:45 +0100
  • 1c4a941c88
    build(deps): bump @storybook/addon-knobs in /website/client (#11849) dependabot-preview[bot] 2020-02-11 17:24:13 +0100
  • 7c0da8051f
    build(deps): bump @vue/cli-plugin-unit-mocha in /website/client (#11835) dependabot-preview[bot] 2020-02-11 17:23:56 +0100
  • 6c70076c30 Translated using Weblate (Malay) Melior 2020-02-11 11:11:39 +0100
  • 15976e906a apply eslint-disable max-len around block comments that need to have a long line Alys 2020-02-08 16:06:00 +1000
  • ac52da5be2 fix lines that are too long Alys 2020-02-08 14:55:21 +1000
  • 1b39338eec make one extra small change for consistency Alys 2020-02-08 14:30:48 +1000
  • 6fe87a8140 make further minor tweaks to apidocs that were previously changed Alys 2020-02-08 14:26:01 +1000
  • c5d0ff63a5 make corrections and improvements to apidocs (no code changes) Alys 2020-02-08 14:12:20 +1000
  • 6f7243c049 feat(event): Valentine's 2020 Sabe Jones 2020-02-07 14:16:25 -0600
  • 71cc313c9a Merge branch 'origin/develop' into Weblate. Melior 2020-02-06 22:17:35 +0100
  • 788992b8fa Translated using Weblate (Malay) Melior 2020-02-06 22:17:18 +0100
  • ff87a346d6 4.132.2 Sabe Jones 2020-02-06 15:14:53 -0600
  • 99a9bfe62e chore(news): Bailey Sabe Jones 2020-02-06 15:13:55 -0600
  • 4f10f534ee Merge branch 'release' into develop Sabe Jones 2020-02-05 05:32:18 -0600
  • 2053e6cc40 4.132.1 Sabe Jones 2020-02-05 05:31:53 -0600
  • 6a2e84e7cc fix(sprites): new spritesheet Sabe Jones 2020-02-05 05:31:20 -0600
  • 301b171f55 Merge branch 'develop' into fix_addlNotes MynahMarie 2020-02-05 10:53:52 +0200
  • 08baa2ca20 remove package-lock.json from PR MynahMarie 2020-02-05 10:44:45 +0200
  • 2081590a19 Merge branch 'origin/develop' into Weblate. Melior 2020-02-04 22:45:36 +0100
  • f719592237 Translated using Weblate (Korean) Melior 2020-02-04 22:45:05 +0100
  • 25ac3db8c3 Merge branch 'release' into develop Sabe Jones 2020-02-04 15:43:14 -0600
  • 20472caaee 4.132.0 Sabe Jones 2020-02-04 15:42:29 -0600
  • 37ab993b01 chore(sprites): compile Sabe Jones 2020-02-04 15:42:23 -0600
  • b2cfeaf9bd feat(content): Armoire and Backgrounds 2020-02 Sabe Jones 2020-02-04 15:42:12 -0600
  • 7c83cfe9b4 fix merge conflicts MynahMarie 2020-02-03 16:23:47 +0200
  • 57e12c67ac
    build(deps): bump @storybook/addon-knobs in /website/client (#11811) dependabot-preview[bot] 2020-02-03 09:50:07 +0100
  • 775ed7f873
    build(deps): bump @storybook/addon-notes in /website/client (#11810) dependabot-preview[bot] 2020-02-03 09:49:52 +0100
  • b608ca4d72
    build(deps): bump @babel/core from 7.8.3 to 7.8.4 (#11814) dependabot-preview[bot] 2020-02-03 09:47:23 +0100
  • 1536bbfce5
    build(deps): bump js2xmlparser from 4.0.0 to 4.0.1 (#11818) dependabot-preview[bot] 2020-02-03 09:47:15 +0100
  • d4957f39a2
    build(deps): bump @storybook/addon-links in /website/client (#11809) dependabot-preview[bot] 2020-02-03 09:47:02 +0100
  • 6d8833a83f
    build(deps): bump rimraf from 3.0.0 to 3.0.1 (#11819) dependabot-preview[bot] 2020-02-03 09:46:52 +0100
  • bb7b1c15ee
    build(deps): bump mongoose from 5.8.9 to 5.8.11 (#11815) dependabot-preview[bot] 2020-02-03 09:46:41 +0100
  • 9b43ff75fc
    build(deps): bump bootstrap-vue from 2.3.0 to 2.4.0 in /website/client (#11812) dependabot-preview[bot] 2020-02-03 09:45:53 +0100
  • 0aaac9988c
    build(deps): bump @storybook/vue from 5.3.9 to 5.3.10 in /website/client (#11808) dependabot-preview[bot] 2020-02-03 09:45:42 +0100
  • edcd587b03
    build(deps): bump @storybook/addon-actions in /website/client (#11807) dependabot-preview[bot] 2020-02-03 09:45:12 +0100
  • e0b2437f60
    build(deps): bump @babel/preset-env from 7.8.3 to 7.8.4 (#11817) dependabot-preview[bot] 2020-02-03 09:44:23 +0100
  • 3045be3ddf ref issue #11794 - Add error check in _addlNotes field. MynahMarie 2020-02-02 14:56:20 +0200
  • 57b2166bde NPC style should apply to tier $800 only (#11797) Nik 2020-02-02 11:58:32 +0100
  • 39b3ebe04a
    NPC style should apply to tier $800 only (#11797) Nik 2020-02-02 11:58:32 +0100
  • 81c58d2122 update package.json MynahMarie 2020-02-02 11:54:45 +0200
  • a607882214 Merge branch 'release' into develop Sabe Jones 2020-02-01 12:07:53 -0600
  • 0d843d53a5 4.131.4 Sabe Jones 2020-02-01 12:07:32 -0600
  • 34145ed8ca fix(event): decakeify Sabe Jones 2020-02-01 12:07:23 -0600
  • ad3b673fda fix(member details): disable name style in header Matteo Pagliazzi 2020-02-01 15:03:46 +0100
  • 4e6b411763 fix(dropdown): correct dropdown menus colors Matteo Pagliazzi 2020-02-01 14:54:34 +0100
  • dec7bd2ec6 Merge branch 'release' into develop Sabe Jones 2020-02-01 07:27:02 -0600
  • 1cc3633e64 4.131.3 Sabe Jones 2020-02-01 07:26:47 -0600
  • 64c79b7eb6 chore(sprites): compile Sabe Jones 2020-02-01 07:26:40 -0600
  • b2d997c5a6 Merge branch 'release' into develop Sabe Jones 2020-02-01 07:21:23 -0600
  • 1b14c5f6d5 4.131.2 Sabe Jones 2020-02-01 07:21:08 -0600
  • e800cd9a3f chore(event): End Wonderland Sabe Jones 2020-02-01 07:20:55 -0600
  • 68aeda44d4 Merge branch 'release' into develop Sabe Jones 2020-02-01 06:27:22 -0600
  • 443f88ac41 4.131.1 Sabe Jones 2020-02-01 06:24:25 -0600
  • d77b791d56 fix(sprites): rename February items Sabe Jones 2020-02-01 06:21:47 -0600
  • d5c7ced5e3
    Merge pull request #11763 from Kevin-DDR/fixTiers Matteo Pagliazzi 2020-02-01 12:01:34 +0100
  • f45fdfbe0d
    Merge pull request #11708 from alexthomson1/issue-11615 Matteo Pagliazzi 2020-02-01 11:23:29 +0100
  • 311df85dfc Show "no owner" when challenge leader cannot be found Tom Thorpe 2020-02-01 09:17:59 +0000
  • 0e8fb62887 Merge branch 'origin/develop' into Weblate. Melior 2020-01-31 13:55:45 +0100
  • 4d2b7dbf5c Translated using Weblate (Korean) Melior 2020-01-31 13:55:16 +0100
  • 5f7a126df2 4.131.0 Sabe Jones 2020-01-31 06:47:32 -0600
  • 728eaecfc8 Merge branch 'develop' into release Sabe Jones 2020-01-31 06:47:26 -0600
  • 505509d4b7 chore(sprites): compile Sabe Jones 2020-01-31 06:47:06 -0600
  • e31de5c8f0 feat(content): Feb 2020 subscriber set Sabe Jones 2020-01-31 06:46:56 -0600
  • c772afd0c8
    Merge pull request #11647 from tsukimi2/bugfix-npc-style Matteo Pagliazzi 2020-01-29 15:41:46 +0100
  • ebbec57b29
    Merge pull request #11791 from Alys/invalid-uuid-messages Matteo Pagliazzi 2020-01-29 15:39:38 +0100
  • 82a5bc236f clarify all "Invalid uuid" messages by making each unique Alys 2020-01-29 15:49:55 +1000
  • 5a065b8a8a fix(test): food expectation Sabe Jones 2020-01-28 15:49:50 -0600
  • bc1eb62a35 feat(event): Birthday 2020 Sabe Jones 2020-01-28 15:39:05 -0600
  • 02d6b77a03
    Merge pull request #11783 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-notes-5.3.9 Matteo Pagliazzi 2020-01-27 10:33:10 +0100
  • ec4ad7c91b
    Merge pull request #11781 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-knobs-5.3.9 Matteo Pagliazzi 2020-01-27 10:32:58 +0100
  • 8e37d35fda
    build(deps): bump @storybook/addon-notes in /website/client dependabot-preview[bot] 2020-01-27 09:31:30 +0000
  • 384312b089
    build(deps): bump @storybook/addon-knobs in /website/client dependabot-preview[bot] 2020-01-27 09:31:20 +0000
  • d44d62d02b
    Merge pull request #11770 from HabitRPG/dependabot/npm_and_yarn/axios-0.19.2 Matteo Pagliazzi 2020-01-27 10:28:57 +0100
  • 674b6083f2
    build(deps-dev): bump axios from 0.19.1 to 0.19.2 dependabot-preview[bot] 2020-01-27 09:27:48 +0000
  • cb175008dd
    Merge pull request #11780 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-links-5.3.9 Matteo Pagliazzi 2020-01-27 10:27:22 +0100
  • a5c0d50ade
    Merge pull request #11784 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/vue-5.3.9 Matteo Pagliazzi 2020-01-27 10:27:09 +0100
  • 53736f1216
    Merge pull request #11778 from HabitRPG/dependabot/npm_and_yarn/aws-sdk-2.610.0 Matteo Pagliazzi 2020-01-27 10:26:57 +0100
  • 6064bc0103
    Merge pull request #11782 from HabitRPG/dependabot/npm_and_yarn/website/client/storybook/addon-actions-5.3.9 Matteo Pagliazzi 2020-01-27 10:26:42 +0100
  • cf7fd60fff
    Merge pull request #11786 from HabitRPG/dependabot/npm_and_yarn/website/client/bootstrap-vue-2.3.0 Matteo Pagliazzi 2020-01-27 10:26:27 +0100
  • dd8d84bff1
    Merge pull request #11785 from HabitRPG/dependabot/npm_and_yarn/website/client/axios-0.19.2 Matteo Pagliazzi 2020-01-27 10:25:37 +0100
  • c74b6297f2
    Merge pull request #11788 from HabitRPG/dependabot/npm_and_yarn/website/client/inspectpack-4.3.1 Matteo Pagliazzi 2020-01-27 10:25:12 +0100
  • 4c3efdebfa
    build(deps): bump inspectpack from 4.3.0 to 4.3.1 in /website/client dependabot-preview[bot] 2020-01-27 08:10:30 +0000
  • 2aba6acc47
    build(deps): bump bootstrap-vue from 2.2.2 to 2.3.0 in /website/client dependabot-preview[bot] 2020-01-27 08:09:27 +0000