Matteo Pagliazzi 81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive

2016-04-06 23:24:14 +02:00

..

api

Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive

2016-04-06 23:24:14 +02:00

api-legacy

chore(dependency): Upgrade lodash from v2 to v3

2015-12-29 07:45:03 -06:00

common

Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive

2016-04-06 23:24:14 +02:00

common_old

Merge branch 'develop' into api-v3

2016-03-30 23:40:00 +02:00

content

Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."

2016-03-17 08:09:18 -05:00

e2e

lint: Add missing semicolon to test helper

2016-03-13 22:06:09 -05:00

helpers

v3: port coupons

2016-04-02 16:37:55 +02:00

migrations

Add rudimentary test for migration script

2015-06-05 13:12:38 -05:00

server_side

Merge branch 'develop' into api-v3

2016-03-28 16:02:04 -05:00

spec

Remove extra 'it' from spec description

2016-03-29 22:11:36 -04:00

.eslintrc

test: Update protractor to v3 and use mocha

2016-03-13 09:51:01 -05:00

mocha.opts

Merge branch 'develop' into api-v3

2016-03-04 12:16:22 -06:00