GitBucket
| 2017-04-06 |
fixed merge conflicts after rebase
briley
committed
on 6 Apr 2017
|
|---|---|
|
Merge pull request #42 from DMPRoadmap/development
...
Brian Riley
authored
on 6 Apr 2017
GitHub
committed
on 6 Apr 2017
|
|
| 2017-04-05 |
fixed rebase issues
briley
committed
on 5 Apr 2017
|
|
rebuilt locale json files after adding timeago values. updated main <html> tag to include current locale for use with JS. DMPRoadmap/roadmap#204
briley
committed
on 5 Apr 2017
|
|
|
removed template->question dropdowns on guidance pages. updated controller and JS accordingly. fixed issue with themes not being saved. DMPRoadmap/roadmap#221
briley
committed
on 5 Apr 2017
|
|
|
added roles controller tests and updated controller to use strong params and handle failures properly
briley
committed
on 5 Apr 2017
|
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick
committed
on 5 Apr 2017
|
|
|
export text fields and areas. Fixes: https://github.com/DMPRoadmap/roadmap/issues/217
ray.carrick
committed
on 5 Apr 2017
|
|
implimented new role backend according to #219
xsrust
committed
on 5 Apr 2017
|
|
Fixed error trying to save a non-valid exporting format for ExportedPlan. Disabled XML and JSON exporting formats. DMPRoadmap/roadmap#222
Jose Lloret
committed
on 5 Apr 2017
|
|
|
csv exporting format fixed. DMPRoadmap/roadmap#222
Jose Lloret
committed
on 5 Apr 2017
|
|
|
txt exporting format fixed. DMPRoadmap/roadmap#222
Jose Lloret
committed
on 5 Apr 2017
|
|
|
pdf exporting format fixed. DMPRoadmap/roadmap#222
Jose Lloret
committed
on 5 Apr 2017
|
|
|
docx exporting format fixed. DMPRoadmap/roadmap#222
Jose Lloret
committed
on 5 Apr 2017
|
|
| 2017-04-04 |
patched organisation_type reference in view, added secure params to orgs controller. Added functional tests for orgs controller
briley
committed
on 4 Apr 2017
|
|
changes into export to html to properly show admin details fields. DMPRoadmap/roadmap#197
Jose Lloret
committed
on 4 Apr 2017
|
|
|
Fixed Exporting settings. It works per phase. DMPRoadmap/roadmap#197
Jose Lloret
committed
on 4 Apr 2017
|
|
|
export functionality according to workflow defined at DMPRoadmap/roadmap#197
Jose Lloret
committed
on 4 Apr 2017
|
|
| 2017-04-03 |
added notes controller tests
briley
committed
on 3 Apr 2017
|
|
added home controller test. updated test helper to reload LANGUAGES constant if its blank during TravisCI build
briley
committed
on 3 Apr 2017
|
|
|
added error messaging to guidances controller's update and create methods
briley
committed
on 3 Apr 2017
|
|
|
resolved rebase conflicts from merge with development
briley
committed
on 3 Apr 2017
|
|
|
cleaned up guidances controller and added functional tests
briley
committed
on 3 Apr 2017
|
|
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick
committed
on 3 Apr 2017
|
|
|
interface tinymce to the page is_dirty functionality
ray.carrick
committed
on 3 Apr 2017
|
|
|
added error messages to user update profile page and fixed logic bugs
xsrust
committed
on 3 Apr 2017
|
|
| 2017-03-31 |
and forgot to change a project to a role. TODO: test before committing
xsrust
committed
on 31 Mar 2017
|
|
forgot to change a project_group to role
xsrust
committed
on 31 Mar 2017
|
|
|
updated mailers to use new schema
xsrust
committed
on 31 Mar 2017
|
|
|
updated roles controller to use strong parameters
xsrust
committed
on 31 Mar 2017
|