Please enter the commit message for your changes. Lines starting
crappy authentication, not finished
wip authentication
wip google api
wip google api
wip google api2
fixed merge conflicts
bundle
merge conflicts
fixed error in event file
delete result.data from index
:
google add calendar working
Added base of design for event page. Mre to come
new file:   app/assets/stylesheets/event.scss
modified:   app/assets/stylesheets/application.css.scss
modified:   app/assets/stylesheets/comment.scss
modified:   app/assets/stylesheets/main-layout.scss
modified:   app/assets/stylesheets/votes.scss
modified:   app/models/comment.rb
modified:   app/models/event.rb
modified:   app/views/comments/_show.html.erb
modified:   app/views/events/_form.html.erb
modified:   app/views/events/show.html.erb
modified:   app/views/votes/_commentvote_buttons.html.erb
Added case click without any radio button checked
app/controllers/event_confirmations_controller.rb
Merge branch 'auth-allen' into design

Conflicts because of the nmerged gravatar function:
	app/views/users/show.html.erb