Postorius

Merge lp://staging/~mgill25/postorius/m-trunk into lp://staging/postorius

m-trunk
Merge into trunk

Proposed by Manish Gill on 2013-07-18

Status:	Needs review
Proposed branch:	lp://staging/~mgill25/postorius/m-trunk
Merge into:	lp://staging/postorius
Diff against target:	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) Text conflict in src/postorius/urls.py Text conflict in src/postorius/views/user.py
To merge this branch:	bzr merge lp://staging/~mgill25/postorius/m-trunk
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Terri		2013-07-18	Needs Fixing on 2014-04-12
Review via email: mp+175549@code.staging.launchpad.net

Description of the change

GSoC 2013: Authenticated REST API for Postorius/Django

For review only!

These changes are not meant to be merged directly in the current Postorius code and depend on the project https://launchpad.net/mm-rest, which is a Django app that has the new models which correspond to the elements exposed via the MM-Core Internal API. The changes made in this repository will only work as a "simulator", which ensures that Postorius is able to perform the basic functions (User/List/Domain creation, Changing settings) without any connection to the Core via mm-client.

Associated Django project: https://code.launchpad.net/~wacky/postorius/sample_website with settings etc.

Revision history for this message

Terri (terriko) wrote on 2014-04-12:

This was just submitted for the purpose of review, so I'm formally listing it as "needs fixing" so that it stops showing up as a pending unreviewed merge.

review: Needs Fixing

Unmerged revisions

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