Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Commit 8542c34

Browse files
Merge branch 'master' into feature/program-icons
2 parents d4bbcc5 + 35d8644 commit 8542c34

7,265 files changed

Lines changed: 197750 additions & 37969 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v9.4.0

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
sudo: false
22
language: node_js
3-
node_js:
4-
- "6"
3+
54
env:
65
- CXX=g++-4.8
76
addons:
@@ -12,6 +11,7 @@ addons:
1211
- g++-4.8
1312
before_script:
1413
- npm install -g gulp
14+
- npm i -g gulp-cli
1515
- npm install
1616
- cd exampleSite
1717

@@ -24,7 +24,7 @@ script:
2424
before_deploy:
2525
- cd $TRAVIS_BUILD_DIR
2626
- mkdir -p release
27-
- zip -r release/devopsdays-theme-$TRAVIS_TAG.zip . -x \*.git\* \*exampleSite\* appveyor.yml \*.travis.ci\* \*tests\* \*bin\* \*build\* \*release\* config.codekit3 \*bower_components\* bower.json gulpfile.js netlify.toml package.json STYLE.md *\node_modules\* *\scss\* *\gulp\* contributing.json static/js/devopsdays.js .travis.yml \*utils\*
27+
- zip -r release/devopsdays-theme-$TRAVIS_TAG.zip . -x \*.git\* \*exampleSite\* appveyor.yml \*.travis.ci\* \*tests\* \*bin\* \*build\* \*release\* config.codekit3 \*bower_components\* bower.json gulpfile.js netlify.toml package.json package-lock.json STYLE.md *\node_modules\* *\scss\* *\gulp\* contributing.json static/js/devopsdays.js .travis.yml \*utils\*
2828

2929
deploy:
3030
provider: releases

CHANGELOG.md

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,71 @@
11
# Change Log
22

3+
## [1.19.1](https://github.com/devopsdays/devopsdays-theme/tree/1.19.1) (2018-08-20)
4+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.19.0...1.19.1)
5+
6+
**Fixed bugs:**
7+
8+
- Long city names wrap in event navbar [\#638](https://github.com/devopsdays/devopsdays-theme/issues/638)
9+
10+
## [1.19.0](https://github.com/devopsdays/devopsdays-theme/tree/1.19.0) (2018-08-09)
11+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.18.0...1.19.0)
12+
13+
**Implemented enhancements:**
14+
15+
- Change mobile event menu from icons to collapsed menu [\#607](https://github.com/devopsdays/devopsdays-theme/issues/607)
16+
17+
## [1.18.0](https://github.com/devopsdays/devopsdays-theme/tree/1.18.0) (2018-07-02)
18+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.17.0...1.18.0)
19+
20+
**Implemented enhancements:**
21+
22+
- Remove auto-capitalization of talk titles [\#629](https://github.com/devopsdays/devopsdays-theme/issues/629)
23+
24+
## [1.17.0](https://github.com/devopsdays/devopsdays-theme/tree/1.17.0) (2018-05-09)
25+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.16.0...1.17.0)
26+
27+
**Closed issues:**
28+
29+
- Allow comments on 'talk' and 'workshops' in programs [\#626](https://github.com/devopsdays/devopsdays-theme/issues/626)
30+
- Allow event\_links to pull arbitrary event data [\#623](https://github.com/devopsdays/devopsdays-theme/issues/623)
31+
- Shortcodes not compatible with hugo 0.32 [\#618](https://github.com/devopsdays/devopsdays-theme/issues/618)
32+
33+
## [1.16.0](https://github.com/devopsdays/devopsdays-theme/tree/1.16.0) (2018-01-16)
34+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.15.0...1.16.0)
35+
36+
**Closed issues:**
37+
38+
- Speaker attributes obscure twitter name [\#612](https://github.com/devopsdays/devopsdays-theme/issues/612)
39+
40+
## [1.15.0](https://github.com/devopsdays/devopsdays-theme/tree/1.15.0) (2018-01-03)
41+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.14.2...1.15.0)
42+
43+
**Implemented enhancements:**
44+
45+
- Add "event\_group" optional key to event data file [\#61](https://github.com/devopsdays/devopsdays-theme/issues/61)
46+
47+
**Fixed bugs:**
48+
49+
- Default speaker image is too big [\#597](https://github.com/devopsdays/devopsdays-theme/issues/597)
50+
51+
**Closed issues:**
52+
53+
- Test issue for movebot [\#610](https://github.com/devopsdays/devopsdays-theme/issues/610)
54+
55+
## [1.14.2](https://github.com/devopsdays/devopsdays-theme/tree/1.14.2) (2017-10-07)
56+
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.14.1...1.14.2)
57+
358
## [1.14.1](https://github.com/devopsdays/devopsdays-theme/tree/1.14.1) (2017-10-07)
459
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.14.0...1.14.1)
560

661
**Implemented enhancements:**
762

863
- change organizers page to use https for twitter and github [\#595](https://github.com/devopsdays/devopsdays-theme/issues/595)
964

65+
**Fixed bugs:**
66+
67+
- Version number in theme file needs to be a string [\#598](https://github.com/devopsdays/devopsdays-theme/issues/598)
68+
1069
## [1.14.0](https://github.com/devopsdays/devopsdays-theme/tree/1.14.0) (2017-08-31)
1170
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.13.1...1.14.0)
1271

@@ -628,4 +687,4 @@
628687

629688

630689

631-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
690+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

REFERENCE.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,17 @@ The YYYY-CITY.yml file is the main configuration file for your event. This is wh
4242
| `event_twitter` | String | Yes | The twitter handle for your event such as "devopsdayschi" or "devopsdaysmsp". Exclude the "@" symbol. | "devopsdayschi" |
4343
| `description` | String | No | Overall description of your event. Quotation marks need to be escaped. | "It's time for more DevOpsDays at Ponyville!" |
4444
| `ga_tracking_id` | String | No | If you have your own Google Analytics tracking ID, enter it here. | "UA-74738648-1" |
45+
| `speakers_verbose` | String | No | Set this to "true" if you want verbose speaker attributes (URLs visible). | "true" |
4546

4647
### Date-related Fields
47-
All dates are in unquoted YYYY-MM-DD, like this: `variable: 2016-01-05`
48+
All dates are in unquoted YYYY-MM-DD, like this: `variable: 2016-01-05`, or like `variable: 2016-01-05T23:59:00-06:00`
4849

4950
| Field Name | Type | Required | Description | Example |
5051
|-------------------------|------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------|
5152
| `startdate` | YYYY-MM-DD | No | The start date of your event. Leave blank if you don't have a venue reserved yet. | 2016-01-05 |
5253
| `enddate` | YYYY-MM-DD | No | The end date of your event. Leave blank if you don't have a venue reserved yet. | 2016-01-05 |
5354
| `cfp_date_start` | YYYY-MM-DD | No | The date you will start accepting talk proposals. Can be a blank value. | 2016-01-05 |
54-
| `cfp_date_end` | YYYY-MM-DD | No | The date you will close your call for proposals. Can be a blank value. | 2016-01-05 |
55+
| `cfp_date_end` | YYYY-MM-DD | No | The date you will close your call for proposals. Can be a blank value. If you set the full datetime string with correct TZ, CFP will display as open until local close time. | 2016-01-05T23:59:00-06:00 |
5556
| `cfp_date_announce` | YYYY-MM-DD | No | The date you will inform proposers of status. Can be a blank value. | 2016-01-05 |
5657
| `cfp_open` | String | No | Either "true" or "false". Can be blank. This controls whether or not the "propose" button shows on your event page. *Deprecated field; if you have set `cfp_date_start` and `cfp_date_end` they will serve the same purpose.* | "true" |
5758
| `cfp_link` | String | No | If you have a custom link for submitting proposals, add it here. This will control the Propose menu item as well as the "Propose" button. | "https://myurlhere" |
@@ -126,7 +127,7 @@ Each team member is an element of `team_members`.
126127
| `facebook` | String | No | The full URL to the person's Facebook page | "https://www.facebook.com/sally.fields" |
127128
| `linkedin` | String | No | The full URL to the person's LinkedIn page | "https://www.linkedin.com/in/sallyfields" |
128129
| `website` | String | No | The full URL to the person's webpage | "https://mattstratton.com" |
129-
| `image` | String | No | The name of the image for this user, located in `static/events/YYYY-CITY/organizers/`. This image must be either 300px square or (optimally) 600px square. | "sally-fields.jpg" |
130+
| `image` | String | No | The name of the image for this user, located in `static/events/YYYY-CITY/organizers/`. This image must be a JPEG, either 300px square or (optimally) 600px square. | "sally-fields.jpg" |
130131
| `bio` | String | No | The bio for the user. Markdown is supported. Quotation marks must be escaped. | "Thought leader paradigm affordances physical computing quantitative vs. qualitative disrupt thought leader disrupt. Venture capital Steve Jobs pitch deck moleskine sticky note agile Steve Jobs pivot disrupt grok driven. Human-centered design bootstrapping agile driven grok food-truck ship it long shadow." |
131132

132133
#### Organizer Emails
@@ -188,7 +189,7 @@ program:
188189
| `date` | Yes | The date of the program element, in YYYY-MM-DD format. | 2017-06-16 |
189190
| `start_time` | Yes | The start time of the program element. | "08:00" |
190191
| `end_time` | Yes | The end time of the program element. | "13:40" |
191-
| `comments` | No | Additional comments/notes about the program element (for example, location of an evening event). Markdown is supported. | "This will be at the [Pony Club](http://www.mattstratton.com),1005 Ponyville Drive,Ponyville, IL,60612" |
192+
| `comments` | No | Additional comments/notes about the program types `talk`, `workshop` and `custom` (for example, location of an evening event). Markdown is supported. | "This will be at the [Pony Club](http://www.mattstratton.com),1005 Ponyville Drive,Ponyville, IL,60612" |
192193
| `background_color` | No | Allows the ability to override the color of the program element. Only the background color can be changed; please test to make sure the color works with the displayed text colors. Color is expressed in RGB HEX value. Must be in quotes. | "#FFFA99" |
193194

194195
##### Program Element Colors

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 1.0.{build}
22
install:
33
# Install Hugo from chocolatey and display the version number
44
- cmd: >-
5-
choco install hugo -y
5+
choco install hugo -y --version 0.31.1
66
77
hugo version
88

0 commit comments

Comments
 (0)