Merge lp://staging/~wacky/postorius/GSoC2012 into lp://staging/postorius
Proposed by
Richard Wackerbarth
| Status: | Merged |
|---|---|
| Merged at revision: | 141 |
| Proposed branch: | lp://staging/~wacky/postorius/GSoC2012 |
| Merge into: | lp://staging/postorius |
| Diff against target: |
468 lines (+81/-74) 32 files modified
src/postorius/context_processors.py (+4/-4) src/postorius/management/commands/mmclient.py (+2/-2) src/postorius/models.py (+2/-2) src/postorius/templates/postorius/confirm_dialog.html (+1/-1) src/postorius/templates/postorius/domain_confirm_delete.html (+1/-1) src/postorius/templates/postorius/domain_index.html (+1/-1) src/postorius/templates/postorius/domain_new.html (+1/-1) src/postorius/templates/postorius/errors/generic.html (+1/-1) src/postorius/templates/postorius/lists/confirm_delete.html (+1/-1) src/postorius/templates/postorius/lists/held_messages.html (+1/-1) src/postorius/templates/postorius/lists/index.html (+1/-1) src/postorius/templates/postorius/lists/mass_subscribe.html (+1/-1) src/postorius/templates/postorius/lists/members.html (+1/-1) src/postorius/templates/postorius/lists/metrics.html (+1/-1) src/postorius/templates/postorius/lists/new.html (+1/-1) src/postorius/templates/postorius/lists/settings.html (+1/-1) src/postorius/templates/postorius/lists/subscribe.html (+1/-1) src/postorius/templates/postorius/lists/subscriptions.html (+1/-1) src/postorius/templates/postorius/lists/summary.html (+1/-1) src/postorius/templates/postorius/lists/unsubscribe.html (+1/-1) src/postorius/templates/postorius/login.html (+1/-1) src/postorius/templates/postorius/site_settings.html (+7/-0) src/postorius/templates/postorius/user_mailmansettings.html (+1/-1) src/postorius/templates/postorius/user_profile.html (+1/-1) src/postorius/templates/postorius/user_settings.html (+1/-1) src/postorius/templates/postorius/user_subscriptions.html (+1/-1) src/postorius/templates/postorius/user_tasks.html (+1/-1) src/postorius/urls.py (+36/-33) src/postorius/utils.py (+3/-3) src/postorius/views/api.py (+1/-2) src/postorius/views/generic.py (+2/-3) src/postorius/views/settings.py (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~wacky/postorius/GSoC2012 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Florian Fuchs | Approve | ||
|
Review via email:
|
|||
Description of the change
Changes from GSoc2012. Each commit is a separate patch.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Richard,
thanks for these changes! Everything merged into trunk...
Florian