GitBucket
| 2017-06-06 |
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 6 Jun 2017
|
|---|---|
|
Merge branch 'xsrust/bugfixes' of https://github.com/DigitalCurationCentre/roadmap into xsrust/bugfixes
xsrust
committed
on 6 Jun 2017
|
|
|
updated org-admin customization of templates according to #373
xsrust
committed
on 6 Jun 2017
|
|
|
Merge pull request #398 from DigitalCurationCentre/vyruss/bugfixes
...
Sam Rust
authored
on 6 Jun 2017
GitHub
committed
on 6 Jun 2017
|
|
Default ordering for Phase, Question becomes .number - closes #402
Jimmy Angelakos
committed
on 6 Jun 2017
|
|
|
Changed guidance tooltip - Closes #333
Jimmy Angelakos
committed
on 6 Jun 2017
|
|
|
Made invitation email title same as sharing email title - related to #271
Jimmy Angelakos
committed
on 6 Jun 2017
|
|
| 2017-06-05 |
Merge pull request #395 from DigitalCurationCentre/xsrust/bugfixes
...
Jimmy Angelakos
authored
on 5 Jun 2017
GitHub
committed
on 5 Jun 2017
|
|
Update templates_controller_test.rb
Jimmy Angelakos
authored
on 5 Jun 2017
GitHub
committed
on 5 Jun 2017
|
|
|
Update templates_controller_test.rb
Jimmy Angelakos
authored
on 5 Jun 2017
GitHub
committed
on 5 Jun 2017
|
|
|
remove add phase button from customized templated
xsrust
committed
on 5 Jun 2017
|
|
|
fixes no route error when trying to customize a template
xsrust
committed
on 5 Jun 2017
|
|
|
fixes bug where guidance dropdowns have duplicate id's so are unable to be expanded
xsrust
committed
on 5 Jun 2017
|
|
|
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 5 Jun 2017
|
|
|
Merge pull request #394 from DigitalCurationCentre/issue272
...
Jimmy Angelakos
authored
on 5 Jun 2017
GitHub
committed
on 5 Jun 2017
|
|
Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272
Jose Lloret
committed
on 5 Jun 2017
|
|
| 2017-06-02 |
Merge pull request #393 from DigitalCurationCentre/vyruss/bugfixes
...
Brian Riley
authored
on 2 Jun 2017
GitHub
committed
on 2 Jun 2017
|
|
Updated translation strings & added :migrated attribute access to template model
Jimmy Angelakos
committed
on 2 Jun 2017
|
|
|
Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes
Jimmy Angelakos
committed
on 2 Jun 2017
|
|
|
Merge pull request #392 from DigitalCurationCentre/issue_382
...
Jimmy Angelakos
authored
on 2 Jun 2017
GitHub
committed
on 2 Jun 2017
|
|
|
Re-enable attr_accessible for Dragonfly gem (logo uploads) - closes #375
Jimmy Angelakos
committed
on 2 Jun 2017
|
|
|
Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382
...
Jose Lloret
committed
on 2 Jun 2017
|
|
|
We don't need .live here but just a template name for @based_on - Should fix #385, #389.
Jimmy Angelakos
committed
on 2 Jun 2017
|
|
|
Merge pull request #39 from DMPRoadmap/development
...
Jimmy Angelakos
authored
on 2 Jun 2017
GitHub
committed
on 2 Jun 2017
|
|
| 2017-05-31 |
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 31 May 2017
|
|
updated routes from put to get for admin_customize, addresses part of #370
xsrust
committed
on 31 May 2017
|
|
|
Updated translation strings
Jimmy Angelakos
committed
on 31 May 2017
|
|
|
Merge pull request #386 from DigitalCurationCentre/xsrust/bugfixes
...
Jimmy Angelakos
authored
on 31 May 2017
GitHub
committed
on 31 May 2017
|
|
|
changed text for example answers, fixes #277
xsrust
committed
on 31 May 2017
|
|
|
fixes issue with some template guidance not displaying
xsrust
committed
on 31 May 2017
|