Commit Graph

310 Commits (54e1e3e98b53449d8483a30b84838919876641a0)

Author SHA1 Message Date
eric 77a66e5420 [#29498563] fixed urls by moving email share messages to django templates; eliminated sender from form 2012-05-12 11:12:43 -04:00
Raymond Yee fbd58d5e4e Add import of notification 2012-05-11 14:14:49 -07:00
Raymond Yee ba36838dfa must import notification 2012-05-11 14:03:28 -07:00
eric 17d641cf65 wired pledge_you_have_pledged [#27785469] 2012-05-11 15:53:46 -04:00
eric 81d158f505 [#28851641] Edition creation and editing !!! Needs a schema migration. 2012-05-11 14:13:09 -04:00
Andromeda Yelton c6186c7808 need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want 2012-05-09 16:33:22 -04:00
Andromeda Yelton beff46fd8c standardizing on Unglue.it rather than Unglue.It 2012-05-08 16:15:23 -04:00
Andromeda Yelton 11c19b950d preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns 2012-05-08 15:51:17 -04:00
Andromeda Yelton 6e1aa4dfd0 changed work_list page to clearly communicate that it's staff picks when facet = recommended 2012-05-08 14:28:06 -04:00
Andromeda Yelton 9fc2444f37 need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly 2012-05-08 10:51:04 -04:00
Raymond Yee b06a1e218a Merge branch 'fps' of github.com:Gluejar/regluit into ry 2012-05-07 16:50:00 -07:00
eric 1ab9304475 [finish #28949611] rights holders are now the default campaign manager; they can remove themselves after they add another manager 2012-05-07 17:32:58 -04:00
Jason e09418a7a2 Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class 2012-05-04 10:30:05 -04:00
Andromeda Yelton 4be0cab5a0 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-04 10:05:54 -04:00
Andromeda Yelton 8902ec84b3 made manage_campaign workflow suck less 2012-05-04 09:56:41 -04:00
Raymond Yee b9bbecb351 Merge branch 'master' of github.com:Gluejar/regluit into fps
Conflicts:
	settings/common.py
	settings/dev.py
	settings/prod.py
2012-05-02 18:01:20 -07:00
Ed Summers b8b007c427 last_campaign_status is a string not function 2012-05-02 17:53:45 +00:00
Andromeda Yelton 122454b949 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-01 13:56:12 -04:00
Andromeda Yelton 3deb660ce3 more css tweaks per stefan 2012-05-01 13:49:23 -04:00
eric 1c2e48bc87 added edition to campaign model to allow selection of a preferred edition [finish #28736373] 2012-05-01 10:56:19 -04:00
Andromeda Yelton ce36f6771d css changes per Stefan, part 1 2012-05-01 09:56:19 -04:00
eric bc9f1d3cd3 [fix #28759049] prefixing ebook contribution form not handled properly in view or form 2012-04-27 17:14:57 -04:00
Raymond Yee 47a22f3ccb Merge branch 'master' of github.com:Gluejar/regluit into fps 2012-04-26 15:50:49 -07:00
Raymond Yee 4219149132 Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up. 2012-04-26 19:31:55 +00:00
Raymond Yee 061f656e63 Merge branch 'jkace' of github.com:Gluejar/regluit into fps
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up:  see whether this works for PayPal too.

Conflicts:
	frontend/views.py
2012-04-25 13:10:53 -07:00
Jason 3bc14c1ac9 Modifying frontend/views to use new transaction status codes 2012-04-25 13:55:30 -04:00
Andromeda Yelton 8706e9a900 email sharing needs to populate the sender field in order to validate 2012-04-25 13:45:18 -04:00
eric d0148cf6dc [finish #28524505] add change email form 2012-04-24 22:20:10 -04:00
eric 2a79a82dd7 detab text 2012-04-24 22:17:30 -04:00
Raymond Yee 709cb4ce41 now stuck on the status of an ACTIVE transaction in amazon in campaign_test 2012-04-24 18:03:57 -07:00
Andromeda Yelton 911f6f6212 pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY 2012-04-19 10:50:40 -04:00
eric d88a908082 [finish #27470423] provide preview of unlaunched campaigns 2012-04-10 16:13:28 -04:00
Andromeda Yelton edf3617f5a partial de-suckification of pledge_complete page 2012-04-10 15:00:28 -04:00
eric e36facbeda [finish #27468521] campaign form must also be valid to launch it 2012-04-09 16:52:24 -04:00
eric 163c7a924a [finish #27522103] clear rightsholder creation form when new rightsholder successfully created 2012-04-07 15:31:11 -04:00
eric e764a44ace fixed issues with campaign setup [fix #27468285] 2012-04-07 14:12:54 -04:00
eric 26c0ad2b27 fixed failure when editing campaign managers [fix #27468285] [finish #27531719] 2012-04-05 17:53:00 -04:00
eric db736818fc [finish #27524965] fixed issue where released claim prevents new claim 2012-04-05 16:55:10 -04:00
Raymond Yee 8a6de4ef1d A proxy for the mailchimp js 2012-04-04 09:15:18 -07:00
eric 5d5c60993e added form to edit campaign managers [start #27468285] 2012-04-03 15:54:41 -04:00
Andromeda Yelton 24b7a77228 modifying display of claim status 2012-04-03 09:56:41 -04:00
Raymond Yee 6d50897508 Clarify the pledge modification process for the supporter. 2012-03-28 10:12:09 -07:00
Andromeda Yelton 81c2c7a935 default to active tab when supporter has active campaigns, else wishlist tab 2012-03-28 09:08:05 -04:00
Andromeda Yelton 2ab92b6a2f Merge github.com:Gluejar/regluit 2012-03-28 09:00:31 -04:00
eric 8892a935dd Implemented limited edition premiums, front and back end [finish #27011359] 2012-03-26 18:47:02 -04:00
Andromeda Yelton 1a53a79752 merge all the things 2012-03-26 16:16:57 -04:00
eric 7264b9846f Added management of custom premiums. (migration needed) [finish #26921893] 2012-03-26 15:32:23 -04:00
Andromeda Yelton 66d62ef3aa making pledge complete page prettier and more featureful: next actions, more speciic email sharing text, enforce login 2012-03-26 15:26:47 -04:00
Raymond Yee 0e61d7477a [#22756079] Changed name of constants (e.g., IPN_PAY_STATUS_ACTIVE to IPN_PREAPPROVAL_STATUS_ACTIVE to make the meaning of these constants clearer
Also fixed an error in how I'm using transaction management in regluit.test.campaigntest.support_campaign
2012-03-23 11:28:09 -07:00
eric 6237fcebfe detabbing views code 2012-03-23 11:15:37 -04:00