Commit Graph

6175 Commits

Author SHA1 Message Date
Sabe Jones bb01475e02 Merge branch 'release' into develop 2018-12-03 22:54:08 +00:00
Sabe Jones 71ad1957b1 chore(i18n): update locales 2018-12-03 22:52:42 +00:00
Sabe Jones 3ba5ea1d2d chore(news): Bailey 2018-12-03 16:50:02 -06:00
Sabe Jones aaa16a9527 refactor(migrations): move Take This to new template
also fix linting error in server lib
2018-12-03 22:04:52 +00:00
Sabe Jones b98e95ee45 chore(items): deactivate premium potions 2018-12-03 15:49:09 -06:00
Matteo Pagliazzi b9e12aca3e success modal and fix redirects 2018-12-02 17:33:21 +01:00
Matteo Pagliazzi e212842b50 fix redirects and basic success message 2018-12-02 15:44:52 +01:00
Matteo Pagliazzi d2f7cba43d Merge branch 'develop' into payments/paypal-amazon-checkout 2018-12-02 14:47:56 +01:00
Matteo Pagliazzi 7873800f87 fix(kafka queue): remove leftover code 2018-12-01 12:16:34 +01:00
Sabe Jones 727041f020 fix(chat): escape regexes so parentheses etc. don't bust it 2018-11-30 16:19:22 -06:00
Sabe Jones de0c62a37f Merge branch 'release' into develop 2018-11-30 20:28:23 +00:00
Sabe Jones f211ebeb0a chore(i18n): update locales 2018-11-30 20:25:45 +00:00
Sabe Jones b91ef9f539 chore(news): Last Chance Bailey
also give a few more days for items
2018-11-30 14:21:12 -06:00
Matteo Pagliazzi ac0601630e Merge branch 'develop' into payments/paypal-amazon-checkout 2018-11-30 16:11:55 +01:00
Matteo Pagliazzi 3239491144 fix(lint): remove unused params 2018-11-30 16:04:56 +01:00
Sabe Jones b218eb2c00 Merge remote-tracking branch 'origin/greenkeeper/update-to-node-10' into release
also remove Kafka
2018-11-29 14:51:40 +00:00
Matteo Pagliazzi 7f2e12ba23 remove memwatch-next, try/catch 2018-11-29 14:35:22 +01:00
Sabe Jones 357b48dc8f fix(server): update package lock, attempt to log crashes 2018-11-29 12:11:03 +00:00
Matteo Pagliazzi 2cbd78b139 Merge branch 'develop' into payments/paypal-amazon-checkout 2018-11-29 10:55:13 +01:00
Sabe Jones b82660823d Merge branch 'release' into develop 2018-11-28 20:57:37 +00:00
Sabe Jones 5fe0776074 chore(i18n): update locales 2018-11-28 20:55:35 +00:00
Sabe Jones d218f316d3 chore(sprites): compile 2018-11-28 14:50:54 -06:00
Sabe Jones f19e69948a feat(content): mystery items 2018-11 2018-11-28 14:50:43 -06:00
Sabe Jones e6807d36b5 fix(analytics): record usernames 2018-11-28 13:02:48 -06:00
Phillip Thelen 1ece230621 remove console call 2018-11-28 12:52:08 -06:00
Phillip Thelen d934d9d759 Move group chat analytics event to server 2018-11-28 12:52:00 -06:00
Matteo Pagliazzi bf7fabb20a fix(amazon): add new env variable to specify environment 2018-11-28 11:07:06 +01:00
Sabe Jones 88a2f317d8 Merge branch 'release' into develop 2018-11-27 19:46:39 -06:00
Sabe Jones dbe2143b7a fix(mystery-items): add missing set sprite 2018-11-26 14:23:18 -06:00
Sabe Jones 7b687280d7 Merge branch 'release' into develop 2018-11-26 19:10:05 +00:00
Sabe Jones bf91dacb94 chore(i18n): update locales 2018-11-26 19:01:55 +00:00
Sabe Jones 33e0892e95 chore(event): end Thanksgiving tweaks 2018-11-26 12:59:23 -06:00
Phillip Thelen 42b146d5d0 Attach client to chat messages (#10845)
* Attach client to chat messages

* Word

* Design tweaks

* Fix potential error
2018-11-26 10:45:42 +01:00
Nathan Zimmerman 2bebaf2cf8 Fixes issue #10857 ("Tags have extra space at the bottom when they should be centered") (#10861)
* Fix for #10857 centered category tag text

* Fixes #10857 and #10856 display tag markdown.
2018-11-26 10:44:41 +01:00
Matteo Pagliazzi 6181328ac1 feat(footer): always show expanded footer (#10862) 2018-11-26 10:37:29 +01:00
Sabe Jones f94fd0d69d chore(i18n): update locales 2018-11-23 20:17:56 +00:00
Sabe Jones 2cd66436bc Merge branch 'release' into develop 2018-11-22 18:05:28 -06:00
Sabe Jones b6b953ec46 chore(i18n): update locales 2018-11-22 21:09:20 +00:00
Sabe Jones ab34c83a9d chore(sprites): compile 2018-11-22 15:05:33 -06:00
Sabe Jones 9cea86f4e0 feat(content): Turkey Day 2018 2018-11-22 15:05:03 -06:00
negue e2c5b9058b more checks on the item.klass, also added the specialClass checks (#10859) 2018-11-22 14:35:34 +01:00
Matteo Pagliazzi cc751960ac save state and close tab afetr success 2018-11-21 11:42:32 +01:00
Matteo Pagliazzi 433c73c9d3 paypal: restore url after purchase 2018-11-21 11:25:36 +01:00
Matteo Pagliazzi 680c2162a7 paypal: new redirects 2018-11-21 11:19:55 +01:00
Alys a2b38ffb02 add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc 2018-11-21 19:48:50 +10:00
Matteo Pagliazzi 6395870c00 fix(stable): remove progress number from petItem 2018-11-21 10:35:59 +01:00
Sabe Jones 9562ba432f Merge branch 'release' into develop 2018-11-20 21:02:17 +00:00
Sabe Jones 745edd731d chore(i18n): update locales 2018-11-20 20:59:23 +00:00
Sabe Jones 53b195931c chore(sprites): compile 2018-11-20 14:55:56 -06:00
Sabe Jones 37ae467fff feat(content): Frost Hatching Potions 2018-11-20 14:55:45 -06:00