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
|
|
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
|
|
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
|
|
| 2017-04-04 |
Fixed Exporting settings. It works per phase. DMPRoadmap/roadmap#197
Jose Lloret
committed
on 4 Apr 2017
|
| 2017-04-03 |
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
|
|
| 2017-03-30 |
switched all Perm::CONSTANT to Perm.scope calls. Travis could not handle CONSTANT definitions likely due to rails/ruby evironment. Its better to use scope for queries anyway
briley
committed
on 30 Mar 2017
|
|
testing switch from constant to scope on perm
briley
committed
on 30 Mar 2017
|
|
|
added debug to User perm check
briley
committed
on 30 Mar 2017
|
|
|
Added freeze back to perm constants. did not turn out to be the issue with travis tests
briley
committed
on 30 Mar 2017
|
|
|
removed 'freeze from Perm constant definitions. this is deprecated in Rails 4
briley
committed
on 30 Mar 2017
|
|
| 2017-03-27 |
Merge pull request #206 from DigitalCurationCentre/development
...
Brian Riley
authored
on 27 Mar 2017
GitHub
committed
on 27 Mar 2017
|
 |
|
| 2017-03-24 |
fixed some of the failing tests. Commented out helpers/plan_list tests because it relied on old I18n helpers to determine column name
briley
committed
on 24 Mar 2017
|
| 2017-03-14 |
fix access to owner and template
ray.carrick
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-10 |
public_plans view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 10 Mar 2017
|
| 2017-03-07 |
I18n replaced from models. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 7 Mar 2017
|
| 2017-03-03 |
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust
committed
on 3 Mar 2017
|
|
created a to_hash method for templates to help remove data access from views
xsrust
committed
on 3 Mar 2017
|
|
|
minor fixes from code review
ray.carrick
committed
on 3 Mar 2017
|
|
| 2017-03-02 |
timestamp off updated_at rather than created_at plus other tidying up
ray.carrick
committed
on 2 Mar 2017
|
|
reinstate funder_id used in create plan
ray.carrick
committed
on 2 Mar 2017
|
|
|
change question_format to use enum rather than bits
ray.carrick
committed
on 2 Mar 2017
|