Development (#251)

* Fixed fonts

* Fixed assets

* Fixed logo in emails

* Switched to immediate email delivery

* Fixed prod emails and added deployment tasks

* Fixed deployments

* Updated README

* Added Bike Collectives Core to README

* Fixed issue with map loading

* Fixed issue with map loading

* Added map JSON data to assets precompilation

* Fixed error sending to conference administrators

* Let error report signature wrap

* Fixed backtrace in error reports

* Fixed backtrace in error reports

* Moved pronoun heading to make it more obvoius

I moved the "Pronoun" heading directly above the input field. It turned out that a lot of users were entering "He
 or "She" in the name field, I believe that was because of the placement of the "Pronoun" heading. I also needed to remove the optional warning but I'm hoping that won't cause problems.

* Added an error message when no email address is used on login

* Fixed select guest table

* Added house rules to housing admin and review

* Edit workshop locale warning

* Fixed workshop translation saving + ordered guests
This commit is contained in:
Godwin
2017-08-12 11:25:59 -07:00
committed by GitHub
parent f54c09f248
commit a6002d6c9a
7 changed files with 15 additions and 8 deletions
@@ -884,6 +884,8 @@ class ConferenceAdministrationController < ApplicationController
end
end
@guests = @guests.sort_by { |k,v| v.user.firstname }
return @hosts_affected_by_guests
end
+7 -2
View File
@@ -147,8 +147,13 @@ class WorkshopsController < ApplicationController
# only save if the text has changed, if we want to make sure only to update the translator id if necessary
workshop.save_translations if do_save
elsif can_edit
workshop.title = title
workshop.info = info
if workshop.locale.nil? || workshop.locale.to_s == I18n.locale.to_s
workshop.title = title
workshop.info = info
else
workshop.set_column_for_locale(:title, workshop.locale, title)
workshop.set_column_for_locale(:info, workshop.locale, info)
end
workshop.languages = (params[:languages] || {}).keys.to_json
workshop.needs = (params[:needs] || {}).keys.to_json
workshop.theme = params[:theme] == 'other' ? params[:other_theme] : params[:theme]