Commit Graph

11941 Commits

Author SHA1 Message Date
Blade Barringer 5947dcf68b (chore): Add lint:watch task 2015-11-18 17:23:33 -06:00
Alys cb1f745d39 Merge pull request #6247 from ojeytonwilliams/subcriber-benefits-comparisons
Potential fix for #6085 - fix subscriber benefits comparisons; round down 3 month blocks for perks - fixes #6085
2015-11-19 07:09:14 +10:00
Matteo Pagliazzi 5c859ca52e add req.t in place of i18n.t passing req.language, begins implementing user signup 2015-11-18 22:04:36 +01:00
Sabe Jones 72ea9426dd fix(lint): Space infix operator (?) 2015-11-18 15:18:44 -05:00
Sabe Jones ed443b490a refactor(constant): Screaming camel MAX_LEVEL 2015-11-18 15:14:47 -05:00
Sabe Jones 31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Matteo Pagliazzi 662c9ecc29 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3-user 2015-11-18 20:50:15 +01:00
Blade Barringer 6991d5ab67 Correct reject block to include details about error 2015-11-18 13:01:56 -06:00
Blade Barringer f95c6ef927 Move notFound api v3 test to integration folder. 2015-11-18 13:01:35 -06:00
Blade Barringer a64085828b Correct path to api-v3 integration files in gulp test task. 2015-11-18 13:01:06 -06:00
Matteo Pagliazzi bd980e166b fix action method 2015-11-18 18:16:14 +01:00
Matteo Pagliazzi de75849c7a fix apidoc comment 2015-11-18 18:06:37 +01:00
Matteo Pagliazzi d5d13477d7 wip user controllers: local login method 2015-11-18 18:02:35 +01:00
Matteo Pagliazzi 2dfca76a5e Merge pull request #6256 from HabitRPG/api-v3-apidoc
API v3 - apidoc wip
2015-11-18 17:12:14 +01:00
Oliver Eyton-Williams 570d7c3c76 Added tests for buying two-handed weapons 2015-11-18 16:41:06 +01:00
Blade Barringer 627da76b49 Merge branch 'develop' into api-v3 2015-11-18 09:09:49 -06:00
Blade Barringer eded44fea5 Adjust helper files for linting preferences. 2015-11-18 08:54:34 -06:00
Blade Barringer 22c8a24d15 Move test specific eslint rules to eslint task 2015-11-18 08:50:03 -06:00
Blade Barringer f94394127a Remove unused var 2015-11-18 08:00:14 -06:00
Blade Barringer 9e557c43d3 Fix bug where seasonal items could not be purchased. 2015-11-18 07:58:01 -06:00
Blade Barringer 26b82dff4b Fix bug where armoire items could not be repurchased. 2015-11-18 07:57:45 -06:00
Matteo Pagliazzi 3b633a87b9 try fixing the notFound test 2015-11-18 12:44:52 +01:00
Matteo Pagliazzi 65a8d2e255 misc fixes and improvements, starts adding route tests 2015-11-18 12:36:13 +01:00
Oliver Eyton-Williams cae267c0fa Two-handed weapons no longer automatically equip unless desired. 2015-11-18 11:59:31 +01:00
Matteo Pagliazzi b5adf9f19b add apidoc to production build step 2015-11-18 11:52:13 +01:00
Matteo Pagliazzi 6fb4fdfd8a create apidoc task in grunt, update package.json version 2015-11-18 11:50:55 +01:00
Blade Barringer 08c4ec5557 Merge branch 'develop' into api-v3 2015-11-17 23:15:15 -06:00
Blade Barringer 553548046f Add linting for tests 2015-11-17 23:14:49 -06:00
Blade Barringer 94bf181301 Add noscript locales 2015-11-17 22:02:57 -06:00
Blade Barringer 0a7d7fc42d Merge pull request #6251 from crookedneighbor/modularize-content-gear
Pull out gear into separate modules
2015-11-17 21:57:13 -06:00
Blade Barringer 4d415ee9c1 chore(i18n): update locales 2015-11-17 21:54:30 -06:00
Blade Barringer fba35ea491 chore(i18n): update locales 2015-11-17 21:48:55 -06:00
Blade Barringer 6bd0ed76cc Fixes #6524. Correct spelling of community 2015-11-17 21:41:06 -06:00
Blade Barringer 71473a93ad chore(i18n): update locales 2015-11-17 21:38:32 -06:00
Blade Barringer c452cf9f99 Adjust styling of noscript block 2015-11-17 21:35:07 -06:00
Blade Barringer 1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00
Blade Barringer 5b7c02334a Adjust sm modal to not attach objects on rootScope 2015-11-17 21:23:20 -06:00
Gautham Chandra 37e08e8d5d Converted noscript text into translatable strings 2015-11-17 22:22:55 -05:00
Blade Barringer b280267cde Expand object to make it more readable. 2015-11-17 21:10:29 -06:00
Blade Barringer 05eb0ec782 Add missing comma. 2015-11-17 17:26:18 -06:00
Blade Barringer a11048b604 Split out wondercon gear into separate module 2015-11-17 17:16:38 -06:00
Blade Barringer f58b3eee64 Move special gear into own subdirectory 2015-11-17 17:06:00 -06:00
Sabe Jones f5f33bd1b9 fix(modals): SM modal fixes
Fixes #6253, allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042.
2015-11-17 16:56:11 -05:00
Sabe Jones 7d2643063f fix(math-helpers): diminishingReturns parameter logic 2015-11-17 16:00:18 -05:00
Sabe Jones 4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00
Matteo Pagliazzi 18503e31c3 fix linting 2015-11-17 19:31:51 +01:00
Matteo Pagliazzi 2a51117d21 comment errors according to apidoc, add new tests and fix existing ones 2015-11-17 19:22:47 +01:00
Matteo Pagliazzi 846800ccc9 fix linting 2015-11-17 17:49:59 +01:00
Matteo Pagliazzi 9905deec06 move static handler to separate middleware 2015-11-17 17:02:53 +01:00
Matteo Pagliazzi aa1b046cf2 add example apidoc comments, add notFound middleware 2015-11-17 16:48:50 +01:00