| 2020-05-28 |
Replaced signature by partial with signature in invitation mail
|
| 2019-10-31 |
Plan sharing notification should display the email of the inviter next to his name
|
| 2019-03-07 |
Merged with DMPRoadmap:master
|
| 2018-12-04 |
Patch issue with share plans on development
...
Devise circumvents running validations on the user models when invite! is called.
I updated this call to adhere to validations, and I've updated the form to request the name,org of the user when a plan is shared with them.
This should fix the issue for both newly created share-plan users, and those with previous, bad data in the system.
You may want to consider re-running your validations(or fixup) scripts for users as you can have some invalid ones that you'll need to set a default name/org
Sam Rust
committed
on 4 Dec 2018
|
| 2018-11-22 |
Issue #1931 - Share plan emails updated.
...
- The inviter name is added to the devise file app/views/devise/mailer/invitation_instructions.html.erb
- The name of person invited the plan is shared with is added to the greeting if it exists for both the devise
and non-devise emails (repectively app/views/devise/mailer/invitation_instructions.html.erb and app/views/user_mailer/sharing_notification.html.erb).
Otherwise, the invited person's email is displayed in the greetings.
Fix for #1931
John Pinto
committed
on 22 Nov 2018
|
| 2018-08-28 |
Issue 532 (#1847)
...
* Replaced instances of `raw` with `sanitize`
* Updated Brakeman ignores
* Remove unnecessary sanitation
* Add support for TinyMCE tags
Gavin Morrice
authored
on 28 Aug 2018
GitHub
committed
on 28 Aug 2018
|
| 2018-05-15 |
New translations should use dmpopidor domain
|
Added the name of the person sharing a DMP in the title and the body of the notification
|
| 2017-12-11 |
updated devise emails to use contact_us instead of contact_us_url for variable name
...
fixed copy/paste issue
briley
committed
on 11 Dec 2017
|
| 2017-11-20 |
added contact_us_url check on devise emails
Brian Riley
committed
on 20 Nov 2017
|
| 2017-11-02 |
welcome notification done. DMPRoadmap/roadmap#731
...
sharing notification completed. DMPRoadmap/roadmap#731
permissions change notification done. DMPRoadmap/roadmap#731
api_token_granted_notification done. DMPRoadmap/roadmap#731
change password done. shared plan for non-registered user. DMPRoadmap/roadmap#731
new entries at branding for mailing. DMPRoadmap/roadmap#731
Jose Lloret
committed
on 2 Nov 2017
|
| 2017-05-12 |
Fixes #307 - Single invitation email issue
Jimmy Angelakos
committed
on 12 May 2017
|
| 2017-05-11 |
Bugfixes for invitations/ password change. Fixes #268, #271.
Jimmy Angelakos
committed
on 11 May 2017
|
| 2017-04-14 |
updated remaining mailers to use fastgettext default locale and fixed spacing issues. DMPRoadmap/roadmap#239
Brian Riley
committed
on 14 Apr 2017
|
| 2016-08-12 |

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
Damodar Sojka
authored
on 12 Aug 2016
Brian Riley
committed
on 12 Aug 2016
|
| 2016-07-22 |

Rails 4.2 (#10)
...
* Migrated codebase from rails 4.0 to 4.2, also removed most of the version specifications from the gem dependencies and ran bundle update
* Commented out api test since it is incomplete and references a missing fixture. Also commented out stubbed performance test because that functionality is no longer a part of rails
* renamed config/environment to config/environments which is what rails is looking for. Commented out the DOCX mime type reference because it is already added by rails. Commented out the belongs_to_and has_many line in models/user because it is already defined by rolify gem
* updated ruby version to 2.1.10 for devise gem
* Added line to have tests auto-run db:migrate
* Ran db:migrate to update the schema since there were some pending migrations preventing travis from running rake
* removed schem_migration line from test_helper as it did not seem to help with the schema migration issue in travis
* Added fb:migrate and db:test:prepare commands to travis file
* replaced deprecated ActiveRecord::Migrator call in old db migration file
* Removed rake db tasks from travis file now that the offending migration script has been fixed
* added rake db:test:prepare back to travis file and added call to run default test task
* Updated find_by_all to the newer and more accepted 'where'
* Updated routes.rb to remove unecessary create and edit route definitions
* Fixed stack too deep error by commenting out circular reference to sections in the version model. Changed deprecated '.find(:all, :order => 'field ASC')' format to '.all.order('field')'
* removed redundant bootstrap file. using bootstrap.min.js going forward. updated css to default align all text to left
* Added js preventDefault to modal popup functions to prevent them from appearing and immediately disappering
* Replaced deprecated link_to_function. the call in the helpers/application.rb should eventually be rethought. We shouldn't be using the onclick function of an html element directly, we should use the jquery approach: .click()
* removed deprecated link_to_object function from helpers/application.rb and added client side js script to add new options to a question.
* Upgraded select2 js file
* Removed all accepts_nested_attributes_for for belongs_to associations because they were creating circular calls in ActiveRecord.
* Fixed add/remove option js
* Fixed i18n calls in erb files that were missing an equal sign (e.g. <% t('value'') %> --> <%= t('value') %> so that the value will appear to the user. Also updated i18n calls from admin.js with 'js.' prefix)
* Removed deprecated uniq_by call on ActiveRecord collection
* Updated textbox and textarea sizes on contact_us form. added a route for the 'future plans' page
* Added 'self' prefix to dmptemplate references in models/project.rb because of a scoping issue. tweaks to select2 dropdowns on create project page
* Moved i18n calls out of string content in toolbar.js
* Removed outdated i%() array initializers because they now create arrays of symbols instead of strings
* Fixes to the plan settings page
* Fixed issues with settings hash
* Removed some debug statements
* Added the new rails 4.2 byebug gem
* added rails 4 bin
* added rails 4 bin
* tweaks to env and session_store cookie domain
* Updated routes to make lock/unlock paths use json by default
* updated routes for lock/unlock section on plan form
* fixed issue with lock/unlock using .json extension in ajax call. fixed unknown i18n references in plans.js
* Fixed issue with location of web-console in the Gemfile.
Brian Riley
authored
on 22 Jul 2016
GitHub
committed
on 22 Jul 2016
|
| 2016-06-27 |
Master (#7)
...
* Update license (merging Marta's change that added Univ. of Glasgow to the text)
Update license to include University of Glasgow.
* Added API and Localisation work
API development done by Sam Rust - xsrust
Localisation work done by Damodar Sojka - DamodarSojka
DigitalCurationCentre
authored
on 27 Jun 2016
Brian Riley
committed
on 27 Jun 2016
|
| 2016-06-03 |
DMPonline4 - RAILS 4.0 (#4)
...
Merging the initial DMPOnline4 codebase into Roadmap
DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.
Marta Ribeiro
authored
on 3 Jun 2016
Brian Riley
committed
on 3 Jun 2016
|