e27ad644b5
Merge branch 'campaignformviewnixed'
2012-05-29 11:48:41 -07:00
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
2563dda3e5
creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent
2012-05-29 08:54:57 -04:00
365976933e
[ #29809805 ] made username change form more pythonic
2012-05-26 17:30:12 -04:00
61f45a5716
[ #29809805 ] fixed changed email doesn't check for duplicate email
2012-05-26 17:28:57 -04:00
acaa931445
I think that the CampaignFormView should be deleted -- but before I merge this into master, I want to let others confirm
2012-05-25 19:39:02 -07:00
f0dde230f3
[ #27015121 ] forgot to add context to Pledgeview
...
Seems to me there's refactoring that can be done with these two views!
2012-05-25 18:44:28 -04:00
7de9616e23
[finish #27015121 ] add going to amazon text, premium amount now inline.
2012-05-25 18:18:29 -04:00
1335b3cb72
[ #29500707 ]
...
Fleshing out exception handling for pledge_cancel
selenium tests work for both amazon and paypal on RY laptop -- now going to test them on ry-dev
2012-05-24 18:47:50 -07:00
60b84b0358
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 14:10:10 -07:00
86313666ee
making [ #29858801 ] happen -- now you can get back to the home page by clicking on the logo even if logged in
2012-05-24 15:29:45 -04:00
b55af7977d
[ #29500707 ] The core of the cancel pledge is in place, though refinements, particularly in the UI still needs to be made.
...
Outstanding issues:
* Will the IPNs on a cancel come quickly enough so that the user will no longer see "Modify Pledge" when redirected to the Work page
* How to provide better feedback on the fact that a transaction has indeed been canceled? Do we need to use notifications here?
* This code is working on RY's laptop -- but now needs to be tested where there IPNs available.
2012-05-23 09:12:21 -07:00
a0bc6deefc
Closing in on pledge_cancel
2012-05-23 07:22:48 -07:00
b8336c4ed6
En route to implementing pledge cancellation
2012-05-21 07:56:18 -07:00
272d795ded
Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
...
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
9d33a95147
[ fixed #29647161 ] fixed login redirect which was failing when next included a query string
2012-05-15 14:18:17 -04:00
0e59ee746b
Update frontend/views.py
2012-05-14 18:23:13 -03:00
6d14ba1c30
only really need to set context for site once, not separately for view and triggered notification
2012-05-14 16:56:36 -04:00
3fe2800dfa
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-14 13:51:06 -04:00
2b9b4a7331
share links in pledge_complete need to include url base
2012-05-14 13:42:34 -04:00
b07d6c267d
Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet
2012-05-14 10:15:40 -07:00
6bb564aca6
[finish #28851641 ]campaign managers now have access to edition creation and editing for works they manage
2012-05-14 01:07:02 -04:00
ea9ac7508e
repaired the invocation ot I_just_pledged emailshare [ #27785469 ]
2012-05-13 22:59:07 -04:00
296b5b5b20
countdown broke preview
2012-05-13 22:13:45 -04:00
66f08eab10
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-13 13:55:08 -07:00
d9a96c2ada
putting from email in reply-to: header [ #29498563 ]
2012-05-13 16:38:58 -04:00
9badabb53b
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-13 13:33:53 -07:00
193e4ef324
methods are not properties, whoops
2012-05-13 15:33:54 -04:00
a54aa1a342
First pass -- pledge view will redirect to pledge modify view if there is already an active transaction
2012-05-13 12:18:48 -07:00
d2cf8a773b
improvifying pledge front end around modify and cancel
2012-05-13 10:49:23 -04:00
ae76f89034
fixing problems with context for you_have_pledged notification
2012-05-12 22:42:09 -04:00
77a66e5420
[ #29498563 ] fixed urls by moving email share messages to django templates; eliminated sender from form
2012-05-12 11:12:43 -04:00
fbd58d5e4e
Add import of notification
2012-05-11 14:14:49 -07:00
ba36838dfa
must import notification
2012-05-11 14:03:28 -07:00
17d641cf65
wired pledge_you_have_pledged [ #27785469 ]
2012-05-11 15:53:46 -04:00
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
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
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
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
6e1aa4dfd0
changed work_list page to clearly communicate that it's staff picks when facet = recommended
2012-05-08 14:28:06 -04:00
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
b06a1e218a
Merge branch 'fps' of github.com:Gluejar/regluit into ry
2012-05-07 16:50:00 -07:00
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
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
4be0cab5a0
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-04 10:05:54 -04:00
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
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
b8b007c427
last_campaign_status is a string not function
2012-05-02 17:53:45 +00:00
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
Raymond Yee
Andromeda Yelton
eric
Jason
Ed Summers