Commit Graph

2147 Commits (272d795dedfe4c5ce933d67dd9ffdbc7ae30d142)

Author SHA1 Message Date
Raymond Yee 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
Raymond Yee 93aa8d54f2 The selenium test is now working again 2012-05-18 15:06:35 -07:00
Andromeda Yelton a5df3b608a fixing broken link 2012-05-18 11:35:08 -04:00
Andromeda Yelton 9cac73f036 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-18 11:29:51 -04:00
Andromeda Yelton bfc958fd06 updating with launch coverage 2012-05-18 11:29:37 -04:00
Andromeda Yelton 333de6ce6b mildly humiliating grammar mistake 2012-05-18 11:28:58 -04:00
Raymond Yee 0d5392aeae Merge branch 'ry' 2012-05-17 14:05:33 -07:00
Raymond Yee b532a13bd0 Putting in MAINTENANCE_MODE for various local configurations 2012-05-17 13:56:44 -07:00
Raymond Yee cbb7045ad9 Another set of URLs for DEBUG only 2012-05-17 13:55:02 -07:00
Raymond Yee 1ca930440c certain test views that should be on only if DEBUG = True 2012-05-17 13:54:09 -07:00
Raymond Yee 04ec596dc1 pieces of django-maintenance 2012-05-17 13:28:48 -07:00
Andromeda Yelton 085b67fb93 making sure not to run into int/float mismatch problems, and also it's ok if the percent goes over 100 2012-05-17 14:51:53 -04:00
Andromeda Yelton d94b23e2fe wow so calculating percents totally works better when you multiply by one hundred huh 2012-05-17 14:47:32 -04:00
Raymond Yee b233c5f03a Undo the work I started with to finish pledge_cancel. 2012-05-17 10:52:12 -07:00
Raymond Yee ac44911fa7 Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-05-17 10:48:04 -07:00
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