mrutkows closed pull request #251: Added latest events. Fixed repo name in README. Fixed nav. URL: https://github.com/apache/incubator-openwhisk-website/pull/251
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index 89224e3..a084d4b 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Apache OpenWhisk is a cloud-first distributed event-based programming service. I ### Install Prerequisites -* Download and install Nodejs: see [https://nodejs.org/](https://nodejs.org/) +* Download and install Node.js: see [https://nodejs.org/](https://nodejs.org/) * Download and install Ruby: see [https://www.ruby-lang.org/en/documentation/installation/](https://www.ruby-lang.org/en/documentation/installation/) ``` sh @@ -27,10 +27,10 @@ gem install jekyll bundler ``` sh # Clone the repository (and correct branch). -git clone https://github.com/openwhisk/openwhisk.github.io.git +git clone https://github.com/apache/incubator-openwhisk-website.git # Move into the cloned repo. -cd openwhisk.github.io +cd incubator-openwhisk-website # Install gem dependencies bundle install @@ -71,7 +71,7 @@ https://builds.apache.org/view/OpenWhisk/job/OpenWhisk-site/ Report bugs, ask questions and request features [here on GitHub](../../issues). -You can also join our slack channel and chat with developers. To get access to our slack channel, please see the instructions [here](https://github.com/openwhisk/openwhisk/wiki). +You can also join our slack channel and chat with developers. To get access to our slack channel, please see the instructions [here](https://github.com/apache/incubator-openwhisk/wiki). ### License diff --git a/_includes/partial/site-header.html b/_includes/partial/site-header.html index 3d1da40..cde42dc 100644 --- a/_includes/partial/site-header.html +++ b/_includes/partial/site-header.html @@ -75,7 +75,7 @@ class="site-nav__item site-nav__item--dropdown-item">Demos & Examples</a> <a href="https://github.com/apache/incubator-openwhisk-external-resources#articles"; class="site-nav__item site-nav__item--dropdown-item">Articles</a> - <a href="https://github.com/apache/incubator-openwhisk-/opennal-resources#workshops"; + <a href="https://github.com/apache/incubator-openwhisk-external-resources#tutorials"; class="site-nav__item site-nav__item--dropdown-item">Tutorials</a> </div> </div> diff --git a/events.md b/events.md index 2ebfef0..8c87891 100644 --- a/events.md +++ b/events.md @@ -8,29 +8,42 @@ The Apache Software Foundation does not endorse listed events. [Get in touch wit ## Upcoming Events -### September 2017 +### February 2018 +- [**ServerlessConf Boston Meetup**](https://www.meetup.com/Serverless-Boston/events/245915761/), February 7th, Boston, US<br/>Paul Castro will be presenting on Apache OpenWhisk. +- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/245972003/), February 15th, NY, US<br/>Daniel Krook will be presenting on Apache OpenWhisk using IBM Cloud Functions. +- [**Serverlessconf Paris**](http://paris.serverlessconf.io/), February 14th-15th, Paris, France<br/>A workshop and talk on OpenWhisk and IBM Cloud Functions. +- [**JeffConf Hamburg**](https://hamburg.jeffconf.com/), February 15th-16th, Hamburg, Germany<br/>Several OpenWhisk members in attendance. +- [**DevNexus Atlanta**](https://devnexus.com/speakers/), February 21st-23rd, Atlanta, US<br/>Raymond Camden will provide "A general introduction to serverless with Apache OpenWhisk." -- [**APIDays Zurich**](http://www.apidays.io/events/zurich-2017), September 26th-27th 2017, Zurich, Switzerland<br/>Rob Allen will give a talk on building serverless APIs in Swift -- [**Pixels Camp**](https://pixels.camp/jthomas), September 28th-30th 2017, Lisbon, Portugal<br/>James Thomas will give a talk on building serverless applications using OpenWhisk +### March 2018 +- [**IBM Think**](https://www.ibm.com/events/think/), March 19th?22rd, Las Vegas, USA<br/>Several talks on OpenWhisk and IBM Cloud Functions. +- [**Voxxed Days Bristol**](https://voxxeddays.com/bristol/), March 15th, Bristol, UK<br/>James Thomas will talk about "Microservices Without Servers." + +## Past Events + +### January 2018 +- [**CodeMash**](https://akrabat.com/talks/serverless-apis-codemash/), January 9th-12th, Sandusky, US<br/>Rob Allen spoke about how to "Build a Delightful API with Serverless Technology." + +### November 2017 + +- [**?Con London**](https://skillsmatter.com/conferences/8549-con-2017-the-microservices-conference), November 6th-7th 2017, London, UK<br/>Rob Allen will give a talk on building serverless APIs in Swift +- [**Devoxx Morocco**](https://devoxx.ma/), November 14th-16th 2017, Casablanca, Morocco<br/>James Thomas will give a talk on building serverless applications with OpenWhisk +- [**UA Mobile**](http://uamobile.org/topics/serverless-swift-apache-openwhisk), November 25th 2017, Kiev, Ukraine<br/>James Thomas will give a talk on building mobile APIs with Swift on OpenWhisk ### October 2017 - [**TopConf Duesseldorf**](https://www.topconf.com/conference//duesseldorf-2017/talk/microservices-without-servers/), October 4th-6th 2017, Cologne, Germany<br/>James Thomas will give a talk on building serverless applications using OpenWhisk - [**NCDevCon**](http://ncdevcon.com/) Carlos Santana will give a talk on using OpenWhisk with Websites. - [**ServerlessConf**](https://nyc.serverlessconf.io/agenda) October 8th-11th, NY, US<br/> Several talks on OpenWhisk -- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/243399016/?_cookie-check=QsFBwgKfBvP1vKyC) October 12th, NY, US<br/> Dan Krooks (IBM) and Dragos Dascalita Haut (Adobe) will be presenting on Apache OpenWhisk +- [**ServerlessConf NYC Meetup**](https://www.meetup.com/Serverless-NYC/events/243399016/?_cookie-check=QsFBwgKfBvP1vKyC) October 12th, NY, US<br/> Daniel Krook (IBM) and Dragos Dascalita Haut (Adobe) will be presenting on Apache OpenWhisk - [**Nordic APIs Summit**](https://nordicapis.com/?post_type=sessions&p=6682), October 10th-11th 2017, Stockholm, Sweden<br/>James Thomas will give a talk on building serverless APIs using OpenWhisk and Swift - [**Going Serverless**](http://certifiedfreshevents.com/events/going-serverless/), October 20th 2017, Online Webinar<br/>James Thomas will give a talk on building multi-provider serverless applications with The Serverless Framework and OpenWhisk - [**BristolJS October**](https://www.meetup.com/BristolJS/events/242690371/), October 25th 2017, Bristol, England<br/>James Thomas will give a talk on serverless Node.js applications with OpenWhisk -### November 2017 - -- [**?Con London**](https://skillsmatter.com/conferences/8549-con-2017-the-microservices-conference), November 6th-7th 2017, London, UK<br/>Rob Allen will give a talk on building serverless APIs in Swift -- [**Devoxx Morocco**](https://devoxx.ma/), November 14th-16th 2017, Casablanca, Morocco<br/>James Thomas will give a talk on building serverless applications with OpenWhisk -- [**UA Mobile**](http://uamobile.org/topics/serverless-swift-apache-openwhisk), November 25th 2017, Kiev, Ukraine<br/>James Thomas will give a talk on building mobile APIs with Swift on OpenWhisk - +### September 2017 -## Past Events +- [**APIDays Zurich**](http://www.apidays.io/events/zurich-2017), September 26th-27th 2017, Zurich, Switzerland<br/>Rob Allen will give a talk on building serverless APIs in Swift +- [**Pixels Camp**](https://pixels.camp/jthomas), September 28th-30th 2017, Lisbon, Portugal<br/>James Thomas will give a talk on building serverless applications using OpenWhisk ### September 2017 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
