Commit Graph

10896 Commits

Author SHA1 Message Date
Sabe Jones 2bde07fa1c fix(test): Call hasAll correctly 2015-09-16 16:12:29 -04:00
Sabe Jones 7cc29810f3 fix(test): inject Content
Also refactors to remove lodash where it's overkill.
2015-09-16 16:01:13 -04:00
Sabe Jones 3bfeb15715 test(hourglass): TDD for Time Travel filtering 2015-09-16 15:27:19 -04:00
Sabe Jones c8cc01fc44 feat(hourglass): Buy pets/mounts
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
2015-09-16 14:35:43 -04:00
Sabe Jones 25b133c562 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-16 12:48:12 -04:00
Blade Barringer c9c169a0fb Merge pull request #5912 from TheHollidayInn/group-remove-party-invites-when-last-member-leaves
Removed user's party invites when last user leaves party
2015-09-16 07:59:32 -05:00
Blade Barringer f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only
Adjustments to group quest behavior
2015-09-15 18:57:32 -05:00
Blade Barringer 4c84728873 Removes quest from group if quest leader is booted 2015-09-15 18:10:31 -05:00
Blade Barringer a655242c49 Correct test assertion 2015-09-15 17:38:22 -05:00
Blade Barringer e0c30a4214 Merge pull request #5935 from ziir/use-npm-bin
Ensure NPM scripts always use local binary
2015-09-15 17:21:52 -05:00
Tim PILLARD 6a96a2910e Ensure NPM scripts always use local binary 2015-09-16 00:19:19 +02:00
Blade Barringer 9abe67b0ad Prevent quest leaders from leaving party
(cherry picked from commit dc43aa5902)
2015-09-15 16:41:50 -05:00
Blade Barringer f8850755d0 Correct leave call to prevent leaving if quest is in progress
(cherry picked from commit eddea562f4)
2015-09-15 16:41:25 -05:00
Blade Barringer 78fe1073d4 Add user sync to sendAction 2015-09-15 16:39:08 -05:00
Sabe Jones 6e4cc4b35b fix(API): Missing colons 2015-09-15 15:47:19 -04:00
Sabe Jones ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00
Sabe Jones 2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -04:00
Sabe Jones 66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Sabe Jones bc16ec1729 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-15 11:32:28 -05:00
Blade Barringer 6aa04aa6fb Add another dev dep to deps 2015-09-15 10:57:18 -05:00
Blade Barringer 0fe6054b76 Add missing client code 2015-09-15 10:53:56 -05:00
Blade Barringer 41afe0a2f5 Add another dev dep to deps 2015-09-15 10:49:28 -05:00
Blade Barringer 76bd6cbd59 Move some dev dependencies to normal dependencies 2015-09-15 10:38:48 -05:00
Blade Barringer b32e521c56 Pull in client side changes for quest routes 2015-09-15 09:35:17 -05:00
Sabe Jones 580a9871b9 chore(news): Bailey 2015/09/14 2015-09-14 21:21:22 -05:00
Blade Barringer 38e07246da chore(i18n): update locales 2015-09-13 18:38:59 -05:00
Blade Barringer 737b4703e6 Fix markdown bug in faq. Fixes #5920 2015-09-13 18:36:36 -05:00
Blade Barringer d573f3c53d Merge branch 'melarish-Mystery_items_already_owned' into develop 2015-09-13 18:28:18 -05:00
Blade Barringer 5974c7e079 Simplify time travelers page 2015-09-13 18:27:57 -05:00
Blade Barringer d5eaaefa72 Adjust positioning of alert message 2015-09-13 16:56:39 -05:00
Blade Barringer 5553d74334 Create method to calculate whether or not user has attained all mystery equipment 2015-09-13 16:26:29 -05:00
Blade Barringer b6f02d388f Correct method to correctly add an hourglass in debug menu 2015-09-13 16:25:57 -05:00
Blade Barringer 50b709045d Remove only from test 2015-09-13 16:24:46 -05:00
Alys 909ab4eb35 remove extra line breaks from "What are some sample tasks?" FAQ question - fixes https://github.com/HabitRPG/habitrpg/issues/5920 2015-09-14 07:07:12 +10:00
Alys cbd5626cfd remove FAQ from CONTRIBUTING.md - it's less relevant there and confusing now that we have two FAQs 2015-09-14 06:58:11 +10:00
Blade Barringer e554309822 Add route to add a hourglass 2015-09-13 15:09:41 -05:00
Blade Barringer 33c51a77d9 Add unit test for addTenGems route 2015-09-13 14:42:10 -05:00
Blade Barringer 5e9b74a2b9 Add test for addHourglass 2015-09-13 10:01:14 -05:00
Blade Barringer 7e97b73e8b Add test for addTenGems 2015-09-13 09:59:46 -05:00
Blade Barringer edbdab5912 Add test shells for debug mode functions 2015-09-13 09:47:34 -05:00
Blade Barringer 7c8a46b178 Move message into alert box 2015-09-13 09:34:54 -05:00
Blade Barringer cd4ec5bd12 Adjust formatting in footer controller 2015-09-13 02:19:34 -05:00
Blade Barringer 7aad958062 Merge pull request #5922 from crookedneighbor/gulpify
Gulpify the sprites tasks
2015-09-13 02:15:05 -05:00
Blade Barringer 14fabfbe40 Remove excess white space 2015-09-12 22:34:58 -05:00
Blade Barringer dab6b555c4 Revert files 2015-09-12 22:32:13 -05:00
Blade Barringer 41458fbd5b chore(i18n): update locales 2015-09-12 22:26:30 -05:00
Blade Barringer be6acd7c09 Move post to slack function to task helper 2015-09-12 22:23:08 -05:00
Blade Barringer b65c8e3b16 Change directory name from guides to scenes 2015-09-12 21:23:41 -05:00
Blade Barringer 5876c37271 Remove underscores from function names 2015-09-12 21:04:38 -05:00
Blade Barringer a0e5ea6f4f Reformat sprite tasks 2015-09-12 20:43:04 -05:00