Andromeda Yelton
|
b6a6b6df7d
|
first pass at making pledge amount and premium level boxes reconcile. needs to be made DRYer but works.
|
2012-05-15 19:31:49 -04:00 |
|
Andromeda Yelton
|
af0ef1648e
|
removing extraneous semicolon
|
2012-05-15 19:31:17 -04:00 |
Raymond Yee
|
c9e5de9330
|
Merge branch 'fps' of github.com:Gluejar/regluit into ry
Conflicts:
payment/manager.py
|
2012-05-15 14:53:09 -07:00 |
Jason
|
65a7df298d
|
Adding secure IPN url for amazon payments
|
2012-05-15 16:52:05 -04:00 |
|
Jason
|
7a38bdf91c
|
Merging master -> fps
|
2012-05-15 16:16:39 -04:00 |
|
Raymond Yee
|
3027589a5d
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-15 12:47:02 -07:00 |
|
Andromeda Yelton
|
6c3c1a8cd5
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-15 15:44:54 -04:00 |
|
Andromeda Yelton
|
4a606cfc4e
|
here you go Eric. note the spaces provided for your title and name
|
2012-05-15 15:44:42 -04:00 |
|
Andromeda Yelton
|
03f98844fd
|
removing pledge_prefill script, moving tiny little focus script to here
|
2012-05-15 15:44:18 -04:00 |
|
Raymond Yee
|
220714e320
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-15 12:42:28 -07:00 |
eric
|
9d33a95147
|
[ fixed #29647161] fixed login redirect which was failing when next included a query string
|
2012-05-15 14:18:17 -04:00 |
|
eric
|
28a4eb5f57
|
[#29632523] pledge modify form now preselects the correct premium
|
2012-05-15 13:47:00 -04:00 |
|
Raymond Yee
|
9da5b155f5
|
closing key in quotes
|
2012-05-15 10:24:43 -07:00 |
|
Andromeda Yelton
|
8cba752057
|
more notices need html templates for display at /notifications
|
2012-05-15 10:27:57 -04:00 |
|
Raymond Yee
|
19fe43b215
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-15 07:23:42 -07:00 |
|
Raymond Yee
|
d56b7a6453
|
First pass at a django admin command to check integrity of payments
|
2012-05-15 07:23:02 -07:00 |
|
Andromeda Yelton
|
9e2050c000
|
adding answer to an actual question from an actual user
|
2012-05-15 09:33:12 -04:00 |
|
eric
|
d3bff4efb5
|
[#29481707] added explanation of how to "edit" a premium
|
2012-05-14 23:27:44 -04:00 |
|
Andromeda Yelton
|
95d4786c4b
|
notice templates should actually say stuff
|
2012-05-14 21:42:46 -04:00 |
|
Andromeda Yelton
|
26061cd240
|
hey the reason I wasn't getting the layout I expected was that I'm an idiot. sweet\!
|
2012-05-14 21:09:29 -04:00 |
|
Andromeda Yelton
|
fe9ee13ae1
|
adding eric's ccc podcast
|
2012-05-14 20:53:05 -04:00 |
|
Andromeda Yelton
|
4fec8438a6
|
communicating a little more clearly
|
2012-05-14 20:44:27 -04:00 |
|
Andromeda Yelton
|
ff5e0b76a9
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-14 20:38:28 -04:00 |
|
Andromeda Yelton
|
2617deb636
|
standardized font size of error message (which triggered recompilation of css files depending on variables.less)
|
2012-05-14 20:37:57 -04:00 |
|
Andromeda Yelton
|
50d9fcc6d6
|
filling box with number, not string
|
2012-05-14 20:37:29 -04:00 |
|
thatandromeda
|
0e59ee746b
|
Update frontend/views.py
|
2012-05-14 18:23:13 -03:00 |
|
Andromeda Yelton
|
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 |
|
Andromeda Yelton
|
33bfb73a25
|
the sharing options in the you_have_pledged notice.html should be real live links
|
2012-05-14 16:53:53 -04:00 |
|
Andromeda Yelton
|
407c8ed376
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-14 16:41:13 -04:00 |
|
Andromeda Yelton
|
54e9f8ad17
|
changed from click to on syntax in hopes of addressing possible IE9 event handling weirdness
|
2012-05-14 16:27:48 -04:00 |
|
eric
|
e42ecfbec5
|
html cleanup on pledge page
|
2012-05-14 15:56:19 -04:00 |
|
eric
|
98aca7b474
|
Attorney review done [finish #29281959]
|
2012-05-14 15:43:22 -04:00 |
|
Raymond Yee
|
58fbc843a9
|
Merging Jason's code in -- first and hopefully successful pass
Conflicts:
payment/manager.py
|
2012-05-14 11:52:01 -07:00 |
|
eric
|
6451e1adba
|
Do number comparison, not string comparison, on pledge amounts
|
2012-05-14 14:05:40 -04:00 |
|
Andromeda Yelton
|
3fe2800dfa
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-14 13:51:06 -04:00 |
|
Andromeda Yelton
|
1c5d517d93
|
setting clearer expectations about communication in response to user feedback
|
2012-05-14 13:50:55 -04:00 |
|
Andromeda Yelton
|
2b9b4a7331
|
share links in pledge_complete need to include url base
|
2012-05-14 13:42:34 -04:00 |
|
Raymond Yee
|
cd9bdf70b5
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-14 10:16:26 -07:00 |
|
Raymond Yee
|
b07d6c267d
|
Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet
|
2012-05-14 10:15:40 -07:00 |
Raymond Yee
|
32250157e3
|
Merge branch 'real_money' of github.com:Gluejar/regluit
|
2012-05-14 15:41:55 +00:00 |
|
Raymond Yee
|
78791a454f
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-14 06:32:15 -07:00 |
|
eric
|
443c4b5d42
|
[finish #27015121] give focus to pledge amount box, select premium doesn't reduce pledge
|
2012-05-14 09:01:03 -04:00 |
|
Raymond Yee
|
ef0ea5569a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-13 23:12:16 -07:00 |
|
Raymond Yee
|
c500b8dbaa
|
TURN ON FPS PAYMENT -- let's see what happens
|
2012-05-13 23:11:47 -07:00 |
|
eric
|
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 |
|
eric
|
08290c0128
|
[#28736373] fixed problem with not being able to select no edition
|
2012-05-14 01:05:14 -04:00 |
|
eric
|
4d1a1aba35
|
fixed missing inputs for manage campaign form [fix #29179771] which prevented active campaigns from saving edits
|
2012-05-14 00:56:32 -04:00 |
|
Raymond Yee
|
5ccf1fe0d1
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-13 21:43:36 -07:00 |
|
eric
|
3c98e65217
|
whoops. So used to django knowing what I meant...
|
2012-05-13 23:11:06 -04:00 |
|
eric
|
ea9ac7508e
|
repaired the invocation ot I_just_pledged emailshare [#27785469]
|
2012-05-13 22:59:07 -04:00 |