fixed typo in invalid web address notification

Updated 'destroy' label on view plans page to read 'delete'

Changed 'plan title' to 'file name' in export settings to more accurately reflect what the information will be used for.

Added trap for Dragonfly exceptions on the organisation update. It will now display the logo upload error message stored in the locale files

fixed policy name typo in locale files

updated 'i accept the terms and conditions' link on sign up form so that the terms open in a separate window

Fixed bug in yaml files. Updated help page content so that it lists an MIT license

updated links and email addresses on the static forms

Changed Digital Curation 'Center' to 'Centre' in all locale files

Added fix for issues when displaying column headings on the view plans page. Setup and 'Unknown' column heading that defaults to ' - ' but is updateable in the locale files. If there are issues determining the column heading it will use that value

reverted back changes to user<-->org relationship. added missing api and magic strings sections to the other locale files.

Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

merged DCC changes into master

added ability to grant permissions to other users

added granting api to orgs permission

Branding changes (#24) ...

- Removed the description field from organisation
- Added a contact email field to organization
- Added an email address validator
- Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image
- Change how the organisation logo is displayed 

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.

bugfixes to auth

added pundit auth to organisations controller

added magic string and constant structure for auth

Merging current stable development branch into master (#23) ...

This is our unofficial v.0.1.0 release. It includes:
- Rails 4.2 migration
- Internationalization
- API
- Institutional logo upload (thanks to Weiwei and the Univ. of Alberta)
- Generic branding
- General cleanup of code and bug fixes

fixed merge conflicts in Gemfile and Schema.rb

fixed merge conflicts with fr and de locale files

Fixed issue with link to the terms page in the 'I accept the terms and conditions' link in the sign up section. The link is a part of the locale file, so created a variable called current_locale

fixed merge conflict in schema.rb

Merging master (#20) ...

* added data structures for testing

* renamed token_permission_type to plural to follow convention of fixtures

* added gem to allow testing of controllers

* began implimenting testing for projects controller

* fixed auth to reject empty string

* added data structures for testing

* added data structures for testing

* removed old unnecissary data structures from fixtures

* added forgotten view for org-admins giving user's api permissions

* updated .gitignore

* added gem to allow testing of controllers

* began implimenting testing for projects controller

* fixed auth to reject empty string

* added data structures for testing

* added data structures for testing

* removed old unnecissary data structures from fixtures

* added forgotten view for org-admins giving user's api permissions

* updated .gitignore

* fixed leftover merge conflict in .gitignore

* updated org-admin view of users for rails 4.2 compatability

* fiexed a bug where user's api token permissions wouldnt display

* fixed syntax error

* changed guidance_group to guidance_groups for consistancy with api spec

* fix roadmap route

* bugfixing auth for api

* removed token_permission as it was accidentially re-added by a merge

* added gem to allow testing of controllers

* began implimenting testing for projects controller

* fixed auth to reject empty string

* added data structures for testing

* added data structures for testing

* removed old unnecissary data structures from fixtures

* added forgotten view for org-admins giving user's api permissions

* updated .gitignore

* removed old unnecissary data structures from fixtures

* updated .gitignore

* updated org-admin view of users for rails 4.2 compatability

* fiexed a bug where user's api token permissions wouldnt display

* fixed syntax error

* changed guidance_group to guidance_groups for consistancy with api spec

* bugfixing auth for api

* modified schema

* removed admin interface to token_permission, another forgotten side-effect

* removed admin interface to token_permission, another forgotten side-effect

* modified return structure of guidance_groups API to reflect current spec

* removed guidances api endpoint as no longer necissary

* added templates api endpoint

* commit

* commit

* initial commit of untested statistics API

* updated Statistics API and added bugfixes

* added aditional seeds for api token_permission_types

* added docs for stats api, also passing tests

* added fucntionality to give org_admin priveleges through the org_admin interface

* corrected statistics API to handle null dates and filter projects correctly

* addedrestriction that users must be confirmed to be counted by stats api

* added documentation to dmptemplates api controller

* added org_id field to plans metadata as a returned plan can belong to somebody else's organisation

* initial passover of removing magic strings

* added comment to I18n_constant and fixed missing magic string

* fixed the magic strings function

* removed duplicate gem from gemfile

* migrations and routes tests

* changed gem dependancies and fixed syntax bug

* fixed bug where show plans view only displayed first letter of columns

* aliased

* added documentation to organisation, phase, and part of plans

* added documentation to organisation, phase, and part of plans

* added documentation to model for plan

* added documentation to project model

* added documentation to project_group model

*  added documentation to remaining models

* fixed admin logout bug

*  removed hard-coded references to DCC

* fixed bug in dmptemplate with magicstrings

* dropdown and org language setting

* test

* commit

* migrations and routes tests

* aliased

* dropdown and org language setting

* test

* remove typo

* fixed parentheses bug in api/projects_controller

* fix

* merging

* remove git merge conflicts artifacts

* added gemfile, environments, and an initaliser to allow merge

* fix locales picking

* super_admin area for languages, changes to langauge initializer to fix migrations issue and org language priority in user language picking

* add association between organisation and language

super_admin area for languages, changes to langauge initializer to fix migrations issue and org language priority in user language picking

allow org admin to upload logo through admin UI

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

Lots of merge conflicts so I had to go through and manually fix them

Hopefully have not missed any conflicts nor destroyed any work done by somebody
Most of the conflicts were on account of changes to branding in files, but
others were content changed on both forks

New Gem requires ruby 2.2.2 (contact_us)

conflicts

migrations and routes tests