GitBucket
| 2017-06-09 |
resolved cherry-pick conflicts
briley
authored
on 1 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|---|---|
fix issue regarding co-owner ablility to delete the plan #242
...
bhavi
authored
on 31 May 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved cherry-pick conflicts
briley
authored
on 18 May 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved cherry-pick conflicts
briley
authored
on 17 May 2017
Brian Riley
committed
on 9 Jun 2017
|
|
fixed typo introduced during merge conflict resolution
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved merge conflicts from merging development 2016-06-09 into CDL-MVP
Brian Riley
committed
on 9 Jun 2017
|
|
changed empty string to nothing
xsrust
committed
on 9 Jun 2017
|
|
|
updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338
xsrust
committed
on 9 Jun 2017
|
|
| 2017-06-08 |
updated edit customization and published status of customizations according to #338
xsrust
committed
on 8 Jun 2017
|
|
fixed bug where org not set by update function
xsrust
committed
on 8 Jun 2017
|
|
|
updated class for button, fixes issue brought up in #373
xsrust
committed
on 8 Jun 2017
|
|
|
enforce manditory fields on edit profile page
xsrust
committed
on 8 Jun 2017
|
|
| 2017-06-07 |
Filtering funders with published templates only - Closes #387
Jimmy Angelakos
committed
on 7 Jun 2017
|
|
Fixed faulty description display logic for plans with 1-phase-templates - Closes #401
Jimmy Angelakos
committed
on 7 Jun 2017
|
|
Merge pull request #404 from DigitalCurationCentre/issue337
...
Jimmy Angelakos
authored
on 7 Jun 2017
GitHub
committed
on 7 Jun 2017
|
|
Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337
...
Jose Lloret
committed
on 7 Jun 2017
|
|
|
Changed error text - closes #382.
Jimmy Angelakos
committed
on 7 Jun 2017
|
|
| 2017-06-06 |
added default answer text according to #388, fixed bug introduced yesterday from guidance fix
xsrust
committed
on 6 Jun 2017
|
|
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 6 Jun 2017
|
|
|
updated org-admin customization of templates according to #373
xsrust
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 |
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
|
|
|
Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272
Jose Lloret
committed
on 5 Jun 2017
|
|
| 2017-06-02 |
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
|