Resolves merge conflicts.
Resolves merge conflicts.
Adds second table to Invitations page for open events responded to.
Merge branch 'master' into shehryar
Fixes margin issues on event button lists.
Adds minor changes to finalised EventSuggestion partial.
Merge branch 'master' into stef
Resolves CanCan issue for reading Users. Also resolves User data leak via JSON for autocomplete AJAX call.
Disables form submit with enter press and fixes a bug so that event venue description are saved on create
Resolves merge conflicts.
Resolves finalise EventSuggestion issue for basic_user. Also removes current_user from autocomple AJAX JSON.
Resolves accept_suggestion block for hosts.
Sets finalised event location to Venue id instead of name so that object can be used in the view.
Fixes the upcoming, manage events and invitations pages so that they display the host name if no event name
Adds Google Maps to finalised event page.
Adds validation for the date range, and add prompts to add venue or invitees if none
Updates finalised event page copy.
adds a delete event to the open ES page
Merge branch 'event_suggestion_views' into stef
Fixes merge conflicts