lp:~mgill25/postorius/m-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:postorius

Terri: Needs Fixing on 2014-04-12

Diff: 1208 lines (+153/-476) (has conflicts)

23 files modified

src/postorius/auth/decorators.py (+1/-2)
src/postorius/forms.py (+1/-4)
src/postorius/management/commands/mmclient.py (+0/-50)
src/postorius/models.py (+0/-177)
src/postorius/templates/postorius/base.html (+1/-1)
src/postorius/templates/postorius/lists/metrics.html (+4/-4)
src/postorius/templates/postorius/lists/summary.html (+2/-2)
src/postorius/templates/postorius/user_profile.html (+1/-1)
src/postorius/templates/postorius/user_subscriptions.html (+1/-1)
src/postorius/templates/postorius/users/index.html (+1/-1)
src/postorius/templates/postorius/users/summary.html (+1/-1)
src/postorius/tests/test_auth_decorators.py (+0/-1)
src/postorius/tests/test_list_members.py (+2/-1)
src/postorius/tests/test_user_creation_sync.py (+0/-1)
src/postorius/urls.py (+5/-2)
src/postorius/utils.py (+15/-9)
src/postorius/views/__init__.py (+0/-1)
src/postorius/views/api.py (+0/-60)
src/postorius/views/generic.py (+22/-49)
src/postorius/views/list.py (+44/-62)
src/postorius/views/settings.py (+10/-16)
src/postorius/views/user.py (+42/-27)
src/postorius/views/views.py (+0/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

171. By Manish Gill <email address hidden> on 2013-07-04

Modified user_summary url from /users/id/<user_id> to /user/<user_id>

170. By Manish Gill <email address hidden> on 2013-07-04

Query with user_id instead of one out of multiple possible emails

169. By Manish Gill <email address hidden> on 2013-07-04

User Summary url modified to have /id prefix to avoid ambiguity with pagination urls

168. By Manish Gill <email address hidden> on 2013-07-04

User summary template fix

167. By Manish Gill <email address hidden> on 2013-07-04

Remove Old API code from views and corresponding URLConf

166. By Manish Gill <email address hidden> on 2013-07-04

Models.py reverted during merge; delete it

165. By Manish Gill <email address hidden> on 2013-07-03

Merged result of m-updating and m-noclient

164. By Manish Gill <email address hidden> on 2013-07-03

Updated models in auth decorators

163. By Manish Gill <email address hidden> on 2013-07-03

Proper commit of models.py removal

162. By Manish Gill <email address hidden> on 2013-07-03

Delete the old models.py file