Blade Barringer 006b074ac2 Merge branch 'develop' into party_page

2016-06-07 07:59:59 -05:00

..

api

change user quest.progress.collect to quest.progress.collectedItems (#7612)

2016-06-05 20:47:45 -05:00

api-legacy

API v3 [WIP] (#6144)

2016-05-23 13:58:31 +02:00

common

change user quest.progress.collect to quest.progress.collectedItems (#7612)

2016-06-05 20:47:45 -05: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 [WIP] (#6144)

2016-05-23 13:58:31 +02:00

migrations

API v3 [WIP] (#6144)

2016-05-23 13:58:31 +02:00

server_side

change user quest.progress.collect to quest.progress.collectedItems (#7612)

2016-06-05 20:47:45 -05:00

spec

Merge branch 'develop' into party_page

2016-06-07 07:59:59 -05:00

.eslintrc

chore: merge in develop

2016-04-15 10:11:54 -05:00

mocha.opts

API v3 [WIP] (#6144)

2016-05-23 13:58:31 +02:00