2017-04-19
@xsrust
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust committed on 19 Apr 2017
@xsrust
ensure correct guidance groups display for plan editing
xsrust committed on 19 Apr 2017
@xsrust
fixes guidance group selection for plans
xsrust committed on 19 Apr 2017
2017-04-18
@briley
removed validate on User.password/email from user model because it conflicts with Devise's validation rules
briley committed on 18 Apr 2017
@briley
Updated ActionMailer deliver calls to deliver_now because deliver is deprecated in Rails 5
briley committed on 18 Apr 2017
@briley
patch for missed localisation in fix for DMPRoadmap/roadmap#207
briley committed on 18 Apr 2017
@briley
Merge branch 'development' of https://github.com/CDLUC3/roadmap into development
briley committed on 18 Apr 2017
@briley
added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files DMPRoadmap/roadmap#236
briley committed on 18 Apr 2017
@briley
added a test that searches for missing translations. Added specific error messages for model validations. Added some devise controlled error messages to pot/po files #DMPRoadmap/roadmap#236
briley committed on 18 Apr 2017
2017-04-17
@Brian Riley
Updated general application layout to display flash[:notice/:alert] as raw DMPRoadmap/roadmap#234
Brian Riley committed on 17 Apr 2017
@Brian Riley
fixed issue with share tab not being marked as active tab DMPRoadmap/roadmap#250
Brian Riley committed on 17 Apr 2017
@Brian Riley
fix for multi-phase templates DMPRoadmap/roadmap#252
Brian Riley committed on 17 Apr 2017
@Brian Riley
fix to one of the mailer's localisation
Brian Riley committed on 17 Apr 2017
2017-04-14
@Brian Riley
updated remaining mailers to use fastgettext default locale and fixed spacing issues. DMPRoadmap/roadmap#239
Brian Riley committed on 14 Apr 2017
@Brian Riley
Updated main user_mailer to use FastGettext.default_locale instead of I18n and setup email confirmation to use branding. DMPRoadmap/roadmap#238
Brian Riley committed on 14 Apr 2017
@Brian Riley
finished fixes for answer creation race condition DMPRoadmap/roadmap#241
Brian Riley committed on 14 Apr 2017
@Brian Riley
fixed issue with question.options reference DMPRoadmap/roadmap#249
Brian Riley committed on 14 Apr 2017
2017-04-13
@briley
updates to locking mechanism because it ActiveRecord does not catch 2 creates DMPRoadmap/roadmap#241
briley committed on 13 Apr 2017
@briley
updated lock version notice form so that the text area uses the new class and the text is localised DMPRoadmap/roadmap#241
briley committed on 13 Apr 2017
@briley
added answer-notice class that will make the lock version text area wider DMPRoadmap/roadmap#241
briley committed on 13 Apr 2017
@briley
updated answers controller so that user_id is not a part of the find_by DMPRoadmap/roadmap#241
briley committed on 13 Apr 2017
@briley
realized answer policy was never firing. updated create? to update? and fixed typo DMPRoadmap/roadmap#241
briley committed on 13 Apr 2017
@Jimmy Angelakos
Added admin :show action missing from routes.rb - oops.
Jimmy Angelakos committed on 13 Apr 2017
@Jimmy Angelakos
Fixes issues discussed in DMPRoadmap/roadmap#132
Jimmy Angelakos committed on 13 Apr 2017
@xsrust
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust committed on 13 Apr 2017
@xsrust
updated function call to sharing_notification mailer
xsrust committed on 13 Apr 2017
@xsrust
fixes spacing issues in share plan mailer and adds additional dialog
xsrust committed on 13 Apr 2017
2017-04-12
@ray.carrick
Merge branch 'docx_export_htmltoword' into development
ray.carrick committed on 12 Apr 2017
@ray.carrick
change docx export to htmltoword. Hopefully fixes: #217
ray.carrick committed on 12 Apr 2017
@ray.carrick
Merge branch 'question_options' into development
ray.carrick committed on 12 Apr 2017