negue 31ef21f25c Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm ...

# Conflicts:
#	website/client/store/actions/chat.js

2018-06-25 18:47:47 +02:00

..

controllers

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2018-06-25 18:47:47 +02:00

libs

Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm

2018-06-25 18:47:47 +02:00

middlewares

API v4 (WIP) (#10453)

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

models

Habits: store one history entry per day (#10442)

2018-06-21 21:25:19 +02:00

.eslintrc

Upgrade ESLint to v3 (#8299)

2016-12-20 22:31:36 +01:00

api-doc.js

Improved API documentation for hall #8087 (#8536)

2017-06-06 11:48:11 -07:00

index.js

remove stackimpact

2018-04-30 19:07:46 +02:00

server.js

Api quest restrictions - no purchase/start without fulfilling eligibility requirements (#10387)

2018-05-27 16:41:56 +02:00