Blade Barringer
|
05eb0ec782
|
Add missing comma.
|
2015-11-17 17:26:18 -06:00 |
|
Blade Barringer
|
e6a5d08150
|
Merge branch 'develop' into api-v3
|
2015-11-16 17:34:30 -06:00 |
|
Sabe Jones
|
29c4e21b67
|
Merge pull request #6250 from HabitRPG/sabrecat/costume-awards
Costume Contest awards 2015
|
2015-11-16 17:08:26 -06:00 |
|
Sabe Jones
|
c352a30d4e
|
chore(news): Bailey 2015-11-16
Also sprite recompile to incorporate sticker promo image.
|
2015-11-16 17:26:44 -05:00 |
|
Sabe Jones
|
2d1ad12cbd
|
fix(strings): Make plural more greppable
|
2015-11-16 17:08:38 -05:00 |
|
Sabe Jones
|
16878af76f
|
fix(string): Contest to Contestant
|
2015-11-16 16:17:48 -05:00 |
|
Sabe Jones
|
e73c7be47a
|
fix(achievement): Make Costume Contest repeatable
|
2015-11-16 16:07:16 -05:00 |
|
Sabe Jones
|
bf0f3634d1
|
chore(contest): Award Costume achievements
|
2015-11-16 15:24:08 -05:00 |
|
Blade Barringer
|
2b8cf178b0
|
Merge pull request #6244 from crookedneighbor/modularize-content
Modularize content
|
2015-11-16 12:40:46 -06:00 |
|
Blade Barringer
|
8f9224c2ae
|
Adjust error handling for test task.
|
2015-11-16 12:23:09 -06:00 |
|
Blade Barringer
|
61948e1ca5
|
Add filter to lodash import.
|
2015-11-16 12:22:00 -06:00 |
|
Blade Barringer
|
c3f8bb0726
|
Correct count module to use correct lodash 3 syntax
|
2015-11-16 12:10:58 -06:00 |
|
Blade Barringer
|
086e1da0e1
|
Merge branch 'develop' into api-v3
|
2015-11-16 12:04:42 -06:00 |
|
Blade Barringer
|
7a865b5c2a
|
Correct test output agregator
|
2015-11-16 12:04:09 -06:00 |
|
Matteo Pagliazzi
|
30eed12903
|
Merge pull request #6245 from HabitRPG/api-v3-routes
Api v3 Routes
|
2015-11-16 17:07:46 +01:00 |
|
Blade Barringer
|
9bf1ebdb0f
|
Remove last of coffee files
|
2015-11-16 08:14:42 -06:00 |
|
Blade Barringer
|
dcca17fa4e
|
Set up i18n in unit test helper.
|
2015-11-16 08:12:45 -06:00 |
|
Blade Barringer
|
9ec39a597e
|
Set up i18n in test helpers
|
2015-11-16 08:07:28 -06:00 |
|
Blade Barringer
|
f20336861a
|
Correct lodash syntax
|
2015-11-16 08:07:20 -06:00 |
|
Blade Barringer
|
4ab2fafc5e
|
Remove coffee files
|
2015-11-15 15:45:56 -06:00 |
|
Blade Barringer
|
cc0eefd97d
|
Remove coffeescript dependency
|
2015-11-15 15:45:30 -06:00 |
|
Matteo Pagliazzi
|
3fe6f87a96
|
fix linting
|
2015-11-15 22:44:17 +01:00 |
|
Matteo Pagliazzi
|
448ed70ab9
|
add example controller and lib to setup routes
|
2015-11-15 22:40:00 +01:00 |
|
Blade Barringer
|
6ba9027252
|
Switch out babel for babel-core
|
2015-11-15 15:15:52 -06:00 |
|
Blade Barringer
|
24cd36e716
|
Remove second babel require
|
2015-11-15 15:08:31 -06:00 |
|
Blade Barringer
|
49fd6b9f5c
|
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
|
2015-11-15 14:59:57 -06:00 |
|
Blade Barringer
|
00055ad055
|
Merge branch 'develop' into api-v3
|
2015-11-15 14:57:41 -06:00 |
|
Matteo Pagliazzi
|
83eb2308fb
|
Merge pull request #6232 from HabitRPG/api-v3-utils
[API v3] Port Utils
|
2015-11-15 20:01:48 +01:00 |
|
Blade Barringer
|
d1c1940bde
|
Merge pull request #6243 from crookedneighbor/lint
Lint Common Files
|
2015-11-15 12:36:36 -06:00 |
|
Blade Barringer
|
ea87910c2f
|
Correct test path
|
2015-11-15 12:34:40 -06:00 |
|
Blade Barringer
|
2a7dfe09a0
|
Move user can own quest categories constant to constants module.
|
2015-11-15 12:27:16 -06:00 |
|
Matteo Pagliazzi
|
1ccb9a5aaa
|
move ported middlewares to /api-v2
|
2015-11-15 18:15:06 +01:00 |
|
Matteo Pagliazzi
|
5dc2fb0b6f
|
port domainMiddleware
|
2015-11-15 18:12:55 +01:00 |
|
Blade Barringer
|
40cee42e03
|
Remove unneeded return statement
|
2015-11-15 11:04:17 -06:00 |
|
Blade Barringer
|
6ec864ea4e
|
Remove unused src files in content directory
|
2015-11-15 11:03:30 -06:00 |
|
Blade Barringer
|
1a31c26330
|
Add item list to common constants module
|
2015-11-15 11:03:17 -06:00 |
|
Blade Barringer
|
f7c88478bc
|
Explicitly bump ampitude version
|
2015-11-15 10:48:46 -06:00 |
|
Matteo Pagliazzi
|
1cd7189119
|
Merge pull request #6240 from HabitRPG/api-v3-buildManifest
[API v3] Build manifest lib
|
2015-11-15 17:40:03 +01:00 |
|
Matteo Pagliazzi
|
78e5d913f5
|
update test to match possible html string
|
2015-11-15 17:27:22 +01:00 |
|
Blade Barringer
|
ea14326025
|
Adjust faq test
|
2015-11-15 10:18:10 -06:00 |
|
Blade Barringer
|
411946e487
|
Modularize mystery sets
|
2015-11-15 10:08:40 -06:00 |
|
Blade Barringer
|
600f3e4554
|
Extract classes, events and gearTypes into constants file.
|
2015-11-15 09:47:06 -06:00 |
|
Blade Barringer
|
b13b2d0f62
|
Remove coffee content index file
|
2015-11-15 09:28:26 -06:00 |
|
Blade Barringer
|
a127bb8711
|
Switch to babel-core form babel.
Babel includes the CLI, which we don't need.
|
2015-11-15 08:59:57 -06:00 |
|
Blade Barringer
|
9ee56a5622
|
Remove rule
|
2015-11-15 08:52:29 -06:00 |
|
Blade Barringer
|
01946b64e6
|
Remove coffeescript from dependencies.
|
2015-11-15 08:29:54 -06:00 |
|
Blade Barringer
|
2e16bade2b
|
Add lint task to test command.
|
2015-11-15 08:28:16 -06:00 |
|
Blade Barringer
|
037337d54f
|
Remove extraneous anonymous function.
|
2015-11-15 08:24:42 -06:00 |
|
Blade Barringer
|
5be9b88cc6
|
Add babel compiler to mocha.opts
|
2015-11-15 08:24:19 -06:00 |
|
Blade Barringer
|
da881153b9
|
Convert coffee tests to js
|
2015-11-15 08:19:41 -06:00 |
|