041224b5ac
fix merge conflicts
2015-11-21 12:09:40 +01:00
bdf1c82b39
chore(news): Misc Bailey
2015-11-19 21:22:38 -05: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
2dfca76a5e
Merge pull request #6256 from HabitRPG/api-v3-apidoc
...
API v3 - apidoc wip
2015-11-18 17:12:14 +01:00
65a8d2e255
misc fixes and improvements, starts adding route tests
2015-11-18 12:36: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
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
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
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
e6a5d08150
Merge branch 'develop' into api-v3
2015-11-16 17:34:30 -06:00
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
2d1ad12cbd
fix(strings): Make plural more greppable
2015-11-16 17:08:38 -05:00
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
30eed12903
Merge pull request #6245 from HabitRPG/api-v3-routes
...
Api v3 Routes
2015-11-16 17:07:46 +01:00
e811693752
Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap.
2015-11-16 15:11:11 +01:00
41e6abfc83
Fixed capitalization
2015-11-15 16:58:19 -05:00
cc0eefd97d
Remove coffeescript dependency
2015-11-15 15:45:30 -06:00
3fe6f87a96
fix linting
2015-11-15 22:44:17 +01:00
8df005d29e
Added noscript content for the landing page
2015-11-15 16:42:48 -05:00
448ed70ab9
add example controller and lib to setup routes
2015-11-15 22:40:00 +01:00
49fd6b9f5c
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-15 14:59:57 -06:00
00055ad055
Merge branch 'develop' into api-v3
2015-11-15 14:57:41 -06:00
b5e10bf1e9
Added a helpful message for when JS is disabled
2015-11-15 14:12:12 -05:00
83eb2308fb
Merge pull request #6232 from HabitRPG/api-v3-utils
...
[API v3] Port Utils
2015-11-15 20:01:48 +01:00
1ccb9a5aaa
move ported middlewares to /api-v2
2015-11-15 18:15:06 +01:00
5dc2fb0b6f
port domainMiddleware
2015-11-15 18:12:55 +01:00
a127bb8711
Switch to babel-core form babel.
...
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
ddeb0e7b23
Add babel register in the server file
2015-11-15 08:16:11 -06:00
19ce7c9b53
add tests for emails (wip) and encryption, misc fixes
2015-11-14 17:43:56 +01:00
170a25c712
remove v2 utils where possible
2015-11-14 17:43:56 +01:00
b315d10c79
migrate utils to v3, uprade nodemailer
2015-11-14 17:43:56 +01:00
6343bc9f59
port buildManifest lib
2015-11-14 15:50:57 +01:00
9c8d4c383f
fix eslint, remove unused constant
2015-11-14 15:37:02 +01:00
ae656b044c
firebase can be enabled when not in production
2015-11-14 14:52:10 +01:00
cf4eb7c89b
Merge pull request #6237 from HabitRPG/api-v3-firebase
...
port firebase lib to api v3
2015-11-14 13:14:50 +01:00
d89b1cb60d
port firebase lib to api v3
2015-11-14 02:50:58 +01:00
2e21d227e0
Simplify get language from user function.
2015-11-13 19:36:49 -06:00
4a52f22774
Correct path to old i18n file
2015-11-13 19:30:36 -06:00
Matteo Pagliazzi