Merge lp://staging/~ubuntudeveloperportal/developer-ubuntu-com/webapp-generator-v0 into lp://staging/developer-ubuntu-com
Proposed by
David Callé
Status: | Merged |
---|---|
Approved by: | Michael Hall |
Approved revision: | 111 |
Merged at revision: | 92 |
Proposed branch: | lp://staging/~ubuntudeveloperportal/developer-ubuntu-com/webapp-generator-v0 |
Merge into: | lp://staging/developer-ubuntu-com |
Diff against target: |
614 lines (+378/-22) (has conflicts) 17 files modified
developer_portal/management/commands/update-template.py (+2/-1) developer_portal/settings.py (+3/-1) developer_portal/static/developer_portal/css/devportal.css (+38/-0) developer_portal/urls.py (+3/-0) developer_portal/views.py (+6/-3) locale/developer_portal.pot (+112/-16) locale/zh_CN.po (+11/-0) templates/webapp.html (+17/-0) templates/website_base.html (+1/-1) webapp_creator/admin.py (+3/-0) webapp_creator/models.py (+2/-0) webapp_creator/resources/appname.apparmor (+13/-0) webapp_creator/resources/appname.desktop (+10/-0) webapp_creator/resources/manifest.json (+7/-0) webapp_creator/tests.py (+3/-0) webapp_creator/views.py (+64/-0) webapp_creator/woc.py (+83/-0) Text conflict in locale/zh_CN.po |
To merge this branch: | bzr merge lp://staging/~ubuntudeveloperportal/developer-ubuntu-com/webapp-generator-v0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Planella | Needs Fixing | ||
David Callé | Needs Fixing | ||
Review via email: mp+252991@code.staging.launchpad.net |
Commit message
Add a webapp generator at http://
Description of the change
Add a webapp generator at http://
To post a comment you must log in.
Remaining issue: It appears that the csrf setting (l90 on developer_ portal/ settings. py) breaks the form submission.