Dan Ribbens 03e6eeb507 fix bad merge

2019-12-26 14:28:34 -05:00

..

auth

revises the way that the config sends back collections and globals

2019-12-21 20:00:31 -05:00

client

retrieves config from newly created route

2019-10-18 17:26:46 -04:00

collections

merges master

2019-12-26 14:14:35 -05:00

errors

remove PayloadError and switched to APIError where it was used, set res status where possible and some fixed eslint issues

2019-12-23 16:54:27 -05:00

globals

merges master

2019-12-26 14:14:35 -05:00

init

eslint and code cleanup of uploads

2019-12-26 13:45:10 -05:00

localization

ensures that non-localized flexible content is still supported

2019-12-26 12:09:51 -05:00

mongoose

fix bad merge

2019-12-26 14:28:34 -05:00

routes

revises the way that the config sends back collections and globals

2019-12-21 20:00:31 -05:00

tests

remove unfinished test config changes

2019-10-29 10:18:06 -04:00

uploads

merges master

2019-12-26 14:14:35 -05:00

utilities

flattens content blocks and collections, cleans index.js, implements Airbnb ESLint

2019-12-21 15:54:30 -05:00

index.js

merges master

2019-12-26 14:14:35 -05:00