This repository was archived by the owner on Jan 22, 2020. It is now read-only.
Conversation
attempt #1 to make react-engine compatible with react-router v1.x
* "react": "^0.14.0", * "react-router": "^1.0.0-rc3"
Review for fixing test cases to accommodate version changes
* Adding edge example to do live testing * Working on tests * Deal with JSCS issues
Multiple bug fixes + client-side redirect
Added Test Cases and Modified Edge Example
404 Capability
* documentation udpated * adding URL for 404 reporting
404 Capability Follow Up
* master: Export Router object to consumers (#81) updates package.json test to include new grunt linting fixes code as per jscs adds back .jscsrc updates jshint to eslint update change log and pkg version updating documentation Fix test errors. Custom doctype option locak down the version of react and react-router for sane predictable installations make the clearRequireCacheInDir platform windows friendly Upgraded to v2 as suggested by @samsel Updating webpack example to work # Conflicts: # .jscsrc # README.md # lib/client.js # lib/server.js # package.json
* upstream/master: (30 commits) fix jscs lint issues remove node v4.0 from travis until jsdom dependency version is figured out update read me with the server side setup for the example app updated styles for the example app fully functioning app add the instructions for the detail/layout/list page push the instructions for step 2.1 in the example app update the read me Fix indentation in code blocks in README.md fixed typo in the readMe on the server side, when the docType is empty, attach the script to the end of the rendered string update changelog and readme hoist Router and other publish manifest changes update the pkg versions in examples Throw an error if peer dependency is not installed Removed conflict in Readme added a page to list movies renamed examples folder to example created lib to abstract all helpers and other stuff removed the simple example ... # Conflicts: # .gitignore # .jscsrc # README.md # lib/client.js # lib/server.js # package.json
updated docs and prepare to release 3.x
* upstream/master: correct the change log with the correct description for 2.6.2 release update changeLog replace lodash-node # Conflicts: # package.json
v3.x cleanup
Contributor
There was a problem hiding this comment.
and empty string should be an empty string
vuhwang
added a commit
that referenced
this pull request
Jan 11, 2016
[v3.x] - support react-router@1 and react@0.14
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.