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
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
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
e6a5d08150
Merge branch 'develop' into api-v3
2015-11-16 17:34:30 -06:00
639dfb31d7
Pull out gear into separate modules
2015-11-16 17:29:13 -06:00
29c4e21b67
Merge pull request #6250 from HabitRPG/sabrecat/costume-awards
...
Costume Contest awards 2015
2015-11-16 17:08:26 -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
16878af76f
fix(string): Contest to Contestant
2015-11-16 16:17:48 -05:00
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
bf0f3634d1
chore(contest): Award Costume achievements
2015-11-16 15:24:08 -05:00
2b8cf178b0
Merge pull request #6244 from crookedneighbor/modularize-content
...
Modularize content
2015-11-16 12:40:46 -06:00
8f9224c2ae
Adjust error handling for test task.
2015-11-16 12:23:09 -06:00
61948e1ca5
Add filter to lodash import.
2015-11-16 12:22:00 -06:00
c3f8bb0726
Correct count module to use correct lodash 3 syntax
2015-11-16 12:10:58 -06:00
086e1da0e1
Merge branch 'develop' into api-v3
2015-11-16 12:04:42 -06:00
7a865b5c2a
Correct test output agregator
2015-11-16 12:04:09 -06:00
30eed12903
Merge pull request #6245 from HabitRPG/api-v3-routes
...
Api v3 Routes
2015-11-16 17:07:46 +01:00
9bf1ebdb0f
Remove last of coffee files
2015-11-16 08:14:42 -06:00
dcca17fa4e
Set up i18n in unit test helper.
2015-11-16 08:12:45 -06:00
9ec39a597e
Set up i18n in test helpers
2015-11-16 08:07:28 -06:00
f20336861a
Correct lodash syntax
2015-11-16 08:07:20 -06:00
41e6abfc83
Fixed capitalization
2015-11-15 16:58:19 -05:00
4ab2fafc5e
Remove coffee files
2015-11-15 15:45:56 -06: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
6ba9027252
Switch out babel for babel-core
2015-11-15 15:15:52 -06:00
24cd36e716
Remove second babel require
2015-11-15 15:08:31 -06:00
49fd6b9f5c
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2015-11-15 14:59:57 -06:00
Blade Barringer