GitBucket
| 2017-01-25 |
fixed merge conflicts
briley
committed
on 25 Jan 2017
|
|---|---|
| 2017-01-24 |
extracted plan visibility work out of dev branch for PR to DCC
briley
committed
on 24 Jan 2017
|
updated admin_phase view and partials associated with it to use new data access
xsrust
committed
on 24 Jan 2017
|
|
| 2017-01-20 |
removed substance-forms modifications from the dev branch. will place in a separate branch so that we can continue development
Brian Riley
committed
on 20 Jan 2017
|
| 2017-01-13 |
fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page
Brian Riley
committed
on 13 Jan 2017
|
| 2017-01-12 |
Switched answer text area to substance editor.
briley
committed
on 12 Jan 2017
|
|
Added substance-rails gem and then included the appropriate js and css libraries into the asset pipeline
briley
committed
on 12 Jan 2017
|
|
| 2017-01-11 |
switched visibility over to an enum. updated the project objects accordingly. Added some more unit tests. Updated locale files with visibility text
briley
committed
on 11 Jan 2017
|
| 2017-01-03 |
added JS logic to prevent is_test and is_public from both being true on the project edit page. Also added include to projects show page so that it pulls in the projects.js file
briley
committed
on 3 Jan 2017
|
| 2016-12-02 |
Merge pull request #16 from DMPRoadmap/development
...
Brian Riley
authored
on 2 Dec 2016
GitHub
committed
on 2 Dec 2016
|
|
Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.
Brian Riley
committed
on 2 Dec 2016
|
|
| 2016-11-29 |
added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts
briley
committed
on 29 Nov 2016
|
bugs found in fr dmponline
Ray Carrick
committed
on 29 Nov 2016
|
|
| 2016-11-08 |
Merge branch 'master' into add-orcid-functionality
briley
committed
on 8 Nov 2016
|
|
editing a guidance by question now shows template through question
xsrust
committed
on 8 Nov 2016
|
|
|
fixed bug where selecting guidance was impropperly filtering
xsrust
committed
on 8 Nov 2016
|
|
|
Merge branch 'master' into postgresql
Ray Carrick
committed
on 8 Nov 2016
|
|
| 2016-11-07 |
moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views
Brian Riley
committed
on 7 Nov 2016
|
| 2016-11-02 |
Corrected spelling of text_desription field in token_permission_types
briley
committed
on 2 Nov 2016
|
|
merge postgresql -> master
Ray Carrick
committed
on 2 Nov 2016
|
|
| 2016-10-28 |
added rake task to seed database with key values, additionally added rake task to perform all migration tasks
xsrust
committed
on 28 Oct 2016
|
| 2016-10-26 |
resolving merge conflicts
briley
committed
on 26 Oct 2016
|
| 2016-10-25 |
moved migrating user permissions to a rake task migrate:permissions
xsrust
committed
on 25 Oct 2016
|
| 2016-10-12 |
reverted changes to devise that were attempting to redirect users to the login page after session expiration. It was causing occassional sign_in issues due to a redirect loop
briley
committed
on 12 Oct 2016
|
| 2016-10-10 |
fixed typo in fr.yml locale file. Added custom failure app for devise that should redirect the user to the home page on a session timeout
briley
committed
on 10 Oct 2016
|
|
fixed typo with class name
briley
committed
on 10 Oct 2016
|
|
|
Updated devise to redirect user to the home page after session expiration rather than the unauthorized page
briley
committed
on 10 Oct 2016
|
|
| 2016-08-12 |
 |
| 2016-06-03 |
DMPonline4 - RAILS 4.0 (#4)
...
Marta Ribeiro
authored
on 3 Jun 2016
Brian Riley
committed
on 3 Jun 2016
|