55 Commits

Author	SHA1	Message	Date
Mateus Etto	b28adc6b42	Merge branch 'develop' into party-chat-translations	2018-08-29 20:07:19 +09:00
Alys	1d597039ca	prevent Quest progress message in Party chat when user is Resting in the Inn (#10636) ... * prevent quest progress message in party chat when user is resting in the inn * improve comment * update tests now that the test group includes a new member (sleeping quest participant) * adjust a test to fix lint failure (and make the test better) * fix order of element assignments in test array	2018-08-28 15:04:16 +02:00
Rene Cordier	5c4f763bb1	Fix lostMasterclasser achievement issue (#10616)	2018-08-24 15:23:43 -05:00
Mateus Etto	89f6a9b07e	Merge branch 'develop' into party-chat-translations ... # Conflicts: # test/api/unit/models/group.test.js	2018-06-20 20:24:38 +09:00
Matteo Pagliazzi	8be9964483	API v4 (WIP) (#10453) ... API v4	2018-06-18 14:40:25 +02:00