Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
541cb7c
Remove Cloudfile used by defunct cloud platform
myabc Mar 20, 2018
d51279c
Update event branding, strings for Isle of Ruby
myabc Mar 20, 2018
72363bd
Force SSL in staging, production
myabc Mar 21, 2018
9580d1a
Update dates for Isle of Ruby 2018
myabc Mar 28, 2018
4ff0b27
Update dates for Isle of Ruby 2018, fixing year
myabc Apr 6, 2018
cd0b772
Commit generated schema.rb
myabc Apr 7, 2018
4b50278
Rename requires_eurucamp_ticket column
myabc Apr 7, 2018
7c1393b
Add official column to activities
myabc Apr 7, 2018
b023bc7
Replace "requires_eurucamp_ticket" by "requires_event_ticket"
lucaspinto Apr 7, 2018
8bf9ac8
Remove unique constraint on activities name column
lucaspinto Apr 7, 2018
11d852e
Make some exceptions for official events
lucaspinto Apr 7, 2018
cabf99b
Add additional_information JSONB column to activities table
lucaspinto Apr 7, 2018
31a1e32
Fix path to event logo (Isle of Ruby illustration)
myabc Apr 7, 2018
e8e09e6
Add missing translation for too early validation
lucaspinto Apr 7, 2018
8cbf59c
Fix remaining tests
lucaspinto Apr 7, 2018
8431870
Add initial import schedule script
myabc Apr 7, 2018
920289f
Tell Travis to target Postgres 9.6
myabc Apr 7, 2018
9c1d447
Add tags (array) column to activities
myabc Apr 8, 2018
3f6d54f
Update import script to add tags, speaker image
myabc Apr 8, 2018
1c8c30b
Merge pull request #2 from isleofruby/feature/schedule-import
myabc Apr 8, 2018
06a3099
Add encrypted Slack integration token for Travis
myabc Apr 8, 2018
f565ee4
Target Ruby 2.4.1
wordgraphy Apr 3, 2018
38a3b3d
Add title images
wordgraphy Apr 3, 2018
ccf3d23
Bump Bourbon to 5.0.0, Neat to 2.1.0 (latest)
myabc Apr 4, 2018
f247b7b
Upgrade Sass stylesheets for Bourbon 5, Neat 2
myabc Apr 8, 2018
8101330
Add Autoprefixer Rails to add CSS vendor prefixes
myabc Apr 8, 2018
8140a77
Convert stylesheets from Sass syntax to SCSS
myabc Apr 8, 2018
e712c66
Switch to new Isle of Ruby 2018 Typekit kit
myabc Apr 8, 2018
44ec8a4
Change font faces to Abril Text, Helvetica Neue
myabc Apr 8, 2018
4fb66cd
Use serif face (Abril Text) for most headings
myabc Apr 8, 2018
b646bce
Merge pull request #4 from isleofruby/feature/redesign-lightweight
myabc Apr 8, 2018
1fce8ae
Hide the numbers of spot left for official events
lucaspinto Apr 8, 2018
4fb5001
Make activities font size small so we can read from from it
lucaspinto Apr 8, 2018
3de36ea
Merge pull request #6 from lucaspinto/hide_spots_left
myabc Apr 8, 2018
8bc82db
Merge pull request #7 from lucaspinto/make_activities_name_small
myabc Apr 8, 2018
b3e174e
Fix capitalization of 'GitHub' in i18n strings
myabc Apr 9, 2018
30be409
Tell Rails to use 'Europe/London' time (GMT/BST)
myabc Apr 10, 2018
f1b6a35
:clock1: expand activities time
beseven Apr 10, 2018
44da1b3
Merge pull request #8 from isleofruby/feature/expand-activites-time
beseven Apr 10, 2018
bfebd76
:bug: account for BST
beseven Apr 10, 2018
95ae9d8
Merge pull request #9 from isleofruby/feature/expand-activites-time
myabc Apr 10, 2018
bc171d3
[wip] Minimal styling of header
myabc Apr 8, 2018
4fc0c4c
Apply branding and same styles as website
wordgraphy Apr 10, 2018
0e6d075
Fix border size change when field (de)activated
myabc Apr 10, 2018
4ee31df
Merge pull request #5 from isleofruby/feature/redesign-new-header
myabc Apr 11, 2018
64efb42
Remove code supporting obsolete Chrome Frame
myabc Apr 11, 2018
46e8917
Dockerize application
beseven Apr 11, 2018
ba2bb9e
:guardsman: secure connections so no cross site warnings
beseven Apr 10, 2018
98afe7d
Remove remnants of Typekit JS Web Font loader
myabc Apr 11, 2018
a502286
Hotfix for the datepicker issue
lucaspinto Apr 12, 2018
3c48808
Change meeting point picture
lucaspinto Apr 13, 2018
7a0d1ec
Tidy up background image Sass, add colour fallback
myabc Apr 11, 2018
6aaae86
Lint Sass with sass-lint
myabc Apr 11, 2018
f9e1fee
Fix deprecation double colon for pseudo-elements
myabc Apr 11, 2018
bd70a61
Hide other day headers when 'Day' filter applied
myabc Apr 14, 2018
dc06a34
Merge pull request #17 from isleofruby/feature/day-filter-hide-other-…
beseven Apr 14, 2018
2b38a08
Fix issue #14
wordgraphy Apr 14, 2018
4bdffe4
fix issue #13
wordgraphy Apr 14, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.3
2.4.1
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@ before_script: cp config/database.yml.sample config/database.yml
language: ruby
rvm:
- 2.3.3
addons:
postgresql: "9.6"
script: bundle exec rake db:create db:migrate spec
notifications:
slack:
secure: c+9K1YyGPnoVYrGm5L47ojKu8cCBROSRnsB2O3FY3xfuD0CDtCTXrWQa1bOz02jnMbDmUe0BmP2dNM1m+I2Ppps3xDYIRMBIPYAJN30/ot4yCiJFKGbz2rjhzEun70yqV0h/ej+LC4Mx2/5FwACvLhw/EE0GRx64rT7Kju5LrLGmjpJYxvfvWQfKiJ4ggQSKAPe4CnKHtHTUkDlAjTi+dIFw1VYcd11IxKOizQsyQPU7ZNA3kb/dKcwcbhcm0EUrLXpJesxPVSC0v0NcYkaQACUVje9Sxo8wck/CTFDi8oZSE2aI+CiH6ekaSxNKuduk0mW7zEQzOfc7dhu9BGc4/5zCSAMJEkCsgZQAiSqvXy1K6rWy5XgphyBUCpoyFu+5umu7wniGA7kWojl5XwsIDap+rjhO3rIrfP2Jnvg8T2QHGY6TP1SLK9PHbwvDd+JeWoxllPu4xbhjuADzZH0ui3MODtjNpcRhBtUjDHl8OGLuVsxKQrn3GBNbCgS2+jKyo+R2JkxyOAAEGWIgyA6Sbpa2IxjjOLDxaNaDQeoY0YJaFbL4QHjC/Ppqs2FkR8LiEisy/l4w0HcaaRlehWgbnvL11PKSVOxWtUEUp2gLOFA9HnZe+fwUWxhuy5WJU+ilHOHwo/taWWy0sngesH8jj0ub9DfQEPWJ4FCzClZJ9z0=
22 changes: 0 additions & 22 deletions Cloudfile

This file was deleted.

8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM ruby:2.4.1
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
RUN mkdir /activities-app
WORKDIR /activities-app
COPY Gemfile /activities-app/Gemfile
COPY Gemfile.lock /activities-app/Gemfile.lock
RUN bundle install
COPY . /activities-app
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ gem 'sprockets-rails', '~> 3.2.0'
gem 'jquery-rails'
gem 'turbolinks'
gem 'jbuilder', '~> 1.0.1'
gem 'bourbon'
gem 'neat', '~> 1.8.0'
gem 'bourbon', '~> 5.0.0'
gem 'neat', '~> 2.1.0'
gem 'haml-rails'
gem 'rails_html_helpers'
gem 'draper', '~> 3.0.0.pre1'
Expand All @@ -28,6 +28,8 @@ gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.2.1'
gem 'uglifier', '>= 1.0.3'

gem 'autoprefixer-rails', '~> 8.2'

gem 'activemodel-serializers-xml'

group :development do
Expand Down
25 changes: 18 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,16 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
arel (7.1.4)
autoprefixer-rails (8.2.0)
execjs
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourbon (4.3.3)
bourbon (5.0.0)
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.3)
Expand Down Expand Up @@ -108,6 +110,7 @@ GEM
railties (>= 3.0.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.23)
foreman (0.83.0)
thor (~> 0.19.1)
globalid (0.3.7)
Expand Down Expand Up @@ -153,8 +156,8 @@ GEM
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
neat (1.8.0)
sass (>= 3.3)
neat (2.1.0)
sass (~> 3.4)
thor (~> 0.19)
newrelic_rpm (3.18.1.330)
nio4r (1.2.1)
Expand Down Expand Up @@ -221,6 +224,9 @@ GEM
thor (>= 0.18.1, < 2.0)
raindrops (0.17.0)
rake (12.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redcarpet (3.4.0)
request_store (1.3.2)
responders (2.3.0)
Expand Down Expand Up @@ -255,7 +261,11 @@ GEM
rspec-support (3.5.0)
ruby_parser (3.8.4)
sexp_processor (~> 4.1)
sass (3.4.23)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand Down Expand Up @@ -306,9 +316,10 @@ PLATFORMS
DEPENDENCIES
accept_values_for
activemodel-serializers-xml
autoprefixer-rails (~> 8.2)
better_errors
binding_of_caller
bourbon
bourbon (~> 5.0.0)
cancan
capybara (~> 2.1)
coffee-rails (~> 4.2.1)
Expand All @@ -323,7 +334,7 @@ DEPENDENCIES
jquery-rails
json_spec
modernizr-rails
neat (~> 1.8.0)
neat (~> 2.1.0)
newrelic_rpm
omniauth (~> 1.6.1)
omniauth-github
Expand All @@ -347,4 +358,4 @@ DEPENDENCIES
unicorn

BUNDLED WITH
1.14.3
1.16.1
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
# eurucamp Activities [![License](http://img.shields.io/:license-AGPL-0030c8.svg)](COPYRIGHT) [![Build Status](https://travis-ci.org/eurucamp/eurucamp-activities.png?branch=master)](https://travis-ci.org/eurucamp/eurucamp-activities)
# eurucamp Activities [![License](http://img.shields.io/:license-AGPL-0030c8.svg)](COPYRIGHT) [![Build Status](https://travis-ci.org/isleofruby/isleofruby-activities.png?branch=master)](https://travis-ci.org/isleofruby/isleofruby-activities)

The Activities app is a small application to allow attendees to organize and plan small event in and around a conference. Users create events or sign up to created ones. Signup works through GitHub or Twitter.

The app is mobile friendly and easy to run on a free Heroku account.

## Donationware

The app was created by members on the Ruby Berlin e.V. on their free time as a community effort for the eurucamp conference. Ruby Berlin is the body behind RailsGirls Berlin and Hamburg, eurucamp and JRubyConf.eu.
The app was created by members on the Ruby Berlin e.V. on their free time as a community effort initially for the eurucamp conference. Ruby Berlin is the body behind RailsGirls Berlin and Hamburg, eurucamp and JRubyConf.eu.

If you end up using the app, please get in [contact](mailto:info@eurucamp.org) so that we know. Also, spread the word about our [projects](http://rubyberlin.org). Also, consider [donating](https://www.betterplace.org/en/organisations/ruby-berlin/), especially, if you run a commercial conference. We are a registered non-profit, donations are tax deducible. Betterplace handles all paperwork - if in doubt, send us a mail.
If you end up using the app, please get in [contact](mailto:info@isleofruby.org) so that we know. Also, spread the word about our [projects](http://rubyberlin.org). Also, consider [donating](https://www.betterplace.org/en/organisations/ruby-berlin/), especially, if you run a commercial conference. We are a registered non-profit, donations are tax deducible. Betterplace handles all paperwork - if in doubt, send us a mail.

If you cannot or don't want to donate - use it, it's free.

## Logo

Don't use the eurucamp logo for your instance to avoid confusion.
Don't use the Isle of Ruby logo for your instance to avoid confusion.

## Examples

An instance of the app can be seen running at the [rubyweek page](http://rubyweek.org).

Screenshot: ![The activities app](screenshot.png)

## Running the app on Heroku

To deploy the app, you need the following:

* Clone this repository: `https://github.com/eurucamp/eurucamp-activities-2013/`
* Clone this repository: `https://github.com/isleofruby/isleofruby-activities/`

* An account and a created application at Heroku.
* A registered Twitter application. Go [here](https://apps.twitter.com/).
Expand Down
1 change: 1 addition & 0 deletions app/assets/images/activities/activities.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/activities/create.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/activities/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/activities/meeting_points.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/activities/register.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/activities/schedule.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/activities/sign in.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/hero/IoR_logo_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/hero/IoR_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/layout/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/shared/IoR_illustration.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 0 additions & 16 deletions app/assets/images/shared/eurucamp-2015.svg

This file was deleted.

2 changes: 2 additions & 0 deletions app/assets/javascripts/initializers.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ ready = ->
.map(-> $(@).val()).get()
unless 'all' in values
$activities.not(".#{values.join(',.')}").hide()
hideEmptyDays()

# use search input to filter further
if query = $search.val()
$activities
Expand Down
Loading