Skip to content

Commit

Permalink
Revert "Merge Cafebokning into master"
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwessman committed Mar 29, 2015
1 parent fe22738 commit 600b0d1
Show file tree
Hide file tree
Showing 149 changed files with 4,944 additions and 10,013 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ config/database.yml
config/initializers/secret_token.rb
config/secrets.yml
/storage/

## Environment normalisation:
/.bundle
/vendor/bundle
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ gem 'coffee-rails'
# Set to 1.8 due to https://github.com/jashkenas/coffeescript/issues/3829
gem 'coffee-script-source', '1.8.0'
gem 'devise'
gem 'bootstrap3-datetimepicker-rails', '~> 4.7.14'
gem 'fancybox2-rails'
gem 'font-awesome-rails'
gem 'fullcalendar-rails'
Expand All @@ -24,7 +23,7 @@ gem 'jbuilder'
gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'jquery-ui-rails'
gem 'momentjs-rails', "~> 2.9.0"
gem 'momentjs-rails'
gem 'mysql2'
gem 'paperclip'
gem 'prawn-rails'
Expand Down Expand Up @@ -56,3 +55,4 @@ group :test do
gem 'database_cleaner'
gem 'shoulda-matchers', require: false
end

5 changes: 1 addition & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap3-datetimepicker-rails (4.7.14)
momentjs-rails (>= 2.8.1)
builder (3.2.2)
byebug (4.0.3)
columnize (= 0.9.0)
Expand Down Expand Up @@ -316,7 +314,6 @@ PLATFORMS

DEPENDENCIES
better_errors
bootstrap3-datetimepicker-rails (~> 4.7.14)
cancancan
capistrano (~> 3.1.0)
capistrano-bundler (~> 1.1.2)
Expand All @@ -339,7 +336,7 @@ DEPENDENCIES
jquery-turbolinks
jquery-ui-rails
mailcatcher
momentjs-rails (~> 2.9.0)
momentjs-rails
mysql2
paperclip
poltergeist
Expand Down
Binary file added app/assets/images/border1.png
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/border2.png
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/classic-loader.gif
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/classic-map.png
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/fullscreen_off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 124 additions & 0 deletions app/assets/images/fullscreen_off.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/fullscreen_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 124 additions & 0 deletions app/assets/images/fullscreen_on.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 removed app/assets/images/hilbert.eps
Binary file not shown.
Binary file removed app/assets/images/hilbert.jpg
Binary file not shown.
Binary file added app/assets/images/pausebutton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 600b0d1

Please sign in to comment.