events import
event view fix, seems to require having a reg conf
meged conflicts
import thread and status update
Merge branch 'refs/heads/master' into 357_events_import

Conflicts:
	tendenci/addons/events/forms.py
	tendenci/addons/events/views.py
fix field value matching in do event import
import preview update
merged conflicts
subprocess for import events, failure reason saved
Squashed commit of the following:

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

    Add setting for invoice notice recipients.

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

    Squashed commit of the following: Directories Renewal functionality.

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

        Print email recipient when sending directory notices.

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

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

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

        Directories: default days to show renewal link to 7.

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

        Remove debugging.

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

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

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

        Merge branch 'refs/heads/master' into directories_renewal

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

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

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

        Directories: add get_renew_url to directory model.

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

        Directories: add eligible for renewal notice templates.

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

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

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

        Directories: shorten up renew form a bit more.

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

        Directories: change title of renewed notice.

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

        Directories: directory renewed notice.

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

        Directories: remove logo handling from renew view.

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

        Directories: use a shorter form for renewal.

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

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

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

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

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

        Directories: use renewal requires approval setting in renew view.

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

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

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

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

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

        Directories: add a setting for renewal requires approval.

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

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

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

        Reactivating the REMOTE_DEPLOY_URL

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

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

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

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

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

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

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

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

        This reverts commit 9c4424fcb581bc1f80422c74a924addfcb1cced5.

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

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

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

        Temporarily comment out the theme editor to continue testing.

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

        Excluding description and header fields from displaying in the email.

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

        import thread and status update

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

        meged conflicts

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

        event view fix, seems to require having a reg conf

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

        events import

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

    Squashed commit of the following:

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

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

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

        Move membership export to a task.

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

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

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

    Update invoice detail url in payment template.

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

    Fix issue with anon users on memberships applications.

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

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

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

    Add proper ordering to the entry_fields

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

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

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

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

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

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

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

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

commit a14bc777467b3bee89e5f4dfc4d0a7f821d696a6
Author: Alex <aragsdale@schipul.com>
Date:   Tue Oct 30 12:22:56 2012 -0500

    Submit profile search form when show members checkbox input is changed.

commit 61ed5eb4bfbeffb31c124b27ffda1559c54b6bd1
Author: Alex <aragsdale@schipul.com>
Date:   Tue Oct 30 12:22:37 2012 -0500

    Change label for username column on membership import template.

commit aad2abcb6636f96a7463c0eff51ad2fcbe083054
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 30 12:18:34 2012 -0500

    Updating permissions on membership import files.

commit 69c65a9800ad49f59efb0c499e7c13065b0fe5b8
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 30 09:27:13 2012 -0500

    Memberships: Update index page to redirect to pending list or user search based on login.

commit a8cd8047d0dacdf843de830322ef365e84811df1
Author: Alex <aragsdale@schipul.com>
Date:   Tue Oct 30 09:07:48 2012 -0500

    Update imports in membership update protection mgmt command.

commit ff8089d0304f99a22dbc00e456259b8a15f6f77c
Author: Alex <aragsdale@schipul.com>
Date:   Mon Oct 29 17:16:47 2012 -0500

    Fix import in refresh profile member numbers mgmt command.

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

    Trap payment_gross error for paypal fraud verification.

commit 9161782b54749c91d23627abe85e7e1c8ae222a0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 29 15:44:36 2012 -0500

    Added remove_migrations command.

commit 0aceeb02276cd96da2d63dcbc28d4c4c730184e0
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 29 15:44:19 2012 -0500

    Update profile search to incorporate the membership search.

commit ef0ccca5288b3ed3cbdf16912970e5c93f939397
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 29 13:38:33 2012 -0500

    Removing the Show Advanced Modules javascript.

commit ef82652a7d79a360e19e1bc25a3c40133fb75bf9
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Mon Oct 29 13:46:10 2012 -0500

    Updated the membership import feature to call the 'membership_update_proection' management command.  This ensures that all membership records are using the security level specified with membership settings.

commit 3d8ac16d2c7b8519b41eaf936ca043c4051d6603
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Oct 29 12:27:09 2012 -0500

    Minor update on newsletter generator page.

commit 752ca9482aabcec155ef59678237600f3da0e2fd
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 29 12:25:46 2012 -0500

    Removed the Show Advanced Modules.

commit 9b19469154b98294f5c231eff5ecf1eecfaecd95
Author: Jenny Qian <jqian@schipul.com>
Date:   Mon Oct 29 08:46:14 2012 -0500

    Admin top menu replace the link to campaign monitor with the one to newsletter generator.

commit 7df805836274376a9a6e49ab5f1e178389f73fe2
Author: Jenny Qian <jqian@schipul.com>
Date:   Sun Oct 28 12:22:34 2012 -0500

    A newsletter generator page to list third-party newsletter providers

commit 6d7c4ed6b0eaa6b7bf21d77921be1c2005d5bf3a
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Sun Oct 28 20:34:53 2012 -0500

    Created a link that allows you to export active and expired memberships from the separate report pages.

commit 4549af2386c43ea4305b451908eec134596d9c0d
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Sun Oct 28 20:34:04 2012 -0500

    Updated method that renders cdv response.

commit 312d553e8bcc39481df4fd882a1461534b84a033
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 26 21:23:19 2012 -0500

    Trap photo errors caused by non-existent images.

commit 96d52161828e105cd0ffc19fca95f9a5117a0076
Author: Alex <aragsdale@schipul.com>
Date:   Fri Oct 26 10:33:09 2012 -0500

    News: add a "remove photo" checkbox on the news form if there is already a thumbnail.

commit 4b5af31d58de39c7be334464015cc73c0369306c
Merge: 582fa86 10c880c
Author: Alex <aragsdale@schipul.com>
Date:   Fri Oct 26 08:56:59 2012 -0500

    Merge branch 'refs/heads/380_recurring_payment_for_anonymous'

commit 582fa86f4eeb8e7ba0c8bc506b295bf4109007c1
Author: Alex <aragsdale@schipul.com>
Date:   Thu Oct 25 16:28:07 2012 -0500

    Use reports.css for users not in groups report.

commit 23eab612e91f140496bd8f7974d4c33f768cdb03
Author: Alex <aragsdale@schipul.com>
Date:   Thu Oct 25 15:28:59 2012 -0500

    Files: return nicer file names on download if the basename ends with the extension.

commit bfa0186dd01ba670498ae4060bae07c14a7bf81f
Author: Alex <aragsdale@schipul.com>
Date:   Thu Oct 25 10:04:37 2012 -0500

    Files delete method: Roll back the transaction to fix the postgres error "current transaction is aborted, commands ignored until end of transaction block".

commit 55cbda5beaec1fa60751aa43a42370e37fcd853f
Author: Alex <aragsdale@schipul.com>
Date:   Thu Oct 25 09:38:20 2012 -0500

    Remove django debug toolbar from setup and settings.

commit 6075e6a99a883fc5ab7d4aec0951f73f349eea2b
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 25 08:50:36 2012 -0500

    Fix typo of news.image to news.thumbnail

commit 49e4d77a2ddb5e9b689db8c254a6dcfe82f3b22c
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Oct 24 18:09:55 2012 -0500

    Updated the files import task to not include the media root when downloading the import file.

commit 14f623670bd7c29fd9b3c9e4d867b7d22007b4c7
Author: Eloy Zuniga Jr <eloyz.email@gmail.com>
Date:   Wed Oct 24 16:09:01 2012 -0500

    Reverted back to old working versions of the celery package and django-celery package.

commit 4b559011e606dc004fb0271b1ff352aed8f7e619
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Wed Oct 24 11:13:47 2012 -0500

    Adding ordering to user_groups. Pep8 of the model.

commit 4fd0d90cfe4dd92afcc7ffeb989b223ed5ade73c
Author: Sam Lee <sam@bixly.com>
Date:   Wed Oct 24 23:44:33 2012 +0800

    debug toolbar for optimization.

commit e1ae4986c6391f4b70de193e9345a2b3548f63c4
Author: Alex <aragsdale@schipul.com>
Date:   Wed Oct 24 09:25:42 2012 -0500

    Profiles: filter on status=True and status_detail=active on profiles search.

commit dd8daa66d3b25ee6945406828d3261b7ec7175d2
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Tue Oct 23 16:10:41 2012 -0500

    Removing the edit link on membership entries page.

commit 7231f8ceccf36943c70043562dd61f510ec91417
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Oct 23 13:04:29 2012 -0500

    Update the thumbnail filter to fix errors when using external storages.

commit 144dd316d7a9c7122ceb7b0a9d660d7806afd1f1
Author: Jenny Qian <jqian@schipul.com>
Date:   Tue Oct 23 11:48:49 2012 -0500

    Update set_s3_file_permission to print out the file if doesn't  exist.

commit 29263d6cbe462242c694f311fd4ecd9fcf650bd0
Author: Alex <aragsdale@schipul.com>
Date:   Tue Oct 23 12:16:50 2012 -0500

    Users not in groups report. Added to admin menu under Reports.

commit 9c1c6f62aa8f429dc1022ee49ddc4d13c4cbd46d
Author: John Eddie Ayson <je@bixly.com>
Date:   Wed Oct 10 17:09:27 2012 +0800

    added error message for wrong file type in corporate membership import

commit 0195a0c656f6da70206c79bfc5f39510eaf8c30c
Author: John Eddie Ayson <je@bixly.com>
Date:   Thu Oct 4 16:01:49 2012 +0800

    updated form to default check renew all individuals for free memberships

commit 10c880c83543b247d6a6dd92b8c9e7a5932cda6a
Author: Alex <aragsdale@schipul.com>
Date:   Tue Oct 23 09:16:39 2012 -0500

    WP Import/Export: Add user emails to messages to let users know where they will receive notifications.

commit 39765ee676b1b41542f29ada3bc2c27a0d10b87a
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 13:18:57 2012 +0800

    fixes

commit 29cf0305ab85042a97c2bf8ff00a2a89d5ae3719
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 13:05:11 2012 +0800

    added fix for importing articles

commit 115eed2cf48f3f1f50da836a33cb4f4346873064
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 11:27:55 2012 +0800

    added notification for wp export

commit 3feb47dc0aa2e306a704f7cbcdd31fa1f394aa31
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 21:53:42 2012 +0800

    finished email notification for wp import

commit 9879bcd7e87393b241f1594f5faff7dea820e2d3
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 15:01:18 2012 +0800

    removed added noticetype for wp import

commit 856e35ff06c67b4adcef5e4316b1c52ace98666e
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 11:09:00 2012 +0800

    started work on notifications for wp import

commit e20a55ad0a046662f1488d3ce760a36cfc795926
Merge: 9b8ab2e 9e6dc8b
Author: Alex <aragsdale@schipul.com>
Date:   Tue Oct 23 09:20:52 2012 -0500

    Merge branch 'refs/heads/369_notifications_for_wp_import_export'

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

    WP Import/Export: Add user emails to messages to let users know where they will receive notifications.

commit 97966fc76f73110fc1a62e76838cfbe29e057fa7
Merge: 79931a3 9b8ab2e
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Oct 23 15:11:59 2012 +0800

    Merge branch 'master' into 380_recurring_payment_for_anonymous

commit 79931a39d2fe100c096742871e9fde7218193d34
Author: John Eddie Ayson <je@bixly.com>
Date:   Tue Oct 23 15:10:26 2012 +0800

    required log in for forms with recurring payments

commit 9b8ab2e79ec70f50a52ea7cb01dcb0292eb73b5f
Author: Alex <aragsdale@schipul.com>
Date:   Mon Oct 22 17:37:52 2012 -0500

    News: add thumbnail image field, update forms, views, save method and add and edit templates accordingly.

commit c9352a436e8e3ffe995e5736ca9a80899ea48c82
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Mon Oct 22 08:53:06 2012 -0500

    Adding the license for django-forms-builder to our forms_builder app.

    Fixes #309

commit ea8c2a5915c00cf3bb035c15146221c08427659a
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 19 17:49:05 2012 -0500

    Minor update to the set_media_files_perms.

commit 6f9ea0534102dbe3fe989843af3a1b4e1d098ef6
Merge: f669ef2 c417642
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 19 17:16:23 2012 -0500

    Merge branch 'master' of github.com:tendenci/tendenci

commit f669ef27a31bccd91d68e3a5611f5392dbf6bcb5
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 19 17:16:14 2012 -0500

    Management command to set permissions for media files on S3.

commit c417642a0f764bc20de2176dec0c61cc7ba28274
Author: Alex <aragsdale@schipul.com>
Date:   Fri Oct 19 16:19:52 2012 -0500

    Campaign Monitor: set S3 file permissions for template files when a template is saved.

commit 8e2d155b8594b8630f602b18de79d1b440c50e5a
Author: Sam Lee <sam@bixly.com>
Date:   Fri Oct 12 20:35:33 2012 +0800

    Updated corporate membership roster. Fixed corporate membership bugs.

commit b62f1aec41fee1c40d31879cc34ca6b82847f3af
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 19 04:05:15 2012 +0800

    added fix in redirect to add pricing

commit 8564a879dcd8a6af33caceff312ded9d97545c40
Author: John Eddie Ayson <je@bixly.com>
Date:   Thu Oct 18 10:41:24 2012 +0800

    added redirect to add directory pricing

commit 0051f115d39b49a04fcf0a98db85debd4751eead
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 19 12:39:15 2012 -0500

    Roll back the transaction to fix the error for postgres "current transaction is aborted, commands ignored until end of transaction block"

commit 4faea4e411fa5b9c4bd48b5f35097d4a6f6174e8
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Oct 19 11:15:24 2012 -0500

    Events: Updating the way event limit is pulled.

commit a39c351278470058afe0026fe9ff67ead2aea012
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Oct 19 11:01:27 2012 -0500

    Only add an event limit if there is a registration_configuration for that event.

commit 25d1bd7e0a518401376ec92f8d9e077b936071b4
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 19 10:44:17 2012 -0500

    Set file pointer to the beginning of the file before save.

commit 9e7c5bc600b2f695a28e3c5c36857b8cdcb01791
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Fri Oct 19 10:33:23 2012 -0500

    Updating the version of the createsend api.

commit 58ff576db2fe8efaad5bb3f756121221ddf4ad49
Author: Jenny Qian <jqian@schipul.com>
Date:   Fri Oct 19 09:03:50 2012 -0500

    Remove notifications 0001_initial from south_0001.json.

    Notifications was renamed from notification in 5.1 but not in 5.0. So, there is no need to fake it during the database migration from 5.0.

commit 65bbf4e7d39d1997ac1e6a4185ccb518dd07ba8c
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Oct 18 16:56:34 2012 -0500

    Removed the test code.

commit 02305df2da422d21a221c81ab63f53b455d2525c
Author: Jenny Qian <jqian@schipul.com>
Date:   Thu Oct 18 15:32:50 2012 -0500

    Check and download files from t4 based on the info in the table mig_files_file_t4_to_t5.

commit bb422aec425b78adfd1cd1a650c72f25ac635d2b
Author: dharol <dharol@gmail.com>
Date:   Thu Oct 18 11:26:40 2012 -0500

     Various fixes in memberships & entities

commit 4638bd1ebdcef00267cca24372088b5b08dc6f78
Author: dharol <dharol@gmail.com>
Date:   Thu Oct 18 11:00:53 2012 -0500

    Revert "Added event logging to tendenci core"

    This reverts commit 608a7c851f50422c2977bf1cb1f97aaaf34a8a18.

commit 80f4b3dc29d51d84159cbfd321e392e9d392f8cd
Author: dharol <dharol@gmail.com>
Date:   Wed Sep 26 11:40:36 2012 -0500

    Added event logging to tendenci core

commit 1abc1c2e3d873f07617b3c89413b0c9f5461b220
Author: dharol <dharol@gmail.com>
Date:   Wed Oct 17 15:22:39 2012 -0500

    Added try clause to event_logs/managers to accept local ip

commit 4506030454ce4a961de59eec0ab3468170249c6d
Author: Alex <aragsdale@schipul.com>
Date:   Thu Oct 18 10:57:43 2012 -0500

    Directories: user-friendly __unicode__ method for DirectoryPricing.

commit 60e175f9f0a4771a92f349d8c80d25ed99f1863f
Author: jmoswalt <jmoswalt@gmail.com>
Date:   Thu Oct 18 09:30:12 2012 -0500

    Update location of custom widgets in memberships applications.

commit bda9267fdd4b743d436923c57354edf565d434c1
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 13:18:57 2012 +0800

    fixes

commit b6d20a3ae34ecdd079fd5493be5712fd9f5453c6
Merge: 3084dfc a9978c6
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 13:10:12 2012 +0800

    Merge branch 'master' into 369_notifications_for_wp_import_export

commit 3084dfc029c8cc857f6921671bd64c420ea391cc
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 13:05:11 2012 +0800

    added fix for importing articles

commit b93f0aad1c0388de7caa72882f971ced6fc6df2f
Author: John Eddie Ayson <je@bixly.com>
Date:   Mon Oct 15 11:27:55 2012 +0800

    added notification for wp export

commit 21eb4a68f4ee1f5bacdbbd02ae5f39ff5ff83ade
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 21:53:42 2012 +0800

    finished email notification for wp import

commit 8bcba7eb237485e922db5b94a9d79474106e2fa0
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 15:01:18 2012 +0800

    removed added noticetype for wp import

commit 8db2bb52333c892343faafee5c2081fb8f7b7b3b
Merge: 8a76d3c b5a8ca0
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 11:23:34 2012 +0800

    Merge branch 'master' into 369_notifications_for_wp_import_export

commit 8a76d3c1db93ba573aeb59b44ff776b995193847
Author: John Eddie Ayson <je@bixly.com>
Date:   Fri Oct 12 11:09:00 2012 +0800

    started work on notifications for wp import
Change text on event import add.
Fix year format on event import add.
added checker for incorrect timezone
Make group required on event form.
Events: add info text on import process page.
Reload import processing page after 15 seconds.
Add a message when import is complete.
added user group import
Change DoesNotExists to DoesNotExist in user group utils.
merge with master