| 2017-09-19 |
Merge pull request #650 from CDLUC3/CDL-MVP
...
Minor bugfix
Jose Lloret
authored
on 19 Sep 2017
GitHub
committed
on 19 Sep 2017
|
| 2017-09-18 |
bugfix of missing closing parens in password reset page
briley
committed
on 18 Sep 2017
|
| 2017-09-15 |

Bootstrapped Edit Profile page (#90)
...
* DMPRoadmap/roadmap#issue567
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
* Boostrapped the create plan page. DMPRoadmap/roadmap#632
- Converted JS for page over to ES6
- Added stub test and fixture
- Converted jquery autocomplete combobox to Bootstrap and ES6
TODO:
- Add in AJAX calls to retrieve template options based on org/funder selections
- Fix issue with the hidden id field being updated when combobox item is selected
- Finish tests for the autoComplete.js
Bootstrapped Plan Writing and Download pages (#88)
* DMPRoadmap/roadmap#issue567
* DMPRoadmap/roadmap#issue561
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
added JS tests for expandCollapseAll accordion functionality
fixed linter complaint about double vs single quotes in test
removed a few empty and unused views. removed old es5 js for create plan page. bootstrapped the create plan page
boostrapped the create plan page. converted jquery autocomplete to ES6 and bootstrap. started adding JS tests
removed unfinished tests for autocomplete, will finihs after demo. added comments to autoComplete.js
* Boostrapped the create plan page
* Bootstrap User profile page (#563) (#637)
* adding bootstrap classes to the form
* add bootstrap classes to user details and preferences tab
* add user profile page js file
* add other tabs form to js bundle as well
* import password validator js into user_profile
* Pulling in Bootstrap of Create Plan changes (#89)
* DMPRoadmap/roadmap#issue567
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
* Boostrapped the create plan page. DMPRoadmap/roadmap#632
- Converted JS for page over to ES6
- Added stub test and fixture
- Converted jquery autocomplete combobox to Bootstrap and ES6
TODO:
- Add in AJAX calls to retrieve template options based on org/funder selections
- Fix issue with the hidden id field being updated when combobox item is selected
- Finish tests for the autoComplete.js
Bootstrapped Plan Writing and Download pages (#88)
* DMPRoadmap/roadmap#issue567
* DMPRoadmap/roadmap#issue561
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
added JS tests for expandCollapseAll accordion functionality
fixed linter complaint about double vs single quotes in test
removed a few empty and unused views. removed old es5 js for create plan page. bootstrapped the create plan page
boostrapped the create plan page. converted jquery autocomplete to ES6 and bootstrap. started adding JS tests
removed unfinished tests for autocomplete, will finihs after demo. added comments to autoComplete.js
* Boostrapped the create plan page
* add user profile page js file
* add other tabs form to js bundle as well
import password validator js into user_profile
update the jquery to es6 for preferences
* fixing minor issues on user_profile related to forms
Brian Riley
authored
on 15 Sep 2017
GitHub
committed
on 15 Sep 2017
|

Bootstrap User profile page (#563) (#637)
...
* adding bootstrap classes to the form
* add bootstrap classes to user details and preferences tab
* add user profile page js file
* add other tabs form to js bundle as well
* import password validator js into user_profile
* Pulling in Bootstrap of Create Plan changes (#89)
* DMPRoadmap/roadmap#issue567
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
* Boostrapped the create plan page. DMPRoadmap/roadmap#632
- Converted JS for page over to ES6
- Added stub test and fixture
- Converted jquery autocomplete combobox to Bootstrap and ES6
TODO:
- Add in AJAX calls to retrieve template options based on org/funder selections
- Fix issue with the hidden id field being updated when combobox item is selected
- Finish tests for the autoComplete.js
Bootstrapped Plan Writing and Download pages (#88)
* DMPRoadmap/roadmap#issue567
* DMPRoadmap/roadmap#issue561
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
added JS tests for expandCollapseAll accordion functionality
fixed linter complaint about double vs single quotes in test
removed a few empty and unused views. removed old es5 js for create plan page. bootstrapped the create plan page
boostrapped the create plan page. converted jquery autocomplete to ES6 and bootstrap. started adding JS tests
removed unfinished tests for autocomplete, will finihs after demo. added comments to autoComplete.js
* Boostrapped the create plan page
* add user profile page js file
* add other tabs form to js bundle as well
import password validator js into user_profile
update the jquery to es6 for preferences
* fixing minor issues on user_profile related to forms
Bhavi
authored
on 15 Sep 2017
Brian Riley
committed
on 15 Sep 2017
|
| 2017-09-12 |

Pulling in Bootstrap of Create Plan changes (#89)
...
* DMPRoadmap/roadmap#issue567
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
* Boostrapped the create plan page. DMPRoadmap/roadmap#632
- Converted JS for page over to ES6
- Added stub test and fixture
- Converted jquery autocomplete combobox to Bootstrap and ES6
TODO:
- Add in AJAX calls to retrieve template options based on org/funder selections
- Fix issue with the hidden id field being updated when combobox item is selected
- Finish tests for the autoComplete.js
Bootstrapped Plan Writing and Download pages (#88)
* DMPRoadmap/roadmap#issue567
* DMPRoadmap/roadmap#issue561
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
added JS tests for expandCollapseAll accordion functionality
fixed linter complaint about double vs single quotes in test
removed a few empty and unused views. removed old es5 js for create plan page. bootstrapped the create plan page
boostrapped the create plan page. converted jquery autocomplete to ES6 and bootstrap. started adding JS tests
removed unfinished tests for autocomplete, will finihs after demo. added comments to autoComplete.js
* Boostrapped the create plan page
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
Merge branch 'CDL-MVP' into CDL-MVP
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
Merge pull request #636 from CDLUC3/issue632
...
Boostrapped the Create Plan page
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
Merge branch 'CDL-MVP' into issue632
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
Boostrapped the create plan page
briley
committed
on 12 Sep 2017
|

Boostrapped the create plan page. DMPRoadmap/roadmap#632
...
- Converted JS for page over to ES6
- Added stub test and fixture
- Converted jquery autocomplete combobox to Bootstrap and ES6
TODO:
- Add in AJAX calls to retrieve template options based on org/funder selections
- Fix issue with the hidden id field being updated when combobox item is selected
- Finish tests for the autoComplete.js
Bootstrapped Plan Writing and Download pages (#88)
* DMPRoadmap/roadmap#issue567
* DMPRoadmap/roadmap#issue561
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
added JS tests for expandCollapseAll accordion functionality
fixed linter complaint about double vs single quotes in test
removed a few empty and unused views. removed old es5 js for create plan page. bootstrapped the create plan page
boostrapped the create plan page. converted jquery autocomplete to ES6 and bootstrap. started adding JS tests
removed unfinished tests for autocomplete, will finihs after demo. added comments to autoComplete.js
Brian Riley
authored
on 12 Sep 2017
briley
committed
on 12 Sep 2017
|

Bootstrapped Plan Writing and Download pages (#88)
...
* DMPRoadmap/roadmap#issue567
* DMPRoadmap/roadmap#issue561
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
* Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
* DMPRoadmap/roadmap#562
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
* fixed linter issue with CRLF
* fixed tests broken by name change from show_export to download.
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
Merge pull request #631 from CDLUC3/issue561
...
Bootstrapped Plan Download
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
Merge branch 'CDL-MVP' into issue561
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
fixed tests broken by name change from show_export to download.
briley
committed
on 12 Sep 2017
|
Merge pull request #633 from DigitalCurationCentre/issue562
...
DMPRoadmap/roadmap#562
Brian Riley
authored
on 12 Sep 2017
GitHub
committed
on 12 Sep 2017
|
| 2017-09-11 |
fixed linter issue with CRLF
briley
committed
on 11 Sep 2017
|
DMPRoadmap/roadmap#562
...
edit phases using plan navigation layout
bootstrap plan progress. bootstrap sections header. added togglable section icons for expand/collapse
answers_controller returning a JSON with partial views rendered. Split question types in different partials. Started new answers/status.js
Rename view to edit_plan_answers.html.erb. Load tinymce through ES6 for question answers. Delete old status.js ES5. Added timeago to vendor
fixed broken test regarding answers_controller
Jose Lloret
committed
on 11 Sep 2017
|
Merge branch 'CDL-MVP' into issue561
Jose Lloret
authored
on 11 Sep 2017
GitHub
committed
on 11 Sep 2017
|
| 2017-09-08 |
Bootstrapping and ES6 of the Plan Download page DMPRoadmap/roadmap#561.
...
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route)
- Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes)
- Bootstrapped page html
changed name of show_export to download to match UI terminology. Bootstrapped download page
Added ES6 JS for download page and made tweaks to the format
Brian Riley
committed
on 8 Sep 2017
|
Bootstrapped accordions on Write Plan page
...
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
Brian Riley
authored
on 8 Sep 2017
GitHub
committed
on 8 Sep 2017
|
Merge pull request #629 from CDLUC3/issue567
...
Bootstrapped Accordions on Write Plan page
Jose Lloret
authored
on 8 Sep 2017
GitHub
committed
on 8 Sep 2017
|
| 2017-09-07 |
DMPRoadmap/roadmap#issue567
...
- Bootstrapped the Write Plan page accordions
- Rebased with latest from CDL-MVP
bootstrapped the phases accordion DMPRoadmap/roadmap#567
added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap/roadmap#567
finished Bootstrapping write plan accordions DMPRoadmap/roadmap#567
fixed linter issue DMPRoadmap/roadmap#issue567
fixed linter issue
briley
authored
on 31 Aug 2017
Brian Riley
committed
on 7 Sep 2017
|
Merge pull request #86 from DMPRoadmap/CDL-MVP
...
Rebase
Brian Riley
authored
on 7 Sep 2017
GitHub
committed
on 7 Sep 2017
|
Merge pull request #627 from DigitalCurationCentre/fix_fixture_tests
...
Fix fixture tests
Brian Riley
authored
on 7 Sep 2017
GitHub
committed
on 7 Sep 2017
|
Merge pull request #626 from CDLUC3/ariatise-tests
...
Latest bug fixes from development and ariatiseForm.js tests
Jose Lloret
authored
on 7 Sep 2017
GitHub
committed
on 7 Sep 2017
|
1. click ariatiseForm preventDefault only once now
...
2. removed dependency karma-jasmine-jquery in favour of plain jasmine-jquery
3. fixed ariatiseFormSpec by bundling the fixtures to the body of the window currently executing
4. moved tinymceSpec.js to the new place for Spec
Jose Lloret
committed
on 7 Sep 2017
|
| 2017-09-06 |
fixed merge conflicts
briley
committed
on 6 Sep 2017
|
fixed merge conflicts from pulling in latest bug fixes from development
briley
committed
on 6 Sep 2017
|
Merge pull request #84 from DMPRoadmap/development
...
Pulling in bug fixes
Brian Riley
authored
on 6 Sep 2017
GitHub
committed
on 6 Sep 2017
|
Merge branch 'DMPRoadmap-CDL-MVP' into CDL-MVP
briley
committed
on 6 Sep 2017
|