You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@training.apache.org by jm...@apache.org on 2020/08/02 08:56:38 UTC

[incubator-training] branch master updated (9ae0a75 -> 52c35f7)

This is an automated email from the ASF dual-hosted git repository.

jmclean pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-training.git.


    from 9ae0a75  Add Apache Hive Slides (#66)
     new dfabe0b  Add initial draft ApacheCon slides
     new 88aeae2  add title slide update status
     new acfbc16  new simple pom
     new ba63c85  Merge branch 'master' into ApacheConSlides
     new c862b1e  copy file
     new 24441be  Merge branch 'master' into ApacheConSlides
     new 726d45a  no need for copy file block anymore
     new b0c21a8  add link to style sheet
     new d37cf5c  move css
     new f1d0929  move css
     new f30c33b  add city images
     new d56d21d  remove spaces from image names
     new fc063bd  fix background
     new 031caa2  remove spaces from image names
     new b2ed72d  fix logos
     new 1990a04  Add extra site slides
     new 7275f1c  new New Orleans images
     new a978d0a  add some custom styles
     new 39f6b0d  update demo slides and add New Orleans iages
     new 4963d46  add some more simple examples
     new 1ebffbe  remove titles and linking css
     new 37de456  Merge branch 'master' into ApacheConSlides
     new deffe79  move css file
     new 6ff5cfa  remove footer image
     new a06abf4  fix title
     new 0cd1d4b  Remove image script and images due to unresolved legal issues around their licenses
     new 2d45fe4  fix spelling error
     new 43f4310  remove other slide as they were confusing
     new 9744f07  add CC0 license
     new 66dd3dc  add minimal support for ruby
     new 302be9d  add minimal node support
     new 9cb9326  reduced transparency so it more readable over a wider range of backgrounds
     new 299826d  Changed to Apache @Home
     new 52c35f7  Merge pull request #58 from justinmclean/ApacheConSlides

The 199 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/ApacheCon/Gemfile                          |   3 +
 .../IncubatorReleases => ApacheCon}/LICENSE        |   6 +-
 .../{Training/Presentations => ApacheCon}/NOTICE   |   0
 .../Presentations => ApacheCon}/README.md          |  25 ++-
 content/ApacheCon/convert-slides.js                |   8 +
 .../Presentations => ApacheCon}/install-deps.sh    |   0
 .../libs/docinfo-hack/document.html.slim           |   0
 content/ApacheCon/libs/third-party/erd             |   1 +
 content/ApacheCon/licenses/CC0.txt                 |  33 ++++
 content/ApacheCon/package.json                     |  16 ++
 .../ApacheCon}/pom.xml                             |  33 ++--
 content/ApacheCon/src/main/asciidoc/index_en.adoc  | 203 +++++++++++++++++++++
 .../src/main/resources/images/ApacheConAtHome.png  | Bin 0 -> 147211 bytes
 .../main/resources/images/ApacheConAtHomeLogo.png  | Bin 0 -> 44718 bytes
 .../src/main/resources/images/ApacheConEULogo.png  | Bin 0 -> 37761 bytes
 .../src/main/resources/images/ApacheConEurope.png  | Bin 0 -> 5361 bytes
 .../src/main/resources/images/ApacheConNA.jpg      | Bin 0 -> 52675 bytes
 .../src/main/resources/images/ApacheConNALogo.png  | Bin 0 -> 44718 bytes
 .../src/main/resources/images/ApacheCon_bg.jpg     | Bin 0 -> 108403 bytes
 .../src/main/resources/images/AtHomeDesktop.jpg    | Bin 0 -> 1452990 bytes
 .../src/main/resources/images/AtHomeDesktopII.jpg  | Bin 0 -> 1638800 bytes
 .../src/main/resources/images/AtHomeOutside.jpg    | Bin 0 -> 2301696 bytes
 .../src/main/resources/images/AtHomeSpiceRack.jpg  | Bin 0 -> 2162239 bytes
 .../src/main/resources/images/NewOrleans.jpg       | Bin 0 -> 1020623 bytes
 .../src/main/resources/images/NewOrleansII.jpg     | Bin 0 -> 3025372 bytes
 .../src/main/resources/images/NewOrleansIII.jpg    | Bin 0 -> 848020 bytes
 .../src/main/resources/images/NewOrleansIV.jpg     | Bin 0 -> 2996934 bytes
 .../main/resources/images/communityovercode.jpg    | Bin 0 -> 23968 bytes
 .../src/main/resources/images/favicon.ico          | Bin 0 -> 1595 bytes
 .../src/main/theme/apachecon.css}                  |  82 ++++++++-
 .../libs/docinfo-hack/document.html.slim           |   2 +-
 .../src/main/asciidoc/index.adoc                   |  37 +++-
 .../src/main/asciidoc/projectstats.adoc            |  10 +-
 .../src/main/resources/images/ApacheConEULogo.png  | Bin 0 -> 43241 bytes
 .../src/main/resources/images/ApacheConEurope.png  | Bin 0 -> 5361 bytes
 .../src/main/resources/images/apachecon_eu.jpg     | Bin 0 -> 108403 bytes
 .../src/main/theme/apache.css                      |  85 ++++++++-
 37 files changed, 498 insertions(+), 46 deletions(-)
 create mode 100644 content/ApacheCon/Gemfile
 copy content/{ApacheWay/IncubatorReleases => ApacheCon}/LICENSE (98%)
 copy content/{Training/Presentations => ApacheCon}/NOTICE (100%)
 copy content/{Training/Presentations => ApacheCon}/README.md (67%)
 create mode 100644 content/ApacheCon/convert-slides.js
 copy content/{Training/Presentations => ApacheCon}/install-deps.sh (100%)
 copy content/{ZooKeeper => ApacheCon}/libs/docinfo-hack/document.html.slim (100%)
 create mode 160000 content/ApacheCon/libs/third-party/erd
 create mode 100644 content/ApacheCon/licenses/CC0.txt
 create mode 100644 content/ApacheCon/package.json
 copy {tools/content-parent-resources => content/ApacheCon}/pom.xml (56%)
 create mode 100644 content/ApacheCon/src/main/asciidoc/index_en.adoc
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheConAtHome.png
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheConAtHomeLogo.png
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheConEULogo.png
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheConEurope.png
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheConNA.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheConNALogo.png
 create mode 100644 content/ApacheCon/src/main/resources/images/ApacheCon_bg.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/AtHomeDesktop.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/AtHomeDesktopII.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/AtHomeOutside.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/AtHomeSpiceRack.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/NewOrleans.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/NewOrleansII.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/NewOrleansIII.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/NewOrleansIV.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/communityovercode.jpg
 create mode 100644 content/ApacheCon/src/main/resources/images/favicon.ico
 copy content/{Training/Presentations/src/main/theme/apache.css => ApacheCon/src/main/theme/apachecon.css} (86%)
 create mode 100644 content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheConEULogo.png
 create mode 100644 content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/ApacheConEurope.png
 create mode 100644 content/ApacheWay/NavigatingASFIncubation/src/main/resources/images/apachecon_eu.jpg