Raymond Yee
|
ec37368e71
|
Merge branch 'ry' of github.com:Gluejar/regluit
|
2012-05-16 20:26:43 -07:00 |
Andromeda Yelton
|
b094bc8444
|
moved feedback box to slightly less annoying position so it will not be in the way of explore bar now that people need to use that
|
2012-05-16 21:44:35 -04:00 |
|
Andromeda Yelton
|
10dbc6e20d
|
images should have the same pretty border as videos
|
2012-05-16 21:44:12 -04:00 |
|
Andromeda Yelton
|
cc8c9ebbb9
|
added a message that will display when is_preview is off directing people toward active campaigns
|
2012-05-16 21:43:45 -04:00 |
|
Raymond Yee
|
3a6b6e038d
|
First pass at handling the situation in which user interrupts Amazon pledge
|
2012-05-16 18:16:06 -07:00 |
|
Andromeda Yelton
|
45720197c6
|
ensuring that cancel message is not too wide
|
2012-05-16 14:29:15 -04:00 |
|
Andromeda Yelton
|
e60be456cc
|
whoops ungrammatical
|
2012-05-16 14:28:51 -04:00 |
|
Andromeda Yelton
|
c4053a4b59
|
communicating stuff more clearly
|
2012-05-16 14:03:14 -04:00 |
|
Andromeda Yelton
|
5445041382
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-16 12:18:56 -04:00 |
|
Andromeda Yelton
|
2a9ef4030f
|
rewording notification box to reflect current state
|
2012-05-16 12:18:35 -04:00 |
|
Andromeda Yelton
|
f5602b5756
|
we weren't using this
|
2012-05-16 11:38:53 -04:00 |
|
Andromeda Yelton
|
104b916171
|
changing http unglue.it links to https
|
2012-05-16 11:38:42 -04:00 |
|
Raymond Yee
|
57d74ecea1
|
Added:
from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE
|
2012-05-16 08:18:04 -07:00 |
|
Raymond Yee
|
bd66c62842
|
tell Jenkins about setting.PAYMENT_PROCESSOR (while we transition to having code look up transaction.host)
add missing comma
|
2012-05-16 07:47:16 -07:00 |
|
Andromeda Yelton
|
b9de19bb09
|
modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom
|
2012-05-16 10:35:58 -04:00 |
|
Andromeda Yelton
|
2bf67671ad
|
supporters should only return people with active transactions, not e.g. canceled ones
|
2012-05-16 10:24:03 -04:00 |
|
Andromeda Yelton
|
775d1d4af2
|
fixing rendering of successful campaign notifications
|
2012-05-16 10:06:26 -04:00 |
eric
|
0f9d292e16
|
more andromeda's nits [#29281959]
|
2012-05-16 02:05:32 -04:00 |
|
eric
|
4a98076b63
|
fix andromeda's nits [#29281959]
|
2012-05-16 01:49:36 -04:00 |
|
eric
|
979bb8b037
|
missing humaize in pledged_charge [#28493739]
|
2012-05-16 01:48:41 -04:00 |
|
eric
|
36a5e92d25
|
[finish #29677811] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
|
2012-05-15 23:42:31 -04:00 |
|
eric
|
06b002c276
|
[#28493739] fix heading of pleadge_charged notice
|
2012-05-15 23:07:18 -04:00 |
|
eric
|
a6e685618c
|
resolve conflicts
|
2012-05-15 22:54:23 -04:00 |
|
eric
|
8fd4edbe42
|
wired pledged_charged notice [finish #28493739]
|
2012-05-15 22:47:57 -04:00 |
|
Andromeda Yelton
|
4a34ba6f86
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-15 20:58:19 -04:00 |
|
Andromeda Yelton
|
655908b855
|
now DRY and commented, albeit not dryly commented
|
2012-05-15 20:58:07 -04:00 |
|
Raymond Yee
|
4d9873ccb5
|
Get rid of an FPS key
|
2012-05-15 17:46:01 -07:00 |
|
Raymond Yee
|
942d80688a
|
Add secure IPN settings to prod.py
|
2012-05-15 17:42:16 -07:00 |
Raymond Yee
|
a1808b13ec
|
Merge branch 'ry' of github.com:Gluejar/regluit into ry
|
2012-05-16 00:29:49 +00:00 |
|
Raymond Yee
|
7a6b62ede9
|
Comment out django-merchant requirement
|
2012-05-16 00:28:54 +00:00 |
|
Raymond Yee
|
450c1cdf56
|
Add settings for secure IPN -- the secure IPN doesn't work in RY's testing yet, however
|
2012-05-15 17:12:58 -07:00 |
|
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 |