Merge branch 'source' into add-dublin-talks

app/config/sculpin_kernel.yml

@@ -6,5 +6,5 @@ sculpin_content_types:
         permalink: projects/:slug_title/
         taxonomies: [skills, tags]
     talks:
-        permalink: talks/:slug_title/
+        permalink: talks/:basename/
         taxonomies: [tags]

app/data/events.yml

@@ -88,123 +88,121 @@ events:
     dates:
         - event: unifieddiff
           date: '2012-09-05'
-          talk: what-is-this-drupal-thing
+          talk_id: 1
 
         - event: swdug
           date: '2013-07-10'
-          talk:
-              title: Drupal and the LDAP Module
-              type: Talk
+          talk_title: Drupal and the LDAP Module
 
         - event: drupalcamp-london-14
           date: '2014-03-01'
           talk: git-flow
+          talk_id: 2
 
         - event: drupal-bristol
           date: '2014-08-19'
           talk: drush-make-drupalbristol
+          talk_id: 3
 
         - event: swdug
           date: '2014-08-19'
-          talk:
-              title: About the Drupal Association
-              type: Talk
+          talk_title: About the Drupal Association
+        #       type: Talk
 
         - event: drupalcamp-brighton-15
           date: '2015-01-18'
-          talk: drupalorg-2015
+          talk_id: 4
 
         - event: drupalcamp-london-15
           date: '2015-02-28'
-          talk: drupalorg-2015
+          talk_id: 4
 
         - event: phpsw
           date: '2015-04-08'
-          talk: drupal-8
+          talk_id: 5
 
         - event: drupalcamp-north-15
           date: '2015-07-25'
-          talk: test-drive-twig-with-sculpin
+          talk_id: 6
 
         - event: umbristol
           date: '2015-08-25'
-          talk: dancing-for-drupal
+          talk_id: 7
 
         - event: phpsw
           date: '2015-10-14'
-          talk: sculpin
+          talk_id: 8
           feedback: https://joind.in/talk/view/15486
 
         - event: drupalcamp-london-16
           date: '2016-03-05'
-          talk: drupal-8-module-development
+          talk_id: 9
 
         - event: nwdug
           date: '2016-03-08'
-          talk: drupal-vm-generator
+          talk_id: 10
 
         - event: drupal-bristol
           date: '2016-04-02'
-          talk: drupal-vm-generator
+          talk_id: 10
 
         - event: phpsc16
           date: '2016-06-11'
-          talk: drupal-8-rejoining-the-herd
+          talk_id: 11
           feedback: https://joind.in/talk/41d0f
 
         - event: drupalcamp-bristol-16
           date: '2016-07-23'
-          talk: drupal-vm-meet-symfony-console
+          talk_id: 12
 
         - event: phpsw
           date: '2016-11-09'
-          talk: drupal-development-with-composer
+          talk_id: 13
 
         - event: drupal-bristol
           date: '2016-11-17'
-          talk: goodbye-drush-make-hello-composer
+          talk_id: 14
 
         - event: drupal-bristol
           date: '2017-01-18'
-          talk: getting-your-data-into-drupal-8
+          talk_id: 15
 
         - event: phpsw
           date: '2017-02-08'
-          talk: it-all-started-with-a-patch
+          talk_id: 16
           feedback: https://joind.in/event/phpsw-new-skills-february-17/it-started-with-a-patch
 
         - event: drupalcamp-london-17
           date: '2017-03-04'
           time: '16:15 - 17:00'
-          talk: test-driven-drupal-simpletest-phpunit
+          talk_id: 17
 
         - event: drupalcamp-london-17
           date: '2017-03-04'
           time: '12:05 - 12:50'
-          talk: getting-your-data-into-drupal-8
+          talk_id: 15
 
         - event: nomad-php
           date: '2017-04-20'
           time: '19:00 (CET)'
-          talk:
-              id: deploying-php-with-fabric
-              type: Lightning talk
+          type: Lightning talk
+          talk_id: 18
 
         - event: phpsw
           date: '2017-09-13'
           time: ~
-          talk: deploying-php-with-fabric
           feedback: https://joind.in/talk/a5ff3
+          talk_id: 18
 
         - event: phpnw17
           date: '2017-10-01'
           time: '09:00 - 09:45'
-          talk: deploying-php-with-fabric
+          talk_id: 18
 
         - event: drupalcamp-dublin-17
           date: '2017-10-20'
-          talk: deploying-drupal-fabric
+          talk_id: 19
 
         - event: drupalcamp-dublin-17
           date: '2017-10-20'
-          talk: test-driven-drupal-simpletest-phpunit
+          talk_id: 17