Revise Publish action on Guidances page (#871) ...

Getting the tests to pass

Merge pull request #902 from CDLUC3/issue813 ...

Make templates page usable for Org Admins and Super Admins

updated org links to use same logic as template links. display org name if no logo ...

removed unecessary line form orgs controller

fixed linter complaint

fixed tests broken by org.links addition

Make templates page usable for Org Admins and Super Admins ...

started work on super admin templates page

consolidated org_admin and super_admin templates page

moved template logic to org_admin module and consolidated logic for super/org admins

switched from submit button click to form submit

fixed issue with unused js var

fixed broken templates controller tests

switched back to submit button

updated template_options route in integration test

fixed broken integration tests caused by moving templates to org_admin namespace

added tests for copy template

added button to get back to 'all templates' page from template edit page

renamed delete button from 'Cancel' to 'Delete' and added proper cancel button to edit section view

made recommended adjustments and accounted for new template visibility functionality

switched out scopes in favor of flagshihtzu helpers

moved link to Themes to Admin menu

fixed broken tests for the public_pages controller

fixes for tests

refactored template current version queries

pulled in customization view changes

Org Admin provide feedback ...

Add Plans page to Org Admin section

added org admin plans page

finsihed up org admin plans page

added feedback complete and updated emails to use email_signature partial

refactored access checks on Plan now that user can have multiple roles (reviewer + ?)

finished feedback completion routine

added tests for new feedback methods

fixes for merge conflicts

fixed issues with plan and user changes

fixed issue with notes controller test

fixed issue with phase controller test

Added Request Feedback button to the share plan page ...

modifications to tooltips and email defaults

moved email constants to usermailer

aded missing colon

started adding in the button to request feedback

modifications to tooltips and email defaults

started adding in the button to request feedback

finsihed adding request feedback button

Removed old comment

switched to roles

updated to role based reviewer

updated user_mailer

moved feedback confirmation defaults to methods on UserMailer

added default visibility back to schema.rb

made adjustments based on PR feedback

refactored to use flagshihtzu function that returns values for flags

Added Feedback Request to Org Details ...

Initial form changes for the New Org Details

added new db components for the org profile tab

split org page into tabs and updated profile form

switched section headers from labels to h3

finished org details tab

added feedback tab

made textarea a tinymce

fixed test broken by org controller update

Added btree back to schema.rb

added foreign keys back to schema.rb

fixed default email for feedback

Update logo size to 75px height (from 165px). DMPRoadmap/roadmap#639 ...

Updated dragonfly resize to 75px height (retain aspect ratio)

removed old ES5 copy statements from webpack config

decreased dragonfly resize of logos to 75px height

fixed broken dragonfly logo test

fixed broken test created by change in dashboard page title. updated logo resize function on org model to work with larger image size DMPRoadmap/roadmap#242

fixed merge conflicts

api updates

resolved cherry-pick conflicts

resolved merge conflicts from merging development 2016-06-09 into CDL-MVP

Re-enable attr_accessible for Dragonfly gem (logo uploads) - closes #375

bugfixes to allow tests to work

Plan duplication functionality. ...

Ability to Create a Plan copy

removing guidances being copied over since they requrie omly references

Plan deep copy method to duplicate plans (associated answers and guidance_groups)

Append 'Copy of' to the title of a duplicated plan

Set default sort order for Orgs to be Name ASC - fixes #340

updated super admin to use annotations and model files accordingly

updated org model's instituions scope to return correct org_type DMPRoadmap/roadmap#150

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

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)

fixed some of the failing tests. Commented out helpers/plan_list tests because it relied on old I18n helpers to determine column name

URLs without locale param

removed old Ability model which was used by the CanCan gem. added some more test coverage for Org and User

filled in test coverage gaps. Removed duplicate User.can_grant_api_to_orgs? method

some cleanup of irrelevant objects (e.g. removal of remaining OrganisationType)

Added a managing org and funder scope to Org. Updated methods on Guidance and guidanceTest to work with new schema. Added guidance and guidance_group tests

added new seed file that works with new schema. commented out plans and answers for now though because plan model is unfinished

resolved merge conflicts