Merge lp://staging/~stylistica/postorius/preferences into lp://staging/postorius
Proposed by
Sneha Priscilla
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 152 | ||||
| Proposed branch: | lp://staging/~stylistica/postorius/preferences | ||||
| Merge into: | lp://staging/postorius | ||||
| Diff against target: |
1557 lines (+671/-263) (has conflicts) 10 files modified
src/postorius/forms.py (+111/-80) src/postorius/templates/postorius/user_address_preferences.html (+128/-0) src/postorius/templates/postorius/user_mailmansettings.html (+112/-96) src/postorius/templates/postorius/user_subscription_preferences.html (+84/-0) src/postorius/templates/postorius/user_subscriptions.html (+2/-2) src/postorius/urls.py (+47/-34) src/postorius/views/generic.py (+20/-16) src/postorius/views/list.py (+17/-8) src/postorius/views/settings.py (+1/-0) src/postorius/views/user.py (+149/-27) Text conflict in src/postorius/views/generic.py |
||||
| To merge this branch: | bzr merge lp://staging/~stylistica/postorius/preferences | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Florian Fuchs | Pending | ||
|
Review via email:
|
|||
Description of the change
Proposing a merge for my GSoC Project - User Interface Design for Mailman users to manage their preferences.
This branch contains 2 new html files - for address and subscription based preferences.
It includes:
1. A new form called UserPreferences in forms.py
2. Three new views in views/user.py for the 3 type of preferences
3. Change to the get_memberships function in views/generic.py
4. Modifications to urls.py and other html files to accommodate the above
5. Autopep8ed files/corrected syntax in few other files
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
