Merge lp://qastaging/~blake-rouse/maas/fix-1453730 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Blake Rouse
| Status: | Merged |
|---|---|
| Approved by: | Blake Rouse |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3879 |
| Proposed branch: | lp://qastaging/~blake-rouse/maas/fix-1453730 |
| Merge into: | lp://qastaging/~maas-committers/maas/trunk |
| Diff against target: |
443 lines (+404/-1) 6 files modified
src/maasserver/context_processors.py (+1/-0) src/maasserver/static/css/maas-styles.css (+1/-1) src/maasserver/static/js/os_distro_select.js (+155/-0) src/maasserver/static/js/tests/test_os_distro_select.html (+38/-0) src/maasserver/static/js/tests/test_os_distro_select.js (+198/-0) src/maasserver/static/scss/maas/components/_tables.scss (+11/-0) |
| To merge this branch: | bzr merge lp://qastaging/~blake-rouse/maas/fix-1453730 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gavin Panella (community) | Approve | ||
| Raphaël Badin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Re-add the os_distro_select YUI widget. Fix the commissioning script table to be auto hidden by default.
Description of the change
Nothing here really needs to be reviewed. I am just adding back the YUI that I had removed before. I have not changed the code at all. Only added the CSS that Rich gave me to fix the table not being hidden by default.
To post a comment you must log in.
Revision history for this message
| Raphaël Badin (rvb) | # |
review:
Approve
Revision history for this message
| Gavin Panella (allenap) | # |
review:
Approve
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Attempt to merge into lp:maas failed due to conflicts:
text conflict in src/maasserver/