Blade Barringer b3b7108bd6 Merge branch 'develop' into Hus274-7688

2016-08-20 08:31:22 -04:00

..

api

add route for QR codes (#7902)

2016-08-18 19:37:14 +02:00

common

api: expose user's inbox.optOut for api/v3/members/:memberId #7798 (#7893)

2016-08-15 22:21:14 -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

add route for QR codes (#7902)

2016-08-18 19:37:14 +02:00

migrations

API v3 [WIP] (#6144)

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

sanity

chore(tests): Add sanity test for proper babel routes

2016-07-26 21:56:51 -05: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 Hus274-7688

2016-08-20 08:31:22 -04: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