Commit Graph

13207 Commits

Author SHA1 Message Date
Blade Barringer 2d55a2a31d chore: compile sprites 2016-03-24 07:57:57 -05:00
Blade Barringer c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05:00
Blade Barringer f33469609c Adjust sprite task to not include wheelchair images in the customize-option handling 2016-03-24 07:57:50 -05:00
Nick Bunn 0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Blade Barringer 01a7132b0b refactor: Extract play reward sound logic into function 2016-03-23 17:55:44 -05:00
Kenny Carlsen 7b708f51ba Proposed bug fix, issue #6668 - erroneous reward purchase sound 2016-03-23 17:55:41 -05:00
Sabe Jones 17b02f2867 fix(news): missing promo 2016-03-23 15:47:22 -04:00
Sabe Jones ba1cc67654 chore(news): fill out remaining Bailey 2016-03-23 15:36:24 -04:00
Sabe Jones be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones 1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Blade Barringer 2a4a8466ca Merge pull request #6948 from MathWhiz/patch-1
Fix ISSUE_TEMPLATE.md
2016-03-23 11:48:13 -05:00
MathWhiz 802b8bed0a Fix ISSUE_TEMPLATE.md
Added parentheses around two of the comments to hide them.
2016-03-23 09:11:08 -05:00
Blade Barringer a958fefa6b Merge pull request #6946 from HabitRPG/update_pageres
Update pageres
2016-03-23 08:36:52 -05:00
Blade Barringer ef2a1f5929 chore: Update pageres
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
2016-03-23 08:16:39 -05:00
Blade Barringer fd10422e0c tests: Add preliminary tests around send message and send gift 2016-03-22 21:49:27 -05:00
Blade Barringer f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00
Brian Murray eaea55687b Make change regarding pluralization of gem gift message easier to read and not one long line 2016-03-22 21:49:27 -05:00
Brian Murray 369386e370 Only add an 's' to months of subscription or gems given if they are not 1. 2016-03-22 21:49:22 -05:00
Blade Barringer 9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu 521195ab95 fix: Unify html in translation strings
Closes #6859
2016-03-22 17:34:29 -05:00
Matteo Pagliazzi 23f92e2d28 Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite
[v3] Added group reject invite route and initial tests
2016-03-22 22:46:12 +01:00
Keith Holliday da08b6c814 Removed group query from route 2016-03-22 16:10:17 -05:00
MathWhiz 86516b5e20 Update presskit 2016-03-22 08:41:02 -05:00
Blade Barringer 92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Blade Barringer 3add287a85 Merge branch 'khipkin-fix_class_change_gear_modal' into develop 2016-03-22 08:10:55 -05:00
MathWhiz c70b40e0a3 Add pull request instructions to CONTRIBUTING.MD 2016-03-22 07:59:13 -05:00
Blade Barringer bbcef441bf Adjust template instructions 2016-03-22 07:59:13 -05:00
mathwhiz a5b7066358 Add templates for issues and pull requests 2016-03-22 07:59:06 -05:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops
[v3] Port several shared ops and their linked fns
2016-03-21 23:00:43 +01:00
Matteo Pagliazzi 85a05e0a99 Merge pull request #6938 from piousbox/api-v3-test-local-login-2
local login test
2016-03-21 22:50:37 +01:00
Matteo Pagliazzi f04d8d4d97 do not remove ops/fns from common/script/index.js until they have been ported everywhere 2016-03-21 22:50:18 +01:00
Victor Piousbox a03f34362c resolving conflicts 2016-03-21 21:28:07 +00:00
Victor Piousbox b555930e9e invalid login credentials fixes 2016-03-21 21:27:11 +00:00
Victor Piousbox 5426d63a36 local login test 2016-03-21 21:26:04 +00:00
Matteo Pagliazzi d6fa16f86c skip tests that cannot be stubbed correctly 2016-03-21 22:22:26 +01:00
Victor Piousbox ddbb8a1beb invalid login credentials fixes 2016-03-21 21:10:17 +00:00
Keith Holliday a8e4455124 Added group reject invite route and initial tests 2016-03-21 15:42:38 -05:00
Matteo Pagliazzi 1d3c67af40 Merge pull request #6937 from piousbox/api-v3-delete-social-auth-test
Api v3 delete social auth test
2016-03-21 21:28:59 +01:00
Victor Piousbox fa079bd764 added those awaits for DELETE social user testing 2016-03-21 18:35:00 +00:00
Victor Piousbox 5f5fc754b0 local login test 2016-03-21 05:48:37 +00:00
Victor Piousbox 363e23b5e0 Merge branch 'api-v3-delete-social-auth-test' of github.com:piousbox/habitrpg into api-v3-delete-social-auth-test 2016-03-21 04:53:40 +00:00
Victor Piousbox ebcf913676 strengthen the test of password-reset just a little 2016-03-21 04:49:29 +00:00
Matteo Pagliazzi 0b5506b16b Merge pull request #6908 from piousbox/api-v3-password-reset
api-v3 password reset
2016-03-20 22:32:32 +01:00
Matteo Pagliazzi bd3c162b97 port allocateNow and autoAllocate 2016-03-20 20:21:15 +01:00
Victor Piousbox f73141f1f6 strengthen the test of password-reset just a little 2016-03-20 19:00:23 +00:00
Matteo Pagliazzi 480194f53c add routes for buy ops and integration tests 2016-03-20 17:41:17 +01:00
Matteo Pagliazzi fea2e0d8c0 correctly stub methods and test errors 2016-03-20 16:06:31 +01:00
Matteo Pagliazzi 657f19af0d add tests for shared.ops.buySpecialSpell and partially fix shared.ops.buy 2016-03-20 13:46:56 +01:00