billing invoice and history conflict pr

Author: na3d

CHANGELOG.md

@@ -4,8 +4,39 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.15.3] 2017-10-13
+### Fixed
+- Send custom integers correctly on volume create
+
+## [0.15.2] 2017-10-13
+### Fixed
+- Rendering of selects
+- Filtering Linodes by region correctly when attaching
+
+## [0.15.1] 2017-10-13
+### Added
+- Fremont as available Volume region
+
+## [0.15.0] 2017-10-10
+### Added
+- Added volume_clone, credit_card_updated, payment_submitted event support #2622
+- KVMify #2562, #2611
+- Noscript #2565
+- Logout if in maintenance mode #2627
+### Changed
+- Use full backup names in dialogs #2564
+- Restore from Backup should not offer Region #2586
+- Buttons that are dropdowns include the default action in the dropdown #2585
+- Configs should be offered when creating from volume #2544
+- Restrict Volumes to availability regions #2623
+- Hide volume Linodes and Configs when appropriate #2630
+- (Docs) updated to 0.13.3
+### Fixed
+- Allow Notifications to poll with no previous Events #2618
+- Fix multi select (stackscript distros ui) #2614
+
 ## [0.14.2] 2017-10-04
-### Changes
+### Changed
 - Changes to work with the latest API changes
 - (Docs) Updated to 0.13.2
 

CONTRIBUTING.md

@@ -94,7 +94,7 @@ When creating a new feature:
 1. `git checkout develop`
 2. `git checkout -b my-feature-name`
 3. stage and commit changes to your feature branch
-4. `yarn run lint` # to lint your code
+4. `yarn lint` # to lint your code
 5. `yarn test` # to test your code, see 
 6. `git push -u your-remote my-feature-name` # push to your remote and --set-upstream-to
 7. `git checkout develop` and `git pull origin develop` # make sure you're up to date
@@ -139,7 +139,7 @@ Copy relative changes from the [CHANGELOG.md](https://github.com/linode/manager/
 **Tip**: set up your local git repository to lint before every commit.
 ```sh
 echo '#!/usr/bin/env bash' > .git/hooks/pre-commit
-echo 'yarn run lint' >> .git/hooks/pre-commit
+echo 'yarn lint' >> .git/hooks/pre-commit
 chmod +x .git/hooks/pre-commit
 ```
 
@@ -151,11 +151,11 @@ To run tests:
 
 To automatically re-run tests when you make changes:
 
-    yarn run test:watch
+    yarn test:watch
 
 To automatically re-run tests on a single test file:
 
-    yarn run test:watch --single_file=**/name.spec.js
+    yarn test:watch --single_file=**/name.spec.js
 
 Our tests live in test/**.spec.js. They're based on
 [Mocha](https://mochajs.org/) and do assertions with

components/breadcrumbs/Breadcrumbs.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { Link } from 'react-router';
 
 export default function Breadcrumbs(props) {

components/buttons/Button.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { Link } from 'react-router';
 
 export default function Button(props) {

components/buttons/CancelButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import Button from './Button';
 

components/buttons/ExternalLink.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 
 export default function ExternalLink(props) {

components/buttons/LinkButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import Button from './Button';
 

components/buttons/PrimaryButton.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import { Dropdown } from '../dropdowns';
 

components/cards/Card.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 
 export default function Card(props) {

components/cards/CardHeader.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function CardHeader(props) {
   return (

components/cards/CardImageHeader.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 
 export default function CardImageHeader(props) {

components/dropdowns/Dropdown.js

@@ -1,4 +1,4 @@
-import { PropTypes } from 'prop-types';
+import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 
 // Avoid a circular import by importing ../buttons by itself.
@@ -15,6 +15,16 @@ export default class Dropdown extends Component {
     };
   }
 
+  close = () => {
+    if (typeof this.props.onClose === 'function') {
+      this.props.onClose();
+    }
+
+    this.emitEvent(DROPDOWN_CLOSE, 'close');
+
+    this.setState({ open: false });
+  }
+
   emitEvent(type, action, item) {
     if (this.props.analytics && this.props.analytics.title) {
       EmitEvent(type, 'dropdown', action, this.props.analytics.title, item);
@@ -31,16 +41,6 @@ export default class Dropdown extends Component {
     this.setState({ open: !this.state.open });
   }
 
-  close = () => {
-    if (typeof this.props.onClose === 'function') {
-      this.props.onClose();
-    }
-
-    this.emitEvent(DROPDOWN_CLOSE, 'close');
-
-    this.setState({ open: false });
-  }
-
   wrapClick(f, item) {
     return (...args) => {
       this.emitEvent(DROPDOWN_CLICK, 'change', item);

components/editors/CodeEditor.js

@@ -1,7 +1,8 @@
 import 'brace';
 import 'brace/mode/javascript';
 import 'brace/theme/tomorrow';
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import AceEditor from 'react-ace';
 
 

components/errors/ComingSoon.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 
 export default function ComingSoon(props) {

components/errors/Error.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 
 export default function Error(props) {

components/errors/InternalError.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import { ExternalLink } from '../buttons';
 import { FormModalBody } from '../modals';

components/formats/Code.js

@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import Highlight from 'react-highlight';
 import ClipboardButton from 'react-clipboard.js';
 
@@ -12,20 +13,18 @@ export default class Code extends Component {
   constructor() {
     super();
 
-    this.onClickCopy = this.onClickCopy.bind(this);
-
     this.state = { clipboardIcon: DEFAULT_CLIPBOARD_ICON };
   }
 
-  onClickCopy() {
+  onClickCopy = () => {
     if (this.state.clipboardIcon === DEFAULT_CLIPBOARD_ICON) {
       this.setState({ clipboardIcon: 'fa-check' }, () => {
         setTimeout(() => {
           this.setState({ clipboardIcon: DEFAULT_CLIPBOARD_ICON });
         }, 2500);
       });
     }
-  }
+  };
 
   render() {
     const { example, language, noclipboard } = this.props;

components/forms/Checkbox.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function Checkbox(props) {
   return (

components/forms/CheckboxInputCombo.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import Checkbox from './Checkbox';
 import Input from './Input';

components/forms/Checkboxes.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function Checkboxes(props) {
   return <fieldset className="Checkboxes">{props.children}</fieldset>;

components/forms/Form.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import { EmitEvent, FORM_SUBMIT } from '../utils';
 

components/forms/FormGroup.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function FormGroup(props) {
   const { errors, name, crumbs } = props;

components/forms/FormGroupError.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function FormGroupError(props) {
   const { errors, name, crumbs, inline, className } = props;

components/forms/FormSummary.js

@@ -1,30 +1,29 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 
-export default class FormSummary extends Component {
-  render() {
-    const { className, errors, success } = this.props;
+export default function FormSummary(props) {
+  const { className, errors, success } = props;
 
-    let content;
-    if (errors._ && errors._.length) {
-      content = (
-        <div className="alert alert-danger">
-          {errors._.map(error => {
-            const text = error.reason || error;
-            return (<div key={text}>{text}</div>);
-          })}
-        </div>
-      );
-    } else if (Object.keys(errors).length > 1) {
-      content = <div className="alert alert-danger">Please fix all errors before retrying.</div>;
-    } else if (errors._) {
-      content = success ? <div className="alert alert-success">{success}</div> : '';
-    }
-
-    return (
-      <div className={`FormSummary ${className}`}>{content}</div>
+  let content;
+  if (errors._ && errors._.length) {
+    content = (
+      <div className="alert alert-danger">
+        {errors._.map(error => {
+          const text = error.reason || error;
+          return (<div key={text}>{text}</div>);
+        })}
+      </div>
     );
+  } else if (Object.keys(errors).length > 1) {
+    content = <div className="alert alert-danger">Please fix all errors before retrying.</div>;
+  } else if (errors._) {
+    content = success ? <div className="alert alert-success">{success}</div> : '';
   }
+
+  return (
+    <div className={`FormSummary ${className}`}>{content}</div>
+  );
 }
 
 FormSummary.propTypes = {

components/forms/Input.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function Input(props) {
   return (

components/forms/ModalFormGroup.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import FormGroup from './FormGroup';
 import FormGroupError from './FormGroupError';

components/forms/PasswordInput.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import Input from './Input';
 

components/forms/Radio.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function Radio(props) {
   return (

components/forms/RadioInputCombo.js

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import Radio from './Radio';
 import Input from './Input';
@@ -7,14 +8,15 @@ export default function RadioInputCombo(props) {
   return (
     <div className="RadioInputCombo">
       <Radio
-        id={props.radioId}
+        name={props.radioName}
         value={props.radioValue}
         checked={props.radioChecked}
         onChange={props.radioOnChange}
         label={props.radioLabel}
       />
       <Input
         id={props.inputId}
+        name={props.inputName}
         value={props.inputValue}
         onChange={props.inputOnChange}
         label={props.inputLabel}
@@ -27,13 +29,14 @@ export default function RadioInputCombo(props) {
 }
 
 RadioInputCombo.propTypes = {
-  radioId: PropTypes.string,
+  radioName: PropTypes.string,
   radioOnChange: PropTypes.func.isRequired,
   radioLabel: PropTypes.string.isRequired,
   radioChecked: PropTypes.bool.isRequired,
   radioValue: PropTypes.object,
   inputOnChange: PropTypes.func.isRequired,
   inputId: PropTypes.string,
+  inputName: PropTypes.string,
   inputValue: PropTypes.any.isRequired,
   inputDisabled: PropTypes.bool,
   inputLabel: PropTypes.string,