History for dmpopidor / app
2017-03-21
@briley
fixes 'we're sorry HTTP 500 error' when clicking on the phase tab when editing a template. DMPRoadmap/roadmap#187
briley committed on 21 Mar 2017
@briley
Merge branch 'development' of https://github.com/CDLUC3/roadmap into development
briley committed on 21 Mar 2017
@briley
fixes to some of the functional tests to use FastGettext instead of I18n
briley committed on 21 Mar 2017
@Jimmy Angelakos
Merge branch 'feature/superadmin' into HEAD ...
Jimmy Angelakos committed on 21 Mar 2017
2017-03-20
@briley
Noticed that the user/org's language settings were not being factored in during testing. Updated application controller to use the current user's language or the org's language if available. The locale is only set in the session if the user is logged in now. also fixed to some functional tests.
briley committed on 20 Mar 2017
@ray.carrick
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick committed on 20 Mar 2017
@ray.carrick
choose template where org has more than one valid
ray.carrick committed on 20 Mar 2017
@ray.carrick
fix helpers for cancel and data access
ray.carrick committed on 20 Mar 2017
2017-03-16
@ray.carrick
resolve conflicts from merging Roadmap into DCC
ray.carrick committed on 16 Mar 2017
@ray.carrick
still need @languages when updating email address
ray.carrick committed on 16 Mar 2017
2017-03-15
@briley
removed debug statement from projects controller
briley committed on 15 Mar 2017
@briley
fixed issues with omniauth and registrations controller tests. removed some debug statements
briley committed on 15 Mar 2017
@briley
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
@Jose Lloret
Export plans according to gettext. DMPRoadmap/roadmap#98
Jose Lloret committed on 15 Mar 2017
2017-03-14
@briley
fixes DMPRoadmap/roadmap#172
briley committed on 14 Mar 2017
@ray.carrick
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
ray.carrick committed on 14 Mar 2017
@ray.carrick
fix access to owner and template
ray.carrick committed on 14 Mar 2017
@Jose Lloret
Merge branch 'issue167' into development
Jose Lloret committed on 14 Mar 2017
@Jose Lloret
Extended .pot an .po files with translations from static.yml. DMPRoadmap/roadmap#167
Jose Lloret committed on 14 Mar 2017
@ray.carrick
fix merge conflicts
ray.carrick committed on 14 Mar 2017
@ray.carrick
change from serialized hash tp just using includes
ray.carrick committed on 14 Mar 2017
2017-03-13
@Jose Lloret
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
@Jose Lloret
public_plans view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret committed on 10 Mar 2017
@Jose Lloret
termsuse view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret committed on 10 Mar 2017
@Jose Lloret
roadmap view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret committed on 10 Mar 2017
@Jose Lloret
help view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret committed on 10 Mar 2017
@Jose Lloret
about_us view according to gettext. DMPRoadmap/roadmap#167
Jose Lloret committed on 10 Mar 2017
2017-03-09
@Jose Lloret
Language switcher hidden if only one language is installed. DMPRoadmap/roadmap#110
Jose Lloret committed on 9 Mar 2017
2017-03-08
@Jimmy Angelakos
- Fixed app/controllers/admin/application_controller.rb oopsie ...
Jimmy Angelakos committed on 8 Mar 2017
2017-03-07
@Jose Lloret
Replace parametrised .yaml keys (e.g. t("helpers.settings.plans.margins.#{pos}")). DMPRoadmap/roadmap#98
Jose Lloret committed on 7 Mar 2017