Revert "Rebase"

.editorconfig

@@ -10,7 +10,7 @@ insert_final_newline = true
 indent_style = tab
 
 [*.js]
-indent_size = 2
+indent_size = 4
 
 [*.json]
 indent_style = space

.eslintignore

@@ -7,4 +7,3 @@ docs/*
 fields/types/**/lib/*
 node_modules/*
 test/*
-website/*

.github/ISSUE_TEMPLATE.md

@@ -3,9 +3,10 @@
 
   Please ask questions and support requests on:
   * https://stackoverflow.com/questions/tagged/keystonejs
+  * https://gitter.im/keystonejs/keystone
 
-  Join the KeystoneJS Slack for discussion with the community & contributors:
-  * https://launchpass.com/keystonejs
+  New features can be requested and voted upon on:
+  * https://productpains.com/product/keystonejs
  -->
 
 ### Expected behavior
@@ -22,7 +23,7 @@
 
 ### Steps to reproduce the actual/current behavior
 <!-- If you're describing a bug, tell us what steps to take to reproduce your bug -->
-<!-- If you're suggesting a change/improvement, explain how to reproduce the current behavior -->
+<!-- If you'resuggesting a change/improvement, explain how to reproduce the current behavior -->
 
 
 
@@ -32,5 +33,4 @@
 | Software         | Version
 | ---------------- | -------
 | Keystone         | 
-| Node.js          | 
-| Browser          | 
+| Node             | 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,30 +1,29 @@
 <!--
+
  Please make sure the following is filled in before submitting your Pull Request - thanks!
 
- Join the KeystoneJS Slack for discussion with the community & contributors:
-  * https://launchpass.com/keystonejs
  -->
 
 ## Description of changes
 
 
+
 ## Related issues (if any)
 
 
 ## Testing
 
- - [ ] List browser version(s) any admin UI changes were tested in:
- - [ ] Please confirm you've added (or verified) test coverage for this change.
- - [ ] Please confirm `npm run test-all` ran successfully.
+- [ ] Please confirm `npm run test-all` ran successfully.
 
 <!--
+
  Notes:
- * For more information on the End-2-End (E2E) testing framework for Keystone 4, see:
-    https://github.com/keystonejs/keystone-nightwatch-e2e
- * To successfully have all E2E tests pass you need to have the following set up:
-    - A recent version of Chrome or Firefox
-    - Java Runtime Environment 1.8+
+
+ * To successfully have all e2e tests pass you need to have the following setup:
+    - a recent version of the chrome browser
+    - java 1.8+
  * If you are developing in Windows you may run into linebreak linting issues.
    One possible workaround is to remove the "linebreak-style" rule in `node_modules/eslint-config-keystone/eslintrc.json`.
+
  -->
 

.gitignore

@@ -33,9 +33,4 @@ reports
 
 test/e2e/drivers/*
 
-package-lock.json
 yarn.lock
-
-# Website dependencies
-website/.cache
-website/public

.travis.yml

@@ -44,7 +44,21 @@ matrix:
         - npm run test-admin
       env:
         - JOB=unit_tests_node_6
-
+    - node_js: '5'
+      script:
+        - npm run test-admin
+      env:
+        - JOB=unit_tests_node_5
+    - node_js: '4'
+      script:
+        - npm run test-admin
+      env:
+        - JOB=unit_tests_node_4
+    - node_js: '0.12'
+      script:
+        - npm run test-admin
+      env:
+        - JOB=unit_tests_node_0.12
 
 before_script:
 - sleep 15
@@ -62,9 +76,8 @@ services:
 git:
   depth: 10
 cache:
-  yarn: true
   directories:
-    - node_modules
+  - node_modules
 addons:
   apt:
     sources:

HISTORY.md

@@ -2,9 +2,6 @@
 
 KeystoneJS is maintained by [@JedWatson](https://github.com/JedWatson) and an amazing team of contributors. All contributions are given credit here except for Jed's.
 
-Release notes for Keystone 4 beta & release candidates can be found on the [GitHub releases]( https://github.com/keystonejs/keystone/releases) page.
-
-Changes for production releases are included below.
 
 ## v0.3.22 / 2016-07-22
 

admin/client/App/components/Navigation/Primary/index.js

@@ -91,8 +91,7 @@ var PrimaryNavigation = React.createClass({
 
 		return this.props.sections.map((section) => {
 			// Get the link and the class name
-			const to = !section.lists[0].external && `${Keystone.adminPath}/${section.lists[0].path}`;
-			const href = section.lists[0].external && section.lists[0].path;
+			const href = section.lists[0].external ? section.lists[0].path : `${Keystone.adminPath}/${section.lists[0].path}`;
 			const isActive = this.props.currentSectionKey && this.props.currentSectionKey === section.key;
 			const className = isActive ? 'primary-navbar__item--active' : null;
 
@@ -102,8 +101,7 @@ var PrimaryNavigation = React.createClass({
 					key={section.key}
 					label={section.label}
 					className={className}
-					to={to}
-					href={href}
+					to={href}
 				>
 					{section.label}
 				</PrimaryNavItem>

admin/client/App/elemental/Button/index.js

@@ -23,7 +23,7 @@ class Button extends Component {
 	render () {
 		var {
 			active,
-			cssStyles,
+			aphroditeStyles,
 			block,
 			className,
 			color,
@@ -43,7 +43,7 @@ class Button extends Component {
 			block ? commonClasses.block : null,
 			disabled ? commonClasses.disabled : null,
 			active ? variantClasses.active : null,
-			...cssStyles
+			...aphroditeStyles
 		);
 		if (className) {
 			props.className += (' ' + className);
@@ -64,23 +64,23 @@ class Button extends Component {
 
 Button.propTypes = {
 	active: PropTypes.bool,
+	aphroditeStyles: PropTypes.arrayOf(PropTypes.shape({
+		_definition: PropTypes.object,
+		_name: PropTypes.string,
+	})),
 	block: PropTypes.bool,
 	color: PropTypes.oneOf(BUTTON_COLORS),
 	component: PropTypes.oneOfType([
 		PropTypes.func,
 		PropTypes.string,
 	]),
-	cssStyles: PropTypes.arrayOf(PropTypes.shape({
-		_definition: PropTypes.object,
-		_name: PropTypes.string,
-	})),
 	disabled: PropTypes.bool,
 	href: PropTypes.string,
 	size: PropTypes.oneOf(BUTTON_SIZES),
 	variant: PropTypes.oneOf(BUTTON_VARIANTS),
 };
 Button.defaultProps = {
-	cssStyles: [],
+	aphroditeStyles: [],
 	color: 'default',
 	variant: 'fill',
 };

admin/client/App/elemental/FormField/index.js

@@ -17,7 +17,7 @@ class FormField extends Component {
 	render () {
 		const { formLayout = 'basic', labelWidth } = this.context;
 		const {
-			cssStyles,
+			aphroditeStyles,
 			children,
 			className,
 			cropLabel,
@@ -31,7 +31,7 @@ class FormField extends Component {
 			classes.FormField,
 			classes['FormField--form-layout-' + formLayout],
 			offsetAbsentLabel ? classes['FormField--offset-absent-label'] : null,
-			cssStyles
+			aphroditeStyles
 		);
 		if (className) {
 			props.className += (' ' + className);
@@ -75,12 +75,12 @@ FormField.childContextTypes = {
 	formFieldId: PropTypes.string,
 };
 FormField.propTypes = {
-	children: PropTypes.node,
-	cropLabel: PropTypes.bool,
-	cssStyles: PropTypes.oneOfType([
+	aphroditeStyles: PropTypes.oneOfType([
 		PropTypes.arrayOf(PropTypes.shape(stylesShape)),
 		PropTypes.shape(stylesShape),
 	]),
+	children: PropTypes.node,
+	cropLabel: PropTypes.bool,
 	htmlFor: React.PropTypes.string,
 	label: React.PropTypes.string,
 	offsetAbsentLabel: React.PropTypes.bool,

admin/client/App/elemental/FormInput/index.js

@@ -15,7 +15,7 @@ class FormInput extends Component {
 	}
 	render () {
 		const {
-			cssStyles,
+			aphroditeStyles,
 			className,
 			disabled,
 			id,
@@ -36,7 +36,7 @@ class FormInput extends Component {
 			classes['FormInput__size--' + size],
 			disabled ? classes['FormInput--disabled'] : null,
 			formLayout ? classes['FormInput--form-layout-' + formLayout] : null,
-			...concatClassnames(cssStyles)
+			...concatClassnames(aphroditeStyles)
 		);
 		if (className) {
 			props.className += (' ' + className);
@@ -61,7 +61,7 @@ const stylesShape = {
 };
 
 FormInput.propTypes = {
-	cssStyles: PropTypes.oneOfType([
+	aphroditeStyles: PropTypes.oneOfType([
 		PropTypes.arrayOf(PropTypes.shape(stylesShape)),
 		PropTypes.shape(stylesShape),
 	]),

admin/client/App/elemental/FormInput/noedit.js

@@ -56,6 +56,7 @@ const classes = {
 		borderWidth: theme.input.border.width,
 		color: theme.color.gray80,
 		display: 'inline-block',
+		height: theme.input.height,
 		lineHeight: theme.input.lineHeight,
 		padding: `0 ${theme.input.paddingHorizontal}`,
 		transition: 'border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s',

admin/client/App/elemental/FormLabel/index.js

@@ -3,7 +3,7 @@ import React, { PropTypes } from 'react';
 import classes from './styles';
 
 function FormLabel ({
-	cssStyles,
+	aphroditeStyles,
 	className,
 	component: Component,
 	cropText,
@@ -20,7 +20,7 @@ function FormLabel ({
 		classes.FormLabel,
 		formLayout ? classes['FormLabel--form-layout-' + formLayout] : null,
 		cropText ? classes['FormLabel--crop-text'] : null,
-		cssStyles
+		aphroditeStyles
 	);
 	if (className) {
 		props.className += (' ' + className);
@@ -41,15 +41,15 @@ const stylesShape = {
 };
 
 FormLabel.propTypes = {
+	aphroditeStyles: PropTypes.oneOfType([
+		PropTypes.arrayOf(PropTypes.shape(stylesShape)),
+		PropTypes.shape(stylesShape),
+	]),
 	component: PropTypes.oneOfType([
 		PropTypes.string,
 		PropTypes.func,
 	]),
 	cropText: PropTypes.bool,
-	cssStyles: PropTypes.oneOfType([
-		PropTypes.arrayOf(PropTypes.shape(stylesShape)),
-		PropTypes.shape(stylesShape),
-	]),
 };
 FormLabel.defaultProps = {
 	component: 'label',

admin/client/App/elemental/Glyph/index.js

@@ -10,7 +10,7 @@ import classes from './styles';
 // font and CSS; inflating the project size
 
 function Glyph ({
-	cssStyles,
+	aphroditeStyles,
 	className,
 	color,
 	component: Component,
@@ -24,7 +24,7 @@ function Glyph ({
 		classes.glyph,
 		colorIsValidType && classes['color__' + color],
 		classes['size__' + size],
-		cssStyles
+		aphroditeStyles
 	) + ` ${octicons[name]}`;
 	if (className) {
 		props.className += (' ' + className);
@@ -40,14 +40,14 @@ function Glyph ({
 };
 
 Glyph.propTypes = {
+	aphroditeStyles: PropTypes.shape({
+		_definition: PropTypes.object,
+		_name: PropTypes.string,
+	}),
 	color: PropTypes.oneOfType([
 		PropTypes.oneOf(Object.keys(colors)),
 		PropTypes.string, // support random color strings
 	]),
-	cssStyles: PropTypes.shape({
-		_definition: PropTypes.object,
-		_name: PropTypes.string,
-	}),
 	name: PropTypes.oneOf(Object.keys(octicons)).isRequired,
 	size: PropTypes.oneOf(Object.keys(sizes)),
 };

admin/client/App/elemental/GlyphButton/index.js

@@ -28,7 +28,7 @@ function GlyphButton ({
 
 	const icon = (
 		<Glyph
-			cssStyles={classes.glyph}
+			aphroditeStyles={classes.glyph}
 			color={glyphColor}
 			name={glyph}
 			size={glyphSize}

admin/client/App/elemental/GlyphField/index.js

@@ -21,7 +21,7 @@ function GlyphField ({
 
 	const icon = (
 		<Glyph
-			cssStyles={classes.glyph}
+			aphroditeStyles={classes.glyph}
 			color={glyphColor}
 			name={glyph}
 			size={glyphSize}
@@ -30,7 +30,7 @@ function GlyphField ({
 	);
 
 	return (
-		<Field cssStyles={classes.wrapper} {...props}>
+		<Field aphroditeStyles={classes.wrapper} {...props}>
 			{isLeft && icon}
 			{children}
 			{isRight && icon}