From 2e4f81f4ab393ebfef39ac8b4a9ec7cd0556ef85 Mon Sep 17 00:00:00 2001 From: Rick Beerendonk Date: Sat, 31 Jan 2015 22:46:03 +0100 Subject: [PATCH 1/2] Add Conferences section to the Community Resources on the website --- _data/nav_docs.yml | 2 ++ docs/conferences.md | 19 +++++++++++++++++++ docs/thinking-in-react.md | 2 +- docs/videos.md | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 docs/conferences.md diff --git a/_data/nav_docs.yml b/_data/nav_docs.yml index 8b4acece..fcde3e37 100644 --- a/_data/nav_docs.yml +++ b/_data/nav_docs.yml @@ -8,6 +8,8 @@ title: Thinking in React - title: Community Resources items: + - id: conferences + title: Conferences - id: videos title: Videos - id: complementary-tools diff --git a/docs/conferences.md b/docs/conferences.md new file mode 100644 index 00000000..d2c5297e --- /dev/null +++ b/docs/conferences.md @@ -0,0 +1,19 @@ +--- +id: conferences +title: Conferences +permalink: conferences.html +prev: thinking-in-react.html +next: videos.html +--- + +### React.js Conf 2015 +January 28 & 29 + +[Website](http://conf.reactjs.com/) - [Schedule](http://conf.reactjs.com/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr) + + + +### ReactEurope 2015 +July 2 & 3 + +[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule) diff --git a/docs/thinking-in-react.md b/docs/thinking-in-react.md index e5518d5b..6d2dc87c 100644 --- a/docs/thinking-in-react.md +++ b/docs/thinking-in-react.md @@ -2,7 +2,7 @@ id: thinking-in-react title: Thinking in React prev: tutorial.html -next: videos.html +next: conferences.html --- This was originally a [blog post](/react/blog/2013/11/05/thinking-in-react.html) from the [official React blog](/react/blog). diff --git a/docs/videos.md b/docs/videos.md index 8036b104..c15a78da 100644 --- a/docs/videos.md +++ b/docs/videos.md @@ -2,7 +2,7 @@ id: videos title: Videos permalink: videos.html -prev: thinking-in-react.html +prev: conferences.html next: complementary-tools.html --- From 037b5829382d61f80c0f7b820475a8a5ce4a9d40 Mon Sep 17 00:00:00 2001 From: Rick Beerendonk Date: Mon, 9 Feb 2015 22:17:33 +0100 Subject: [PATCH 2/2] Remove zerowidth space at the beginning of file --- docs/conferences.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conferences.md b/docs/conferences.md index d2c5297e..aa5e6af1 100644 --- a/docs/conferences.md +++ b/docs/conferences.md @@ -1,4 +1,4 @@ ---- +--- id: conferences title: Conferences permalink: conferences.html