replaced old create plan page with new, cleaner html version DMPRoadmap/roadmap#150

Merge branch 'fix-template-controller' into development

removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254

Updated template controller to use new model helper methods. updates phase/section/question controllers to update template dirty flag. added new routes for customize, publish, unpublish

added another activerecord error message to po/pot files

Merge branch 'development' into development

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

Added admin :show action missing from routes.rb - oops.

Fixes issues discussed in DMPRoadmap/roadmap#132

finished functional tests DMPRoadmap/roadmap/#212

Merge pull request #42 from DMPRoadmap/development ...

Rebase with lastest fixes from DCC

removed rake wrapper task because json dir can be set in initializer. Added initializer and updated _('') to __('') DMPRoadmap/roadmap#204

hacked jquery.timeago.js to work with new gettext localisation. Added timeago text to pot and po files. DMPRoadmap/roadmap#204

pdf exporting format fixed. DMPRoadmap/roadmap#222

Fixed Exporting settings. It works per phase. DMPRoadmap/roadmap#197

export functionality according to workflow defined at DMPRoadmap/roadmap#197

Merge branch 'development' into development

Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development

Change notes to work with AJAX calls.

Merge pull request #206 from DigitalCurationCentre/development ...

Super admin fixes/improvements

Administrate (new Super Admin) fixes ...

- Bumped version to latest for upstream bugfixes, fixes DMPRoadmap/roadmap#196
- Removed unneeded fields from some dashboards (that slowed down their Edit page)

added logic to db/seeds.rb to always create a default org for the one defined in config/branding.yml. This is the managing org

removed branding.yml (branding_example.yml is now in place) and added it to .gitignore

Added example of branding.yml. Added note that the abbreviation listed in branding.yml must match the one in the DB

Merge pull request #189 from DigitalCurationCentre/development ...

Reinstating Formtastic which was prematurely removed.

Reinstating Formtastic which was prematurely removed.

Merge branch 'development' into development

Merge branch 'feature/superadmin' into HEAD ...

Replaces ActiveAdmin with Administrate.

Quick fix for i18n issue which prevents db:setup because of lack of Languages table

updated recaptcha gem to 4.x. Updated gemfile and example initializer because 4.x changed the vraible names for its API