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

Rebases 'next' branch onto current 'master'. #2165

Closed
wants to merge 352 commits into from
Closed

Rebases 'next' branch onto current 'master'. #2165

wants to merge 352 commits into from

Conversation

jimbolla
Copy link
Contributor

No description provided.

Will White and others added 30 commits May 3, 2016 13:22
* use subscribe to persist to localStorage

more discoverable than #1608

* Clearer wording
Just fixed a sentence error.
* feat(compose): optimize one function case

* style(compose): do not use a variable for funcs.length

* test(compose): add test for a single param
* Remove redundant empty layers (groups) from SVG logo

* Optimize redux SVG logo code w/ SVGO
I think React is in our head stamped with ReactDOM.
So it may be clearer to specifiate React Native, even if there is no difference between using Redux within React nor React Native.

What do you think?
`expect` package is missing from devDependencies and it's required to run tests in this example.
* Add check for ES3 syntax compatibility

* Remove uglify optimization that undos ES3 compatibility
I had to add a .babelrc change to get the default examples to work, as described here:
http://jamesknelson.com/testing-in-es6-with-mocha-and-babel-6/
Add extra required babel configuration step
I, Herman, setup up patreon account as an employee of HauteLook. The company should receive the credit for funding the project.
The normalizr lib has moved to a different location. Update the URL in comments to point to the new repo.
Hope you are willing to have this listed - I've got lots of great feedback from people who have taken it!
* rename createStore param `initialState` to `preloadedState`

* rename configureStore param `initialState` to `preloadedState`

* rename `window.__INITIAL_STATE__` in examples and docs

rename window.__INITIAL_STATE__ to window.__PRELOADED_STATE__
wmertens and others added 26 commits November 25, 2016 09:59
This short piece of code renders all html tags in JSON harmless, by replacing the `<` character with its unicode escape `\u003c`. Since the only place where JSON can have `<` is in strings, this is sufficient for protecting JSON from XSS injection.
Provide example of initial state SSR scrub
Doc: Improve readability of Usage with React Router section
Fixed typo and increased fidelity of description with respect to
example.
Doc: clarify Navigating with React Router section
Added a line in handleChange() which fixes the issue of posts not being requested when a new subreddit is selected.
Updated ExampleRedditAPI.md
grammar fix - missing word
Update ReducingBoilerplate.md
Remove `export` from requestPosts, receivePosts, and fetchPosts actions, as these are not exported in the final version. Also suggest adding brief explanation as to why they are not exported.
#2142)

* Modification to docs/basics/Reducers to make imports more clear. This should help reduce the need to scroll down to the completed code at the bottom of the file, as mentioned in #2107

* Removed instructions on importing SET_VISIBILITY_FILTER
Code typo: returns => return
fixed condition where multiple bad values would be filtered out and h…
…#1569)

* throw error if getState, subscribe, or unsubscribe called while dispatching

* prevent throwing if not subscribed

* update getState error message

* fix space after period

* update subscribe/unsubscribe error messages
* Add a doc section on dispatching during middleware setup.

* Warn when dispatching during middleware setup.

* Upgrade the warning to an error.

* Update docs to match thrown error behavior.
Redux 4.x behavior changes from 'keeps unwrapped dispatch available while middleware is initializing' to  'warns when dispatching during middleware setup'
@jimbolla
Copy link
Contributor Author

It looks like a lot, but it's really just rebasing 51be564 b368bd5 and 27bef56

I'm unsure if github is handling rebasing via a PR correctly or not; first time I've ever tried it. I wasn't expecting that Merge commit it made me do at the end. It might be cleaner to just force push the branch..

@timdorr
Copy link
Member

timdorr commented Dec 30, 2016

Yeah, this isn't working right... 😄

I can make sure that branch gets updated by hand. Doing this via PR isn't going to work with the complexity of it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.