GitBucket
| 2017-04-28 |
Merge pull request #47 from DMPRoadmap/development
...
Brian Riley
authored
on 28 Apr 2017
GitHub
committed
on 28 Apr 2017
|
|---|---|
Merge branch 'DigitalCurationCentre-development' into development
Brian Riley
committed
on 28 Apr 2017
|
|
|
fixed merge conflict in schema.rb
Brian Riley
committed
on 28 Apr 2017
|
|
Merge pull request #279 from CDLUC3/development
...
Jimmy Angelakos
authored
on 28 Apr 2017
GitHub
committed
on 28 Apr 2017
|
|
| 2017-04-27 |
commented out plan creation integration test. the workflow will be changing soon
Brian Riley
committed
on 27 Apr 2017
|
|
debug line for travis.ci issue
Brian Riley
committed
on 27 Apr 2017
|
|
|
debug line for travis.ci issue
Brian Riley
committed
on 27 Apr 2017
|
|
|
debug line for travis.ci issue
Brian Riley
committed
on 27 Apr 2017
|
|
|
debug line for travis.ci issue
Brian Riley
committed
on 27 Apr 2017
|
|
|
fixed integration tests for templates
Brian Riley
committed
on 27 Apr 2017
|
|
|
removed debug lines from template test
Brian Riley
committed
on 27 Apr 2017
|
|
|
fixed issue with template test
Brian Riley
committed
on 27 Apr 2017
|
|
| 2017-04-26 |
Merge branch 'remove-settings' into development
Brian Riley
committed
on 26 Apr 2017
|
|
Merge branch 'fix-template-controller' into development
Brian Riley
committed
on 26 Apr 2017
|
|
|
updated plan edit lock warning message and disabled textbox with user's answer DMPRoadmap/roadmap#55
Brian Riley
committed
on 26 Apr 2017
|
|
|
updated generic error message handler to show value when applicable DMPRoadmap/roadmap#234
Brian Riley
committed
on 26 Apr 2017
|
|
|
removed confirmations controller, route and tests since we turned devise's email confirmation off DMPRoadmap/roadmap#254
Brian Riley
committed
on 26 Apr 2017
|
|
|
|
|
|
Removed remaining pieces of the plan_list settings DMPRoadmap/roadmap#248
Brian Riley
committed
on 26 Apr 2017
|
|
|
moved some of the logic that was defaulting template attributes in the controller over to the model. Fixed tests DMPRoadmap/roadmap#251 DMPRoadmap/roadmap#273
Brian Riley
committed
on 26 Apr 2017
|
|
section association sorted by number rather than id. DMPRoadmap/roadmap#269
...
Jose Lloret
committed
on 26 Apr 2017
|
|
| 2017-04-25 |
moved most of the save logic from the template controller to the model. Updated the phases/section/question models to use the after_save callback to handle updating the template.dirty flag
Brian Riley
committed
on 25 Apr 2017
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust
committed
on 25 Apr 2017
|
|
|
updated link to admin area to ensure that the user has permission to view that page, fixes #265
xsrust
committed
on 25 Apr 2017
|
|
Removed extraneous .all
Jimmy Angelakos
committed
on 25 Apr 2017
|
|
| 2017-04-24 |
Updated email subjects and access removed message DMPRoadmap/roadmap#239
Brian Riley
committed
on 24 Apr 2017
|
|
Updated email content and added new welcome message DMPRoadmap/roadmap#239
Brian Riley
committed
on 24 Apr 2017
|
|
|
Fixed issue with current_user.org ref for unaffiliated users. Then fixed issue with timing of plan creator assignment DMPRoadmap/roadmap#257
Brian Riley
committed
on 24 Apr 2017
|
|
|
removed the devise confirmation requirement DMPRoadmap/roadmap#254
Brian Riley
committed
on 24 Apr 2017
|
|
|
added line break before 'publish/unpublish' links
Brian Riley
committed
on 24 Apr 2017
|