negue 8b15d94ae1 Merge remote-tracking branch 'origin/develop' into negue/flagpm ...

# Conflicts:
#	website/client/components/chat/chatCard.vue
#	website/client/components/chat/chatMessages.vue
#	website/common/locales/en/messages.json

2018-11-18 22:04:33 +01:00

..

challenges

fix(tests): linting & more expects

2018-11-14 07:43:08 -06:00

chat

fix tests / lint

2018-10-14 15:28:00 +02:00

content

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

coupons

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

dataexport

fix xml export (#10505)

2018-07-12 15:49:22 -05:00

debug

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

emails

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

groups

fix(tests): linting & more expects

2018-11-14 07:43:08 -06:00

hall

fix(tests): increase timeout

2018-10-23 13:30:38 +02:00

inbox

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

members

fix(tests): correct expects

2018-11-14 13:07:44 +00:00

models

apiDoc: meta (#8167)

2017-01-13 14:06:46 -07:00

news

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

notifications

prevent multiple notifications (#10524)

2018-07-30 16:11:56 +02:00

payments

Upgrade sinon (#10773)

2018-10-26 18:15:28 +02:00

qrcodes

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

quests

Move inbox to its own model (#10428)

2018-09-21 15:12:20 +02:00

shops

Node 8 (WIP) (#9946)

2018-03-15 19:59:36 +01:00

status

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

tags

fix: correct api tag tests to not rely on default tags

2016-09-07 12:55:07 -05:00

tasks

raise coverage for tasks api calls (#10029)

2018-10-01 13:29:14 +02:00

user

move the update username route to v3 (#10836)

2018-11-14 10:40:27 +01:00

webhook

moving developer-only strings to api/common messages (#10258)

2018-05-04 16:00:19 -05:00

world-state

API v4 (WIP) (#10453)

2018-06-18 14:40:25 +02:00

notFound.test.js

API v3 [WIP] (#6144)

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