diff --git a/Gemfile b/Gemfile
index 9e1435d..1a8c9b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,6 @@ else
gem 'bumbleberry', :git => 'git://github.com/bumbleberry/bumbleberry.git'
end
-gem 'foundation-rails'
gem 'uglifier', '>= 1.3.0'
gem 'sorcery', '>= 0.8.1'
gem 'oauth2', '~> 0.8.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f14fcb..f6fcb33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,19 +189,16 @@ GEM
railties (>= 3.2, < 5.0)
forgery (0.6.0)
formatador (0.2.5)
- foundation-rails (5.5.2.1)
- railties (>= 3.1.0)
- sass (>= 3.3.0, < 3.5)
- gdk_pixbuf2 (3.0.2)
- glib2 (= 3.0.2)
- gdk_pixbuf2 (3.0.2-x86-mingw32)
- glib2 (= 3.0.2)
+ gdk_pixbuf2 (3.0.3)
+ glib2 (= 3.0.3)
+ gdk_pixbuf2 (3.0.3-x86-mingw32)
+ glib2 (= 3.0.3)
geocoder (1.2.11)
gherkin3 (3.1.1)
git-version-bump (0.15.1)
- glib2 (3.0.2)
+ glib2 (3.0.3)
pkg-config
- glib2 (3.0.2-x86-mingw32)
+ glib2 (3.0.3-x86-mingw32)
cairo (>= 1.12.8)
pkg-config
globalid (0.3.6)
@@ -289,7 +286,7 @@ GEM
mini_portile (~> 0.6.0)
nokogiri (1.6.6.2-x86-mingw32)
mini_portile (~> 0.6.0)
- notiffany (0.0.7)
+ notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
oauth (0.4.7)
@@ -299,9 +296,9 @@ GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- pango (3.0.2-x86-mingw32)
+ pango (3.0.3-x86-mingw32)
cairo (>= 1.14.0)
- glib2 (= 3.0.2)
+ glib2 (= 3.0.3)
paper_trail (3.0.8)
activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
@@ -400,13 +397,13 @@ GEM
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
- rsvg2 (3.0.2)
+ rsvg2 (3.0.3)
cairo (>= 1.12.8)
- gdk_pixbuf2 (= 3.0.2)
- rsvg2 (3.0.2-x86-mingw32)
+ gdk_pixbuf2 (= 3.0.3)
+ rsvg2 (3.0.3-x86-mingw32)
cairo (>= 1.12.8)
- gdk_pixbuf2 (= 3.0.2)
- pango (>= 3.0.2)
+ gdk_pixbuf2 (= 3.0.3)
+ pango (>= 3.0.3)
ruby_parser (3.7.1)
sexp_processor (~> 4.1)
rubyzip (1.1.7)
@@ -509,7 +506,6 @@ DEPENDENCIES
delayed_job_active_record
factory_girl_rails
font-awesome-rails
- foundation-rails
geocoder
gherkin3 (>= 3.1.0)
guard-rspec
diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index e54bb74..d2abc54 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -427,7 +427,7 @@ class ConferencesController < ApplicationController
@other = []
if request.format.xls?
- #I18n.backend.init_page(request, params)
+ logger.info "Generating stats.xls"
@excel_data = {
:columns => [:name, :email, :city, :date, :languages, :arrival, :departure, :housing, :bike, :food, :allergies, :other, :fees_paid],
:key => 'articles.conference_registration.headings',
@@ -495,6 +495,8 @@ class ConferencesController < ApplicationController
return
end
+ logger.info "Rendering stats.xls" if request.format.xls?
+
respond_to do |format|
format.html
format.text { render :text => content }
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html
index a401c48..698c6c7 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--.html
@@ -46,7 +46,7 @@
Guadalajara, Jalisco, Mexico
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
index e2e009c..886b37e 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
@@ -51,7 +51,7 @@
-Nam Nulla
+
Morbi Odio Odio, Elementum Eu, Interdum Eu, Tincidunt In, Leo
You are interested in this workshop
-
Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.
+
Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.
Facilitators
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
index 57d5b1e..9063ddf 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
@@ -51,7 +51,7 @@
-Nam Nulla
+
Morbi Odio Odio, Elementum Eu, Interdum Eu, Tincidunt In, Leo
No one is interested in this workshop yet
-
Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.
+
Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.
Facilitators
diff --git a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html
index 57d5b1e..9063ddf 100644
--- a/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html
+++ b/config/locales/data/html_records/Be-the-first-to-like-a-workshop--conferences.MyBikeBike.workshops.1.html
@@ -51,7 +51,7 @@
-Nam Nulla
+
Morbi Odio Odio, Elementum Eu, Interdum Eu, Tincidunt In, Leo
No one is interested in this workshop yet
-
Aenean fermentum. Donec ut mauris eget massa tempor convallis. Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh.
+
Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum. Integer a nibh.
Facilitators
diff --git a/config/locales/data/html_records/Broadcast-message--.html b/config/locales/data/html_records/Broadcast-message--.html
index 7db5a5b..02be57a 100644
--- a/config/locales/data/html_records/Broadcast-message--.html
+++ b/config/locales/data/html_records/Broadcast-message--.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
index 8c24c4a..629f1d9 100644
--- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
+++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html
@@ -78,7 +78,7 @@
-
+
|
@@ -94,7 +94,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
|
diff --git a/config/locales/data/html_records/Create-workshop--.html b/config/locales/data/html_records/Create-workshop--.html
index 7db5a5b..02be57a 100644
--- a/config/locales/data/html_records/Create-workshop--.html
+++ b/config/locales/data/html_records/Create-workshop--.html
@@ -46,7 +46,7 @@
San Marcos, Texas
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html
index bd8356e..fbde51d 100644
--- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html
+++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-1.html
@@ -73,8 +73,8 @@
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html
index f91ddd0..5464ce5 100644
--- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html
+++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-2.html
@@ -73,8 +73,8 @@
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html
index f91ddd0..5464ce5 100644
--- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html
+++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1-3.html
@@ -73,8 +73,8 @@
diff --git a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html
index bd8356e..fbde51d 100644
--- a/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html
+++ b/config/locales/data/html_records/Create-workshop--conferences.MyBikeBike.workshops.1.html
@@ -73,8 +73,8 @@
diff --git a/config/locales/data/html_records/Edit-a-conference--.html b/config/locales/data/html_records/Edit-a-conference--.html
index 861bc78..c0eed1e 100644
--- a/config/locales/data/html_records/Edit-a-conference--.html
+++ b/config/locales/data/html_records/Edit-a-conference--.html
@@ -46,7 +46,7 @@
Portland, Oregon
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html
index 1a59268..a7c43cf 100644
--- a/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html
+++ b/config/locales/data/html_records/Edit-a-conference--conferences.MyBikeBike.edit.html
@@ -40,7 +40,7 @@
@@ -62,8 +62,8 @@
diff --git a/config/locales/data/html_records/Like-a-workshop--.html b/config/locales/data/html_records/Like-a-workshop--.html
index a401c48..698c6c7 100644
--- a/config/locales/data/html_records/Like-a-workshop--.html
+++ b/config/locales/data/html_records/Like-a-workshop--.html
@@ -46,7 +46,7 @@
Guadalajara, Jalisco, Mexico
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
index 6a6508d..7534ed5 100644
--- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
+++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-1.html
@@ -51,7 +51,7 @@
-Aenean Auctor Gravida Sem
+
Praesent Id Massa Id Nisl Venenatis Lacinia
You and 4 others are interested in this workshop
-
Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.
+
In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet.
Facilitators
diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
index e0efc50..0bb3022 100644
--- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
+++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1-2.html
@@ -51,7 +51,7 @@
-Aenean Auctor Gravida Sem
+
Praesent Id Massa Id Nisl Venenatis Lacinia
4 people are interested in this workshop
-
Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.
+
In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet.
Facilitators
diff --git a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html
index e0efc50..0bb3022 100644
--- a/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html
+++ b/config/locales/data/html_records/Like-a-workshop--conferences.MyBikeBike.workshops.1.html
@@ -51,7 +51,7 @@
-Aenean Auctor Gravida Sem
+
Praesent Id Massa Id Nisl Venenatis Lacinia
4 people are interested in this workshop
-
Sed sagittis. Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.
+
In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet.
Facilitators
diff --git a/config/locales/data/html_records/See-a-more-info-link--.html b/config/locales/data/html_records/See-a-more-info-link--.html
index 31c4c41..33cc0d9 100644
--- a/config/locales/data/html_records/See-a-more-info-link--.html
+++ b/config/locales/data/html_records/See-a-more-info-link--.html
@@ -50,7 +50,7 @@
Halifax, Nova Scotia
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/See-a-register-link--.html b/config/locales/data/html_records/See-a-register-link--.html
index 0a8ba70..57a3394 100644
--- a/config/locales/data/html_records/See-a-register-link--.html
+++ b/config/locales/data/html_records/See-a-register-link--.html
@@ -41,7 +41,7 @@
Sackville, New Brunswick
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--.html b/config/locales/data/html_records/Start-registration-from-landing-page--.html
index 8d72d58..7f4e8e3 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--.html
@@ -41,7 +41,7 @@
Halifax, Nova Scotia
-August 15 – 19, 2015
+August 17 – 21, 2015
@@ -62,7 +62,7 @@ Curabitur non nulla sit amet nisl tempus convallis quis ac lectus.
My Awesome Workshop
-
In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante. Nulla justo.
+
Nam ultrices, libero non mattis pulvinar, nulla pede ullamcorper augue, a suscipit nulla elit ac nulla. Sed vel enim sit amet nunc viverra dapibus. Nulla suscipit ligula in lacus.
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
index 523e803..c7cb76f 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html
@@ -81,7 +81,7 @@
@@ -95,7 +95,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
|
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
index 4fc3880..f6b223c 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html
@@ -90,7 +90,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
|
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
index 523e803..c7cb76f 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html
@@ -81,7 +81,7 @@
@@ -95,7 +95,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
|
diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html
index 4fc3880..f6b223c 100644
--- a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html
+++ b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html
@@ -90,7 +90,7 @@
-© Bike!Bike! 2015
+© Bike!Bike! 2015
|
diff --git a/config/locales/data/html_records/View-stats--.html b/config/locales/data/html_records/View-stats--.html
index fa4343a..637e7e7 100644
--- a/config/locales/data/html_records/View-stats--.html
+++ b/config/locales/data/html_records/View-stats--.html
@@ -46,7 +46,7 @@
Anchorage, Alaska
-August 15 – 19, 2015
+August 17 – 21, 2015
diff --git a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html
index 09801ba..56e5931 100644
--- a/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html
+++ b/config/locales/data/html_records/View-stats--conferences.MyBikeBike.stats.xls.html
@@ -28,7 +28,7 @@ Excel Spreadsheet
Jeff |
someguy@bikebike.org |
Somewhere |
-2015-09-15 04:09:19 |
+2015-09-16 23:53:56 |
English |
2015-09-28 00:00:00 |
2015-09-28 00:00:00 |