12 Commits

Author	SHA1	Message	Date
Dave Conway-Jones	f5bebef37f	websocket - preserve _session on msg but don't send as part of wholemsg	2018-09-23 10:34:22 +01:00
Nick O'Leary	2aae76c9bc	Merge branch 'dev' into repackage	2018-09-17 14:49:11 +01:00
Nick O'Leary	cfaaef7860	Merge branch 'dev' into repackage	2018-09-06 10:31:36 +01:00
Nick O'Leary	18b5b4901f	Merge branch 'dev' into repackage	2018-08-31 21:18:23 +01:00
Nick O'Leary	55d71659f8	Merge branch 'master' into repackage	2018-08-29 09:55:40 +01:00
Nick O'Leary	79e004a040	Merge branch 'master' into repackage	2018-08-24 14:13:09 +01:00
Nick O'Leary	546f07156f	Move node locales and tidy up package.json files	2018-08-20 20:31:29 +01:00
Nick O'Leary	954226da0d	Fix up promises in tests, remove package-lock	2018-08-20 16:45:50 +01:00
Nick O'Leary	e57d8ba0ef	pull out editor-client and editor-api	2018-08-17 22:10:54 +01:00
Nick O'Leary	6b79c6135f	Merge branch 'master' into repackage	2018-08-16 20:43:15 +01:00
Nick O'Leary	a3aec6b939	Merge branch 'master' into repackage	2018-08-15 20:46:56 +01:00
Nick O'Leary	ecd8f97d8b	WIP: move all the code	2018-08-04 22:23:06 +01:00