f87d6d250a
remove unlinted file
2015-11-21 12:11:53 +01:00
4862cebdb7
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-21 12:10:11 +01:00
041224b5ac
fix merge conflicts
2015-11-21 12:09:40 +01:00
a6fb5790e5
refactor(gulp): Dry out linting task
2015-11-20 07:56:59 -06:00
776faddb34
(chore): lint test/common files
2015-11-19 20:27:39 -06:00
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05:00
5947dcf68b
(chore): Add lint:watch task
2015-11-18 17:23:33 -06:00
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
6991d5ab67
Correct reject block to include details about error
2015-11-18 13:01:56 -06:00
f95c6ef927
Move notFound api v3 test to integration folder.
2015-11-18 13:01:35 -06:00
a64085828b
Correct path to api-v3 integration files in gulp test task.
2015-11-18 13:01:06 -06:00
2dfca76a5e
Merge pull request #6256 from HabitRPG/api-v3-apidoc
...
API v3 - apidoc wip
2015-11-18 17:12:14 +01:00
627da76b49
Merge branch 'develop' into api-v3
2015-11-18 09:09:49 -06:00
eded44fea5
Adjust helper files for linting preferences.
2015-11-18 08:54:34 -06:00
22c8a24d15
Move test specific eslint rules to eslint task
2015-11-18 08:50:03 -06:00
f94394127a
Remove unused var
2015-11-18 08:00:14 -06:00
9e557c43d3
Fix bug where seasonal items could not be purchased.
2015-11-18 07:58:01 -06:00
26b82dff4b
Fix bug where armoire items could not be repurchased.
2015-11-18 07:57:45 -06:00
3b633a87b9
try fixing the notFound test
2015-11-18 12:44:52 +01:00
65a8d2e255
misc fixes and improvements, starts adding route tests
2015-11-18 12:36:13 +01:00
b5adf9f19b
add apidoc to production build step
2015-11-18 11:52:13 +01:00
6fb4fdfd8a
create apidoc task in grunt, update package.json version
2015-11-18 11:50:55 +01:00
08c4ec5557
Merge branch 'develop' into api-v3
2015-11-17 23:15:15 -06:00
553548046f
Add linting for tests
2015-11-17 23:14:49 -06:00
94bf181301
Add noscript locales
2015-11-17 22:02:57 -06:00
0a7d7fc42d
Merge pull request #6251 from crookedneighbor/modularize-content-gear
...
Pull out gear into separate modules
2015-11-17 21:57:13 -06:00
4d415ee9c1
chore(i18n): update locales
2015-11-17 21:54:30 -06:00
fba35ea491
chore(i18n): update locales
2015-11-17 21:48:55 -06:00
6bd0ed76cc
Fixes #6524 . Correct spelling of community
2015-11-17 21:41:06 -06:00
71473a93ad
chore(i18n): update locales
2015-11-17 21:38:32 -06:00
c452cf9f99
Adjust styling of noscript block
2015-11-17 21:35:07 -06:00
1299afcb01
Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js
2015-11-17 21:28:22 -06:00
5b7c02334a
Adjust sm modal to not attach objects on rootScope
2015-11-17 21:23:20 -06:00
37e08e8d5d
Converted noscript text into translatable strings
2015-11-17 22:22:55 -05:00
b280267cde
Expand object to make it more readable.
2015-11-17 21:10:29 -06:00
05eb0ec782
Add missing comma.
2015-11-17 17:26:18 -06:00
a11048b604
Split out wondercon gear into separate module
2015-11-17 17:16:38 -06:00
f58b3eee64
Move special gear into own subdirectory
2015-11-17 17:06:00 -06:00
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
18503e31c3
fix linting
2015-11-17 19:31:51 +01:00
2a51117d21
comment errors according to apidoc, add new tests and fix existing ones
2015-11-17 19:22:47 +01:00
846800ccc9
fix linting
2015-11-17 17:49:59 +01:00
9905deec06
move static handler to separate middleware
2015-11-17 17:02:53 +01:00
aa1b046cf2
add example apidoc comments, add notFound middleware
2015-11-17 16:48:50 +01:00
195b39561b
Move contributor gear to own module
2015-11-17 09:01:38 -06:00
2bac9c3c17
Separate out backer gear into own module
2015-11-17 08:17:40 -06:00
03c1a957f6
Correct ownsItem function to allow owning item if user has ever previously owned the item.
2015-11-17 08:13:20 -06:00
53417adda1
Replaced magic numbers with variables
2015-11-17 14:07:35 +01:00
8b7f50bfcf
Adjust memory leak message to be meaningful.
...
Got this message in the heroku logs:
2015-11-17T04:28:18.549451+00:00 app[web.1]: '[Memory Leak] Memory=' + parseFloat(memory).toFixed(3) + ' Time=' + moment()
Converted the line into a variable and threw that instead.
2015-11-16 22:34:06 -06:00
3000517b06
Fix bug where any backer or contributor item could be purchased.
2015-11-16 21:47:46 -06:00
Matteo Pagliazzi