Merging "recipients for form entries"

commit a5591abd255d1975eba09cf6f64d36cde843a95d
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Jun 4 16:38:10 2013 +0800

    Updated data migration

commit 7ffeecb3e740eb3785efbf8a84b7d4f4120c07e4
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Jun 4 16:24:46 2013 +0800

    Added data migration to move group field values to choice field

commit d9129de3d227aa37baff39c681cd27eed519a276
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Jun 3 15:40:03 2013 +0800

    Merged Group field to Choices field

commit d43ad8c58275f014edeb17b07f196dc7ca75d993
Merge: e1e2942 685e593
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Jun 3 13:43:45 2013 +0800

    Merge branch 'master' into 421_recipients_for_form_entries

commit e1e294291b04887aef2d9049cf47e231a5828007
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri May 10 15:17:11 2013 +0800

    Updated fields

commit e1b103daffd78643f44e867fe8b3479f1466cc62
Merge: a5c4f67 2ec2ab8
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri May 10 13:20:52 2013 +0800

    Merge branch 'master' into 421_recipients_for_form_entries

commit a5c4f67f1253c2c8aee173856516e9bd9f82da88
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Mar 12 19:36:43 2013 +0800

    Updated migrations

commit 2c78e7a4bed14cf97c898dba42b237ac52845032
Merge: b8807b3 c7b16f2
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Mar 12 19:25:30 2013 +0800

    Merge branch 'master' into 421_recipients_for_form_entries

commit b8807b3f9c8e163eab4ba3bd692f7d474b813461
Merge: fc6bd48 0285183
Author: John Eddie Ayson <je@bixly.com>
Date:   Sun Dec 23 20:34:29 2012 +0800

    merge

commit fc6bd4807113799eb3c2b8b58f09a8b62750515b
Author: John Eddie Ayson <je@bixly.com>
Date:   Sun Dec 23 20:23:31 2012 +0800

    updated email recipients list

commit ad86a52a6abd9daca533cc36a94b0287fac5c366
Merge: bdba22b a312d73
Author: John Eddie Ayson <je@bixly.com>
Date:   Sat Dec 22 07:27:20 2012 +0800

    Merge branch 'master' into 421_recipients_for_form_entries

commit 028518304bdfa241ce10a089098e4a59b820c089
Author: Alex <aragsdale@schipul.com>
Date:   Fri Dec 21 08:42:01 2012 -0600

    Remove event_logs from south_0001.json.

commit b7b1151c13b580e6b7b6268d3912c8bb198f14f3
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 22:42:17 2012 -0600

    Updating deploy.py migrate command.

commit 2c6386896f56d41dc622e043d411be5016c53899
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 18:18:16 2012 -0600

    Adding entity migration for profiles which tests if the column exists before it runs.

commit 6069a9750193744099db2e40f40af29bd64e2bec
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 17:12:23 2012 -0600

    Adding entity back to profiles_profile

commit 248ccc7fbea2ff3c29d306b945fec9054c590d6e
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 16:45:22 2012 -0600

    Reverting file to a previous state.

commit 51dac76c2594e19526805d7c73d8197e5cf313c4
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 16:37:54 2012 -0600

    Convert non-space characters to spaces

commit d41d3d1aa48b8c9af916bbb17b5ad3acfc38d38d
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 20 16:23:03 2012 -0600

    Renamed membership migration 0003.

commit 3e1396cfc8cff59247c5a20658de58ed1902ed36
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 20 15:41:46 2012 -0600

    Updated the profile model to insert blank user defined data by default.

commit 80bea81135f6d190b23d1b5f18e789b250566274
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 20 15:39:03 2012 -0600

    Updated the contact form to record more robust event logs during the submission process.

commit e0c9c8fc0048a5ec90bc48f8b5a20ec7d97a995e
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 20 15:38:13 2012 -0600

    Switched the event log search page to use a wide template.

commit 5b3062be38d7e79b8dd216dabbb619d5af75d2ea
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 20 14:56:46 2012 -0600

    Merge: membership_default

    commit f124decbee49c0957ace120bd8138ed5ab23f6fc
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Dec 19 13:55:49 2012 -0600

        Updating invoices to detect for entry.object_type NoneType object.

    commit fe51fb964c59771dce9d4d18af055230bc42717c
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Dec 19 13:45:43 2012 -0600

        Updated the invoice module to check for an object_type attribute before referencing.

    commit ed70f8e6285944629f98b9249ae26c35188df71d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 19 13:40:48 2012 -0600

        Fix template edit error (html_url referenced before assignment) when zip file is not uploaded.

    commit b415a80c5310cf89c7ffbd8bd3713ac1d046a685
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Dec 19 12:18:16 2012 -0600

        Refresh member number on profile page after editing the profile page.

    commit d8b5fab0107cc2e43d9260deece9f5eba7abce89
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Dec 19 11:51:26 2012 -0600

        Changed membership add link.

    commit 7657c8eb613da1e48d7c8df01f3db355201d9272
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 19 11:12:14 2012 -0600

        Clear out cache for membership import with invalidate.

    commit 211efdbe78ee289d55da65b28a7cd5ff1660d7a2
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 18 15:26:35 2012 -0600

        Add export link to the corp nav.

    commit 9bebccd75a974da347fe9348ec07946ede282b68
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 18 15:22:12 2012 -0600

        Include authorized_domains and dues_rep fields to the corp. export.

    commit f822047beab2932878ee77c09878fa725e3e3324
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 18 14:59:48 2012 -0600

        Update django model report in setup.py.

    commit 1fabe0eb8d53d9471dc040b88728bc3745e6387a
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 18 14:49:11 2012 -0600

        Update django model report version.

    commit 6e7b6cb651fbf997194ab891f8ac3107bef5bae9
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Dec 18 11:42:02 2012 -0600

        Updated user/profile import to use dparser.parse instead of dparser.parser.  "parse" returns a datetime object instead of a parser object.

    commit 818c6e6ce91e2181caf68f7f4feecb829e5e3ce0
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 18 11:40:07 2012 -0600

        Add model report templates to tendenci templates.

    commit 587f2572e6784aadf34f411bf9b8f366cb20d0e2
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Dec 18 11:06:06 2012 -0600

        Added 5 custom fields to user/profile import feature.

    commit 915e323726aaad1ea0fe423c492c8a5e01379076
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 18 10:28:47 2012 -0600

        Update command port_to_membership_default.

    commit c3a2f2a6c8487c967357010e8296233dd76abcfd
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Dec 18 09:37:37 2012 -0600

        Added 5 user defined fields to the profile export feature.

    commit d8d452f428a4d68d1a80f0ee1c79eaf74c4b5981
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 17 17:43:57 2012 -0600

        Fix the 'matching query does not exist' error for payment_method function in AppEntry (the function is used in port_to_membership_default command)

    commit 4c58aed06672338e86160fcaa4206ccb1d893bb2
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 17 16:41:33 2012 -0600

        Resolve membership migration conflicts

    commit f1b93d8abac41b845b324a17ef3fcfe1c90c9dda
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sun Dec 16 16:16:37 2012 -0600

        Add CorpExportForm to export.

    commit d720a8614b36bfedd2800590c99cfd013a13e871
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Dec 17 16:40:05 2012 -0600

        Added 5 user defined fields to the membership application.

    commit 0ffd48cec3385254cc7d1eb48efc54c72b24305c
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Dec 17 15:12:24 2012 -0600

        Adding 5 user-defined fields to membership import.  The 5 user-defined fields will be stored in the profile database table.

    commit 44058cc19ef16bc5744bfe5b2be88ad378c17884
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Dec 17 12:34:54 2012 -0600

        PEP8 import_memberships_defaults.py

    commit c1e093a52e77d4e239cdc66eca1c576ba1b24b62
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Mon Dec 17 14:56:19 2012 -0600

        Removed the all_files gallery from the membership_default branch.

    commit cdcb41744bde4f9b964e08cbdf1270612ece6baa
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Mon Dec 17 14:45:12 2012 -0600

        Adding a hard max length to imported fields on the user import.

    commit b3b028d7f9f93142f7a10e4e21ef53a0e3a411cc
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Mon Dec 17 14:44:48 2012 -0600

        Updating user groups edit forms to be similar to each other.

    commit 234e3e3d55acfba3e9a07e47d8ed788dc2521aac
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Fri Dec 14 08:24:59 2012 -0600

        inexact match on email when trying to match members.

    commit 0afd8d4e55a7a2a41fe7bc19d232ac5d824fae6e
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 17 14:31:29 2012 -0600

        Add sync for newsletters to user group admin.

    commit 3926187dfb93965cf202afaa0bbc8c895a3fbcd0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Dec 17 11:55:35 2012 -0600

        Adding 5 user defined fields to the profile model.

    commit 384e2f3d77f835015a7a8fc1aa7e76486137e15b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 17:51:28 2012 -0600

        Wrap @password_required to corp. export.

    commit b520854bb4701719bdc922450cd9dbf7768ea13b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 17:37:14 2012 -0600

        Corp. memb. export.

    commit 895153315cac50c90c2c02a2561a881f57e5badf
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 17:36:47 2012 -0600

        Add corp. import link to nav.

    commit 8573d70839c5c9c257dc6d0ea2059532d69a046e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 15:37:28 2012 -0600

        Wrap password_required decorator to corp import.

    commit 0be816ec338228145896b0b31e31461c4b6be70f
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 15:25:55 2012 -0600

        Corp. memb. import update.

    commit 82008bc36b3196d31895f625c51640ac39b3e868
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 13:41:21 2012 -0600

        Corp. memb. import css update.

    commit 15a7b011e58f2800795b6bd0512a54b8c75fd389
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 13:22:09 2012 -0600

        Add nav to the import preview and status pages.

    commit bcaa32e76e37671bbe370c1d8dc31aed704e0010
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 13:19:45 2012 -0600

        Update corp. memb. import instruction.

    commit b7c71437c198fa21d91fed3d533a46ead7ee2e1e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 14 13:09:21 2012 -0600

        Handle authorized domains and dues reps in the corp. memb. import.

    commit a25b052fb69dbf77085d6f2d29d5ff532aa8f74d
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Dec 14 09:17:25 2012 -0600

        Change text on membership report list.

    commit c0fce5b6549eeaea8ba9032e57ed36687d39e683
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Dec 14 09:14:44 2012 -0600

        Add download CSV to renewed members report.

    commit 3eceddd81eb9437bedb51b668f6cbef30ecbf59f
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Dec 14 09:06:37 2012 -0600

        Add download CSV to current members quick list.

    commit 90bd708a58a1c106941e96694e807269f0c5fa3d
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Dec 14 08:55:32 2012 -0600

        Members YTD by type report.

    commit a71baca59571a2afcf6a36f5473c93d3efaacc0d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 13 15:57:04 2012 -0600

        Option for corporate membership import to bind members to corporations by their company names.

    commit 46de434c3790747b76f5973f44ec611644ff4317
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 13 14:25:06 2012 -0600

        Changed the status_detail from 'archived' to 'archive' for memberships and corporate memberships.

        This is to keep consistent with T4.

    commit 411db1092b749114fa2a4d58519baa9d1fcf5262
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Dec 13 13:30:11 2012 -0600

        Add link to membership invoices on membership report list.

    commit ef15552897c639287e2cacc901b542bf8f3733d5
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 13 09:36:10 2012 -0600

        Corp. memb. import process and status page.

    commit f4bed76201921ebd534e4afbf707614e88bf468a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 13 09:35:10 2012 -0600

        Correct the upload url in membership_default_import_status.

    commit af2fdf92dba5b792e98c074d8bae9a56e2d7058b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 13 09:32:49 2012 -0600

        Management command to import corporate memberships.

    commit 6ad3ee009ed97bc05087b52163e79faa3cfa8b60
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Dec 13 12:30:36 2012 -0600

        Remove membership reports from admin bar and link to the membership report list instead.

    commit b733dd6af77c2c22a627e05d830058bbeaebd015
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Dec 13 12:22:11 2012 -0600

        Add back advanced options stuff in invoices search view.

    commit 76ce016d67d2e2b6a7e21f12877dec1d5a72019f
    Merge: c5ca7d7 7fe19f8
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Dec 13 11:54:08 2012 -0600

        Merge branch 'refs/heads/master' into membership_default

        Conflicts:
        	setup.py
        	tendenci/addons/corporate_memberships/templates/corporate_memberships/invoice_search_result_line.html
        	tendenci/addons/corporate_memberships/utils.py
        	tendenci/templates/top_menu/admin_top.html

    commit c5ca7d7ab008cf9578300763f8fee200b3395f8e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 12 22:01:19 2012 -0600

        Update corp. memb. preview.

    commit 311b731b812c116902399205e2ad6bbe2893bbe7
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 12 22:00:51 2012 -0600

        Management command to pre-process corp. memb. import.

    commit a3c61c5e0345e8a740634f392b40685170fe8377
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 12 21:40:41 2012 -0600

        Corp. memb. import preview.

    commit 58f1bf701a645ea67a94a4165176710dcbf536c0
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 12 13:01:20 2012 -0600

        Template download page for corp memb. import

    commit 38411af68f78390220effcffe24b30525f4558d1
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 12 11:32:44 2012 -0600

        Corp memb. import upload page.

    commit 6f56d81648d65784740169321899436cc298ffc4
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 12 10:40:45 2012 -0600

        Added models CorpMembershipImport and CorpMembershipImportData.

    commit f5e80a5123b3a0e2b266670fa8d600a6d2d9d9a5
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Dec 12 14:48:08 2012 -0600

        Active Members YTD report.

    commit c12956315e84d73ed978d9a0ec6f1ae7400e2fe3
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Dec 12 10:50:32 2012 -0600

        Update expired and active memberships report to add days filter. Remove new members report that is now redundant.

    commit bb7c10ae0579e2352380404786c63bd32a8e053f
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Dec 12 08:01:28 2012 -0600

        Add renewed members report and order new members report by join dt.

    commit 9ee82e9887cff3b5ca99070079dce2554c7699fd
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 11 18:24:28 2012 -0600

        Corp membership roster search.

    commit ac6f45f21e1937dcec72f7cf72f4add44fdc793a
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 11 12:13:05 2012 -0600

        Add members in grace period report.

    commit 8f2f93550a0c017be044a18c6a62f00986451e22
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 11 10:15:07 2012 -0600

        Fix up membership joins report and membership joins pdf to work with new membership model.

    commit 77c9e3000792c3c16c1a64745b8c1f138ddd6e6a
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 11 10:12:27 2012 -0600

        Add report for members in renewal period.

    commit efbb30c55293a1c2d7418a9f8c46cf883a2ea81b
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 11 09:40:31 2012 -0600

        Add link to pending memberships in django admin on member report list.

    commit 80f4332240eec913726a8bd597fd8cded27780d0
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Dec 11 08:48:11 2012 -0600

        Add new members filterable by join date report.

    commit 74652959adf9d011af38b41d562a3616e270e032
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 10 16:41:42 2012 -0600

        Update corp nav and add it to search, add, edit, delete, approve, preview and view pages.

    commit 26d52d2f8ce41ff1df234ff603701307de8be0a6
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 10 15:06:09 2012 -0600

        Corp. membership invoice update

    commit fdfc79d6dd7b8383bd6a935c39160da2ce7d7c25
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 10 13:52:04 2012 -0600

        Update corp. memb approval.

    commit c0d0c395b01c0935a2bdf9801bf852017ab6ec34
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 10 13:51:11 2012 -0600

        Remove the Payment Method section break from app_fields.json

    commit d5b79d2722c95137822bc3c63c801a1b873891b5
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 10 13:50:27 2012 -0600

        Updated the is_rep function to pull reps from corp_profile.

    commit 2d4548dfd769c7c54776e607bf471008e3de8f7e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 10 13:49:44 2012 -0600

        If corp. membership doesn't have the entity, assign the default one on save.

    commit 5724eebd02b1a548a9f32bd7f0004d600a46dddc
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 10 14:42:52 2012 -0600

        Move and rename active memberships per month.

    commit 8b8acdd7eab32a4acf46a8ca352a9490d2d06567
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 10 14:36:44 2012 -0600

        Group the reports on the membership report list because it is getting long.

    commit 42e33d89b083649ef9e46ecda76ec1a6257b0123
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 10 14:31:06 2012 -0600

        Add current member totals by company report.

    commit 18ed09893cf2c6d0ead298ace010969281c655c4
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 10 13:46:58 2012 -0600

        Add current members quick list report and link it on the report list.

    commit e9dc9a9ad938bca08660ecd50383051c24dd8f8d
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 10 13:38:10 2012 -0600

        Add a membership report list view and link it in the admin bar instead of linking to each membership report.

    commit df3e125744b3e346807b1b9effd8db900ef2a4ae
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Dec 10 11:54:56 2012 -0600

        Current member roster report with new MembershipDefault model.

    commit 83ff2be38baf1d491030a156bc71c41bb59886b9
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 7 17:31:43 2012 -0600

        Corp membership renewal and renewal confirmation.

    commit 77cb0e19de0d6ef3637e0e5f438e001047b60bf3
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Dec 7 10:14:40 2012 -0600

        New model IndivMembershipRenewEntry added for corp renewal

    commit 8b327358ce3db17623e702b54cc4f9c7d5603609
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 21:36:36 2012 -0600

        Added a field corp_profile_id to MembershipDefault.

        This field is used to associate memberships to CorpProfile for individual memberships under corporations.

    commit 03a2baf6b732912becc5ec800165f3d069bd1e55
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 17:34:43 2012 -0600

        Update corp individual signup to reflect the db changes.

    commit 84ed0d684e7c7a9f960e52a2584f9ae47386eea6
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 17:33:46 2012 -0600

        Check the existence of the approved_user before linking to it's profile.

    commit ced75f354f268e42ffe417011cfb9a6707e98c0e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 17:30:07 2012 -0600

        Updated the spawn_username to exclude the first argument because it's the profile class.

    commit 87858992cdb07a845edf3b59058293f43b038c88
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 16:14:01 2012 -0600

        Update corp. memb. approval to reflect the db change.

    commit d90c0675be063b9b23a14ad43aeedfc84ba9828b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 16:09:45 2012 -0600

        Update corp. memo. search and delete to reflect the db change.

    commit bd4db653865278afef85f254c12de3716278ec9e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 15:31:55 2012 -0600

        Update the corp. memb. view page to reflect the db changes.

    commit 6f12a383ac9ccbb50d5befd443b792207039b8aa
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 14:43:36 2012 -0600

        Update corp membership edit to reflect the change of db structure.

    commit 1b421ca299327b77890d01cb0d1bd37218df55c9
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 14:26:54 2012 -0600

        Update corp membership add to reflect the change of db structure.

    commit 029c8d05bd17040bc44e3aab428d8243075a6213
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 12:04:16 2012 -0600

        Update corp app preview to reflect the change of db structure.

    commit 5e04c19adaeb8207f4c901905dbda04dc8cbfabe
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 10:39:40 2012 -0600

        Add the secret_code field to the corp app fields

    commit 0dd18c42e2d8d3ce620b7ca152d1cb1b4b2d2128
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Dec 6 10:23:12 2012 -0600

        New model CorpProfile to store corporate profile information and serve as foreign key for corporate memberships.

    commit 2222b475bc46a9bf08f32b583e0ae82bca499a5d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 5 16:43:26 2012 -0600

        Corp memberships update

    commit 82a3f6903bb2a00ad1b7fde17944c4c777cd83b5
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 5 15:18:50 2012 -0600

        Added the link on view and search pages for individuals to join under the corporation.

    commit 85cfbc441ce538223e279bf73843694c4c618f34
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 5 14:54:08 2012 -0600

        Avoid payment_method.is_online to be evaluated when payment_method is None.

    commit 2068bd0a8a0df511432ba5c4d5cbdc2ce2259588
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 5 14:22:02 2012 -0600

        Updated the membership type choices to display the one associated with corp membership for corp. individuals.

    commit bd9e1541b2f9a20adb59b41580c5444d3ff728b2
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Dec 5 13:05:27 2012 -0600

        Individuals join under corporations.

    commit 3caad610c0ac1a9657711e75678f0431d8c0f04d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 16:42:35 2012 -0600

        Added the IndivEmailVerification model to store the data for individual email verifications.

    commit d4f4c87334f02ab72c51f2eeaef3dae37445b41b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 13:44:48 2012 -0600

        Remove blank fields from corp. memb. view.

    commit ad26f39fa51a2454af292e7ac9e402e54b389dbd
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 12:34:45 2012 -0600

        Update urls in the corp. memb. notifications.

    commit cb8afe5a4d04efd8fe3ccb76470da37d57c5c8fd
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 12:24:04 2012 -0600

        Corp. Memb. approve.

    commit c1080916967c89bd313415b152167a424a46369b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 11:34:28 2012 -0600

        Update corp. memb. view to better display date and None field value.

    commit 36d0ad2f67de61a1e747397e5ca298e097eb26d3
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 11:30:15 2012 -0600

        Corp Membership delete

    commit 72eaa5b670595fb90d79d3fdf1968b4b9726c49b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 10:58:13 2012 -0600

        Corp membership search.

    commit 5d070458150618834b391179a97400ea905b45c2
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Dec 4 09:24:33 2012 -0600

        Corp. membership view.

    commit 4cd9469ca3e464c838a8a0f7fc58ea5a2509d96b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Dec 3 16:26:12 2012 -0600

        Corporate membership edit submission.

    commit c1d77b78748e56395912fd551374c0b17c1b35de
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 30 10:28:08 2012 -0600

        Corporate membership edit.

    commit b9cc3da63656cde68a15f36ce262437bd25e5df3
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 30 12:07:11 2012 -0600

        Updated the list of initial fields and attributes when creating a membership application form.

    commit 1fa2c6492af1676af564da2738ff579498d942c8
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 18:30:46 2012 -0600

        Updated the UserForm.__init__ instance method to use the password widget on the password field.

    commit fe2cfc5340ef9618812ac98fc5c56c7fdbeb0852
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 16:58:21 2012 -0600

        Refactoring MembershipDefault2Form.save instance model.

    commit 0ae56591bb99c9368dc56cc919dd0666424f94b3
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 16:35:55 2012 -0600

        Updated the MemershipDefault2Form.save instance method.  Removing an else statement that handles edit.  This form is only used for adding memberships.

    commit 24c2edcaa2f27fec22d1639e6c6fda48abd66b5b
    Merge: 86dede4 371d734
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 15:24:35 2012 -0600

        Merge branch 'refs/heads/master' into membership_default

        Conflicts:
        	tendenci/core/base/fields.py

    commit 86dede44032e8d0dc96c9d77b1a4e1a8ef11f2d7
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 29 13:24:23 2012 -0600

        Data migration to add permission for view_corpmembership.

    commit 6503a391a6fa2264a0f8107d7a1168d9e6d385a9
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 29 12:56:24 2012 -0600

        Update join notifications to make them work with the new corp memberships.

    commit 86f9d089a9cb528a66e580f88afd9ce66a911f8d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 29 12:55:00 2012 -0600

        Make payment method not required for free corporate membership types.

    commit fc3cd67341eb47e6cb27361273d69bf5981fed80
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 29 12:53:46 2012 -0600

        CorpMembershipApp custom manager function current_app to get the app being used currently.

    commit bf953987137eadb35e174f2170797704a015dadf
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 29 11:17:15 2012 -0600

        Corporate membership add.

    commit 84a15b80b0c02b7b0c85b9424428fcd307954550
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:12:18 2012 -0600

        Updating the membership_default_preview view [method] to process form information.

    commit 84c6dcc93fce71fe9d7eab9d7a1b2c3b1705c5c6
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:09:54 2012 -0600

        Created MembershipDefault.is_paid_online instance method.  This method checks if the online payment method was selected and whether there is a total to pay.

    commit 8a1fea890b628d478c3ab7fe9ad128aae28663dd
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:08:38 2012 -0600

        Updated MembershipDefault.set_expire_dt instance method to check application_approved field before changing values.

    commit d33263d63906c8ce2e58876cad83903707bf9711
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:05:12 2012 -0600

        Updated MembershipDefault.set_renew_dt instance method check application_approved before making changes.

    commit 11e3aa0b701cfa161f94bc7d367e42f27b3f483e
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:02:34 2012 -0600

        Updated MembershipDefault.get_price instance method to to consider a NoneType admin_fee field.

    commit 2ff7e8308372ca2b68f7b76d20ac2ccfb6251b01
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:00:30 2012 -0600

        Added MembershipDefault.pend instance method.

    commit 825e37f4c26efd7593d48446acf83009a6220b4d
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 11:00:10 2012 -0600

        PEP8 CSVForm

    commit c8170f41a42e1380c5090dccde6d316d38c8dbee
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 10:59:50 2012 -0600

        Replaced MembershipDefault2Form.save instance method.

    commit 9ece0963d1bc73e1585424b31c867fd4593db8fb
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 10:54:59 2012 -0600

        Replaced memberships/ProfileForm.save instance method.

    commit ee43a3de1e38cf75a18a45572dd9113a786565eb
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 29 08:51:58 2012 -0600

        Updated the UserForm with a clean and save method.

    commit 42369eaf5de2a3d96135e51d9200defc097296c1
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 17:20:04 2012 -0600

        Removing commented out fields from the MembershipDefaultForm.

    commit 42f90b478005a711f06ff25e1b1598fdcc5bf50f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 16:54:50 2012 -0600

        Updated membership view calls via the admin interface by passing the request.user.

    commit 5708c5362de6a68b9bdfa8c64be14f3966a390fe
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 16:54:10 2012 -0600

        Updated Profile.get_or_create_user to update email address if passed as parameter.

    commit 2f4d41a4f421a8ad1cd55d69cbd99fde3b0984b9
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 16:53:12 2012 -0600

        Updated the profile __unicode__ method to only return a username if the user object is available.

    commit 757687c956fc82b42f7e5c14368a56a2c264b51e
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 16:45:35 2012 -0600

        Updated the profile view page to show different membership records depending on who the end-user is.

    commit 4c3bd1564753d9f0e4483dd840e644a36bff18f0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 13:07:33 2012 -0600

        PEP8 on notifications/utils.py

    commit 55e28b861b942ac837d45d21cf6f8c867db0dfd3
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 28 13:07:11 2012 -0600

        Added 2 new class methods to Profile.  Profile.spawn_username and Profile.get_or_create_user.

    commit 4f3064d70d53671c4fd9242139dfc60417c00691
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 27 17:21:38 2012 -0600

        Remove unnecessary code.

    commit ac41ff3ad1597490134a05eb8787e83e6ffc9997
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 27 17:21:20 2012 -0600

        Update default for admin_only field.

    commit 4a88eb6ebf3e6faf66fed2d8a9d941bfe147c9c0
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 27 16:45:27 2012 -0600

        Added authentication_method field to the corp admin fieldsets.

    commit 967274e341e8e6841adb84b48c4dbdceef6306c1
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 27 16:34:15 2012 -0600

        Rebuild schema migration for corp. membership. Added corp. memb. app preview.

    commit c015376d80c91e8dff9a2a95af5df8d58a1cba20
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 27 12:08:24 2012 -0600

        Corporate membership app builder.

    commit e7cffde3aa8b874cb8cb7b09e611eb168806ee21
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 26 18:31:00 2012 -0600

        Update model CorpMembershipAppField.

    commit 3a057c17da07a17597b3df9be707f937bd452267
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 26 17:41:10 2012 -0600

        Added models CorpMembershipApp and CorpMembershipAppField.

    commit 8b1e35c34aa0830533a3be416fbe6b06305e9cb1
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 26 16:55:36 2012 -0600

        Added CorpMembership model.

    commit 32a6fd75613709246da7deeaaadf56c247b07343
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 26 11:41:14 2012 -0600

        Integrating membership app to membership add.

    commit 62745967f7e07b5042c46f30940f89738aa3f0dc
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:07:40 2012 -0600

        Updated text on membership stats report.

    commit 2c3c82b9b150cbfb930e728747f247292d75b902
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:07:24 2012 -0600

        Removed extra stylesheet link to reports.css from membership over time report.

    commit 0c46979921ec16a9b922b281506f1d3d50b0cbd6
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:06:51 2012 -0600

        Updated the expired memberships report to work with the MembershipDefault model.

    commit 165031759308d7c607b89e7a04b00cfc9920b91f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:05:48 2012 -0600

        Updated the active memberships report to work with the MembershipDefault model.

    commit 170fffb07f5b6724271b5b38ec3254a09da17447
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:04:12 2012 -0600

        Updated the reports.css with several styles regarding membership reports.

    commit df559528d4207494bfef88452711a61a89efd9f0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:03:38 2012 -0600

        Updated reports/base.html to use STATIC_URL context variable.  This allows us to pull our reports.css from S3.

    commit 16b41c19e55806de2b6187fb478436bee07e120d
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:02:48 2012 -0600

        Updated count_active_memberships function to work with MembershipDefault model.

    commit b57bc406361872788942073a4a601f0c0679a7a0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:02:24 2012 -0600

        Updated get_over_time_stats function to work with MembershipDefault model.

    commit 63b1a81bd7db08cc3552fda7a77cc6613ef88cb0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 16:01:59 2012 -0600

        Updated get_membership_stats function to work with MembershipDefault model.

    commit 1a4146024ad94d3dcc7a1dd2302be9a2ac304316
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 15:59:32 2012 -0600

        Updated function get_user to return a User object or NoneType object without relying on exceptions.

    commit 7a3562fc07b25f35abbd03cdde01d4b7bd6def2b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 15:57:42 2012 -0600

        Updated MembershipDefault.get_invoice instance method to get invoice or NoneType object without using relying on exceptions.

    commit 84abff11748b85d1f5fd39ebd1e879e337db8da5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 20 15:56:21 2012 -0600

        Added a new manager instance method MembershipDefaultManger.expired.

    commit bf7a4c967d717d38b21b0915ec5bc91b4851bc36
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 19 23:15:26 2012 -0600

        Hide payment method if all membership types are free.

    commit 3251ea4b25c3ef34f0f5a1f6a8d47ae9993f2583
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 19 18:14:50 2012 -0600

        Remove the irrelevant help_text for the groups field.

        Also, set the list-style-type to none for some radio select and checkbox fields.

    commit e935643874cf8cd15da9f7d51c3cc36348be069e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 19 17:49:55 2012 -0600

        Added the groups field to the MembershipDefault.

    commit 03e846106dd5b1711916f76f53b1d68416a92ce8
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 19 16:53:26 2012 -0600

        Update membershipapp preview for membership_type, payment_method, status_detail and corporate_membership.

    commit 4f989e7eb9dacd7599533a5aa1550970f0b08055
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 19 16:05:13 2012 -0600

        Updated NoticeAdmin reference to context variables.

    commit 7539b71ced75ffceb4331901df53004c78002810
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 19 16:04:50 2012 -0600

        Passed the membership object to the Notification.send_emails instance method.

    commit ee925c21ed22a60e685a116ee800b48d213515b5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 19 16:03:46 2012 -0600

        Moved the notification import on  Membership/models.py.

    commit ecc6e92a34b678eddc2306b10b89c13e58ec22fc
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 19 16:03:09 2012 -0600

        Updated membership notice context variables.

    commit 5f50a80a06e40f0b5f5eabbb45aa1c35ad78041c
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 19 15:58:17 2012 -0600

        Added MembershipDefault.get_absolute_url instance method.

    commit 058cfcc07f77bb30a1bd2fe9afb56f6fdd59d4fb
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 19 15:57:36 2012 -0600

        Added 'send email' feature to admin membership detail form.

    commit 81807d6a9fda5012637a4b3a4900d13e2d770e89
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sun Nov 18 22:53:06 2012 -0600

        Added membership application preview.

    commit 9e26b96795cb5b81f14ac2a2d1d430c3afccf9bc
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sat Nov 17 22:03:49 2012 -0600

        Remove test code.

    commit 9e6faa4df9f120136c7c59a31f0299e86da5a39a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sat Nov 17 22:01:04 2012 -0600

        Remove unnecessary list.

    commit c04882c572666cbde634fa3f4c55cac129c4f741
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sat Nov 17 18:15:17 2012 -0600

        Updated the pagination for the membership import preview.

    commit 8e2e0409a3755366cc0ce3069e94fcaa8edccc94
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 16 18:57:01 2012 -0600

        Cleanup username to remove the stuff not in the username pattern.

    commit c980d301102ba04c70bbc15c50b3f5d5c31de9e4
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 16 17:56:54 2012 -0600

        Update import to put csv data parse in the background process.

    commit 32214a60b95b53073a2fd7d6479a1990001098ae
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 16 17:54:57 2012 -0600

        Add model MembershipImportData to dump the data so it can be more efficient on import preview and processing pages.

    commit e0b5b3e1c662a8705604c9cd5d354d3f545af4dc
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 16 11:29:05 2012 -0600

        Put upload file in it's own directory to avoid overriding the existing one.

    commit 6ff7230fdf68790b2be8b1693716feb56b23cd88
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 15 22:42:04 2012 -0600

        Invalidate johnny cache on membership import.

    commit b212379b42a539d7402fb4a888ee3b5ce29e8dc7
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 16:19:10 2012 -0600

        Added a "search members" link from the DjangoDefaultAdmin list page.

    commit 79147b848422ace5c48850f805180b5edcf3fdb7
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 12:51:56 2012 -0600

        Updated membership admin templates to work without entries.

    commit 3d69ed5e55934d418d8631bd3953de8b76136748
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 12:24:29 2012 -0600

        Updated the membership application templates for superusers.

    commit b0761cf71d31964f79efaf8470516b171907087b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 12:07:23 2012 -0600

        Updated the MembershipDefaultForm to send approval email if approved.

    commit 80a5f58d8c0c3144b1798290a0b5458c49b5f789
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 11:50:24 2012 -0600

        Updated the MembershipDefaultAdmin actions on the list page to send an email to both members and administrators when an action is applied to a membership.

    commit 00df092404c7199cb3d21336714a98833cd36aab
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 11:49:29 2012 -0600

        Added [convenience instance method] MembershipDefault.send_email that sends typical membership emails. Requires the request object and notice_type string.

    commit 49a6316d35d954e74019e0f777a5588858b0030d
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 11:24:00 2012 -0600

        Updated the membership disapprove notification template. Now it's the same as the other membership notification templates.

    commit 5d4372bb842fa77a728e4a834b8bf3ca9c278b50
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 16 11:20:27 2012 -0600

        Updated the Notice model to work with the MembershipDefault model instead of the original Membership model.

    commit b96c6ba5f56c803172cfaee075d4bbe706f53902
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 15 17:01:58 2012 -0600

        Reduce the item numbers per page to 10 on import preview.

    commit aac790bf3b4c9d75c67fcb59498dee4714f2a740
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 15 16:31:12 2012 -0600

        Changed verbose_name of MembershipDefault model.

    commit 88cca6074ed2fa53518a88b704bbeef398ee3a05
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 15 16:08:45 2012 -0600

        Management command to check the encoding of the uploaded file. The encoding process is put in the background to prevent the timeout.

    commit 304e1e5fb5ee3bb68ae93ed08a819b4dd0e5ec56
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 15 16:03:22 2012 -0600

        Updated the membership default application template.  Reformatted the way non field errors and field errors display.

    commit b029dcace7b6f449c5727128382ab3ee54958314
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 15 16:00:35 2012 -0600

        Overrode the MembershipDefaultForm.clean instance method that validates username and password if they're submitted.

    commit 546cf0181cf113b19c4afa5f3f67a667221137f5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 15 15:59:40 2012 -0600

        Updated the MembershipDefault.get_or_create_user instance method to accept username and password.  It attempts to find the user via username and only uses the password when creating an account.

    commit e555e2a45875606cfcd1cf5c59b0edabea95cc07
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 15 11:58:10 2012 -0600

        Process encoding one chunk at a time.

    commit 23cc04c3de5f2c2198ac8be35030d5ce1a13b1bf
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 15 08:52:32 2012 -0600

        Convert uploaded file to utf8 before importing.

    commit a2a98833f92797df8b4e47a26786a54ff3e0cba4
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 15 08:49:34 2012 -0600

        Add chardet to setup.

    commit 7d2ce656650d054c6e05d37e6548264d038bece5
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 14 18:16:55 2012 -0600

        Check the uniqueness of username on update.

    commit fd45e8ff72b46f419cfe9fb96c89cc4c8aa88b36
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 16:39:24 2012 -0600

        Updated membership porting command to get payment method from entry if membership does not exist in original system.

    commit 92dbba62f4fe7a64057be0bc1d6639d2c94f2297
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 16:26:19 2012 -0600

        Updated profile to use "hide" settings.  (e.g. hide_email, hide_phone, hide_address)

    commit f5fc2cf568e4e3e8acc5050eabad512f8470e598
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 14 16:17:58 2012 -0600

        Assign profile status=True and status_detail=active if blank.

    commit f6b219aba475affd71c834bdbee7f3270411acab
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 15:55:46 2012 -0600

        Excluding search results if a person's profile is requesting to be removed from search.

    commit 0a364f9fa0df01333ea4d780fcec24f53994cba7
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 15:54:52 2012 -0600

        PEP8 profiles/urls.py

    commit b355365775f5d80093bf085453645b9881958595
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 14 15:31:34 2012 -0600

        Test for blank status.

    commit a581f0f52f2caa90b13d3fd5b90219bc73db5435
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 15:16:52 2012 -0600

        Added link to profile from membership default change_form page.

    commit 6b49e58f8c393d0a68a8df14c4e86df9d769c26a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 14 15:09:55 2012 -0600

        Correct datetime assignment.

    commit 352356ccecfcda5e0c6b9750aaaad1144f2e8798
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Nov 14 14:59:40 2012 -0600

        Adding depends_on for industries and regions on memberships

    commit 5d27f10eb3cb080da9469e6d7f5efbcfbd099820
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Nov 14 14:59:10 2012 -0600

        Add invalidation for login to prevent new users from experiencing login issues.

    commit 1c27841796c1a573652ff3fbe7818f2181343ece
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Nov 14 13:36:07 2012 -0600

        Updating exception handling on member imports.

    commit 25a8089b62c928053c78ec630788b7884f7f8245
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 13:11:16 2012 -0600

        Resorted actions list on MembershipDefault admin page.

    commit 57f3254b37ba77bcaadbee39df254886cf22ea0e
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 12:51:12 2012 -0600

        Added disapprove action and link on MembershipDefault admin side.

    commit 4dc6e9771f071a1492aa3ebb43bc8e2b649696ca
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 12:42:14 2012 -0600

        Updated MembershipDefault instance methods (e.g. approve, renew, expired) to accept the request_user.

    commit b1e0636bae34852931a5a9c6f907a3cbe5f0a45f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 12:31:34 2012 -0600

        Updated redirects on on custom admin pages.

    commit 19b08383cec1849be6ea782d42be9858cf9c5232
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 12:31:13 2012 -0600

        Updated misspelling on admin:membership url.

    commit f9a8e0ae69f6d39b49c347ae820d683f420b147a
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 11:12:53 2012 -0600

        Created MembershipDefault.disapprove method that works with new MembershipDefault fields.

    commit 57c39bfb27be4b32301d0267439d190566ecc652
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 14 10:48:15 2012 -0600

        Add reporting options block on the membership admin index page.

    commit c366e33a1dca37ed0f323bbf94c9d85f936862b5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 10:45:40 2012 -0600

        Optimized action options on MembershipDefault admin page to only query specific memberships when applying actions.

    commit 08c5a3569dccc68c3df219b9540219d991f7ba10
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 10:44:54 2012 -0600

        Updated Membership instance methods (e.g. approve, renew, and expire) to avoid memberships of certain a status.

    commit eba815a9fe8ca85482f60c41cc36efb5550f5705
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Nov 14 10:25:21 2012 -0600

        Added filter for user__is_active when filtering members in search

    commit b80dde557225d5c8117870f50cd40c1c0a35012b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Nov 14 10:03:17 2012 -0600

        Updating the membership porting command to use guid for matching if a membership record is available, else use create_dt and membership_type.

    commit 2fe4217bc64631f555c7cd82e5e454685f21622d
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Nov 14 09:36:54 2012 -0600

        Updated output on member number command.

    commit 670473049c2c1e19e1a2584fff5d6697aa39e010
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Nov 14 09:15:27 2012 -0600

        Updated the refresh_member_number method on the profiles.

    commit 2041caedf1a070487abf38becb7683e10c3ea7a8
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 22:32:33 2012 -0600

        Add some section breaks to the app fields list.

    commit 1a71ff12dc5f365145e878a65c4fef0fe3ba005a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 18:28:54 2012 -0600

        Pre-populate slug from name. Split permissions into two sections.

    commit 44ce8aa715c93bc2ddee3d35b1ca6c59229f01fd
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 18:08:48 2012 -0600

        Remove the add another field option from the form.

    commit 2cd10e89e699bf1c1f770507cf1c4a3d2976ba3d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 18:07:57 2012 -0600

        Show cursor only on the last column.

    commit 8e67af4e5b1aee3ea4ec3b43d5387e77419f2bc3
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 17:57:07 2012 -0600

        Correct payment_method typo.

    commit 24075f6d82ac9b39f533b95f86a35c0b0633d35d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 17:55:02 2012 -0600

        Enable sorting for app fields.

    commit 769ef8f78e1cdc88bd2d7ab3b720a3344b6aa8e2
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 17:13:51 2012 -0600

        Membership App admin backend (for membership_default).

    commit ea40bd1c6174d6ba89a134e19db46811b9ca5ebc
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 12:47:32 2012 -0600

        Add field display to the membershipappfield.

    commit ab6f6728785b79e061680c664e357bd485ff24a2
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 13 12:26:34 2012 -0600

        Membership app admin. Remove the field app_field_selection.

    commit 2f823a977f09eb6a24e549fc39850253bffea903
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sun Nov 11 20:33:25 2012 -0600

        Added models MembershipApp and MembershipAppField.

    commit d57d48a04be55fd2ecac6c08ba2a50a5dec30e39
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:42:17 2012 -0600

        Added 'renew' and 'expire' options to membership admin list page.

    commit 93a3526bdfe32afd2337e646665d9146e75991c8
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:31:11 2012 -0600

        Adding links to MembershipDefaultAdmin change page to approve, renew, and expire.

    commit 466963e7a7cd501147c2b2706ee3e7fb38b4e865
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:30:41 2012 -0600

        Added urls to MembershipDefaultAdmin end that will approve, renew, and expire memberships.

    commit 99011e6907efe7b1eb0e47475ab682a55ee99564
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:30:07 2012 -0600

        Using new MembershipDefault.approve instance method in approve option on admin page.

    commit 6fef351f4cdc5432c917f88c3684290f0ac038d7
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:28:37 2012 -0600

        Corrected spelling 'membership' in document string.

    commit 747a12938205875afe091797f064938d024a99e8
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:28:11 2012 -0600

        Using extra field that came from old model Membership.application_approved when calculating whether MembershipDefault is approved.

    commit 104a486be0c450f08000eef866bb8ed8086745e9
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 16:25:24 2012 -0600

        Created instance methods copy, renew, and expire.

    commit 57c35691b44f9183a327715b80d640a430c4617c
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Nov 13 15:44:14 2012 -0600

        Revert "Squashed commit of the following: Adding 404 reporting"

        This reverts commit 2c09530354c0d2756eda289aaedc759585841ed0.

    commit 2c09530354c0d2756eda289aaedc759585841ed0
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Nov 13 15:14:18 2012 -0600

        Squashed commit of the following: Adding 404 reporting

        commit fffede8520887da8efba19dbf6c4f949f2f130b5
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Tue Nov 6 16:41:28 2012 +0800

            added 404 reports

    commit d57631bb680bcf739e2b18a4f03ed754ce6c95ce
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 12:24:08 2012 -0600

        Updated porting membership script.  If a membership type cannot be found, skip the porting of the membership record.

    commit 08f36b238696f956b45b97fb5330e166ad567d52
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 11:55:02 2012 -0600

        Saved membership record before saving invoice.  A membership type has to be associated before getting a price.

    commit 7385f2440455064d8844d8e495988291356bd9af
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 11:34:30 2012 -0600

        Updated membership porting script to save membership record first, then save user to group.  User is referenced via membership record, this means the membership record has to exist in the database first.

    commit 9b5f404605d77e09178f9c082258740a00d7134f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 10:29:02 2012 -0600

        Updated membership porting management command to properly identify when a membership record is created and when it's updated.

    commit 47e6c2f1ff0f82a9319d8831443a166ebcf5f76f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 10:28:01 2012 -0600

        Included membership type as column in MembershipDefault admin page.

    commit 8b8d33d9f210e1328d23dea1e368c4fd1f764c87
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 13 10:27:38 2012 -0600

        Excluding memberships that are active and expired from being re-approved.

    commit ddaba83ef3fc32816ad40b9513acc1c826946ea8
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 16:53:24 2012 -0600

        Overrode change_form.html for MembershipDefault admin page.

    commit b231df12a02a8aa00ce5267071f3e26dd2163b7c
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 15:29:02 2012 -0600

        Updated MembershipDefault.set_join_dt instance method to use MembershipDefault.application_approved_dt field.

    commit 3ff49c3be67212505167b0de4b46b8ce908a7046
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 15:28:25 2012 -0600

        Sorted MembershipDefault admin page with most recently approved memberships on top.

    commit c530e508057e2b0c18e61e6b9df1a5e6c2da5a5a
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 15:27:57 2012 -0600

        Removed the create date time column and added the approved date time column on the MembershipDefault admin page.

    commit daa51dbe5f7a2822f7500007674f968994ca39c1
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 15:27:22 2012 -0600

        Added actions to MembershipDefault admin page that approves memberships.

    commit e2d72c426f174cc4094a88d32dc9a362e4a18a59
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 15:26:30 2012 -0600

        Removed unused methods from MembershipDefaultAdmin model.

    commit 599442a2882c9927af37fc3c96d3849dbcb08e24
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 14:22:52 2012 -0600

        Sorting MembershipDefault admin page by create date time.  With newest created item first.

    commit 79426c4b7010523bb9c91c41d2e821a0acafcb45
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 14:22:18 2012 -0600

        Combined first and last name to create name column on MembershipDefault admin page.

    commit c63af70435dcf0192e2110e44e7774c6e0d0f167
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 13:02:55 2012 -0600

        Updated MembershipDefaultAdmin.queryset instance method to exclude 'inactive' and 'archived' memberships.

    commit def994077c5f48b01da015bb0dc53ef4c8ddf250
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:54:18 2012 -0600

        Added 'status' column on MembershipDefault admin page.

    commit 051bfb8f04d01b492957e19f41ea071eb3640dd4
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:15:46 2012 -0600

        Updated membership management command that ports membership data from old membership structure to new membership structure.

    commit ced2ed41f8b0384de69265bf531a7408e2d879d9
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:14:45 2012 -0600

        Updated calls to m dictionary when retrieving key 'membershiptype' in membership importer methods.

    commit ce1a4f46e1b658a20db60bfab0bc8fc59dfa75ed
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:13:23 2012 -0600

        Made MembershipDefaultManager.

    commit 6a22e166550f317f45e0031fb9b952b0f5448d2f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:12:56 2012 -0600

        Updated document string on MembershipDefault.qs_membership instance method.

    commit 67ec59d941d67938b2a1defbcbcf46a2dc4d30c2
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:12:04 2012 -0600

        Replaced call from profile.can_renew to profile.can_renew2 in order to use MembershipDefault model instead of Membership model.

    commit dd88406c686861aa003bb9536b3917609d4fd89c
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:10:36 2012 -0600

        Added Profile.can_renew2 instance method.  Uses MembershipDefault model instead of Membership model.

    commit 75721eefc731f77fd3f7e405f8697a06b51497bb
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:09:47 2012 -0600

        Added MembershipDefault.get_renewal_period_dt instance method.

    commit 961908c1d484c47983b2133e87a2100af33f00db
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:08:49 2012 -0600

        Added manager to MembershipDefault model.

    commit 5c10dd2b5e833b2826feaffc3654dbd6ab39fbd5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:07:43 2012 -0600

        Added EntityManager.first class method.  Returns object or NoneType object without using exceptions.

    commit 3d6e13974763d7f155d2de23e972c735e5b1d2d5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:07:21 2012 -0600

        Updated InvoiceManager.first class method.  Returns object or NoneType object without using exceptions.

    commit c6aba276590151cd570c9fdbdefe1eb6ff1a7a99
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 12:06:52 2012 -0600

        Updated TendenciBaseManager.first class method.  Returns object or NoneType object without raising exceptions.

    commit ab42792b26725130d4e0aa87b0e08b2bd2e28b5c
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 12 09:26:27 2012 -0600

        Updated the membership confirmation page.  Reference the profile object instead of the user object.

    commit 19f03fd5762af74d4cfad599da4c1f4bc4cf6912
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Nov 9 16:25:10 2012 -0600

        Jobs: add comma missing in get_approve_url.

    commit 39768be742f60ac3b770d1c626500b8d26c950f7
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Fri Nov 9 14:53:04 2012 -0600

        Squashed commit of the following: Updated the options for the password reset.

        commit d896780ccef5cadc5e9f43bcb1de9e692679149c
        Author: Alex <aragsdale@schipul.com>
        Date:   Wed Nov 7 17:06:51 2012 -0600

            Change text on go back to registration link.

        commit 8737c1df49e460c902e875fd78c54f9dde0459a7
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Tue Nov 6 17:14:45 2012 +0800

            added fix

        commit 06b26f4db8def4119535c43d222c11ff6d601a02
        Merge: b41af5d 6aace6c
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Wed Oct 31 16:45:20 2012 +0800

            Merge branch 'master' into 390_prompt_password_reset

        commit b41af5df481c4b93dd898ff738fbf04b11c7bbee
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Wed Oct 31 16:44:38 2012 +0800

            added prompt for password reset

    commit c87e4c2f2d6a864352c87fa50c68ea7f0883d0e6
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Fri Nov 9 11:34:58 2012 -0600

        Adding data migration for payment methods to add the initial methods.

    commit 05b5515e8ee9ee4e194c38a93e6c25c69213e18e
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Nov 9 11:17:41 2012 -0600

        Events: remove option to use different custom reg forms for different pricings.

    commit af7f62c54a814b03280eb6d958058399aba3bd52
    Merge: 15394e0 c938df9
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 9 11:03:32 2012 -0600

        Merge branch 'refs/heads/master' into membership_default

        Conflicts:
        	tendenci/settings.py

    commit 15394e0bf4724fb25246fcf1cc8839075ef1ab55
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 9 11:01:50 2012 -0600

        Added access to the original membership application.  This is required for import memberships to the original system.

    commit 099ffc891a4e1565044551c134711f5282991be5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 9 10:28:37 2012 -0600

        Initial creation of management command that ports data from our current Membership/Entries tables to our new MembershipDefault/Profile tables.

    commit 91db5a1ccdb059965d53c3b30a23cb1622483848
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 9 10:24:25 2012 -0600

        Wrap password_required decorator to the import for the security check.

    commit b71c31b63bf3c61d1d5e5c452ac62e133e5d1f9a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 9 10:10:45 2012 -0600

        Update the way of processing membership_type.

    commit 18d1d95c47c71a49d83f24556b58be32f7ce274a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 8 22:41:37 2012 -0600

        Handle T4 timezone.

    commit c891d25601da5e9ba386cb3862f70570b8501186
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 8 17:25:48 2012 -0600

        Exclude user from the profile fields.

    commit 37a4cccf42fca1fac4901c42aa370ca34442b183
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 8 17:05:48 2012 -0600

        Allow payment_method to be null.

    commit 8ddba7e916c40e080e6860c5107617b64360ce26
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 8 17:03:08 2012 -0600

        Update membership_default import.

    commit 8a8f6257f316aea8a0481adf2c9cb035bcffa6d6
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 7 23:04:34 2012 -0600

        Log an event for import

    commit c509bb5dd5e18d5eb08624673c79f205f6cf8874
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 7 22:58:22 2012 -0600

        Update membership_default import

    commit 86269df0651d70417feb808edfb90f09449b2e3f
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Nov 7 09:23:41 2012 -0600

        Import instruction update.

    commit 138f3153de99f3e65ab04e944800045f5f6942bf
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 21:09:16 2012 -0600

        Force integer to the foreignkey value before querying db.

    commit fa9d806c021763d2942894cc8bbe5e508257cbc0
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 17:50:23 2012 -0600

        Correct a typo

    commit 2112ed38627970e0bfecfbf16f919cd831055892
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 17:40:41 2012 -0600

        Added methods to MembershipDefault model that help create accounting entries when an invoice is created.

    commit 44a4179f1d7ed82c72af7a58ca67ec51b2cd9953
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 17:39:21 2012 -0600

        Increase width for import-settings.

    commit bf59faa48154fc2613c23526e095f7e2ce976911
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 17:38:27 2012 -0600

        Added method MembershipDefault.auto_update_paid_object.  This method updates the membership record once the end-user returns from the payment gateway.

    commit 5a80356de0993c21a9fa0ca698cff2967e1c702b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 17:24:31 2012 -0600

        Trap errors in the management command import_membership_defaults

    commit 3c42f4b14928465dd5a8deb0d04d28a9255efb01
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 16:27:09 2012 -0600

        Update upload page.

    commit 1cbc809d3e0b320fa9520730524a5107a8134c6c
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 16:05:38 2012 -0600

        Display the list of foreign keys.

    commit d6f3495df0ef4d71b195ec1a6b5cf7244328e95d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 15:05:28 2012 -0600

        Add instruction for spreadsheet preparation.

    commit 6a76f773758341ad99ce41e9ab8d0f69b9d33de3
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Tue Nov 6 14:10:54 2012 -0600

        Update the way of cleanning up the import data.

    commit c8252ac2dc54d29f49a907ac078fa0cceb9b4654
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 16:35:56 2012 -0600

        Added extra methods to MembershipDefault model to help detect renewal period.  Updated logic on profile page to display renewal link.  Renewal link goes to default membership application.

    commit ad735e686e63e9550b42fe4c2911f02817adb83a
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 16:15:22 2012 -0600

        Updated membership links that show up on profile page to use MembershipDefault.

    commit c6c0bfe8103820991bd4bb524ebf9faaabd92572
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 16:14:47 2012 -0600

        Removed commented-out MembershipDefaultForm field.  It does not exist in the Profile object.

    commit 2f0b7dba1b259e6d1a2d2646f55a0f8c3518ba0e
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 15:28:38 2012 -0600

        Removed link to membership entries from user tabbed navigation.

    commit e1b8abac3cf8be3617efa32489b049acbb8b161d
    Merge: 975a663 d3510e2
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 15:17:53 2012 -0600

        Merge branch 'refs/heads/master' into membership_default

        Conflicts:
        	tendenci/addons/memberships/templates/memberships/nav.html
        	tendenci/addons/memberships/views.py

    commit 975a663662a64f2d5c5d95c727880a0662c061de
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 13:11:36 2012 -0600

        Grouped notice URLs together.

    commit 266cda511d6cdcb8c00536fed7c1931fa47bec00
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 13:06:51 2012 -0600

        Removed membership export link.  This feature does not exist with the new module yet.

    commit 0a00aac8ef5afdfae4515819b59b32a47ddbff5b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 13:03:25 2012 -0600

        Removed entry and application references.

    commit 9632c7728855053b2211173aabceb4e3ee13f624
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 12:42:50 2012 -0600

        Commented out URLS to membership entries that are not being reference from the new membership module.  I did not delete the lines, we can use them later to track dependents and delete both dependents and links at once.

    commit e21c704600a7c310201eb059aa6faf77099bbff0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 12:29:09 2012 -0600

        Removed pending, entries, and app link from membership navigation tab.

    commit eb5d639e700851e7b4677fbf962375a1abe83286
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 12:21:29 2012 -0600

        Removed application module from admin area.  With the new updates this module is deprecated.

    commit 6c97d59bd3ac35a879cade1ed686b30c28307ffd
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 09:40:09 2012 -0600

        Removed the MembershipDefault.generate_member_number field.

    commit bc98aa9e430655a7d863a6ad67324b0bc416188f
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Tue Nov 6 09:32:30 2012 -0600

        Added very basic confirmation page, very little formatting.

    commit 342fe7b6b94c6e494060aa989f8fed326d750535
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 5 16:05:47 2012 -0600

        Change url recurring_payments/ to rp/

    commit e60ea12cc86878d409ff1add8040ebfaed1e8602
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 5 16:02:34 2012 -0600

        Updated membership confirmation page to display basic confirmation information.

    commit ece22d03fa550e03aff8c7a8dad37d749e720e43
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 5 16:01:56 2012 -0600

        Added Profile.get_name method.  Calls different attributes attempting to get a user name.

    commit 06f2a8f928d5baeec7098ced8b915bba2c8e3b7e
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 5 15:57:07 2012 -0600

        Updated more workflow fields on the MembershipDefault object when filling out the membership application form.

    commit 69fd33eaec3174cf05b854713582d90774a60341
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Nov 5 14:57:19 2012 -0600

        Updated the MembershipDefaultForm to return MembershipTypes depending on whether the profile is in renewal mode or not.

    commit a254b17df88bc675a5ef606550d5055bbb5c2a54
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 14:57:04 2012 -0500

        Added more membership fields to default membership form.

    commit fb7053bf3ca4440bf38d00d21f78874dc5e45f90
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Nov 5 14:07:41 2012 -0600

        Updated key choices for membership_default import.

    commit 4801c8d3a6d947b717319a881ae4b797ed98a80d
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sun Nov 4 17:19:36 2012 -0600

        Move styles from templates to its own css file for membership_default import.

    commit 73b76f7632fab929cf19d27ad4665b9948080fc8
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Sun Nov 4 16:29:34 2012 -0600

        Style update for the member_default import.

    commit 8979f86484cde6eceb9b929bd76b0bb873b1a982
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Fri Nov 2 17:39:24 2012 -0500

        MembershipDefault import status page with progress bar

    commit 4ce52465fbf518ba6f3f7a53f3e5addd29a0f28b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 14:43:28 2012 -0500

        Removed extra industry and region fields on default membership detail page.

    commit 36ff0f095a9561b9af8fc9128344542c2bfdef9b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 14:42:53 2012 -0500

        Updated MembershipDefaultForm logic to handle approval process and archiving process.

    commit 4a9f012a3c660739f00f9e4d15b5992980b17e13
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 11:51:38 2012 -0500

        Set email address to required on MembershipDefaultForm and created new methods to set join dt, set renew dt, set expire dt.

    commit 30c1e345e8ecb7e0f1963c29393ab3482d8e6077
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 10:01:13 2012 -0500

        Temporarily removing the additional address section.

    commit 10dfe60ab27aff36bd72b23e08b383da3cda2b24
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 09:55:00 2012 -0500

        Updated the MembershipDefaultForm to create a member number for all submissions.

    commit efa5b767fa7c8321c359a67b114f73251b9f1044
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 09:35:06 2012 -0500

        Redirecting super user to MembershipDefault model admin change page after submitting form.

    commit 0783ec598200ea679736bc086319cbba94aeaa02
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Fri Nov 2 01:37:04 2012 -0500

        Created the beginnings of a membership default confirmation page.

    commit 584a6e547cb6a863241d94771d23ecc30cef91e5
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 1 22:55:51 2012 -0500

        Replaced transaction.rollback with connection._rollback to resolve the error "This code isn't under transaction management".

    commit 7377ae478c86a37c4b33bcac7f029ed26730ce9c
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Thu Nov 1 22:33:56 2012 -0500

        Update MembershipDefault import for membership types.

    commit 3c095f206620a9693c818d593050a62f6cadc019
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 17:52:03 2012 -0500

        Redirecting end-user to payment gateway if online payment method is chosen.

    commit a6d5cd821b1b025fc07806ece09caaa789953fbd
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 17:51:43 2012 -0500

        Commenting-out unicode overwrite on Invoice model.

    commit fdf3e1f93881cbeb2b2b4ee86ca1b2c4a7f1fe06
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 17:25:49 2012 -0500

        Changing DateTimeField widget if a MembershipDefault object does not exist.

    commit 95011b5674f4f6c81d2d5a052d287a365bec4a97
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 16:38:10 2012 -0500

        Using User.first_name, last_name, email and MembershipDefault.member_number on admin list page.

        Also allowing filtering by MembershipType and MembershipDefault.status_detail.

    commit 229dc39ab4e306fea00cb34d2162aa7931f5dc73
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 16:37:00 2012 -0500

        Removing the fancy date pickers from the MembershipDefault model.

    commit feebd7580877c9874386396414a5780365647e80
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 16:36:30 2012 -0500

        Changing MembershipDefault.notes attribute from a CharField to a TextField.

    commit cbf9a2d1f96f730fdf647666364015add1cad743
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 15:09:16 2012 -0500

        Temporarily removing special interest group from MembershipDefault model.

    commit 7a3ede8fa749a330ff187990538c87d9300af5b0
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 14:28:25 2012 -0500

        Degrading chapter field from radio select widget to input field.  This can be changed back to a radio select widget when we're able to custom membership applications more.

    commit 9268f25308b44801b7d268086539b694df527ed3
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 13:43:32 2012 -0500

        Small changes, making sure the the membership default admin edit page can save.

    commit 4bba9b2ca4bff4c8ee3764ffbee2d72a62817cf3
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 13:43:05 2012 -0500

        Catching all exceptions when adding a group membership record and rolling back transaction.

    commit 08987f83aa10d844d92b6409c8371e524180bce5
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 12:06:07 2012 -0500

        Rolling back transaction when creating a group membership record if an IntegrityError exception is raised.

    commit c7066678c6854aecce0b05279d55f14650f47588
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 12:04:14 2012 -0500

        Returning membership instance when running save method on form.

    commit 0928c01b4170611563971c95001bbf56f676a5ee
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 12:02:54 2012 -0500

        Overwriting save_form instead of save_model.

    commit 193bf6fb0ab61a763b5bd5851a0b48efe123aeeb
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Nov 1 10:36:11 2012 -0500

        Building MembershipDefaultForm admin edit page.

    commit 9f1f936a0680c4fa062836777452235bdc11408b
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 22:24:28 2012 -0500

        Clean up the merge conflict mess for memberships.

    commit 7ae5417e8731cfd5d776967dabafcada38c02b79
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 19:12:18 2012 -0500

        Fix migration conflicts.

    commit d6ae1c38a4b9ca68cdfa81611b469f65012afcc6
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 17:55:33 2012 -0500

        MembershipDefault import update.

    commit b1dbc058c52ca65fe4e11096cde60c2eed47c043
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 17:38:14 2012 -0500

        Alter fields invoice and sig_user_group_ids in MembershipDefault to allow null.

    commit c72cd3bb72257ffde833a322e9f0e8c229ad4a7a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 14:55:31 2012 -0500

        Management command and functions to import memberships to MembershipDefault.

    commit af49d92624d21499e71f1a443b87f5e4ac66e252
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 09:34:34 2012 -0500

        Added status field to the MembershipImport.

    commit dc8e83957fb6562f13ccc397405c952919c3a5fb
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 08:56:48 2012 -0500

        Added 4 fields to the MembershipImport.

    commit dd7a563fb35215f7d6f0bb0d11bb9c8049e788a9
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 31 08:35:09 2012 -0500

        MembershipDefault import - download template, upload and preview.

    commit 8f0381d9ef3b230e4237907d73336d60b7e1ce28
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 16:03:01 2012 -0500

        Set entity, owner, and creator on MembershipDefault object on submitting form.

    commit be08e726f7f964de57f3d84ffccd438e7da243d9
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 16:02:22 2012 -0500

        Added new method to TendenciBaseManager first().  This method returns the first record that matches your query.

    commit 8492baefdd94460c4409b74280ffdc2bbba02038
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 14:54:22 2012 -0500

        Moved membership default form logic to MembershipDefaultForm from MembershipDefault model.

    commit 3d0fc729069f9f5c982001032844b731d27841a2
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 14:53:30 2012 -0500

        Updated the location of the CorporateMembership import.

    commit ff9e587e7868c90d0d7e43c35c742cc9fd00346d
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 14:52:23 2012 -0500

        Added new method to profile model can_renew().  It pulls all memberships and returns whether the membership is within renewal period.

    commit 296631e52c994894256ed9897c8e989011ea511b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 11:49:28 2012 -0500

        Updating default membership form to create or update the membership invoice.

    commit f911e54f1243dc63d6a714fddeca995ff305827d
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 11:20:36 2012 -0500

        Added methods to Invoice model.

    commit c571d2baed82ff0f9ea42791ccbaf29b4c82db68
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 10:04:30 2012 -0500

        Updated membership default form to update profile.

    commit 6d67b2e4db94eb95fac5d2db2f09b31d36e4ee24
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 09:41:16 2012 -0500

        Passing first name, last name, and email parameters to get_or_create_user membership method.

    commit 19b6349adcfd672a08530768a4d13c2063e7219b
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 09:39:43 2012 -0500

        Defaulting to blank entries when creating a membership.user.

    commit 0464dab11aec5bcca9c070b2b9ec1008cea6b834
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 09:18:03 2012 -0500

        Updated default membership form to get or create membership.user.

    commit 3519d03181ba946f317685ad67230c0573ff2e41
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Wed Oct 31 08:58:44 2012 -0500

        Updated DefaultMembershipForm to add or remove user from group.

    commit ed2f6b6ca02972720cd280a7693a1cc7ec0b079d
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Oct 29 17:33:18 2012 -0500

        Adding user and profile fields to membership default view.  Still need to put in logic that finds or creates user object.

    commit fbba9e12259c4d5a1b183d5caa2329e46d77c250
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Oct 29 16:22:13 2012 -0500

        Updated the default membership form to show form errors.

    commit 5ecc9c03aa5519d3786b452378421c56867a6168
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Mon Oct 29 16:21:27 2012 -0500

        Updated default membership form to accept career fields.

    commit e146e892d44c9924c3975f3622c3cf5218f66362
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 29 15:48:50 2012 -0500

        Trap payment_gross error for paypal fraud verification.

    commit cc4cd68dcddd43adbbd6e122fbafb7867ddd6e6e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 29 15:47:33 2012 -0500

        Update app field for membership import.

    commit b80bc5c809f4ef8336c3a24272619776eb23a878
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 29 15:46:32 2012 -0500

        Add upload_file field to the MembershipImport model.

    commit f166b354c04ddad65636e34272baccf375b0c049
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 16:33:48 2012 -0500

        Converting the education and career date time fields to use the more modern date time field widget.

    commit 4442111bec37b1d0514f5c3113af206e74f06523
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 15:09:58 2012 -0500

        Removing commented out directory code on default membership application.  When we bring these fields back we can always find them in the repo history.

    commit e917193b75921fb5eb2e2e415f27bbb8b5564a66
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 15:08:07 2012 -0500

        Updating the default membership application to pick up all education fields.

    commit 013164bd14222eaa0da43340a3c0e099e0194ec1
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 12:37:08 2012 -0500

        Updating the default membership form to read show and store results from the region and industry tables.

    commit 8e92ad80c13a356c0802f49e073f04342414fc22
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 12:06:14 2012 -0500

        Adding industry and region to MembershipDefault model.

    commit 9bdd57090279ddf43c1bee24a17c26bf9d458775
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 11:58:20 2012 -0500

        Merging new models: Eduction, Career, Industry, and Regions.

        commit 8fa6731bd7ea12b47cf45d2a1f8f2e0ad5bf303b
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 12:50:25 2012 -0500

            Added careers app

        commit ae82320d28e40af2ce8018f5af5cf13e07152c03
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 12:50:05 2012 -0500

            Education minor update

        commit bff9c65af173e0590ea6b6d148050ff580e46f73
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 12:03:49 2012 -0500

            Added educations app

        commit 8da0edc038c780cf03d49b7bf0c8306fb3b11e51
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 10:53:41 2012 -0500

            Minor update industries.

        commit f25bf24f77002eb7b5775169fbc244dcad2ee47d
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 10:53:24 2012 -0500

            Added regions app.

        commit 7347590a5dfe0374824061034342a90e3dd58d58
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 10:33:51 2012 -0500

            Added industries to the INSTALLED_APPS.

        commit 6e04d554191dd2574e89deca0a78d05db2c115a4
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Wed Oct 24 10:33:14 2012 -0500

            Created an industries app.

    commit 723739735b0884d4184e4338b20d46742c61ee70
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 11:54:33 2012 -0500

        Removing superuser fields that can be derived on the backend.  Updating the form to successfully post information.  Next steps are two start mapping information that is not associated with the MembershipDefault model.

    commit 7c03e49c36acee11641ae5fbf7b3e80882e62a1a
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 11:30:23 2012 -0500

        Hiding the directory fields on the membership application.

    commit 81813a7a431c77b7dfc2f8e846cb3b5f0c648815
    Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
    Date:   Thu Oct 25 11:12:59 2012 -0500

        Initial creation of MembershipDefault model, form, view, and template.  As well as an update to the URL file.

commit 102563f770604340784d3e69fe43b29cf11d1f77
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 12:20:56 2012 -0600

    Commenting out the user group subscriber import functionality.

commit e6e7d6700065ae311f1649b3dd3cb645f478e6d3
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 18 11:42:02 2012 -0600

    Updated user/profile import to use dparser.parse instead of dparser.parser.  "parse" returns a datetime object instead of a parser object.

commit f8527b3dd560d3dced9f51d42737d14b3086118c
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 11:03:21 2012 -0600

    Readded code for pulling the photo object on the sizes page.

commit 55fddea873f58bf5182e231dcc234e14eff4170b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 10:47:30 2012 -0600

    Updated events delete method to not delete the registration_configuration as that also deletes the event before the image is deleted.

commit 380627db8d7b3d873f2715bc218e24f4bcfa15a0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 10:46:54 2012 -0600

    Updated image_url tag to accept size as a variable. Added support for constrain option.

commit 22236cbf9fd0901c83b2e3b843ca18bcae217687
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 10:46:20 2012 -0600

    Updated imports in jobs accounting entries method.

commit 4b3d68ee8ff441ff47c7f9302df8713eeafe88f0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 19 16:58:19 2012 -0600

    Adding a timeout test to trigger timeouts in some environments.

commit 18be9503aaf4cf5416aeddc86ce17387f1f2df95
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 19 15:56:43 2012 -0600

    Remove all_files query until caching is implemented.

commit 410dc55414e8e191bf7a959e8eb56db56dba9ab0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Dec 18 09:02:45 2012 -0600

    Wrapped base Jquery script with block so it can be overridden.

commit 6da8d430220956320a023bc702f1ea7d514fa7d8
Author: Alex <aragsdale@schipul.com>
Date:   Mon Dec 17 14:30:33 2012 -0600

    Add sync for newsletters to user group admin.

commit ac86d1b83944c3d5496ed6062ee838a81fcffaed
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 14 16:21:45 2012 -0600

    Continuing on previous event delete feature fix.

commit 8874c6178b2cf7af133b77b66b6eee5439432143
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 14 16:05:26 2012 -0600

    Changed the event delete feature to rollback the sql transaction if an event image delete fails.

commit 4b2bd78efbe5e6d7532dff8d2f5d785b8db7ee62
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 14 16:03:51 2012 -0600

    PEP8 Campaign Monitor

commit 6d227a718a3ce825c48713f2204c011426dcd08b
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 13 15:20:47 2012 -0600

    Changed photo bulk edit page to use Form instead of Formset class.

commit a06270771a18d15385b35368c2de769d27f9c546
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 13 12:32:43 2012 -0600

    PEP8 photos/forms.py

commit d1c90dd167caed9a30d1bd829e22144bbce5a862
Author: Alex <aragsdale@schipul.com>
Date:   Thu Dec 13 12:20:22 2012 -0600

    Add back advanced options stuff in invoices search view.

commit 92b6017c33101234294158dc9363fd01269fc7e1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 13 10:11:47 2012 -0600

    Updating files to add a perms GenericRelationship.

commit 70ff189b749bc7e2792f5f0d3c3a8fb4aec50652
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 13 08:23:30 2012 -0600

    Get that double pound sign outta here. That's not valid css!

commit f7ed0df44abeb70bf84d07d1e6f5112e35327613
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 12 15:17:34 2012 -0600

    Merge: Profile search result

    commit 56b2c684bfb3defd982c023187dd321ca26dfc41
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Dec 12 16:44:42 2012 +0800

        updated profile search result template

commit 4418ab859a27a29a73b13ae5e8c442a6bbd60b7f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 12 12:49:26 2012 -0600

    Merge: Campaign Monitor template sync

commit c4c5be2d9b16f8aa9535c5a0921ac3ec55f35c95
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 12 11:47:15 2012 -0600

    Changes to module "enabled" detection.  Using "decorator" instead of if/else statements.

commit ca76e96597a417980a1c9aeee77fd16f92089e0b
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 12 11:25:46 2012 -0600

    Changed import on help_files module.

commit f64c9348b9ea12fb3f9db4fb73f017f7fd26293c
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 17:04:48 2012 -0600

    Updated the enabled/disabled detection on the help files module.

commit 5f696bb96d5d43ad95f64cb9412c59d48fbaf77f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 16:55:39 2012 -0600

    Updated enabled/disabled detection for the events module.

commit 96c3037d56676e30492e6cd0c7d46679932af6e0
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:58:40 2012 -0600

    Updated the directories module enabled/disabled detection.

commit e042895b976f055eebadde85682093701476e086
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:38:34 2012 -0600

    Updated the articles module to use the "is_enabled" decorator when detecting if the module is enabled.

commit 2ab7c57ff40c9faba9c54cbbf85bd8f4a241ad3d
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 12 09:02:57 2012 -0600

    Removing unused imports.

commit c107361ab88a22f36231c47a942333739eccfdd1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 12 08:52:40 2012 -0600

    install_theme management command to download themes from url or from tendenci-themes github repo.

commit c87557d91fd955d07e05d424fa774d64ca294752
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 12 08:50:01 2012 -0600

    Update limit to pull LIMIT instead of title

commit 400387b38a5a31e51cbe6a08844f618d60c15243
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:19:37 2012 -0600

    Removing the "is_enabled" and "redirect" class methods from the Form model.

commit 95ffc293bc3bf7bad21386d91b2e7a25aa9b8c10
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:19:12 2012 -0600

    Updated the forms module to use the new "is_enabled" decorator when detecting if a module is enabled.

commit 13a5419075b627fcb8112c143415a9fa2781c434
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:18:27 2012 -0600

    Removed "is_enabled" and "redirect" class methods from File model.

commit 7191106fddf19e479f61a424f3ef9052042b76d5
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:18:00 2012 -0600

    Updated the files module to use the new "is_enabled" decorator instead of if/else statements.

commit 0c0598466dc307b8c6d18ec525627ac429d470f6
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 15:16:57 2012 -0600

    Added is_enabled decorator. This decorator will be used on view methods and will prevent access to modules via URL if the module is disabled.

commit 2694d1e47784c28fb20ccdd9491b66a0c70c6edc
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Dec 11 13:23:33 2012 -0600

    Removing archive option in page dropdown.

commit b2a67bc7d3dd812e415d04885c8f95588f1db201
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Dec 11 13:12:42 2012 -0600

    try the db.delete_unique and pass if we encounter a ValueError that the UNIQUE didn't exist.

commit 62a5b62837a59dad972e3480f4e2318eba9c9711
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 11 11:52:54 2012 -0600

    Changing "files module" enabled detection to use class methods.

commit 943a056fd8ce841981cdbe3c2fa5612e592ed4d4
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Dec 10 18:16:25 2012 -0600

    Add missing import.

commit a3556df4633264a17fbe0c45c3fab5103c0bf4ec
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Dec 10 17:57:23 2012 -0600

    Updating the 0002 migration and the 0003 migration to remove the unique constraints on from_app.

commit 28ee53c592f0b1653b63bbb7dd8705f8311a1855
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 15:38:47 2012 -0600

    Merge: "Scan for new themes" button

    commit 279d8d1d8cd7b14dd6c2a856ee39887f089008c2
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Nov 27 19:50:30 2012 +0800

        removed scan button, and added the update for input values on settings page load

    commit 9791b355ecb69e0844510febafafb6fd49b3ab54
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Sat Nov 24 06:36:40 2012 +0800

        added scan for new themes button

commit c85dd322442801382802bc8162077d0c89d9f796
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 15:08:30 2012 -0600

    Merge: Create user on anon custom form submit

    commit d8ba01137de1d84b92113cec42c387a4ba75c54c
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Nov 27 19:17:23 2012 +0800

        added a fix for multiple profiles with similar email

    commit defde41a03ffb4724610d18aaa1e404f60c5b6ec
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Nov 22 16:23:25 2012 +0800

        creates auth user for anonymous custom form submit

commit 5a3ade472004be15f0464e442084eb41f46a020f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 14:55:12 2012 -0600

    Updated Form enabled/disabled detection to use class methods.

commit df989216267c57eb3870f8399bba055b6c27411c
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 14:54:34 2012 -0600

    Adding class method decorator to Form views.

commit 0a8b660b3cae1982d328e30f44623838f157a34d
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 14:49:51 2012 -0600

    Update to email address detection on Form object.

commit 824348cda588939976d1f64be4f3477aca02b983
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 14:47:04 2012 -0600

    Adding Form.is_enabled and Form.redirect method.

commit 0c0f68f1193498b910403d87b385e62f735aa937
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 12:50:06 2012 -0600

    Update tendenci/apps/user_groups/templates/user_groups/detail.html

    Removing the import subscribe link, this is no longer a feature. Subscribers will have user/profile records.

commit ed1ed8874fca660f12b77a41226ac54ffbd2e13b
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 10 11:01:09 2012 -0600

    Merge: Redirect option when app is deactivated

    commit 217e05f7f942b5460982ea10923673dc657e0ab4
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 15 15:18:46 2012 -0600

        Prevent redirect from returning blank URL. Return from app if app is selected.

    commit 25d22778020679157a636e09ebafc0ca9a2a7785
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 15 15:13:22 2012 -0600

        Change redirect from app help text.

    commit fd1c400607399b5b5eea8777dd3c1373b07aa015
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Nov 14 04:42:36 2012 +0800

        added fix

    commit fe2956edaf606cd35544816366b4d9d054c4e0e7
    Merge: f595e68 3ac2836
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Fri Nov 9 21:02:21 2012 +0800

        merge with master

    commit f595e68794ec3e3ac514df825f9d714f556c23d2
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Fri Nov 9 20:53:00 2012 +0800

        added redirect option when app is deactivated

commit 8c087e610caf8eccbd3d497bbd9ce41a0687a88f
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 17:17:45 2012 -0600

    Removing old theme files from the templates folder.

commit 7d8c0ef50467e6c0e59564207b23c7a26ceadd9a
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 17:17:25 2012 -0600

    Updating version and adding MANIFEST.in so all files are properly included.

commit acbc2a9f5258eff737758c7f783476489e229eb1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 14:03:20 2012 -0600

    Updating classifiers

commit ef32e5d28207ba564d31c6ab190cce1122862107
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 13:51:08 2012 -0600

    Update the sender for event notices signal.

commit e4191920a09b134994c59ab5ac0eb0a855fbf8a8
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 13:44:44 2012 -0600

    Moving AWS install instructions lower.

commit 9c6c7bee85a64d3add697a5466411a6d22240d5f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 7 13:47:44 2012 -0600

    Merged 401_global_image_referencing

    commit a1e8ebb77f1718992ef75de2bbb9eda7a5a5847c
    Merge: 0a1343a aa65edf
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Nov 15 15:45:21 2012 +0800

        Merge branch 'master' into 401_global_image_referencing

    commit 0a1343a2511229c225ca9a3ba1fd7ada5d61ee22
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Nov 15 15:43:53 2012 +0800

        added a file gallery tab in the insert media popup

commit f6b4ca4a6e7aed7efadc1ead2736872abc530dff
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 7 13:10:09 2012 -0600

    Merged 410_filter_by_event_type with master branch

    commit fee77a1e52e804782e89a5d005995148f56d7aa0
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Mon Nov 19 21:20:12 2012 +0800

        redirects users to the latest upcoming event during event type filter

commit dc8591bc75e5f659cdf89ec944f7d92880bb0f3a
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 7 12:44:57 2012 -0600

    Merged 384_preview_button

    commit c483970f933c4e06e702beb28a32c44a596985f2
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Nov 5 15:28:54 2012 -0600

        Add a close and return to edit button to page preview.

    commit d7ac41b33764f951636b601e9961e17f20dde97f
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Fri Nov 2 15:25:03 2012 +0800

        added a add page/save changes button in preview page

    commit e16ddf81119fb5a2547848fed95dacfadb966bd5
    Author: Sam Lee <sam@bixly.com>
    Date:   Thu Oct 25 06:34:42 2012 +0800

        Preview function done.

commit cdef781e7e3f03a7ec46ae7d0e5f3f1203a24652
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 7 12:05:35 2012 -0600

    Removed unused code from event management command.

commit 82655d874fcf7020c16f46376e546762ec1703a8
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 7 12:05:15 2012 -0600

    Rebuilding event migration.  We had duplicates after the merge.

commit 254791e3189fc9f52ead04799e5dbc20d3c2c586
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 16:54:42 2012 -0600

    Squashed commit of the following:

    commit d17e8903088597f172e7e9af771844699c1b12ba
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 31 16:25:34 2012 -0500

        Trans tags on the event reg end recap short.txt too.

    commit ae35aa36bd90d5da717fd11d1ca4a2b73097c338
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 31 16:24:20 2012 -0500

        Trans tags in event registration end recap template.

    commit 73566ef3f30e4c5a1d59151dc51f9a057052d41a
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 31 16:18:55 2012 -0500

        Events: return 0 for money collected and money outstanding if no money has been collected.

    commit 866916939b6bf8a6d6f3a55905f35443e814011a
    Merge: a572573 9e9a770
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 31 16:06:16 2012 -0500

        Merge branch 'refs/heads/master' into 377_send_recap_email

    commit a572573cf4d1faec329081b56ac3d08095490782
    Author: Sam Lee <sam@bixly.com>
    Date:   Wed Oct 24 13:37:54 2012 +0800

        Updated send recap email.  Allowed a 1 day window for past events.

    commit 368038336ecdb5f4ee2761b5fb5f464cbdc65131
    Author: Sam Lee <sam@bixly.com>
    Date:   Tue Oct 23 17:08:59 2012 +0800

        Updated invoice search interface.

    commit 01178e4cfa9163096a4e2a6fefc14d6c2b99281b
    Author: Sam Lee <sam@bixly.com>
    Date:   Mon Oct 22 21:16:21 2012 +0800

        Additional search filters for invoices.

    commit 5bf022c42a07094402edbf4dff33583774c4a8a7
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 19:04:35 2012 -0500

        Add safe to the NEW_RELIC_HEADER and FOOTER since they are javascript.

    commit b4885f8202bd45aa3afe3ed9449e0ba8cb5680da
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 18:58:46 2012 -0500

        Adding support for new relic browser timing code since it appears our theme_extends prevents this from automatically working.

    commit eb9fbcd720ee17b040ec14c6fd8a7f196ab4d65a
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 17:56:22 2012 -0500

        Updated cache_photos management command to use new caching util.

    commit 437a63ef2ca1e12519b6b3a7ea0274148ebdfed5
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 17 17:33:48 2012 -0500

        Invoice address update to have address2 appended for make_payment.

    commit 206e149d9685cdaf2e32729baf3148d7149dfc92
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 16:08:22 2012 -0500

        Update photos bulk edit to cache photo sizes for edit and default display pages in the background as they are uploaded.

    commit 83275eb25c5f7446cfc0dc953f909f40aecfdc3e
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 16:01:37 2012 -0500

        Updating versioning and pages version url.

    commit 692ca0b9a5a27386e995f882ab1e713851d5105b
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 11:37:51 2012 -0500

        Add photo caching to speed up photo batch edits and photo set page rendering.

    commit 5463ef36074659136272ee2f782da806135c7a04
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 11:36:34 2012 -0500

        Set a default height or width if it is 0.

    commit b978ecfd2288726c0b5d1922c494f5a012c778b9
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 17 10:22:47 2012 -0500

        Catch the socket.gaierror exception.

    commit a86aca7acbc152f4c7e391756db06eb6fd1f86c2
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 17 10:01:11 2012 -0500

        Change plugins to addons in user menu.

    commit 7376c449827d1f3423a1a64d54088e8a665da043
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 15:35:01 2012 -0500

        Adding a management command to cache all images.

    commit 9f7cbc92737ec44248d16fbd1345f67b1096bf83
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 14:25:22 2012 -0500

        Updating url references to invoice view.

    commit e92164fbf63bb60f03cdb63f4d670d40806c89a1
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 14:24:56 2012 -0500

        Updating the url reference to paying online.

    commit 2d512ba8c9afb7dbd8d94e9db7bf1480044d3662
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 14:22:21 2012 -0500

        Default display attendees to admin only.

    commit c9044cb3d4a623544fd7aebe7cf5fec6296804ed
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 16 08:24:53 2012 +0800

        edited name for multi select checkbox, and reordered the options

    commit bbe38d3b5e04add9fe657d6594fd5321c9a21caf
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Thu Oct 4 00:46:40 2012 -0500

        Revert "Temporarily comment out the theme editor to continue testing."

        This reverts commit 9c4424fcb581bc1f80422c74a924addfcb1cced5.

    commit 1a2b31962962433621dd12d4efa62cf374291ac0
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 3 23:18:33 2012 -0500

        Temporarily comment out the theme editor to continue testing.

    commit 5c50aad68c8e333d7104cf5158c5fee8dd6f49ec
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Mon Oct 1 21:17:37 2012 +0800

        added multi-select checkboxes as a field type for custom forms

    commit 2cbd8506272099ab0de64fcf2ad199742e2b461b
    Author: Sam Lee <sam@bixly.com>
    Date:   Mon Oct 15 17:05:00 2012 +0800

        Fixed corp mem view url in invoice search result.

    commit b02aef42359d6c224b1f952b71110ea2ed2fd654
    Merge: 4a38a41 1889546
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 13:58:50 2012 -0500

        Merge branch 'refs/heads/master' into 377_send_recap_email

    commit 4a38a419225dde450ff0c9512f2072f04048a3a5
    Author: Sam Lee <sam@bixly.com>
    Date:   Mon Oct 15 14:23:05 2012 +0800

        Done.  Updated notifications for event registration.

commit 4e789616a95fdf353d5cd9fb30443c53ef59c279
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 10:44:32 2012 -0600

    Updating install requirements for tendenci.

commit 0c8809d532a538f43b1793a5f646812795a3d6b2
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 10:38:06 2012 -0600

    Updating install instructions and prepping for pypi for tendenci.

commit 3a43987e52d3f1d04f1df75226ae667a67b0cb9d
Author: JMO <jmoswalt@gmail.com>
Date:   Fri Dec 7 10:26:27 2012 -0600

    Updating install instructions

commit 891ad9c252da7b8d126d9b55ffdf3d257ca37349
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Dec 7 10:16:32 2012 -0600

    Updating install instructions.

commit 79179ab3138487fd096c15e4f739f80b5d2b9633
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 6 15:33:45 2012 -0600

    Updating description in setup.py

commit d0c2e756feedd93eb04504eff0cfae1ed958144a
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 6 15:33:06 2012 -0600

    Updated Install instructions and the README file.

commit fff5b28bc53e913278c099810ba09072e8f86b8b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 6 15:17:26 2012 -0600

    Updating setup.py classifiers and .gitignore for building and distribution files.

commit b418395fad698fb10c35c3380d3fc471d5d38b01
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 15:43:53 2012 -0600

    Importing missing RegistrationConfiguration Model into events/views.py

commit 9a95dc5e1b5e6ec75a251d9b467e25d6ec7e110e
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 15:39:36 2012 -0600

    Updated the event record to also record the event type when importing events.

commit 7f51a2eb39500ded50d12429427b42cba4180f6a
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 15:20:03 2012 -0600

    PEP8 events/utils.py

commit bc61ce8afb0ab0dd64ed4f1162bb713bca32788f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 15:18:43 2012 -0600

    Removing call to "file.path" property.  Our storage type does not accept the use of the "path" field.

commit 7e4f84798957574271f563fbd15f70f5601a5227
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 15:17:48 2012 -0600

    Removing extra variable "data_dict_list_len" from event import.

commit 833882d80a5890ceb6df4d5a3453a80aecc781b9
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 15:17:06 2012 -0600

    Stripping extra white space when import events.  If the date time format method detects extra characters it raises an exception.

commit 9388abf8d2a5f0c218b0d4316844a0aaceea0baf
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 6 10:18:00 2012 -0600

    Squashed commit of the following:

    commit 3ba9643d7fc10d766b772a8332383d9c7df333e3
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 15 14:51:40 2012 -0600

        Add a message when import is complete.

    commit 8d479f5097bb1dd4396223fe48bfd20a71045781
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 15 14:49:08 2012 -0600

        Reload import processing page after 15 seconds.

    commit 22d366ebd4efca09af73f8b54f38604b3c8544bb
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 8 09:51:31 2012 -0600

        Events: add info text on import process page.

    commit 622fa8258310fd9cd22be23c13c2b0a05c409fec
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Nov 6 10:01:18 2012 -0600

        Make group required on event form.

    commit d72c2369178aeee5fdcf611c34de66b8cefb0359
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Sat Nov 3 16:41:15 2012 +0800

        added checker for incorrect timezone

    commit 6b3695e77d1afe7fc4cb02c0bf46a988911a2dbc
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 1 16:21:30 2012 -0500

        Fix year format on event import add.

    commit 76b0ad6bb3261212a58f9a901a04c1cc43daa0fc
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 1 16:17:04 2012 -0500

        Change text on event import add.

    commit f0a8b5e4bedfd0014400fecda24762bcdce96219
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 1 15:51:30 2012 -0500

        Squashed commit of the following:

        commit 6f9acebabae2bf97e8daffe795de1599e55e77f9
        Author: Alex <aragsdale@schipul.com>
        Date:   Wed Oct 3 17:14:48 2012 -0500

            Add setting for invoice notice recipients.

        commit 675c6c061552d1d6b2ea6aa6e8e2eaabfef600b5
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 31 16:04:19 2012 -0500

            Squashed commit of the following: Directories Renewal functionality.

            commit 5ea1b3e12ee1148876cd4760cd92cb814a18b8d9
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 16 17:03:20 2012 -0500

                Print email recipient when sending directory notices.

            commit d96459ea62c8f1e0119a3ecbd663d10f5915961e
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 16 16:59:01 2012 -0500

                Filter out directories that aren't renewal eligible in the send notices mgmt command.

            commit 2808415153a93ca54059eb599bd7773746bc45b1
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 16 16:27:52 2012 -0500

                Directories: default days to show renewal link to 7.

            commit 5bd41fcf649f5e6372a9a48763bd11eb11abffe4
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 16 16:04:27 2012 -0500

                Remove debugging.

            commit 1475ac75fa088b1fc65aadbb343c7d202b0dbb06
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 16 16:00:57 2012 -0500

                Directories: mgmt command to send notices when renewal opens up, field on model to mark that notice was sent.

            commit fe8ae8a9d5b423f1045eba58d6a6672b35728475
            Merge: f7ec407 b79f5aa
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 16 15:51:10 2012 -0500

                Merge branch 'refs/heads/master' into directories_renewal

            commit f7ec4071c1cb49fe0b0a9dc97a5c1cd91d51ca36
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 9 16:39:03 2012 -0500

                Directories: add renewal notice to management.py and rename notice template folder.

            commit 74a5256090d751bb3ae59fbcd11966790fd8871f
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 9 16:37:17 2012 -0500

                Directories: add get_renew_url to directory model.

            commit b60473a43972bb8bfbd635dda99628604a2d793c
            Author: Alex <aragsdale@schipul.com>
            Date:   Tue Oct 9 16:36:58 2012 -0500

                Directories: add eligible for renewal notice templates.

            commit bda7d89280a438244472f507200939cd758e74cd
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 16:04:32 2012 -0500

                Directories: change text on renew template to reflect shorter form.

            commit db02012839f0016eafd0b887499e1ef2aaaff2c0
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 16:01:05 2012 -0500

                Directories: shorten up renew form a bit more.

            commit 3356b5830271577d2b6016832721c4923b0f3970
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 15:00:52 2012 -0500

                Directories: change title of renewed notice.

            commit 6b6cc5192db261cc0021a77a266a1557c2d73d5a
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 14:52:27 2012 -0500

                Directories: directory renewed notice.

            commit 80304684631814f662b73476b7656f34212564bc
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 14:04:55 2012 -0500

                Directories: remove logo handling from renew view.

            commit cabc2c31af13331d055cbdbf0fa524be1ede5228
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 13:27:28 2012 -0500

                Directories: use a shorter form for renewal.

            commit 0b66b7266d5f93828cf429fb2644caa8859c1339
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 13:09:34 2012 -0500

                Directories: don't show the renew form if not in renew window. Text to contact site admin instead.

            commit 3e3f987d18e81c5c6d6f3811c4100db7b3ba3732
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 13:09:15 2012 -0500

                Directories: show renew link in nav if renew window is open.

            commit 45e575b2b4ec1f89e8a1fe0269b1594d50c2d2e1
            Author: Alex <aragsdale@schipul.com>
            Date:   Fri Oct 5 12:32:02 2012 -0500

                Directories: use renewal requires approval setting in renew view.

            commit 134640eb10c34e00c0e65277989f3c59580a30cd
            Author: Alex <aragsdale@schipul.com>
            Date:   Thu Oct 4 16:33:24 2012 -0500

                Directories: renew_window method to determine whether or not a directory is eligible for renewal based on site setting.

            commit 03a4d38f0e08aa770d72183274a2d45211934765
            Author: Alex <aragsdale@schipul.com>
            Date:   Thu Oct 4 15:23:16 2012 -0500

                Directories: add settings for renewal requires approval and days before expiration to show renewal link.

            commit 6c28c2b1937377370a86da6b8bedf9dddd592da8
            Author: Alex <aragsdale@schipul.com>
            Date:   Thu Oct 4 15:16:49 2012 -0500

                Directories: add a setting for renewal requires approval.

            commit 8ef34c26ea655fa46482d865698dc7aa912d9930
            Author: Alex <aragsdale@schipul.com>
            Date:   Thu Oct 4 15:12:59 2012 -0500

                Directories: add template, url and view that updates expiration date for renewal.

            commit 9f6529b52abc1bd3a43d5894fe4ca5384527db48
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Thu Oct 4 10:05:08 2012 -0500

                Reactivating the REMOTE_DEPLOY_URL

            commit d8fb1f7c65d8a5a2af32b66b11b798c5da73108c
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Thu Oct 4 01:32:23 2012 -0500

                Comment out customize more templates, fix some javascript errors, and add a confirmation box on deleting a theme file.

            commit 3bc7fb4883e8c8ad97bb0ece07915f9d14393bf0
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Thu Oct 4 01:20:59 2012 -0500

                Handle the case where a theme file exists locally but not on S3.

            commit ae3adf22bdcadb91f08c6b0d177cb34748505028
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Thu Oct 4 01:08:58 2012 -0500

                Clear theme template file cache on save, and load theme file contents from S3 when using S3.

            commit ea868b9a110be3feef8c96974f95a4d9c5e3ca1b
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Thu Oct 4 00:46:40 2012 -0500

                Revert "Temporarily comment out the theme editor to continue testing."

                This reverts commit 9c4424fcb581bc1f80422c74a924addfcb1cced5.

            commit 5be6a35564b8aaa4ed5505f8c74e4fd5b464a6cc
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Thu Oct 4 00:46:29 2012 -0500

                Caching of theme template content to increase speed when reading templates from the theme editor.

            commit f5656d56e7ba6b91b9fbe65dddc3288ab10213c1
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Wed Oct 3 23:18:33 2012 -0500

                Temporarily comment out the theme editor to continue testing.

            commit 6d196d29453c310e0b66ec5ccbeb9b6321914a27
            Author: jmoswalt <jmoswalt@gmail.com>
            Date:   Wed Oct 3 15:01:26 2012 -0500

                Excluding description and header fields from displaying in the email.

            commit cb7df680ce54eb230f2d6af1b7ff19b6597f09c8
            Author: Sam Lee <sam@bixly.com>
            Date:   Thu Oct 4 22:32:46 2012 +0800

                import thread and status update

            commit 79185867dc5be9a3d2af634cbdae7ff93fb5ebbf
            Merge: 4957859 267c657
            Author: Sam Lee <sam@bixly.com>
            Date:   Thu Oct 4 06:08:33 2012 +0800

                meged conflicts

            commit 4957859a109d1e4d546bd22486d5d98931bf04a8
            Author: Sam Lee <sam@bixly.com>
            Date:   Thu Oct 4 05:32:25 2012 +0800

                event view fix, seems to require having a reg conf

            commit bd7eca9f0f29b813bc29219343bbc8679c76e79b
            Author: Sam Lee <sam@bixly.com>
            Date:   Thu Oct 4 04:25:16 2012 +0800

                events import

        commit 9e9a770ce111df362a1b75322b001d131bbd22c8
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 31 15:38:13 2012 -0500

            Squashed commit of the following:

            commit 7497d4aea5385e92a1293337440c33a0376365b5
            Author: Alex <aragsdale@schipul.com>
            Date:   Wed Oct 31 13:13:47 2012 -0500

                Membership Exports: Add memb_app fk field to export. Pass the membership app from memberships export form to the run_export_task and into the MembershipsExportTask.

            commit 550780dd5519468d07505d999bd617e877ff6032
            Author: Alex <aragsdale@schipul.com>
            Date:   Thu Oct 25 12:05:12 2012 -0500

                Move membership export to a task.

        commit 77d5953b756ba1cae873ee56e0af85b961f32f4b
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 31 15:15:45 2012 -0500

            Update news and articles search to not list "future" articles to anyone without explicit view_article or view_news permissions.

        commit 1d78cfe5bdbce79023d02ba53f8554ccf7ca7b48
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 31 09:52:10 2012 -0500

            Update invoice detail url in payment template.

        commit 9f82c441ae3c3b71c5d1df9a2953304b2da9be53
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 31 09:35:27 2012 -0500

            Fix issue with anon users on memberships applications.

        commit bbcdf5cc580a2884b48a8221ed910db47875aab3
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 31 08:50:18 2012 -0500

            Fix issue with membership application for anon users in certain instances.

        commit 6aace6c9920aa5018edd9fc69c91ebc152ecba85
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Tue Oct 30 17:33:21 2012 -0500

            Add proper ordering to the entry_fields

        commit ac7f2fcf89f690d98c628c4a51d16aa1d5ef2cec
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Tue Oct 30 17:27:29 2012 -0500

            Updating the ordering of the fields on a form submission detail page.

        commit ff89d9cba91e29a0812c1e9e22e773219c96811a
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Tue Oct 30 17:11:20 2012 -0500

            Updated the story delete to delete the story image first if it exists.

        commit 70cda34a113171c664149e1d4e0633441ea5abcc
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 30 16:39:33 2012 -0500

            Update notice token help text to note that tokens related to the membership record (member number, link, expire dt) are not available until approval.

        commit b793cbbd2b6ae801f8d488508563ff4f0ff79d7c
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 30 16:34:11 2012 -0500

            Take member number out of initial join auto response. Member number is not assigned until approval.

        commit a14bc777467b3bee89e5f4dfc4d0a7f821d696a6
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 30 12:22:56 2012 -0500

            Submit profile search form when show members checkbox input is changed.

        commit 61ed5eb4bfbeffb31c124b27ffda1559c54b6bd1
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 30 12:22:37 2012 -0500

            Change label for username column on membership import template.

        commit aad2abcb6636f96a7463c0eff51ad2fcbe083054
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Tue Oct 30 12:18:34 2012 -0500

            Updating permissions on membership import files.

        commit 69c65a9800ad49f59efb0c499e7c13065b0fe5b8
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Tue Oct 30 09:27:13 2012 -0500

            Memberships: Update index page to redirect to pending list or user search based on login.

        commit a8cd8047d0dacdf843de830322ef365e84811df1
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 30 09:07:48 2012 -0500

            Update imports in membership update protection mgmt command.

        commit ff8089d0304f99a22dbc00e456259b8a15f6f77c
        Author: Alex <aragsdale@schipul.com>
        Date:   Mon Oct 29 17:16:47 2012 -0500

            Fix import in refresh profile member numbers mgmt command.

        commit d8d605fd6f031deced6210965d6de09fba75f5e1
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Mon Oct 29 15:48:50 2012 -0500

            Trap payment_gross error for paypal fraud verification.

        commit 9161782b54749c91d23627abe85e7e1c8ae222a0
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Mon Oct 29 15:44:36 2012 -0500

            Added remove_migrations command.

        commit 0aceeb02276cd96da2d63dcbc28d4c4c730184e0
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Mon Oct 29 15:44:19 2012 -0500

            Update profile search to incorporate the membership search.

        commit ef0ccca5288b3ed3cbdf16912970e5c93f939397
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Mon Oct 29 13:38:33 2012 -0500

            Removing the Show Advanced Modules javascript.

        commit ef82652a7d79a360e19e1bc25a3c40133fb75bf9
        Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
        Date:   Mon Oct 29 13:46:10 2012 -0500

            Updated the membership import feature to call the 'membership_update_proection' management command.  This ensures that all membership records are using the security level specified with membership settings.

        commit 3d8ac16d2c7b8519b41eaf936ca043c4051d6603
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Mon Oct 29 12:27:09 2012 -0500

            Minor update on newsletter generator page.

        commit 752ca9482aabcec155ef59678237600f3da0e2fd
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Mon Oct 29 12:25:46 2012 -0500

            Removed the Show Advanced Modules.

        commit 9b19469154b98294f5c231eff5ecf1eecfaecd95
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Mon Oct 29 08:46:14 2012 -0500

            Admin top menu replace the link to campaign monitor with the one to newsletter generator.

        commit 7df805836274376a9a6e49ab5f1e178389f73fe2
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Sun Oct 28 12:22:34 2012 -0500

            A newsletter generator page to list third-party newsletter providers

        commit 6d7c4ed6b0eaa6b7bf21d77921be1c2005d5bf3a
        Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
        Date:   Sun Oct 28 20:34:53 2012 -0500

            Created a link that allows you to export active and expired memberships from the separate report pages.

        commit 4549af2386c43ea4305b451908eec134596d9c0d
        Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
        Date:   Sun Oct 28 20:34:04 2012 -0500

            Updated method that renders cdv response.

        commit 312d553e8bcc39481df4fd882a1461534b84a033
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 26 21:23:19 2012 -0500

            Trap photo errors caused by non-existent images.

        commit 96d52161828e105cd0ffc19fca95f9a5117a0076
        Author: Alex <aragsdale@schipul.com>
        Date:   Fri Oct 26 10:33:09 2012 -0500

            News: add a "remove photo" checkbox on the news form if there is already a thumbnail.

        commit 4b5af31d58de39c7be334464015cc73c0369306c
        Merge: 582fa86 10c880c
        Author: Alex <aragsdale@schipul.com>
        Date:   Fri Oct 26 08:56:59 2012 -0500

            Merge branch 'refs/heads/380_recurring_payment_for_anonymous'

        commit 582fa86f4eeb8e7ba0c8bc506b295bf4109007c1
        Author: Alex <aragsdale@schipul.com>
        Date:   Thu Oct 25 16:28:07 2012 -0500

            Use reports.css for users not in groups report.

        commit 23eab612e91f140496bd8f7974d4c33f768cdb03
        Author: Alex <aragsdale@schipul.com>
        Date:   Thu Oct 25 15:28:59 2012 -0500

            Files: return nicer file names on download if the basename ends with the extension.

        commit bfa0186dd01ba670498ae4060bae07c14a7bf81f
        Author: Alex <aragsdale@schipul.com>
        Date:   Thu Oct 25 10:04:37 2012 -0500

            Files delete method: Roll back the transaction to fix the postgres error "current transaction is aborted, commands ignored until end of transaction block".

        commit 55cbda5beaec1fa60751aa43a42370e37fcd853f
        Author: Alex <aragsdale@schipul.com>
        Date:   Thu Oct 25 09:38:20 2012 -0500

            Remove django debug toolbar from setup and settings.

        commit 6075e6a99a883fc5ab7d4aec0951f73f349eea2b
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Thu Oct 25 08:50:36 2012 -0500

            Fix typo of news.image to news.thumbnail

        commit 49e4d77a2ddb5e9b689db8c254a6dcfe82f3b22c
        Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
        Date:   Wed Oct 24 18:09:55 2012 -0500

            Updated the files import task to not include the media root when downloading the import file.

        commit 14f623670bd7c29fd9b3c9e4d867b7d22007b4c7
        Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
        Date:   Wed Oct 24 16:09:01 2012 -0500

            Reverted back to old working versions of the celery package and django-celery package.

        commit 4b559011e606dc004fb0271b1ff352aed8f7e619
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Wed Oct 24 11:13:47 2012 -0500

            Adding ordering to user_groups. Pep8 of the model.

        commit 4fd0d90cfe4dd92afcc7ffeb989b223ed5ade73c
        Author: Sam Lee <sam@bixly.com>
        Date:   Wed Oct 24 23:44:33 2012 +0800

            debug toolbar for optimization.

        commit e1ae4986c6391f4b70de193e9345a2b3548f63c4
        Author: Alex <aragsdale@schipul.com>
        Date:   Wed Oct 24 09:25:42 2012 -0500

            Profiles: filter on status=True and status_detail=active on profiles search.

        commit dd8daa66d3b25ee6945406828d3261b7ec7175d2
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Tue Oct 23 16:10:41 2012 -0500

            Removing the edit link on membership entries page.

        commit 7231f8ceccf36943c70043562dd61f510ec91417
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Tue Oct 23 13:04:29 2012 -0500

            Update the thumbnail filter to fix errors when using external storages.

        commit 144dd316d7a9c7122ceb7b0a9d660d7806afd1f1
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Tue Oct 23 11:48:49 2012 -0500

            Update set_s3_file_permission to print out the file if doesn't  exist.

        commit 29263d6cbe462242c694f311fd4ecd9fcf650bd0
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 23 12:16:50 2012 -0500

            Users not in groups report. Added to admin menu under Reports.

        commit 9c1c6f62aa8f429dc1022ee49ddc4d13c4cbd46d
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Wed Oct 10 17:09:27 2012 +0800

            added error message for wrong file type in corporate membership import

        commit 0195a0c656f6da70206c79bfc5f39510eaf8c30c
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Thu Oct 4 16:01:49 2012 +0800

            updated form to default check renew all individuals for free memberships

        commit 10c880c83543b247d6a6dd92b8c9e7a5932cda6a
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 23 09:16:39 2012 -0500

            WP Import/Export: Add user emails to messages to let users know where they will receive notifications.

        commit 39765ee676b1b41542f29ada3bc2c27a0d10b87a
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 13:18:57 2012 +0800

            fixes

        commit 29cf0305ab85042a97c2bf8ff00a2a89d5ae3719
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 13:05:11 2012 +0800

            added fix for importing articles

        commit 115eed2cf48f3f1f50da836a33cb4f4346873064
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 11:27:55 2012 +0800

            added notification for wp export

        commit 3feb47dc0aa2e306a704f7cbcdd31fa1f394aa31
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 21:53:42 2012 +0800

            finished email notification for wp import

        commit 9879bcd7e87393b241f1594f5faff7dea820e2d3
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 15:01:18 2012 +0800

            removed added noticetype for wp import

        commit 856e35ff06c67b4adcef5e4316b1c52ace98666e
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 11:09:00 2012 +0800

            started work on notifications for wp import

        commit e20a55ad0a046662f1488d3ce760a36cfc795926
        Merge: 9b8ab2e 9e6dc8b
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 23 09:20:52 2012 -0500

            Merge branch 'refs/heads/369_notifications_for_wp_import_export'

        commit 9e6dc8bfde82d27b1c6dc01c73f48a4eff06ecc0
        Author: Alex <aragsdale@schipul.com>
        Date:   Tue Oct 23 09:16:39 2012 -0500

            WP Import/Export: Add user emails to messages to let users know where they will receive notifications.

        commit 97966fc76f73110fc1a62e76838cfbe29e057fa7
        Merge: 79931a3 9b8ab2e
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Tue Oct 23 15:11:59 2012 +0800

            Merge branch 'master' into 380_recurring_payment_for_anonymous

        commit 79931a39d2fe100c096742871e9fde7218193d34
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Tue Oct 23 15:10:26 2012 +0800

            required log in for forms with recurring payments

        commit 9b8ab2e79ec70f50a52ea7cb01dcb0292eb73b5f
        Author: Alex <aragsdale@schipul.com>
        Date:   Mon Oct 22 17:37:52 2012 -0500

            News: add thumbnail image field, update forms, views, save method and add and edit templates accordingly.

        commit c9352a436e8e3ffe995e5736ca9a80899ea48c82
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Mon Oct 22 08:53:06 2012 -0500

            Adding the license for django-forms-builder to our forms_builder app.

            Fixes #309

        commit ea8c2a5915c00cf3bb035c15146221c08427659a
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 19 17:49:05 2012 -0500

            Minor update to the set_media_files_perms.

        commit 6f9ea0534102dbe3fe989843af3a1b4e1d098ef6
        Merge: f669ef2 c417642
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 19 17:16:23 2012 -0500

            Merge branch 'master' of github.com:tendenci/tendenci

        commit f669ef27a31bccd91d68e3a5611f5392dbf6bcb5
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 19 17:16:14 2012 -0500

            Management command to set permissions for media files on S3.

        commit c417642a0f764bc20de2176dec0c61cc7ba28274
        Author: Alex <aragsdale@schipul.com>
        Date:   Fri Oct 19 16:19:52 2012 -0500

            Campaign Monitor: set S3 file permissions for template files when a template is saved.

        commit 8e2d155b8594b8630f602b18de79d1b440c50e5a
        Author: Sam Lee <sam@bixly.com>
        Date:   Fri Oct 12 20:35:33 2012 +0800

            Updated corporate membership roster. Fixed corporate membership bugs.

        commit b62f1aec41fee1c40d31879cc34ca6b82847f3af
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 19 04:05:15 2012 +0800

            added fix in redirect to add pricing

        commit 8564a879dcd8a6af33caceff312ded9d97545c40
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Thu Oct 18 10:41:24 2012 +0800

            added redirect to add directory pricing

        commit 0051f115d39b49a04fcf0a98db85debd4751eead
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 19 12:39:15 2012 -0500

            Roll back the transaction to fix the error for postgres "current transaction is aborted, commands ignored until end of transaction block"

        commit 4faea4e411fa5b9c4bd48b5f35097d4a6f6174e8
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Fri Oct 19 11:15:24 2012 -0500

            Events: Updating the way event limit is pulled.

        commit a39c351278470058afe0026fe9ff67ead2aea012
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Fri Oct 19 11:01:27 2012 -0500

            Only add an event limit if there is a registration_configuration for that event.

        commit 25d1bd7e0a518401376ec92f8d9e077b936071b4
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 19 10:44:17 2012 -0500

            Set file pointer to the beginning of the file before save.

        commit 9e7c5bc600b2f695a28e3c5c36857b8cdcb01791
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Fri Oct 19 10:33:23 2012 -0500

            Updating the version of the createsend api.

        commit 58ff576db2fe8efaad5bb3f756121221ddf4ad49
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Fri Oct 19 09:03:50 2012 -0500

            Remove notifications 0001_initial from south_0001.json.

            Notifications was renamed from notification in 5.1 but not in 5.0. So, there is no need to fake it during the database migration from 5.0.

        commit 65bbf4e7d39d1997ac1e6a4185ccb518dd07ba8c
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Thu Oct 18 16:56:34 2012 -0500

            Removed the test code.

        commit 02305df2da422d21a221c81ab63f53b455d2525c
        Author: Jenny Qian <jqian@schipul.com>
        Date:   Thu Oct 18 15:32:50 2012 -0500

            Check and download files from t4 based on the info in the table mig_files_file_t4_to_t5.

        commit bb422aec425b78adfd1cd1a650c72f25ac635d2b
        Author: dharol <dharol@gmail.com>
        Date:   Thu Oct 18 11:26:40 2012 -0500

             Various fixes in memberships & entities

        commit 4638bd1ebdcef00267cca24372088b5b08dc6f78
        Author: dharol <dharol@gmail.com>
        Date:   Thu Oct 18 11:00:53 2012 -0500

            Revert "Added event logging to tendenci core"

            This reverts commit 608a7c851f50422c2977bf1cb1f97aaaf34a8a18.

        commit 80f4b3dc29d51d84159cbfd321e392e9d392f8cd
        Author: dharol <dharol@gmail.com>
        Date:   Wed Sep 26 11:40:36 2012 -0500

            Added event logging to tendenci core

        commit 1abc1c2e3d873f07617b3c89413b0c9f5461b220
        Author: dharol <dharol@gmail.com>
        Date:   Wed Oct 17 15:22:39 2012 -0500

            Added try clause to event_logs/managers to accept local ip

        commit 4506030454ce4a961de59eec0ab3468170249c6d
        Author: Alex <aragsdale@schipul.com>
        Date:   Thu Oct 18 10:57:43 2012 -0500

            Directories: user-friendly __unicode__ method for DirectoryPricing.

        commit 60e175f9f0a4771a92f349d8c80d25ed99f1863f
        Author: jmoswalt <jmoswalt@gmail.com>
        Date:   Thu Oct 18 09:30:12 2012 -0500

            Update location of custom widgets in memberships applications.

        commit bda9267fdd4b743d436923c57354edf565d434c1
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 13:18:57 2012 +0800

            fixes

        commit b6d20a3ae34ecdd079fd5493be5712fd9f5453c6
        Merge: 3084dfc a9978c6
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 13:10:12 2012 +0800

            Merge branch 'master' into 369_notifications_for_wp_import_export

        commit 3084dfc029c8cc857f6921671bd64c420ea391cc
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 13:05:11 2012 +0800

            added fix for importing articles

        commit b93f0aad1c0388de7caa72882f971ced6fc6df2f
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Mon Oct 15 11:27:55 2012 +0800

            added notification for wp export

        commit 21eb4a68f4ee1f5bacdbbd02ae5f39ff5ff83ade
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 21:53:42 2012 +0800

            finished email notification for wp import

        commit 8bcba7eb237485e922db5b94a9d79474106e2fa0
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 15:01:18 2012 +0800

            removed added noticetype for wp import

        commit 8db2bb52333c892343faafee5c2081fb8f7b7b3b
        Merge: 8a76d3c b5a8ca0
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 11:23:34 2012 +0800

            Merge branch 'master' into 369_notifications_for_wp_import_export

        commit 8a76d3c1db93ba573aeb59b44ff776b995193847
        Author: John Eddie Ayson <je@bixly.com>
        Date:   Fri Oct 12 11:09:00 2012 +0800

            started work on notifications for wp import

    commit 2eee19785bf37982ca0b7fbff9b6152b7bc13e41
    Author: Sam Lee <sam@bixly.com>
    Date:   Tue Oct 23 23:18:16 2012 +0800

        subprocess for import events, failure reason saved

    commit c0d79403656f22cb8cc0f3425440b5193aa6c141
    Merge: 6bef4a8 ceabc1a
    Author: Sam Lee <sam@bixly.com>
    Date:   Fri Oct 19 05:04:31 2012 +0800

        merged conflicts

    commit 6bef4a83819461e53065dd03e6ffcf1e7d0e7f56
    Author: Sam Lee <sam@bixly.com>
    Date:   Fri Oct 19 04:56:57 2012 +0800

        import preview update

    commit 11bcbccebc2e36b577875a31b0bfd284358622c9
    Author: Sam Lee <sam@bixly.com>
    Date:   Fri Oct 19 04:19:44 2012 +0800

        fix field value matching in do event import

    commit d52b3f2f9c7e4d8a66d8964c95559d3267b61400
    Merge: cb7df68 6a15709
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Oct 15 15:29:58 2012 -0500

        Merge branch 'refs/heads/master' into 357_events_import

        Conflicts:
        	tendenci/addons/events/forms.py
        	tendenci/addons/events/views.py

    commit cb7df680ce54eb230f2d6af1b7ff19b6597f09c8
    Author: Sam Lee <sam@bixly.com>
    Date:   Thu Oct 4 22:32:46 2012 +0800

        import thread and status update

    commit 79185867dc5be9a3d2af634cbdae7ff93fb5ebbf
    Merge: 4957859 267c657
    Author: Sam Lee <sam@bixly.com>
    Date:   Thu Oct 4 06:08:33 2012 +0800

        meged conflicts

    commit 4957859a109d1e4d546bd22486d5d98931bf04a8
    Author: Sam Lee <sam@bixly.com>
    Date:   Thu Oct 4 05:32:25 2012 +0800

        event view fix, seems to require having a reg conf

    commit bd7eca9f0f29b813bc29219343bbc8679c76e79b
    Author: Sam Lee <sam@bixly.com>
    Date:   Thu Oct 4 04:25:16 2012 +0800

        events import

commit 5c200e2844f126c90a2e544536c774df72f4fb40
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 6 14:38:40 2012 -0600

    Updated the event log link in profiles to show all event logs for the user.

commit b0d262776a7dc8a122b3f7b1da52ff3c54bc2587
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 16:46:10 2012 -0600

    Removing extra drop down "event_id"

commit ff9f5ff681df423f630a67ce47acb0503268a3ec
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 16:45:36 2012 -0600

    Merge 375_invoice_reports

    commit 609a78d5ed99ee61685d3564214290d7b22bd567
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Nov 7 14:37:04 2012 +0800

        changed invoice type to be dynamic

    commit 2ea9249fe615f1b35cd68dc2371da1b1327ffb76
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Fri Nov 2 20:38:27 2012 +0800

        added fix

    commit 5b9d2cf64dec129b21acdc2178d512341df0c092
    Merge: 720dfab 70cda34
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 30 17:15:30 2012 -0500

        Merge branch 'refs/heads/master' into 375_invoice_reports

        Conflicts:
        	tendenci/addons/events/views.py
        	tendenci/addons/photos/models.py
        	tendenci/addons/photos/views.py
        	tendenci/templates/top_menu/admin_top.html

    commit 720dfaba3b95abbaf8a57fc6994ab4d7af46d4b0
    Author: Sam Lee <sam@bixly.com>
    Date:   Tue Oct 23 17:08:59 2012 +0800

        Updated invoice search interface.

    commit 4517451e2a20173940fba2ca2e9ab7a09fdd6a7f
    Author: Sam Lee <sam@bixly.com>
    Date:   Mon Oct 22 21:16:21 2012 +0800

        Additional search filters for invoices.

    commit 4d92f09d5db0b07640a032a61ab16f56a472d728
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 19:04:35 2012 -0500

        Add safe to the NEW_RELIC_HEADER and FOOTER since they are javascript.

    commit 2d76e98bdbf35faf674774f1f47cd01d3bc4fe28
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 18:58:46 2012 -0500

        Adding support for new relic browser timing code since it appears our theme_extends prevents this from automatically working.

    commit 9bae0302abe48607e534b22d8aca313443df14e8
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 17:56:22 2012 -0500

        Updated cache_photos management command to use new caching util.

    commit 9c8ea818d89468cc4f176fc12d57a78bd392696a
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 17 17:33:48 2012 -0500

        Invoice address update to have address2 appended for make_payment.

    commit b9b4695f5aa192d49dd5b7cb02e50d32bfbf553c
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 16:08:22 2012 -0500

        Update photos bulk edit to cache photo sizes for edit and default display pages in the background as they are uploaded.

    commit a367ad6e4cf12b50fd09601753d782b475eb7671
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 16:01:37 2012 -0500

        Updating versioning and pages version url.

    commit 1f6f97c3f3ee2ebbfe9ae89569aaa29427002004
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 11:37:51 2012 -0500

        Add photo caching to speed up photo batch edits and photo set page rendering.

    commit 381fbcb747ffda82c2caadf67d0186e64de641b1
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 17 11:36:34 2012 -0500

        Set a default height or width if it is 0.

    commit 0fc4c0f87b99cee175229ca4368cd8da3e782678
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Wed Oct 17 10:22:47 2012 -0500

        Catch the socket.gaierror exception.

    commit 899b45231f3984950a135eb35da9d5ceb07fa8db
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 17 10:01:11 2012 -0500

        Change plugins to addons in user menu.

    commit 25ba06c2a303e4fd9c5c06e917ee66e5ff8ed6ea
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 15:35:01 2012 -0500

        Adding a management command to cache all images.

    commit d5c245ca9f667782d3b7d04449ed81ebc88f3661
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 14:25:22 2012 -0500

        Updating url references to invoice view.

    commit a97d24a13cd2ea215c336db41f27d621b14d8088
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 14:24:56 2012 -0500

        Updating the url reference to paying online.

    commit 831aab463a24608d7409a4a15c9e550494d56bb4
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 14:22:21 2012 -0500

        Default display attendees to admin only.

    commit 5aa35035c63bb6faa12ae10a6f52b8cdfe3a4874
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 12:29:45 2012 -0500

        Remove campaign monitor task that we're not using.

    commit 7b18506374d629c20eca6a63085094c8aa113b9b
    Author: Sam Lee <sam@bixly.com>
    Date:   Fri Oct 5 20:12:34 2012 +0800

        Moved ics to events.

    commit 85e9fe8622d27fbd29e728153fef684dacc46f95
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 2 20:49:11 2012 +0800

        removed top bar on print view

    commit 39eb2fc5903523fac9b055f73d19e43830279933
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Mon Oct 15 16:39:57 2012 +0800

        updated my jobs page

    commit 802e157b68571da182d8b7e224504b00aa0ee8fa
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 09:52:48 2012 -0500

        Small fix to language on event attendees template.

    commit 8da45329a4479d7fa87db8475fd26039ee7be85b
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Oct 16 09:44:44 2012 -0500

        Adding the license file (GPL3) for the project.

    commit 9db82138d2019d94013e4d717f3af2540969d3c8
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 09:42:35 2012 -0500

        Show "anonymous" as name if no registrant name provided on event attendees page.

    commit 0164091e1a9de717b49b0cf77618f3fc327caa75
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 09:35:43 2012 -0500

        Switch first name and last name on event attendees page.

    commit a607657798b3387a24fef2ac704ef8469372cfc7
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 09:20:35 2012 -0500

        Change template name to top spenders as well.

    commit 7e3d8beae55a0f6e63669ab4c7eda98b86f4317c
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Oct 16 09:14:22 2012 -0500

        Change name of expenses per user view and URL to top spenders. Add link in invoices nav.

    commit 9f7a99bd4fa397a4b95d1755a7e7e0fdcb9ae0fb
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 16 17:19:20 2012 +0800

        updated attendees page, and event add/edit form

    commit 6e757d872b2e56d7d46f95cf73e9d3649c1acb43
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 16 08:24:53 2012 +0800

        edited name for multi select checkbox, and reordered the options

    commit c27881dbf024569e62c8958fe164e7b4a1df70ca
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 16 08:00:03 2012 +0800

        changed from Expenses per User to Top Spenders

    commit 69b029ca9a3d11c0e310960ad26ce289f72ab890
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Thu Oct 4 00:46:40 2012 -0500

        Revert "Temporarily comment out the theme editor to continue testing."

        This reverts commit 9c4424fcb581bc1f80422c74a924addfcb1cced5.

    commit d331b4ee288705f71b489df0c4f959a8e7053c63
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Wed Oct 3 23:18:33 2012 -0500

        Temporarily comment out the theme editor to continue testing.

    commit 325f822e48fdd74935425e01fa15e2b032ad2993
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 15 14:42:31 2012 -0500

        Handle &amp; in the file name.

    commit f9ddd4870cdba9fd9020c2bf889beec7aee48d9e
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 15 13:06:12 2012 -0500

        Handle speakers without associated events.

    commit ae2105ace216a8feeb9c9dd77f279006a605f977
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 2 21:09:51 2012 +0800

        removed most viewed from sort options

    commit 03b150c9b923e825c39a26c273a3f554735c5b60
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 2 04:42:45 2012 +0800

        advanced search sort control

    commit 7175dbf0b069b4553cd1fecda38f1d78ce82e8ae
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 15 12:28:08 2012 -0500

        Added more extensions.

    commit 767127fd07557f338467faeff11c7f913dd2de78
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 15 12:05:33 2012 -0500

        Print out the broken links.

    commit d1239a978bf81894bc013aa8b71c4e003f87f6c6
    Author: Jenny Qian <jqian@schipul.com>
    Date:   Mon Oct 15 11:12:46 2012 -0500

        More media extensions.

    commit 5c35cd84b608d861cea628da7310587d88fd6042
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Oct 9 21:28:50 2012 +0800

        added an option to view attendees per event

    commit 356b50303297d3c4802a4bc24cd2ed5ecd90bc14
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Oct 4 19:10:10 2012 +0800

        updated to look for invoices by creator, owner or bill_to_email address

    commit 460115db0493e08ea271980aef675512ce7a0ef7
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Oct 3 21:33:20 2012 +0800

        used display name for profile detail and search page

    commit 49424ce87aefc5521c6cb6a00e022ae24bd0bb29
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Mon Oct 1 21:17:37 2012 +0800

        added multi-select checkboxes as a field type for custom forms

    commit 9f61af13f76feba8231b2532e4d37b654c8ccd98
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Sep 27 07:59:34 2012 +0800

        top 20 expenses per user report

    commit 19b0e5b04f6c58789689aa0fb74fac24b4a7a1cf
    Author: Sam Lee <sam@bixly.com>
    Date:   Mon Oct 15 17:05:00 2012 +0800

        Fixed corp mem view url in invoice search result.

commit fdea295891281e01cbb1e33cd449a6802d0d62c1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 5 15:47:11 2012 -0600

    Pull tendenci-videos from a different source.

commit 99d87556beea4aeabb4fd0405348d1c3961d3ed2
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 12:38:36 2012 -0600

    Updated the contact form to create users without a password using native Django methods.

commit d0bb844284f31d3cc064980eb5d241cfaa000331
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 11:32:37 2012 -0600

    Merge 385_auth_user_for_contacts

commit 08a0fbf6e7175f0321407debee6253002c21a8f9
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 5 11:25:45 2012 -0600

    Adding version number for tendenci in project_template requirements.

commit a50058c591ec11b208e40ee1c003ae0f5b8d017b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 5 11:06:50 2012 -0600

    Removing videos version number in requirements.

commit 394d1a05d6dc544be829cf194ff5bf205c890e57
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 5 10:50:53 2012 -0600

    Setting up different requirements structure in the project_template. Adding a default app and setting up local_settings and local_urls.

commit e8c3338cf8b4208dddb5cf61c2a253832a8c24a3
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 5 09:45:25 2012 -0600

    Updated the gitignore files in the project and the project template. Added example local_setting and local_urls files to the project_template.

commit 5be7c8b193fb9aa2385f7acbc3d5cdec203114dd
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 5 09:44:34 2012 -0600

    Remove videos from the project_template.

commit 8d91ebf3256faffa69c45c51d9024a2377b515ec
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 10:34:12 2012 -0600

    Added state field to event preset list feature.

commit 95bed5c35527c0416d9d8a60db6dfbedb792e175
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 09:56:08 2012 -0600

    PEP8 events/forms.py

commit f45991f90921e484e3f43d06fd17245455e7f266
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 5 09:51:40 2012 -0600

    Merged 387_preset_list_of_locations

    commit 7a8e7cdd3cec2a2aab467c38b2d43e06221eb01c
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Nov 1 20:16:18 2012 +0800

        added a fix to add new locations when no given place is chosen

    commit f86f44f50413ab8fc964c4033e8214463b413ac5
    Merge: 9f400e6 70cda34
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Oct 31 09:10:35 2012 -0500

        Merge branch 'refs/heads/master' into 387_preset_list_of_locations

    commit 9f400e63e3737f9303c79525038e72273037a502
    Author: Sam Lee <sam@bixly.com>
    Date:   Fri Oct 26 21:39:21 2012 +0800

        Updated preset list o columns. Handle different cases of saving places.

    commit b0438ac9045645afcccd49e4e651709154eab1d7
    Author: Sam Lee <sam@bixly.com>
    Date:   Thu Oct 25 22:38:04 2012 +0800

        Autofill of location fields from dropdown field.

commit 35dc01e7af2e75ad16985a8c3d6c0d2fb5782c2a
Author: Alex <aragsdale@schipul.com>
Date:   Wed Dec 5 10:18:51 2012 -0600

    Remove auto respond template field from user group model and forms.

commit ae66201e83fc7c8133e84790954486363758518f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 4 17:49:36 2012 -0600

    Merged new-relic-search branch

    commit df4452fc822c51d254388573b5616e6127e50b51
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Nov 27 11:21:37 2012 -0600

        Remove __name__ on SearchView.

commit c5bbc55c415116076f5f43dd47960fbc94cedbe5
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Dec 4 17:03:26 2012 -0600

    Squashed commit of the following: Added create-tendenci-project command with install instructions.

    commit c9c13c991c623799f89e5bdaa806a93b9cd3f3fc
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Dec 4 16:59:29 2012 -0600

        Updated the install instructions with the new install script.

    commit 9125cf78b7cda1701b8b704185ec782601d9c3f2
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Dec 4 15:53:57 2012 -0600

        Update writing out site settings and the initial site theme.

    commit b7ff77a2b454b565d01c9c9a9cd958c615c0cd34
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Dec 4 15:28:24 2012 -0600

        Additional updates to the create-tendenci-project command line tool.

    commit 62d2ebdaa2e67ee09db3b25645a471dddd286ac7
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Dec 4 14:22:34 2012 -0600

        Geraldo update. Move over requirements.txt.

    commit 8a7231f383c2dfb2da1e955035ede0f98b1e902c
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Dec 4 10:33:32 2012 -0600

        Updating version numbers and removing some file patterns from the standard exclude.

    commit b12064ebeffc8a11ec01eea146e3ae102777520f
    Author: jmoswalt <jmoswalt@gmail.com>
    Date:   Tue Dec 4 09:55:25 2012 -0600

        Adding a console script to install the tendenci-site django project files

commit 7354f40cdcbdbfdf09aae48293193a4096340181
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 4 16:33:43 2012 -0600

    Merged 397_void_a_payment

    commit 005e87bff1ceffbb9d0e988e5c2ce9dbd6228ee7
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Nov 8 09:54:39 2012 -0600

        Invoices: update text on voided message.

    commit 34e5d7bc914340235207639c8df6040061831248
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Nov 8 18:59:31 2012 +0800

        updated void payment function to change payment status to void

    commit 580032b2b95339abed7dd31628b81bc935070b19
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Nov 7 20:07:12 2012 +0800

        added a void a payment button in invoices page

commit 4ee9285aee7e3f0fd9e86635a1274ffa69979f40
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 4 15:31:33 2012 -0600

    Merging 413_event_types_in_admin branch

    commit a76263f80bdd4aff6b29f992cf28e0d42194ee89
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Thu Nov 22 08:40:00 2012 +0800

        changed reassign link

    commit 92330475e899e1e2e4c1127b6a77f5b679ba6bdf
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Nov 21 19:02:36 2012 +0800

        added event types in admin

commit f1c56aedad1dbad67e608d7ac4f5b4dc34d3f912
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Tue Dec 4 14:37:01 2012 -0600

    Merging model-report

    commit 662213177eb52b8ccefed009b7354330a5118635
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Nov 26 11:43:27 2012 -0600

        Add pisa and html5lib to setup for django-model-report.

    commit c9a169464273e96b69f92684d4c7158679f74dc2
    Merge: 51728bb 27d7a13
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Nov 26 09:36:07 2012 -0600

        Merge branch 'refs/heads/master' into model-report

    commit 51728bbf34fe84de28d6de4226bf8dc91c4694bd
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Nov 16 11:43:46 2012 -0600

        Add report totals.

    commit aa8fad3e8dce0aeffb581d6bc304330c96f41360
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Nov 16 11:29:40 2012 -0600

        Up django-model-report version.

    commit 7d5278dabd6733ed6871484b11303bfea2568d81
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Nov 16 10:54:38 2012 -0600

        Move some formatting functions into the model report utils and out of the invoice report file.

    commit 401283987e324d2c0579d4048ed811c50a274000
    Author: Alex <aragsdale@schipul.com>
    Date:   Fri Nov 16 10:31:24 2012 -0600

        Update format functions to work with latest version. Add group totals.

    commit 4abc5d16a985a118a0bc95ec05d75c70ea590321
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Nov 14 16:04:58 2012 -0600

        Remove report totals for now.

    commit 43ab8d3d06725aff303432dc963137127ea56c85
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Nov 14 14:29:37 2012 -0600

        Change list order by.

    commit 2d7cb19f05d02c4d51e7714b196f0662ee541f37
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Nov 14 12:35:43 2012 -0600

        Change the object type format and add more total columns.

    commit 5575108b1604a95186ca3145647d3bd76ccc759f
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Nov 13 16:54:05 2012 -0600

        Format dates and currency better.

    commit 2a2b41be4841b5ec8382a67ba84fb90c1f2ff32d
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Nov 13 16:00:57 2012 -0600

        Remove title and add id. Format object type and id nicely.

    commit a55df817fa7781e76de1aec8ecc3601ad62dcf3c
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Nov 13 10:36:12 2012 -0600

        Update to title comment.

    commit 7642e40038d514ffcbcd147de520b17e612690a8
    Author: Alex <aragsdale@schipul.com>
    Date:   Tue Nov 13 10:35:35 2012 -0600

        Added more options to invoices report with comments.

    commit a69a16eeb5759c32237bf1cbab1b457f6dd8ae9b
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Nov 12 17:12:26 2012 -0600

        Create basic invoices/reports.py.

    commit bd35b7876b9124e0c8ac6fd416187e9070d1e428
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Nov 12 17:12:12 2012 -0600

        Add model report to settings and urls.

    commit c92ce5b97a880992762ef8a56e6bde1f356e3d62
    Author: Alex <aragsdale@schipul.com>
    Date:   Mon Nov 12 17:11:54 2012 -0600

        Add tendenci fork of django-model-report to setup.py.

commit 2e893b358289d678f7c139e0333aa27c76aef7a6
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Dec 3 14:50:02 2012 -0600

    Squashed commit of the following:

    commit c5eef94b78e0f374b6cd662979aa49470a9afc80
    Author: Alex <aragsdale@schipul.com>
    Date:   Wed Nov 14 16:51:20 2012 -0600

        Change progress bar color.

    commit 317f3bb937397adb21ec7d1711a4c7142fc0997e
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Wed Nov 14 17:11:51 2012 +0800

        fixes to progress bar and ordering of images

    commit 8b282143f00ac9d9350c4fefc9339ec979579473
    Merge: 6da90ad 55afd49
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Nov 13 17:50:54 2012 +0800

        Merge branch 'master' into 398_progress_bar_in_bulk_edit

    commit 6da90ad39ceaf055a51274dd676647b8fb50e23b
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Tue Nov 13 17:49:13 2012 +0800

        added progress bar to photo batch edit

commit 53d564b9c221b499fa9440acd08fc88f204863b3
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Nov 30 15:08:37 2012 -0600

    Fixed the broken images on invoice search.

    The links were broken because it couldn't resolve the STATUS_URL without the context.

commit 61580453476116749c9b9ee2e3abaab1f7747916
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Nov 30 15:04:27 2012 -0600

    Updated the way the invoice is tendered when it is created.

    Instead of simply assigning tendered to the invoice status_detail, we use the function tender() which takes care of accounting entries and other invoice fields.

commit 82a5b93af2c30f575891c53f6c4f40c2264dca1e
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Nov 30 10:40:00 2012 -0600

    Changed payment_gross to mc_gross when verify with PayPal. Looks like the payment_gross is no longer posted from PayPal.

commit abac343c7cbf60c1f26bc3ce1bb56c522be8d90b
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Nov 30 05:06:37 2012 +0800

    added fix for recent actions bug

commit c96983ef00e48983dcf839183fd2460bf4044c41
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Nov 28 16:53:27 2012 -0600

    Updating initial PK's to prevent insert errors in the future.

commit 2cb7982870970eb2c772028a1573fceb874238b1
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Nov 28 15:49:52 2012 -0600

    Update to redirects to truncate url when recording a 404.

commit af1fb3ec955d85d75d3ceb10b7d3aca3d3f85797
Author: Alex <aragsdale@schipul.com>
Date:   Wed Nov 28 13:25:02 2012 -0600

    Update form field inline ordering for td class names "field-fieldname".

commit 48163dcc5b4681af638fd63d2a19a4adf8c4190c
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Nov 28 12:05:37 2012 -0600

    Adding tendenci version number to the Admin menu.

commit bb20ec19c06acbbcb5fd95f09ba3a73fb2a0780c
Author: Alex <aragsdale@schipul.com>
Date:   Wed Nov 28 11:51:39 2012 -0600

    Fix typos in es message file.

commit 44308917b4b534c2ed36b35d7cc2d5e0e6e9ff10
Author: Alex <aragsdale@schipul.com>
Date:   Wed Nov 28 11:37:39 2012 -0600

    Add en message file.

commit 0dc6a910916fe4bab74ccfa293deb8542de41bb7
Author: Alex <aragsdale@schipul.com>
Date:   Wed Nov 28 11:37:26 2012 -0600

    Updates to es message file.

commit 3b3f83db7e19d4ab1fef20a0757b3217d9ba4c7b
Author: Alex <aragsdale@schipul.com>
Date:   Tue Nov 27 16:11:37 2012 -0600

    Add fr folder to locale.

commit c6e375254651a64df3eedb5e7b448cd912d6a8ff
Author: Alex <aragsdale@schipul.com>
Date:   Tue Nov 27 09:03:08 2012 -0600

    Updated es message file.

commit 00f91ba2689986c920d94211e27d17db0faeed8b
Author: Alex <aragsdale@schipul.com>
Date:   Tue Nov 27 09:01:34 2012 -0600

    Update event formsets to avoid warnings when generating message files.

commit bdba22b6d71a6a39158802204d41145494e540ff
Author: John Eddie Ayson <je@bixly.com>
Date:   Thu Dec 6 18:22:11 2012 +0800

    added email to recipients functionality to checkboxes and lists

commit 661ac8ff3948eec3b269930534f834acdb79cfcf
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Nov 28 14:20:11 2012 +0800

    added field for different recipients based on form values