Commit Graph

18076 Commits

Author SHA1 Message Date
Erdenesukh Tsendjav 13793f8b3c revert 2018-12-04 17:28:27 -06:00
Erdenesukh Tsendjav 55f875f95a Delete package-lock.json 2018-12-04 17:04:55 -06:00
Erdenesukh Tsendjav 14576be374 merged 2018-12-04 16:03:11 -06:00
Erdenesukh Tsendjav 4cb2c26475 The istanbul command string in the gulp-tests.js file for each of the tests had to be changed to just the keyword istanbul instead of pointing to the istanbul file location on WINDOWS machines 2018-12-04 15:55:09 -06:00
Matteo Pagliazzi b66a0b76ef Merge pull request #10886 from jeongjinhwi/develop
Accoount Deletion Feedback:update email #10880
2018-12-04 09:38:33 +01:00
Sabe Jones dd313b17b5 fix(migration): correct push op 2018-12-03 21:06:23 -06:00
Sabe Jones bb01475e02 Merge branch 'release' into develop 2018-12-03 22:54:08 +00:00
Sabe Jones 757959529b 4.74.7 v4.74.7 2018-12-03 22:53:23 +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 902da35f2b fix(migration): syntax 2018-12-03 22:06:58 +00: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 757160d6b7 update karma to fix tests 2018-12-03 13:33:58 +01:00
Matteo Pagliazzi 4cf68eb018 update package-lock 2018-12-03 13:22:23 +01:00
Matteo Pagliazzi e91d5e5664 Merge pull request #10863 from HabitRPG/payments/paypal-amazon-checkout
Paypal and Amazon: Improve checkout experience
2018-12-03 12:55:53 +01:00
Matteo Pagliazzi b9e12aca3e success modal and fix redirects 2018-12-02 17:33:21 +01:00
Jeong Jin Hwi 53ca9475ee Accoount Deletion Feedback:update email #10880 2018-12-03 01:04:42 +09: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 84558f79d6 Merge pull request #10885 from HabitRPG/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2018-12-02 14:46:11 +01:00
Matteo Pagliazzi 178e59f287 update npm files 2018-12-02 14:44:19 +01:00
greenkeeper[bot] 7acccc0763 chore(package): update dependencies 2018-12-02 13:36:14 +00:00
Matteo Pagliazzi 8ac21d2fd4 update package-lock.json 2018-12-01 18:53:12 +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 68f420991e 4.74.6 v4.74.6 2018-11-30 20:27:53 +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 c3b0a73507 4.74.5 v4.74.5 2018-11-29 14:52:02 +00: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
Sabe Jones 37d9f76fea 4.74.4 v4.74.4 2018-11-29 07:48:06 -06:00
Matteo Pagliazzi 7f2e12ba23 remove memwatch-next, try/catch 2018-11-29 14:35:22 +01:00
Sabe Jones 21b43287e3 4.74.3 v4.74.3 2018-11-29 12:11:35 +00: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 ee5dd5842b 4.74.2 v4.74.2 2018-11-28 16:18:20 -06:00
Sabe Jones 074b8138de Merge branch 'develop' into release 2018-11-28 16:18:10 -06:00
Sabe Jones cd0b9c0a96 4.74.1 v4.74.1 2018-11-28 15:57:54 -06:00
Sabe Jones a09516944d fix(packages): revert package lock 2018-11-28 15:57:36 -06:00
Sabe Jones b82660823d Merge branch 'release' into develop 2018-11-28 20:57:37 +00:00
Sabe Jones fde4402fbb 4.74.0 v4.74.0 2018-11-28 20:57:14 +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