Blade Barringer 02a60d90d8 Merge branch 'develop' into api-v3

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

..

api

Merge pull request #6907 from HabitRPG/sabrecat/server-party-cheevos

2016-03-27 20:53:15 +02:00

api-legacy

chore(dependency): Upgrade lodash from v2 to v3

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

common

v3: port getBuyList and shared.updateStore

2016-03-26 16:25:15 +01:00

common_old

v3: port hatch, equip and feed ops

2016-03-24 18:59:09 +01: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

api-v3-get-user-anonymized

2016-03-24 18:23:43 +00: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

Merge pull request #6904 from HabitRPG/inventory_sorting_debug

2016-03-18 07:33:45 -05: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