Skip to content

Merge existing release to master #2

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Aug 15, 2017
Merged

Merge existing release to master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a57ebd8
immutable compatibility close #77
nihaux Nov 3, 2016
f89749c
Merge remote-tracking branch 'Nihaux/immutable2' into immutable2
Dec 11, 2016
a4ce98b
Resolve duplicate merged methods of finding currentLocation
Dec 12, 2016
778e26f
Make the router an immutable object through a deep conversion, and co…
Dec 12, 2016
a606523
Parse query string on back button (#131)
tptee Jan 3, 2017
74fcd4c
12.1.2
tptee Jan 3, 2017
05ec969
Bumps the peer dependency for react-redux (#134)
adregan Jan 17, 2017
4be2667
Also handle plain old Javascript objects being passed in, even when t…
Jan 19, 2017
cb6e810
Allow routes to specify `patternOptions` to pass through to `url-patt…
Jan 31, 2017
9a7e2e1
Add a note and example for how `url-pattern` options can be set
Jan 31, 2017
3732ee1
Add test for `patternOptions`
Jan 31, 2017
7a581eb
Add `lodash.omit` so that we can remove `patternOptions` from route m…
Jan 31, 2017
8e56589
if `patternOptions` is defined on the route, omit it from the result
Jan 31, 2017
9b80e1d
eslint fixes
Jan 31, 2017
91b0a07
Merge branch 'immutable2' into j5-12.1.2-j5-1
Jan 31, 2017
4fa7cc0
Merge branch 'allow-url-pattern-options' into j5-12.1.2-j5-1
Jan 31, 2017
ad80ce6
Build before internal j5 release
Jan 31, 2017
7911c46
Internal j5 release
Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import yourReducer from './your-app';
// Useful for page titles and other route-specific data.

// Uses https://github.com/snd/url-pattern for URL matching
// and parameter extraction.
// and parameter extraction. options can be set in patternOptions
const routes = {
'/messages': {
title: 'Message'
Expand All @@ -62,6 +62,7 @@ const routes = {
title: 'Biographies',
'/:name': {
title: 'Biography for:'
patternOptions: {segmentValueCharset: 'a-zA-Z_'},
}
}
}
Expand Down
Loading