Mateus Etto
97e80e2093
Implemented requested changes
2018-05-18 23:08:37 +09:00
Mateus Etto
2588befceb
Merge branch 'develop' into party-chat-translations
...
# Conflicts:
# website/server/models/group.js
2018-05-06 00:46:47 +09: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
Mateus Etto
03b66abe70
Merge branch 'develop' into party-chat-translations
...
# Conflicts:
# website/server/controllers/api-v3/quests.js
# website/server/controllers/api-v3/tasks/groups.js
# website/server/controllers/api-v3/user/spells.js
# website/server/models/group.js
2018-04-25 21:15:49 +09:00
Keith Holliday
7d7fe6047c
Move Chat to Model ( #9703 )
...
* Began moving group chat to separate model
* Fixed lint issue
* Updated delete chat with new model
* Updated flag chat to support model
* Updated like chat to use model
* Fixed duplicate code and chat messages
* Added note about concat chat
* Updated clear flags to user new model
* Updated more chat checks when loading get group
* Fixed spell test and back save
* Moved get chat to json method
* Updated flagging with new chat model
* Added missing await
* Fixed chat user styles. Fixed spell group test
* Added new model to quest chat and group plan chat
* Removed extra timestamps. Added limit check for group plans
* Updated tests
* Synced id fields
* Fixed id creation
* Add meta and fixed tests
* Fixed group quest accept test
* Updated puppeteer
* Added migration
* Export vars
* Updated comments
2018-04-23 12:17:16 -05:00
SabreCat
9f06d78db6
Revert "moving developer-only strings to api messages ( #10188 )"
...
This reverts commit a42cb0e3ab
2018-04-15 17:09:15 +00:00
negue
a42cb0e3ab
moving developer-only strings to api messages ( #10188 )
...
* 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
2018-04-14 16:13:13 +02:00
Mateus Etto
314926cc06
Hard coded messages now using i18n strings
2018-03-12 21:45:41 +09:00
Mateus Etto
d2fcdf4493
Merge branch 'develop' into party-chat-translations
...
# Conflicts:
# website/server/controllers/api-v3/user.js
2018-02-26 19:55:32 +09:00
Keith Holliday
b850ea9dbf
Bulk spell casting ( #10007 )
...
* Reorganized spell code
* Added quantity field
* Fixed parameter passing
2018-02-23 11:30:15 -07:00
