GitBucket
| 2017-05-19 |
Merge pull request #327 from DigitalCurationCentre/roles_and_plan_sharing
...
Jimmy Angelakos
authored
on 19 May 2017
GitHub
committed
on 19 May 2017
|
|---|---|
removed comments from user model, fixes #314
xsrust
committed
on 19 May 2017
|
|
Fixed bug when exporting a phase without sections. DMPRoadmap/roadmap#295
Jose Lloret
committed
on 19 May 2017
|
|
|
Admin settings returning either value or - for txt, html and pdf formats. DMPRoadmap/roadmap#295
Jose Lloret
committed
on 19 May 2017
|
|
| 2017-05-16 |
updated super admin to use annotations and model files accordingly
xsrust
committed
on 16 May 2017
|
|
Merge remote-tracking branch 'upstream/development' into annotations
xsrust
committed
on 16 May 2017
|
|
|
merged development into annotations
xsrust
committed
on 16 May 2017
|
|
| 2017-05-12 |
fixed merge conflicts after rebase
Brian Riley
committed
on 12 May 2017
|
|
added answer partials back to plans dir even though they don't appear to be use in the UI. Added integration tests for template selection on create plan page
Brian Riley
committed
on 12 May 2017
|
|
|
fixed bug with annotation selection
xsrust
committed
on 12 May 2017
|
|
| 2017-05-11 |
began updating org-admin display of suggested_answers
xsrust
committed
on 11 May 2017
|
|
fixed enum to be the same as used for migration
xsrust
committed
on 11 May 2017
|
|
|
updated references of suggested_answer to annotations
xsrust
committed
on 11 May 2017
|
|
| 2017-05-10 |
fixed tests
briley
committed
on 10 May 2017
|
Replace UC3 -> CDL - fixes #245
Jimmy Angelakos
committed
on 10 May 2017
|
|
| 2017-05-09 |
fixed merge conflicts
briley
committed
on 9 May 2017
|
|
renamed suggested_answer files to annotations
xsrust
committed
on 9 May 2017
|
|
| 2017-05-08 |
Fixed failing functional & translation tests
Jimmy Angelakos
committed
on 8 May 2017
|
| 2017-05-04 |
added new create plan page
briley
committed
on 4 May 2017
|
| 2017-04-28 |
fixed merge conflict in schema.rb
Brian Riley
committed
on 28 Apr 2017
|
| 2017-04-27 |
updated org model's instituions scope to return correct org_type DMPRoadmap/roadmap#150
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
|
|
|
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
|
|
created migration from suggested_answers and question.guidance according to #223
xsrust
committed
on 25 Apr 2017
|
|
| 2017-04-24 |
removed the devise confirmation requirement DMPRoadmap/roadmap#254
Brian Riley
committed
on 24 Apr 2017
|
| 2017-04-21 |
Updated tests to work with updated controller
Brian Riley
committed
on 21 Apr 2017
|