Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/react-intl] merge feature/redux #734

Commits on Apr 24, 2016

  1. Merge pull request kriasoft#618 from langpavel/feature/redux

    Sync master into feature/redux
    koistya committed Apr 24, 2016
    Configuration menu
    Copy the full SHA
    6b40eb7 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2016

  1. Configuration menu
    Copy the full SHA
    51ffc76 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2016

  1. Configuration menu
    Copy the full SHA
    4a73920 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2016

  1. Add support for helpers in redux-thunk actions (kriasoft#650)

    Support for isomorphic `fetch` and `graphqlRequest`
    helpers in redux-thunk action creators
    langpavel authored and koistya committed May 17, 2016
    Configuration menu
    Copy the full SHA
    2ea534e View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. Configuration menu
    Copy the full SHA
    9ecbcbc View commit details
    Browse the repository at this point in the history

Commits on May 19, 2016

  1. Configuration menu
    Copy the full SHA
    02393af View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. Configuration menu
    Copy the full SHA
    b22b181 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. Change db string length (kriasoft#691)

    zzh8829 authored and koistya committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    19077c4 View commit details
    Browse the repository at this point in the history
  2. Update history module to v3 (kriasoft#692)

    - Update `history` dependency to v3.0.0 ([changelog](https://github.com/ReactJSTraining/history/blob/master/CHANGES.md))
    - Add `windowScrollX` and `windowScrollY` helpers to `core/DOMUtils`
    - Rename `match()` to `UniversalRouter.resolve()`
    - Fix scroll issues ([see article](https://developers.google.com/web/updates/2015/09/history-api-scroll-restoration))
    frenzzy authored and koistya committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    c556508 View commit details
    Browse the repository at this point in the history
  3. fix(Isomorphic Style Loader): Add support to load multiple styles (kr…

    …iasoft#678)
    
    * fix(Isomorphic Style Loader): Add support to load multiple styles
    
    * fix(Isomorphic Style Loader): Add remove feature back
    dhyegocalota authored and koistya committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    daf10cf View commit details
    Browse the repository at this point in the history
  4. Adds testing section (kriasoft#687)

    Integrates comments by @langpavel
    bravo-kernel authored and koistya committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    8c3bd6c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    de4d26e View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. Configuration menu
    Copy the full SHA
    bf44958 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2016

  1. fixed typo in passport.js (kriasoft#696)

    kenjim83 authored and koistya committed Jun 12, 2016
    Configuration menu
    Copy the full SHA
    68b0fd4 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2016

  1. Configuration menu
    Copy the full SHA
    47c7156 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2016

  1. Add eslint global-require exception (kriasoft#703)

    Add eslint global-require exception, based in 'src/server.js' file.
    
    The 'feature/react-intl' branch also has this problem.
    EdikoCruz authored and koistya committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    f0efee8 View commit details
    Browse the repository at this point in the history
  2. Update stylelint-config-standard (kriasoft#707)

    * Update stylelint-config-standard
    
    When I run 'npm run lint', this warning show up:
    
    Deprecation Warning: 'number-zero-length-no-unit' has been deprecated, and will be removed in '7.0'. Use 'length-zero-no-unit' instead. See: http://stylelint.io/user-guide/rules/length-zero-no-unit/
    
    update package to remove it.
    
    * Update stylelint
    
    to use length-zero-no-unit instead number-zero-length-no-unit.
    EdikoCruz authored and koistya committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    bb655fa View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. Configuration menu
    Copy the full SHA
    0f2d46b View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2016

  1. Remove jade dependency

    frenzzy committed Jun 18, 2016
    1 Configuration menu
    Copy the full SHA
    7456f47 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2016

  1. Update react-style-guide.md (kriasoft#718)

    replace ../Nav with ../Navigation
    giolin authored and koistya committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    ef8b03d View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2016

  1. Merge PR kriasoft#711: Remove Jade dependency

    Remove jade dependency
    koistya authored Jul 10, 2016
    Configuration menu
    Copy the full SHA
    5155d62 View commit details
    Browse the repository at this point in the history
  2. Update CHANGELOG.md

    koistya committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    f671ec5 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into feature/redux

    Conflicts:
    	package.json
    	src/client.js
    	src/server.js
    	src/views/index.jade
    langpavel committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    0dd8363 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'feature/redux' into feature/react-intl

    Conflicts:
    	package.json
    	src/client.js
    	src/server.js
    	src/views/index.jade
    langpavel committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    24204ce View commit details
    Browse the repository at this point in the history