GitBucket
| 2017-03-20 |
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick
committed
on 20 Mar 2017
|
|---|---|
|
choose template where org has more than one valid
ray.carrick
committed
on 20 Mar 2017
|
|
|
fix helpers for cancel and data access
ray.carrick
committed
on 20 Mar 2017
|
|
| 2017-03-16 |
resolve conflicts from merging Roadmap into DCC
ray.carrick
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
|
|
|
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
|
|
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
|
|
|
help view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 10 Mar 2017
|
|
|
about_us view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret
committed
on 10 Mar 2017
|
|
| 2017-03-09 |
Language switcher hidden if only one language is installed. DMPRoadmap/roadmap#110
Jose Lloret
committed
on 9 Mar 2017
|
| 2017-03-07 |
Replace parametrised .yaml keys (e.g. t("helpers.settings.plans.margins.#{pos}")). DMPRoadmap/roadmap#98
Jose Lloret
committed
on 7 Mar 2017
|
|
I18n replaced from models. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 7 Mar 2017
|
|
|
I18n replaced from controllers. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 7 Mar 2017
|
|
| 2017-03-03 |
switched registrations controller to user org_id instead of organisation_id. fixes DMPRoadmap/roadmap#145
Brian Riley
committed
on 3 Mar 2017
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust
committed
on 3 Mar 2017
|
|
|
switched to using the hash for data access for admin_template view and associated partials
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
|