GitBucket
| 2017-06-09 |
cleanup of tabs and objects that are no longer in use DMPRoadmap/roadmap#305
...
Brian Riley
committed
on 9 Jun 2017
|
|---|---|
|
fixed tests for registrations controller DMPRoadmap/roadmap#305
...
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved cherry-pick conflicts
Brian Riley
committed
on 9 Jun 2017
|
|
add unit test for user owned_by plan method
...
bhavi
authored
on 2 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
started register form rewrite DMPRoadmap/roadmap#305
...
briley
authored
on 1 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
fixed tests to deal with placement of welcome header on home page DMPRoadmap/roadmap#305
...
briley
authored
on 1 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
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
|
|
|
added sqlite journal to gitignore
Brian Riley
committed
on 9 Jun 2017
|
|
|
Merge pull request #55 from DMPRoadmap/development
...
Brian Riley
authored
on 9 Jun 2017
GitHub
committed
on 9 Jun 2017
|
|
Merge pull request #411 from DigitalCurationCentre/xsrust/bugfixes
...
Jimmy Angelakos
authored
on 9 Jun 2017
GitHub
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 |
Merge pull request #54 from DMPRoadmap/development
...
Brian Riley
authored
on 8 Jun 2017
GitHub
committed
on 8 Jun 2017
|
|
added translations
xsrust
committed
on 8 Jun 2017
|
|
|
updated edit customization and published status of customizations according to #338
xsrust
committed
on 8 Jun 2017
|
|
|
Merge pull request #410 from DigitalCurationCentre/xsrust/bugfixes
...
Jimmy Angelakos
authored
on 8 Jun 2017
GitHub
committed
on 8 Jun 2017
|
|
|
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 8 Jun 2017
|
|
|
fixed bug where org not set by update function
xsrust
committed
on 8 Jun 2017
|
|
|
Merge pull request #409 from DigitalCurationCentre/xsrust/bugfixes
...
Jimmy Angelakos
authored
on 8 Jun 2017
GitHub
committed
on 8 Jun 2017
|
|
Updated translation templates
Jimmy Angelakos
committed
on 8 Jun 2017
|
|
|
updated class for button, fixes issue brought up in #373
xsrust
committed
on 8 Jun 2017
|
|
|
updated failing test to refelct changes to controller, fixes #344
xsrust
committed
on 8 Jun 2017
|
|
|
enforce manditory fields on edit profile page
xsrust
committed
on 8 Jun 2017
|
|
| 2017-06-07 |
Merge pull request #406 from DigitalCurationCentre/vyruss/bugfixes
...
Brian Riley
authored
on 7 Jun 2017
GitHub
committed
on 7 Jun 2017
|
|
Filtering funders with published templates only - Closes #387
Jimmy Angelakos
committed
on 7 Jun 2017
|