Merge lp://staging/~bac/charmworld/readme-mega into lp://staging/~juju-jitsu/charmworld/trunk
Proposed by
Brad Crittenden
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~bac/charmworld/readme-mega |
| Merge into: | lp://staging/~juju-jitsu/charmworld/trunk |
| Diff against target: |
11853 lines (+962/-9942) 92 files modified
.bzrignore (+0/-1) Makefile (+1/-6) charmworld/globals.py (+30/-4) charmworld/jobs/tests/test_bzr.py (+1/-1) charmworld/jobs/tests/test_scan.py (+2/-2) charmworld/models.py (+9/-0) charmworld/routes.py (+2/-1) charmworld/static/bootstrap-dropdown.js (+0/-100) charmworld/static/css/LICENSE (+0/-177) charmworld/static/css/base.css (+29/-0) charmworld/static/css/bootstrap/LICENSE (+0/-179) charmworld/static/css/bootstrap/accordion.less (+0/-34) charmworld/static/css/bootstrap/alerts.less (+0/-79) charmworld/static/css/bootstrap/bootstrap.less (+0/-63) charmworld/static/css/bootstrap/breadcrumbs.less (+0/-24) charmworld/static/css/bootstrap/button-groups.less (+0/-227) charmworld/static/css/bootstrap/buttons.less (+0/-230) charmworld/static/css/bootstrap/carousel.less (+0/-131) charmworld/static/css/bootstrap/close.less (+0/-31) charmworld/static/css/bootstrap/code.less (+0/-61) charmworld/static/css/bootstrap/component-animations.less (+0/-22) charmworld/static/css/bootstrap/dropdowns.less (+0/-233) charmworld/static/css/bootstrap/forms.less (+0/-687) charmworld/static/css/bootstrap/grid.less (+0/-21) charmworld/static/css/bootstrap/hero-unit.less (+0/-25) charmworld/static/css/bootstrap/labels-badges.less (+0/-82) charmworld/static/css/bootstrap/layouts.less (+0/-16) charmworld/static/css/bootstrap/media.less (+0/-55) charmworld/static/css/bootstrap/mixins.less (+0/-686) charmworld/static/css/bootstrap/modals.less (+0/-95) charmworld/static/css/bootstrap/navbar.less (+0/-490) charmworld/static/css/bootstrap/navs.less (+0/-391) charmworld/static/css/bootstrap/pager.less (+0/-41) charmworld/static/css/bootstrap/pagination.less (+0/-121) charmworld/static/css/bootstrap/popovers.less (+0/-129) charmworld/static/css/bootstrap/progress-bars.less (+0/-122) charmworld/static/css/bootstrap/reset.less (+0/-216) charmworld/static/css/bootstrap/responsive-1200px-min.less (+0/-28) charmworld/static/css/bootstrap/responsive-767px-max.less (+0/-193) charmworld/static/css/bootstrap/responsive-768px-979px.less (+0/-19) charmworld/static/css/bootstrap/responsive-navbar.less (+0/-185) charmworld/static/css/bootstrap/responsive-utilities.less (+0/-43) charmworld/static/css/bootstrap/responsive.less (+0/-57) charmworld/static/css/bootstrap/scaffolding.less (+0/-52) charmworld/static/css/bootstrap/sprites.less (+0/-193) charmworld/static/css/bootstrap/tables.less (+0/-237) charmworld/static/css/bootstrap/tests/buttons.html (+0/-139) charmworld/static/css/bootstrap/tests/css-tests.css (+0/-139) charmworld/static/css/bootstrap/tests/css-tests.html (+0/-1345) charmworld/static/css/bootstrap/tests/forms-responsive.html (+0/-71) charmworld/static/css/bootstrap/tests/forms.html (+0/-179) charmworld/static/css/bootstrap/tests/navbar-fixed-top.html (+0/-104) charmworld/static/css/bootstrap/tests/navbar-static-top.html (+0/-107) charmworld/static/css/bootstrap/tests/navbar.html (+0/-107) charmworld/static/css/bootstrap/thumbnails.less (+0/-52) charmworld/static/css/bootstrap/tooltip.less (+0/-70) charmworld/static/css/bootstrap/type.less (+0/-235) charmworld/static/css/bootstrap/utilities.less (+0/-30) charmworld/static/css/bootstrap/variables.less (+0/-301) charmworld/static/css/bootstrap/wells.less (+0/-29) charmworld/static/css/bootswatch.less (+0/-128) charmworld/static/css/theme.less (+0/-76) charmworld/static/css/variables.less (+0/-301) charmworld/static/jquery-1.7.2.min.js (+0/-4) charmworld/static/pylons.css (+0/-65) charmworld/templates/bundle.pt (+75/-70) charmworld/templates/charm-collection.pt (+27/-34) charmworld/templates/charm-proof-errors.pt (+4/-5) charmworld/templates/charm.pt (+219/-183) charmworld/templates/config.pt (+9/-8) charmworld/templates/hook.pt (+12/-9) charmworld/templates/index.pt (+29/-24) charmworld/templates/interface-collection-redux.pt (+30/-21) charmworld/templates/interface-collection.pt (+16/-6) charmworld/templates/interface.pt (+62/-57) charmworld/templates/main.pt (+90/-61) charmworld/templates/recent.pt (+22/-22) charmworld/templates/review.pt (+21/-25) charmworld/templates/search.pt (+31/-33) charmworld/templates/store-missing.pt (+17/-20) charmworld/templates/tools.pt (+14/-0) charmworld/test_utils.py (+27/-18) charmworld/testing/data/sample_bundle/README.md (+13/-0) charmworld/testing/factory.py (+2/-2) charmworld/tests/test_models.py (+35/-31) charmworld/utils.py (+19/-9) charmworld/views/bundles.py (+30/-15) charmworld/views/tests/test_bundles.py (+58/-6) charmworld/views/tests/test_charms.py (+1/-1) charmworld/views/tests/test_feeds.py (+1/-1) charmworld/views/tests/test_tools.py (+16/-8) charmworld/views/tools.py (+8/-1) |
| To merge this branch: | bzr merge lp://staging/~bac/charmworld/readme-mega |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brad Crittenden (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
* Update design to use Ubuntu framework. (Huw)
* Support for display of README files for bundles. (bac)
Description of the change
Third time's the charm?
The MP at https:/
This branch has Huw's work originally reviewed at:
https:/
And my follow-on reviewed at:
https:/
To post a comment you must log in.
Revision history for this message
| Charmworld Lander (charmworld-lander) wrote | # |
Unmerged revisions
- 390. By Brad Crittenden
-
Charmworld redesign. Support bundle README files.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Self-reviewing as the component branches have both been reviewed and approved.