James Mason eca09dd7d6 Merge branch 'master' into recaptcha

2017-11-15 11:58:15 -08:00

..

admin

Add hint in start and end hour in conference#edit

2017-11-14 17:53:44 +02:00

api

hakiri: fix security issue

2016-11-22 09:58:20 +05:30

users

fixed openid username

2017-10-17 15:49:04 +03:00

application_controller.rb

Fix unreachable code (#1140) in ConferenceRegistrationController#new

2017-03-07 17:40:19 +02:00

booths_controller.rb

Replace flash with flash.now

2017-08-29 00:00:17 +05:30

commercials_controller.rb

Fix reference to non-existant route path in commercials_controller

2016-03-31 15:57:20 +05:30

conference_registrations_controller.rb

Add total amount spent by user

2017-10-14 23:07:08 +05:30

conferences_controller.rb

refactored DomainConstraint and conference_controller_spec

2017-08-22 21:18:58 +00:00

confirmations_controller.rb

rubocop styling

2014-12-01 14:40:31 +02:00

openids_controller.rb

Allow user to remove openid

2017-06-13 13:04:55 +03:00

organizations_controller.rb

Fix missing link on public organizations page

2017-11-07 14:11:13 -08:00

payments_controller.rb

Added amount check for payments#new

2017-10-08 16:23:52 +03:00

physical_tickets_controller.rb

Changed physical_ticket to plural

2017-10-02 09:53:10 +03:00

proposals_controller.rb

Track related refactoring

2017-08-27 18:20:16 +03:00

registrations_controller.rb

Use 'Feature's to toggle optional functionality

2017-11-03 20:40:36 -07:00

schedules_controller.rb

fixed schedule-page error

2017-09-15 15:17:45 +05:30

subscriptions_controller.rb

Fix user already subscribed exception

2017-07-23 17:07:28 +03:00

ticket_purchases_controller.rb

Changed physical_ticket to plural

2017-10-02 09:53:10 +03:00

tickets_controller.rb

Fix Stellas review gripes

2014-12-09 15:19:01 +01:00

tracks_controller.rb

Add relevance field for track requests

2017-08-11 16:25:21 +03:00

users_controller.rb

use flash.now instead of flash where page is rendered in the same controller methods

2017-04-03 20:15:51 +03:00