Alys acf0f4f0b1 Merge remote-tracking branch 'upstream/develop' into admin-panel-conflict-fixes ...

Also adjusts
test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js
to use the heroFields array concept from
test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js

2020-05-06 13:55:17 +10:00

..

challenges

Ensure official challenges are listed first (fixes #11018) (#11030)

2020-03-09 20:08:28 +01:00

chat

fix(string utils): do not escape possible regular expressions

2020-04-28 16:47:52 +02:00

content

fix test lint

2019-10-08 20:45:38 +02:00

coupons

fix test lint

2019-10-08 20:45:38 +02:00

dataexport

fix test lint

2019-10-08 20:45:38 +02:00

debug

fix test lint

2019-10-08 20:45:38 +02:00

emails

fix test lint

2019-10-08 20:45:38 +02:00

groups

Dont throw away extra paypal months (#12149)

2020-05-05 17:16:35 +02:00

hall

Merge remote-tracking branch 'upstream/develop' into admin-panel-conflict-fixes

2020-05-06 13:55:17 +10:00

inbox

fix test lint

2019-10-08 20:45:38 +02:00

members

API: Adding secret.text to the user-schema (#12121)

2020-05-02 19:59:05 +02:00

models

fix test lint

2019-10-08 20:45:38 +02:00

news

API v4 (WIP) (#10453)

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

notifications

fix test lint

2019-10-08 20:45:38 +02:00

payments

fix(test): comment unreliable error message

2020-03-07 13:31:31 -06:00

qrcodes

fix test lint

2019-10-08 20:45:38 +02:00

quests

Handle simultaneous quest accept/reject (#12090)

2020-04-17 22:57:31 +02:00

shops

fix test lint

2019-10-08 20:45:38 +02:00

status

fix test lint

2019-10-08 20:45:38 +02:00

tags

fix test lint

2019-10-08 20:45:38 +02:00

tasks

Reward with negative cost can no longer be created, fixes #11855 (#11870)

2020-03-24 12:10:10 +01:00

user

fix: return full inbox on user-v3-api (#12146)

2020-05-02 21:48:16 +02:00

webhook

Disable Failing Webhooks (#11966)

2020-03-20 23:26:21 +01:00

world-state

fix test lint

2019-10-08 20:45:38 +02:00

notFound.test.js

fix test lint

2019-10-08 20:45:38 +02:00