GitBucket
| 2017-03-21 |
fixes DMPRoadmap/roadmap#191 by creating a default phase
briley
committed
on 21 Mar 2017
|
|---|---|
|
reverted changes to application_controller and schema.rb
briley
committed
on 21 Mar 2017
|
|
|
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
|
|
|
Merge branch 'development' of https://github.com/CDLUC3/roadmap into development
briley
committed
on 21 Mar 2017
|
|
|
fixes to some of the functional tests to use FastGettext instead of I18n
briley
committed
on 21 Mar 2017
|
|
 |
|
| 2017-03-20 |
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
|
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
|
|
| 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
|
|
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
|
|
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
|
| 2017-03-09 |
Language switcher hidden if only one language is installed. DMPRoadmap/roadmap#110
Jose Lloret
committed
on 9 Mar 2017
|
| 2017-03-08 |
- Fixed app/controllers/admin/application_controller.rb oopsie
...
Jimmy Angelakos
committed
on 8 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
|
|
Installed Administrate as Super Admin backend
Jimmy Angelakos
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
|
|
| 2017-03-02 |
Removed ActiveAdmin
Jimmy Angelakos
committed
on 2 Mar 2017
|
|
Replaced I18n.t(...) from controllers. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 2 Mar 2017
|
|
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust
committed
on 2 Mar 2017
|
|
|
remove unneeded format constants
ray.carrick
committed
on 2 Mar 2017
|
|
|
Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development
xsrust
committed
on 2 Mar 2017
|