negue
61606cb69d
change to User ID - change mail var _DISPLAYNAME _DISPLAY_NAME
2019-01-04 21:04:41 +01:00
negue
60a6f6f2f6
fix merge issues
2018-09-30 15:37:14 +02:00
negue
92d68e5c6e
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/chat/chatMessages.vue
# website/common/locales/en/messages.json
# website/server/libs/slack.js
2018-09-22 19:18:08 +02:00
Matteo Pagliazzi
84329e5fad
New inbox client ( #10644 )
...
* new inbox client
* add tests for sendPrivateMessage returning the message
* update DELETE user message tests
* port v3 GET-inbox_messages
* use v4 delete message route
* sendPrivateMessage: return sent message
* fix
2018-08-30 14:50:03 -05:00
negue
5a0eed7eae
copy chatReporter - fix unknown apiMessages - add api for flagging pm
2018-06-02 18:18:00 +02:00
negue
c26696a9eb
moving developer-only strings to api/common messages ( #10258 )
...
* move translatable string to apiMessages
* use apiMessages instead of res.t for groupIdRequired / keepOrRemove
* move pageMustBeNumber to apiMessages
* change apimessages
* move missingKeyParam to apiMessages
* move more strings to apiMessages
* fix lint
* revert lodash imports to fix tests
* fix webhook test
* fix test
* rollback key change of `keepOrRemove`
* remove unneeded `req.language` param
* extract more messages from i18n
* add missing `missingTypeParam` message
* Split api- and commonMessages
* fix test
* fix sanity
* merge messages to an object, rename commonMessage to errorMessage
* apiMessages -> apiError, commonMessages -> errorMessage, extract messages to separate objects
* fix test
* module.exports
2018-05-04 16:00:19 -05:00
