GitBucket
| 2017-03-16 |
Merge pull request #34 from DMPRoadmap/development
...
Brian Riley
authored
on 16 Mar 2017
GitHub
committed
on 16 Mar 2017
|
|---|---|
|
Merge pull request #177 from DigitalCurationCentre/development
...
Brian Riley
authored
on 16 Mar 2017
GitHub
committed
on 16 Mar 2017
|
|
 |
|
|
resolve conflicts from merging Roadmap into DCC
ray.carrick
committed
on 16 Mar 2017
|
|
|
Merge pull request #176 from CDLUC3/development
...
Ray Carrick
authored
on 16 Mar 2017
GitHub
committed
on 16 Mar 2017
|
|
|
still need @languages when updating email address
ray.carrick
committed
on 16 Mar 2017
|
|
| 2017-03-15 |
removed debug statement from projects controller
briley
committed
on 15 Mar 2017
|
|
fixed issues with omniauth and registrations controller tests. removed some debug statements
briley
committed
on 15 Mar 2017
|
|
|
fixed issues with Settings:Plan unit tests
briley
committed
on 15 Mar 2017
|
|
|
fixed broken test in controller functional tests
briley
committed
on 15 Mar 2017
|
|
|
commented out failing Plan unit tests and added commentary for how to address post DCC MVP DMPRoadmap/roadmap#170
briley
committed
on 15 Mar 2017
|
|
|
commented out assertions in unit tests for Answers, Phase and Plans and left notes for how to fix DMPRoadmap/roadmap#170
briley
committed
on 15 Mar 2017
|
|
|
removed references to 'slug' in the unit tests since we removed friendly_id from the models
briley
committed
on 15 Mar 2017
|
|
|
commented out failing Answer unit tests. validations that were introduced prevent the current controller from saving. revisit when working on DMPRoadmap/roadmap#170
briley
committed
on 15 Mar 2017
|
|
|
removed some old empty test files. removed facebook example from identifier_schemes seed
briley
committed
on 15 Mar 2017
|
|
|
removed the public dmps link from the main nav. we will reintroduce at a later date DMPRoadmap/roadmap#167
briley
committed
on 15 Mar 2017
|
|
Added path for retrieving .yml files for external gems. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 15 Mar 2017
|
|
|
New entry for empty question. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 15 Mar 2017
|
|
|
Export plans according to gettext. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 15 Mar 2017
|
|
| 2017-03-14 |
fixes DMPRoadmap/roadmap#172
briley
committed
on 14 Mar 2017
|
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick
committed
on 14 Mar 2017
|
|
|
fix access to owner and template
ray.carrick
committed
on 14 Mar 2017
|
|
|
Merge branch 'issue167' into development
Jose Lloret
committed
on 14 Mar 2017
|
|
|
Extended .pot an .po files with translations from static.yml. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 14 Mar 2017
|
|
|
fix merge conflicts
ray.carrick
committed
on 14 Mar 2017
|
|
|
change from serialized hash tp just using includes
ray.carrick
committed
on 14 Mar 2017
|
|
| 2017-03-13 |
Commented out public_export action since it is working. Currently redirect to public_plans prompting a message. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 13 Mar 2017
|
| 2017-03-10 |
public_plans view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 10 Mar 2017
|
|
termsuse view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 10 Mar 2017
|
|
|
roadmap view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 10 Mar 2017
|