Commit Graph

2336 Commits (5e3cf5d7aa81e73e189790f96d556f2ba28921fa)

Author SHA1 Message Date
Andromeda Yelton 00802f700f digital shift article 2012-05-17 13:08:20 -04:00
Andromeda Yelton e38be413c4 adding LJ article 2012-05-17 12:58:50 -04:00
Andromeda Yelton 5b3c0b5e19 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-17 12:24:10 -04:00
Andromeda Yelton 1eb7847b76 need to make sure book_panel knows about campaign status no matter where it's being included from 2012-05-17 12:06:29 -04:00
Raymond Yee 0ff30626bb nuking UNGLUEIT_SHORTEST_DEADLINE from common.py 2012-05-17 09:06:19 -07:00
eric 229f290d02 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-05-17 11:36:22 -04:00
eric 23b8ec4987 redeleteing UNGLUEIT_SHORTEST_DEADLINE 2012-05-17 11:36:15 -04:00
Raymond Yee 126e0f244e Adding UNGLUEIT_SHORTEST_DEADLINE back 2012-05-17 08:34:46 -07:00
Raymond Yee 199921c015 Flipping IS_PREVIEW on production from True to False -- LAUNCHING 2012-05-17 08:21:51 -07:00
Andromeda Yelton 37c54f0ef7 adding japanese coverage to blog section 2012-05-17 11:08:12 -04:00
Andromeda Yelton b7acd528e5 mediaborder image styling should only apply to description tab 2012-05-17 10:50:22 -04:00
Andromeda Yelton 7bd9f28770 making percent unglued display better in book panels 2012-05-17 10:19:20 -04:00
Andromeda Yelton d234c45c42 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-17 09:55:34 -04:00
Andromeda Yelton 41323e443d one more $ added to premium amount field 2012-05-17 09:43:29 -04:00
Andromeda Yelton a47f48e777 showing percent campaign has proceeded toward goal more clearly 2012-05-17 09:24:57 -04:00
Andromeda Yelton 20a99412ab streamlining percent_of_goal 2012-05-17 09:24:37 -04:00
Andromeda Yelton 4ec0ed0638 adding $ before target price field to reduce chance people will type one into the field 2012-05-17 09:15:33 -04:00
Raymond Yee aa5fb08850 [#29500707] For the moment, ask users to contact us to cancel transactions. 2012-05-16 20:35:43 -07:00
Raymond Yee ec37368e71 Merge branch 'ry' of github.com:Gluejar/regluit 2012-05-16 20:26:43 -07:00
Raymond Yee c2b7cebfcd Work underway for pledgecancel 2012-05-16 20:14:13 -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