GitBucket
| 2017-06-15 |
fixed merge conflicts
Brian Riley
committed
on 15 Jun 2017
|
|---|---|
|
fixed merge conflict left over from unstashed changes
Brian Riley
committed
on 15 Jun 2017
|
|
updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined
xsrust
committed
on 15 Jun 2017
|
|
|
funder guidance now displays on customized templates
xsrust
committed
on 15 Jun 2017
|
|
| 2017-06-14 |
move user profile to partials, and add prefrences tab
bhavi
committed
on 14 Jun 2017
|
|
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 14 Jun 2017
|
|
| 2017-06-13 |
api updates
xsrust
committed
on 13 Jun 2017
|
| 2017-06-12 |
Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414
Jose Lloret
committed
on 12 Jun 2017
|
| 2017-06-09 |
Add Notification Preferences to User's profile page
bhavi
committed
on 9 Jun 2017
|
|
shibboleth_ds changes to make org list links work DMPRoadmap/roadmap#405
Brian Riley
committed
on 9 Jun 2017
|
|
|
fixed double render issue in shibboleth_ds_passthru
Brian Riley
committed
on 9 Jun 2017
|
|
|
bug fix to shibboleth_ds_passthru when page has normal dropdown box
Brian Riley
committed
on 9 Jun 2017
|
|
tweaks to get shib sso login working when called from shibboleth_ds DMPRoadmap/roadmap#405
...
briley
authored
on 8 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
added shibboleth Login.sso with entityID passthru action DMPRoadmap/roadmap#405
...
briley
authored
on 8 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
|
|
|
resolved cherry-pick conflicts
briley
authored
on 7 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved cherry-pick conflicts
briley
authored
on 6 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
Make duplicated plan page editable
...
bhavi
authored
on 6 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved cherry-pick conflicts
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
|
|
|
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 |
fixed bug where org not set by update function
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
|
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
|
|
| 2017-06-06 |
updated org-admin customization of templates according to #373
xsrust
committed
on 6 Jun 2017
|
| 2017-06-05 |
Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 5 Jun 2017
|
| 2017-06-02 |
Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes
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
|