GitBucket
| 2017-06-27 |
fix merge conflicts
bhavi
committed
on 27 Jun 2017
|
|---|---|
|
saving password details separately
bhavi
committed
on 27 Jun 2017
|
|
| 2017-06-26 |
added new roadmap logo. started applying new css to plan edit page
briley
committed
on 26 Jun 2017
|
| 2017-06-23 |
fix merge conflicts
bhavi
committed
on 23 Jun 2017
|
added old admin.js back in to handle templates page. finsihed css rebuild of guidances and guidance groups
Brian Riley
committed
on 23 Jun 2017
|
|
|
made toolbar a generic table filter. finished css restyling of users page
Brian Riley
committed
on 23 Jun 2017
|
|
|
finished css rework on org edit
Brian Riley
committed
on 23 Jun 2017
|
|
|
had to move jquery timeago back to root, added js for org edit page. fixed styling of header when org logo and banner are present
Brian Riley
committed
on 23 Jun 2017
|
|
|
rebased with DCC go-live codebase
Brian Riley
committed
on 23 Jun 2017
|
|
|
fixed merge conflicts
Brian Riley
committed
on 23 Jun 2017
|
|
| 2017-06-22 |
css rewrite
briley
committed
on 22 Jun 2017
|
|
move the user profile tabs into separate forms
bhavi
committed
on 22 Jun 2017
|
|
git Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes
xsrust
committed
on 22 Jun 2017
|
|
|
made docx title correspond to plan title, filename correspond to filename
xsrust
committed
on 22 Jun 2017
|
|
|
Merge pull request #445 from DigitalCurationCentre/kmcgre/bugfixes
...
Sam Rust
authored
on 22 Jun 2017
GitHub
committed
on 22 Jun 2017
|
|
Remove guidances api controller and show action from guidance_groups api controller
Keith McGrellis
committed
on 22 Jun 2017
|
|
| 2017-06-19 |
added initial edit plan redesign and refactored css so that the files aren't loading multiple times
briley
committed
on 19 Jun 2017
|
| 2017-06-16 |
fixed merge conflicts
Brian Riley
committed
on 16 Jun 2017
|
|
Added public DMPs page
Brian Riley
committed
on 16 Jun 2017
|
|
|
remove byebug
bhavi
committed
on 16 Jun 2017
|
|
|
fix the nil error for notification preferences
bhavi
committed
on 16 Jun 2017
|
|
| 2017-06-15 |
fixed merge conflicts
Brian Riley
committed
on 15 Jun 2017
|
|
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 |
Merge branch 'CDL-MVP' into branding
briley
committed
on 14 Jun 2017
|
|
Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP
briley
committed
on 14 Jun 2017
|
|
|
color changes for rebradning
briley
committed
on 14 Jun 2017
|
|
|
move user profile to partials, and add prefrences tab
bhavi
committed
on 14 Jun 2017
|