142ec1a904
de-uglifying
2012-03-28 11:31:50 -04:00
81c2c7a935
default to active tab when supporter has active campaigns, else wishlist tab
2012-03-28 09:08:05 -04:00
2ab92b6a2f
Merge github.com:Gluejar/regluit
2012-03-28 09:00:31 -04:00
4c4697740b
small changes to tabs to communicate better
2012-03-28 08:59:45 -04:00
efe105198f
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-27 14:54:17 -07:00
2c12d84e2a
Set NOTIFICATION_QUEUE_ALL to True for now in various settings file
...
Added a few lines of documentation to signals.py around notifications
2012-03-27 14:53:07 -07:00
2932758077
got notification settings to work [ #27116165 ]
2012-03-27 17:47:54 -04:00
32ca831897
Comments are now notifying and notices are listing [ #25980231 ]
2012-03-27 15:45:41 -04:00
955f74aabe
fixed the send notification; it now sends a notification
2012-03-27 13:41:41 -04:00
290aecab19
wired up notifications
2012-03-27 13:24:16 -04:00
3925e96ad1
wishlist_comment templates
2012-03-27 12:37:07 -04:00
8f700024cf
eek! non-nested with tags
2012-03-27 12:36:47 -04:00
a7ed7cfd5b
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-27 09:06:44 -07:00
f0009efaea
Adding versioned version of django-notification
2012-03-27 09:06:07 -07:00
0892c7cf73
found the django admin signal to connect to
2012-03-27 12:01:09 -04:00
f7974e8ad3
this commit not working yet
2012-03-27 11:52:57 -04:00
26eddf38fd
install notification
2012-03-27 11:52:23 -04:00
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
419c8a1058
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-26 15:05:31 -07:00
723f329e20
PayPal doesn't like iso formatted times using offsets if the offsets are different, as when the two timestamps are on the opposite side of a daylight savings shift. --> switch to sending Zulu time (time formatted in UTC with Z suffix)
2012-03-26 15:02:26 -07:00
51cf67dca7
moved transaction settings to common.py
2012-03-26 16:18:31 -04:00
1a53a79752
merge all the things
2012-03-26 16:16:57 -04:00
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
dc3852d87c
detabbed
2012-03-26 15:32:23 -04:00
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
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
09923c68e1
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-23 09:42:36 -07:00
0f61bd8d66
added license selection to campaigns. Simple migration to apply.
2012-03-23 12:30:49 -04:00
e4fc2621df
fixed form broken by change to TZ aware times
2012-03-23 12:29:38 -04:00
4c8578cb3f
Allow a bit more start time in campaigntest.support_campaign
2012-03-23 09:24:38 -07:00
6237fcebfe
detabbing views code
2012-03-23 11:15:37 -04:00
2c0fb79da5
minor touchups for rh admin
2012-03-23 11:13:11 -04:00
0aba595e05
campaign admin broken by missing jquery
2012-03-23 11:11:43 -04:00
137c48a70d
setup campaign, I mean
2012-03-23 11:10:34 -04:00
360d11f88a
yes we should deprecate setup_work
2012-03-23 11:09:51 -04:00
84411ca6e0
filled in legal stuff placeholder
2012-03-22 21:25:04 -04:00
d03459922e
fixed stuff I broke when making html validate
2012-03-22 21:25:04 -04:00
c08bd9b54b
I had left a debugging message in pledge_modify.html -- now removed.
...
I figured out the problem of why regluit.test.campaigntest.support_campaign could not see the new Transaction -- it was locked in a database transaction that had an older snapshot of the db. fix came from http://stackoverflow.com/a/4739960/7782
2012-03-22 14:51:43 -07:00
08af63e055
modified default premiums to make them implementable via existing profile
2012-03-22 17:05:39 -04:00
eeaae9131a
[ fix #26883175 ] a35bb7cbba broke this by omitting jquery
2012-03-22 16:57:12 -04:00
29789da14d
learn more was broken on these pages
2012-03-22 16:19:15 -04:00
a7ac79bfc2
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2012-03-22 12:13:42 -07:00
6d0e5c6a3e
[ #23019867 ] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now.
2012-03-22 12:12:46 -07:00
2bfb37ac43
[ #22755723 ] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now.
2012-03-22 12:09:13 -07:00
9f72351c67
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-22 10:18:07 -07:00
6e9f0ee669
tidy lists in metric page
2012-03-22 09:04:28 -04:00
ffb7c8cd33
[ #23019867 ] I believe this commit implements the rest of the pledge changing functionality and works as far as I can tell so far.
...
The one part I don't get yet is why the regluit.test.campaigntest.support_campaign script can successfully drive the browser to create a transction and then
change that pledge to create 2 transactions in total -- and yet until regluit.payment.manager.PaymentManager.check_status is run twice, there seems to be only
one transaction visible to the script.
Does this have to do with Django transactions? I don't know yet.
2012-03-21 15:06:56 -07:00
9629e23b21
[ #22755723 ] First step: adding premium field to Transaction model.
...
MIGRATION REQUIRED
2012-03-20 15:05:29 -07:00
5823c0e2de
[ #23019867 ] At this point, a supporter can change the pledge amount to a smaller amount (no new PayPal transaction required) or a larger amount (a new PayPal transaction is required and the old transaction is canceled.)
...
I've not implemented the storage of the premium yet -- that's coming next.
I've not implemented straight out cancellation of a pledge yet.
More UI refinement needed, especially around encouraging supporters not to decrease (or cancel) a pledge and refinements to help people know that they have made a modification.
2012-03-20 14:10:21 -07:00
508a87a6dc
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-20 13:24:26 -07:00
Andromeda Yelton
Raymond Yee
eric