Squashed commit of the following: Merging in master

commit d312ea88ae13c2cc5348e9283575f7d52739ac13
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Jan 11 10:37:57 2013 -0600

    Squashed commit of the following: Adding new phone number filter to base_filters and multiple templates.

    commit d1a001330038a8fc0eba3a90ffa75c55479d8953
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Sun Dec 23 22:42:06 2012 +0800

        updated phone number filter

    commit fcbfab4be920f9ae580786b7afdf95ec597ef16d
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Mon Dec 17 21:02:37 2012 +0800

        added 'phonenumber' template filter

commit e5fd5853826bfc6b1493a9b9f661685d37e87b53
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Jan 11 09:38:07 2013 -0600

    Squashed commit of the following: Adding event count to admin event type list

    commit 1489658c730fee99e509fc69a39546cea7ecc414
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Sat Dec 15 18:17:28 2012 +0800

        added event count in admin event type page

commit 7226ec75d45f2d27df8f651a8c334c090df28964
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Jan 11 09:32:05 2013 -0600

    Squashed commit of the following: Updated forms export.

    commit cd9ee4b5bfcac7ee8414c2c4a427fa0894bd07e9
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Jan 10 16:07:26 2013 -0600

        Remove the old fronted form entries export URL.

    commit c8f948fb85e28113de49d906f282cbc9c5c2f651
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Jan 10 15:57:36 2013 -0600

        Spell permanently correctly.

    commit 6fe0baa21146c1eec6cfc01b01e3cb82d3650da6
    Author: Alex <aragsdale@schipul.com>
    Date:   Thu Jan 10 15:57:11 2013 -0600

        Link entries export without files to the admin.

    commit 439ee2c7d0150a475f332595151aeba35284715b
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Sat Dec 15 17:44:39 2012 +0800

        updated form entries export to be a celery task

    commit b977ee432abd4495cc57f8bc7d090d25ee8ed09d
    Author: John Eddie Ayson <je@bixly.com>
    Date:   Fri Dec 14 18:20:18 2012 +0800

        fixed zip file bug, added a separate link for export with files

commit 39d7f82745678556d02add3818a162ab0b6d8be9
Author: Alex <aragsdale@schipul.com>
Date:   Fri Jan 11 08:07:15 2013 -0600

    Add id to invoices export.

commit ef3ef423e5f331cce537e26b957353f11f2b2da8
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 21:41:19 2013 -0600

    Corp. memb. search update.

commit a2e3b756916434d295ad191a57ceac6e13876526
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Jan 10 19:07:39 2013 -0600

    Updated descriptions for Events, Jobs, and Discounts.

commit 0987cf967f6bb6086abb5c62256faf3daa978fe0
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 18:45:13 2013 -0600

    Update corp. approve page.

commit 999fcb87c759ce9c86171e0fab6b506e4cfb2f63
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 17:41:14 2013 -0600

    Corp memo. view page update.

commit 5db462c074e2708773a9f12882d2cc6066432b16
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 17:40:34 2013 -0600

    Enable corp roster link.

commit cc102ad337c1c98f41a9e46a9d093d3c3f0cf5ec
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 17:38:56 2013 -0600

    Corp. delete update.

commit 23610f5b03f82910a0739a0ce1374cb6b5cf5bdd
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 17:38:10 2013 -0600

    Display the option to create new user only if not exact match found on corp. approval.

commit e01e6623ff87d4844a47c6f2d4e29be1659bf453
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 17:16:39 2013 -0600

    Changed user defined field widget on membership application to text input fields.

commit fb50c5e99f2e45978594fa5193e26b0c9a21e470
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 16:12:36 2013 -0600

    Updated the membership add link on the profile page.

commit 1a582de47515af36eedbb7b64441ab40e5c45741
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 15:54:04 2013 -0600

    Added box fixture file.

commit 613e77ee2e62ff0cf5e226d301d0f7705d950959
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 15:41:23 2013 -0600

    Added user_group and entity fixture files.

commit 80da189f670ca3cb42936955d918ce32a0dace54
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Jan 10 14:51:51 2013 -0600

    Adding additional UD fields to profiles for use with membership applications.

    The UD fields now total 30.

commit a4b705ace5b774effcaf110412a696419e9664eb
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 3 14:16:56 2013 -0600

    Removed unused code from the event admin pages.

commit 33a90d83a0a7b41a8796fca8050a45fad94ed421
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 9 09:54:09 2013 -0600

    Added form_url to the change_view for CustomRegFormAdmin

commit d0fb40f3513eabd14ccc5f348d38b2bb4e0b850c
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 12:31:24 2013 -0600

    Added "/memberships/entries-export" link.

commit d4269b0bcf9d16431b1b000aa5cf914a7c01deb4
Author: Alex <aragsdale@schipul.com>
Date:   Thu Jan 10 11:58:42 2013 -0600

    Delete a file from S3 when deleting from the theme editor.

commit 6a59cde0dabb53fae352418e6e021fa9428faddc
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 11:47:50 2013 -0600

    Updated Membership model to generate case insensitive status_detail queries for "active" and "pending."

commit 31732a02c10373769dac0c5de84f7003ad772a22
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 10 11:46:58 2013 -0600

    Updated profile page to pull memberships using case insensitive status detail options.

commit 12d3cbd7f6f7cce3b9f31273f03958f7b53075b6
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 11:29:29 2013 -0600

    A pagination template tag compatible to bootstrap css.

commit 719c94b794f37475bc8d223eb7614e5c8e8bb16c
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Jan 10 11:28:29 2013 -0600

    Striping HTML tags out of the jobs meta description.

commit 48291e2a8a6bb5f6cf13e73ec6a7b3dba5593c9d
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 10 09:11:33 2013 -0600

    Added the missing attr is_forever for the membership.

commit 8ad2fabde3115090072a7ce1f9c3affa8dc858a6
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 9 14:28:19 2013 -0600

    Update render_excel to use csv_writer for .csv.

commit f471b653e0c5f9d35009808a113d5004dee85f5f
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Jan 9 13:39:25 2013 -0600

    Updated membership application.  Showing only allowed payment methods.

commit 49532ce377704e24d8dd952f0411788e7846e620
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Jan 9 12:48:55 2013 -0600

    Updating stripe version to prevent requests warning.

commit d243410779e2ef60cc8bdb9f70722568404ffeeb
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 9 09:54:09 2013 -0600

    Added form_url to the change_view for CustomRegFormAdmin

commit fa0498fd7c97ae4de3ee85000a38624720a90417
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 20:27:23 2013 -0600

    Default CELERY_IS_ACTIVE to False

commit 23f9ca5e069e1ed1e809d4936f47afb4aa74b412
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 17:30:46 2013 -0600

    Invalidate celery taskmeta.

commit 3a1ab8e8486ba6dc0287526ba6d5d3b8f8e43073
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 16:03:44 2013 -0600

    Register task ExportProfilesTask.

commit 9001d1c585dd5b453b0d2b63689444f1f1599c47
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 14:52:21 2013 -0600

    Show the alert message on corp. app preview.

commit 6fb4b501d51d7ddcbebed035f7613bc00cfec274
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 14:44:26 2013 -0600

    Change the way to get current app for corpmembership_add_pre.

commit 997370a24c1110891334bba574038834afa78467
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 14:41:15 2013 -0600

    Set allow_anonymous_view to False

commit c9e4228c51d7745864a191fb24a82d34b4809227
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 14:39:54 2013 -0600

    Update corp. memb. notifications.

commit 1f4390e5e6673d1e4a4152c17aa197cb484a6196
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 11:06:17 2013 -0600

    Log an event for corp. memb.

commit a759a2307c41c4720223c04e2df54887b4576069
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Jan 8 10:51:02 2013 -0600

    Corp. Memb. index page.

commit dffa3ef3145ac661c9a8ba1dd5f551cf997fdb4c
Author: Alex <aragsdale@schipul.com>
Date:   Tue Jan 8 12:17:52 2013 -0600

    Add impersonate link to profile meta if impersonation is enabled and request.user is superuser.

commit 0cb054e60e5b0f8dd08d4d8bb26fb1d55803a3ce
Author: Alex <aragsdale@schipul.com>
Date:   Tue Jan 8 08:42:36 2013 -0600

    Enable resumes by default.

commit fc7221b82ab889755aceb08685014bcc665dd26b
Author: Alex <aragsdale@schipul.com>
Date:   Mon Jan 7 14:53:39 2013 -0600

    Format entry time for forms entries export.

commit 57ae6ed0aabfc781da9ab1b7954494ec3e29cf5e
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Jan 7 13:40:28 2013 -0600

    Added related_name to the user field for contact.

commit 393bea84d32ad88923fee1b49efb7d83f000f3e1
Author: Alex <aragsdale@schipul.com>
Date:   Thu Jan 3 15:57:08 2013 -0600

    Remove reference to e.payment_method in port to membership default command. AppEntry doesn't have a payment_method field.

commit b44490ed083698a86ba7f6c2c1e6a5e957e868e5
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 3 14:16:56 2013 -0600

    Removed unused code from the event admin pages.

commit 8baa2c8fd6d6310fed206746889dd5762973ce0a
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 3 14:11:33 2013 -0600

    Updated the user registration function to account for the new email address field names when creating an account.

commit ca383cf670ac7f502200c8d1b2683d422220f343
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Jan 3 10:55:05 2013 -0600

    Fixed the pricing issue on event registration messed up by two commits.

commit b3fc18488cfee14d71baa1bcb19d0594dd6d7184
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 2 22:24:26 2013 -0600

    Update the name of the first entity and group if site display name exists.

commit e2a29d9373d52e1cf5da54e0c94df4fc7d01596b
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Jan 3 09:55:12 2013 -0600

    Added a key word that allows you to filter by registrants in global search "is:registrant."

commit 7e3d7a74f8a37ad85d98bf88bd51de70142ca1c3
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 2 16:38:52 2013 -0600

    Exclude allow_user and allow_anonymous when checking if an event has member price.

commit 79693bd485c783124f1c75e790f6d2910cbdff45
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 2 16:09:52 2013 -0600

    Doc string update for create_default_entity and create_detault_group.

commit 13124c04cd1853a905315b7def90cb0425644400
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Jan 2 15:54:01 2013 -0600

    Two fixtures, default_entities.json and default_groups.json, for setting up default entities and groups.

    The fixtures are loaded by their migration signals

commit 0fbb4dd679fe87943aa06f9a10e0e80c6443a512
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Dec 31 22:18:47 2012 -0600

    Add invoice link on corp. view.

commit 5668606ad35278b141869894823d23f76c94f205
Author: Ed Schipul <eschipul@schipul.com>
Date:   Mon Dec 31 19:47:27 2012 -0600

    updates to admin

    additions to backend admin

    Signed-off-by: Ed Schipul <eschipul@schipul.com>

commit abb6378906e3ccd78cba36132b12c092651d70c7
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Dec 31 17:29:55 2012 -0600

    Management command port_to_corpmembership.

commit e2ca8d4b51d695b69c3f919ad5dd085a7c610821
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Dec 31 15:39:31 2012 -0600

    Update the corp. memb. link on dashboard.

commit 022fb12aa041ff59cd3bb2fbfd73ed257a59efbd
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Dec 31 15:34:44 2012 -0600

    Corp. reps edit and delete.

commit 8588e8c37f2df9958fd3685709bbd623bcc47ee3
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Dec 31 13:28:50 2012 -0600

    Added company dropdown field on corp search.

commit 97d2950da14a0afa290c76dc38bb69b504c3a98c
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Dec 31 12:58:49 2012 -0600

    Corp membership search.

commit 33f58cba70d3156b907cad7949625f2e2b9cc211
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Dec 28 17:37:43 2012 -0600

    Exclude the captcha if form is not set to use captcha.

commit 6e6c1d88bac349aecd6362be3d7b96623b090d5d
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Dec 28 17:33:19 2012 -0600

    Update membership confirmation page to display confirmation text from app.

commit df7776682daf8552a4d810141410fee2982c3a6e
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Dec 28 16:04:12 2012 -0600

    Fixed an error on status being set as tuple instead of bool True

commit 920e3db94ffdab5e029e7fc0a8e0eb0339fd7792
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Dec 28 15:58:06 2012 -0600

    Moved the groups handling to the membership approval process.

commit 36ee4d8b4a26777f0112858a4cd4b73d24ac5357
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Dec 28 15:02:49 2012 -0600

    Handle groups for membership add.

commit f0dc3860ea7eb99f3edd4369b734d3d30932243a
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Dec 28 12:41:56 2012 -0600

    Add captcha field to the membership add for anonymous.

commit 074823c569444a87dd6081456a59636999239485
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 15:56:02 2012 -0600

    Update membership app change form for preview link.

commit 046358e8a530192978b510170c2e8b81996ee50b
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 15:55:08 2012 -0600

    Added membership add link to the top admin bar.

commit d41da3e9739aeb057bf699ae7fe33ec5f4ef498b
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 12:45:02 2012 -0600

    Change profile.can_renew to profile.can_renew2 to switch to MembershipDefault

commit f237078926f18b34524ece828b08ad6d9541f449
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 10:04:40 2012 -0600

    Update the query filters to only return items with status=True to prevent inactive stories from showing up on home page.

commit ca9b47e1006adaf9132858762e8c38fa5d57d1e0
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 09:30:48 2012 -0600

    Use hasattr when testing existence of profile.

commit 2b8a3b8d68b9b89b61522e2146363f7d2f81fef6
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 09:15:00 2012 -0600

    Create profile if not exist

commit b16c7ed1f5c273052adbfad5a6afa3b170192eac
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Dec 27 08:56:39 2012 -0600

    Test existence of  'user' attr before referring to it to avoid the error.

commit 5d98ff64319ea190ab517c0316ea3dc3a33819f1
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Dec 26 22:48:37 2012 -0600

    Fix error memberships.models.MultipleObjectsReturned for payment_method in AppEntry class used by port_to_membership_default command.

commit b07a87cd53ef03ec91520b864a4ed14a821c8ef5
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Dec 26 22:31:31 2012 -0600

    Schemamigration for invoice fields update.

commit a0dac20aaa38b2783de015c71436cdaac5c671d3
Author: Jenny Qian <jqian@schipul.com>
Date:   Wed Dec 26 22:20:06 2012 -0600

    Update size of some of invoice fields to match with the corresponding fields in profiles.

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

    Remove event_logs from south_0001.json.

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

    Updating deploy.py migrate command.

commit 4d0b677576eb7b0dfdafc70b7e7b6a13c60d82d9
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 a36d1af2d063546683323db284835c9a4b600188
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 17:12:23 2012 -0600

    Adding entity back to profiles_profile

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

    Reverting file to a previous state.

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

    Convert non-space characters to spaces

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

    Renamed membership migration 0003.

commit 501746e8c0efbed3b717a1aa2e3a3bfdb556f27a
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 4c695eace8afdbd99bee6bc1bea984c19324b187
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 d22e54d755deb11e231835792ab13c6524f04551
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 a17cf41d9222229b835c6bcf315150baf9027053
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 e6d06d768f485ba8a2271de97f0747d544831733
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 12:20:56 2012 -0600

    Commenting out the user group subscriber import functionality.

commit dcbd77b72d3598ebcba73dac6afb8e3ad4b37a61
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 5c315b525feabc6d9e08090c2796b12072cd3d10
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 91fcef770e199cba222493035a27eba61d1ed636
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 1e942a6744fd727862d325f07e857b605ce43ec6
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 ba7aab770019da257f64a46da96ab6f2cb2783a6
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Dec 20 10:46:20 2012 -0600

    Updated imports in jobs accounting entries method.

commit 29e8735d60db279af976a33292bea0e63efe554e
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 388c1c636107b96b4c4a8cfbe294b1f2a404270d
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 19 15:56:43 2012 -0600

    Remove all_files query until caching is implemented.

commit f59745ec16abce1021e69a54eab86a5e8ceee431
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 c4c9a83622cc697d3cdcd488d8030e8817200b74
Author: Alex <aragsdale@schipul.com>
Date:   Mon Dec 17 14:30:33 2012 -0600

    Add sync for newsletters to user group admin.

commit 5f3d00fa3ff3cd82dff071ea6bae965cdc8d994d
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 0e3f5676b89b2862b5ea0318c8a19306c72170b0
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 80f7278ca71496e48e5e362a723a9cb1ad630268
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Fri Dec 14 16:03:51 2012 -0600

    PEP8 Campaign Monitor

commit 182b00b771ec5b63aa93b74b87c2cdf6affefc62
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 8ebaa92dac3739735a82b6bdbef9ff1694d970e7
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Thu Dec 13 12:32:43 2012 -0600

    PEP8 photos/forms.py

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

    Add back advanced options stuff in invoices search view.

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

    Updating files to add a perms GenericRelationship.

commit ef75046183f16f7cfb80bd16dd5d358083dbfabf
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 3bed66d57c00f5f62db8fdff441ff8d87d15ec7d
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 77086bb630a26d26534e9b5e367b6401ad3d0bf7
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 12 12:49:26 2012 -0600

    Merge: Campaign Monitor template sync

commit 036540ba63616c86fef8c410c27aaa944e8b86be
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 7991914c7e0b7b50a0973bf6da23ffee80b27782
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Dec 12 11:25:46 2012 -0600

    Changed import on help_files module.

commit 9c8aefb539d26cf5dc4d2a1dca3e58848ad36a2e
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 05a340a6c5e95838eb7c06ab96eb8958273d57d0
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 c429c83020e0769f28ba62c74e71b0e10e1c0034
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 f30930d60592856a5fa0a3350802bbe000de33cf
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 ba28b49c100ba10041a49582a4cf6ec02a195539
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 12 09:02:57 2012 -0600

    Removing unused imports.

commit 484be3c5e386024699e0cd552e45685b2c135718
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 539a601edb3d9273b87595e60c4e6ec5ea4dd6f7
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Dec 12 08:50:01 2012 -0600

    Update limit to pull LIMIT instead of title