Commit Graph

2414 Commits (0765e6801d2c98cec575f3dc8d1045a8dfb4ead7)

Author SHA1 Message Date
Raymond Yee 4bb48c64e6 changing future to present continuous tense for when credit card charged 2012-06-21 09:07:05 -07:00
eric bc2e5ac3be better handling of successful campaigns on work page 2012-06-21 10:49:55 -04:00
Raymond Yee e3ec5ba1ee don't return empty rightsholder for campaign if it's SUCCESSFUL.
Remaining question:  why does the RH for a campaign depend at all on campaign status?  If it doesn't, we should remove dependence
2012-06-21 07:36:44 -07:00
Raymond Yee 0c88c77733 forgot the easy-to-forget endswith 2012-06-21 06:14:37 -07:00
Raymond Yee 013ddb5a3c Another template problem in the pledge_charged notices 2012-06-21 06:09:37 -07:00
Raymond Yee 3988335072 Add a command to list queued notices 2012-06-21 05:18:12 -07:00
Raymond Yee 20e5baa6ba work -> transaction.campaign.work 2012-06-21 05:09:51 -07:00
Raymond Yee 7482a19cd1 work.id -> campaign.work.id 2012-06-20 21:29:23 -07:00
Raymond Yee 6389c25f11 Trying to import successful_campaign differently 2012-06-20 21:09:05 -07:00
Raymond Yee 31cf653e63 Five -> four active campaigns 2012-06-20 20:47:42 -07:00
Raymond Yee ea4fc308a0 Allowing campaign.update_status to go SUCCESSFUL w/o regard to specific deadline.
Set a bookloader test to expected failure while it might be a transient error
2012-06-20 15:48:55 -07:00
eric f7282d4e11 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-06-19 07:34:52 -04:00
eric 001f654880 trivial cleanup in unglued ebook notification 2012-06-19 07:34:37 -04:00
Raymond Yee 1f77371b7b 1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys'
2) using humanize tag naturalday on the book panel
2012-06-18 13:55:45 -07:00
Raymond Yee 25268b34bc [#29500707] Logging an error when an attempt to cancel a transaction does not succeed 2012-06-15 16:59:51 -04:00
Raymond Yee 30bf30177c Added a case for pledge_modified to have a up_or_down to be 'canceled' -- and change in template text to handle the canceling of a pledge 2012-06-15 16:14:26 -04:00
Raymond Yee 60434b24ad removing one redundant notice in pledge modify 2012-06-15 13:48:05 -04:00
Raymond Yee 2b7da6e91e First attempt to place the notices properly coming from a pledge modify -- inside payment.manager.cancel_related_transaction -- but current problem is now that we get too many notices 2012-06-15 11:38:38 -04:00
Raymond Yee 63166e4f9b Merge branch 'master' of github.com:Gluejar/regluit into fps 2012-06-15 11:33:13 -04:00
Andromeda Yelton eda96f716b ending time should round up, not down. also times less than days were not going to display right due to type errors. now they will. 2012-06-15 12:06:38 -03:00
Andromeda Yelton 12dca9c36d reducing redundancy in comment notification lead-in 2012-06-15 11:32:12 -03:00
Andromeda Yelton 86a9fc5039 first draft customized for each 2012-06-14 17:15:32 -03:00
Andromeda Yelton 2beb4e5dbb commenting 2012-06-14 17:15:11 -03:00
Andromeda Yelton 2c14edd8ad updating press coverage 2012-06-14 11:35:57 -03:00
Andromeda Yelton ad23fc3c4c refactoring to work with new expand_about.js 2012-06-13 16:50:57 -03:00
Andromeda Yelton 7a11e822d8 new about lightboxes for wishlist tabs; need to be in /static/ so they can be found by .js ajax call 2012-06-13 16:50:44 -03:00
Andromeda Yelton df7ea263a0 adding a wishlist-tabs explanation section [#22431977] 2012-06-13 16:50:03 -03:00
Andromeda Yelton 5cab0880e7 refactoring so as to be useful for expanding and collapsing a variety of lightboxes, not just hardcoded to the generic about 2012-06-13 16:49:14 -03:00
Raymond Yee 457aba97bd Merge branch 'master' into fps 2012-06-13 14:43:24 -04:00
Andromeda Yelton 6c86a89edf realized those styling changes aren't actually relevant to anything 2012-06-13 14:33:26 -03:00
Andromeda Yelton 3d5cf5107f embiggening font sitewide (almost nothing below 13px), making font size a less variable so it's easier to change in future and we don't have so many different font sizes 2012-06-13 13:31:21 -03:00
Andromeda Yelton 63143bf860 removing rest of is_preview 2012-06-13 13:30:39 -03:00
Andromeda Yelton d652db5c03 removing is_preview since it's no longer needed 2012-06-13 09:41:23 -03:00
Raymond Yee 9058327370 Modify checkStatus to handle the scenario in which we pass in transactions to check on 2012-06-13 08:35:18 -04:00
Andromeda Yelton 2241134e92 comment notifications should contain link to comments tab 2012-06-13 08:52:53 -03:00
Raymond Yee 19f25d5785 Merge branch 'fps' of github.com:Gluejar/regluit into fps 2012-06-13 07:39:51 -04:00
Jason 56b6ed57cb Adding better error/exception handling to the amazon payment return URL 2012-06-12 14:52:53 -04:00
Raymond Yee 6e922ca2be Merge branch 'master' into fps 2012-06-12 12:28:20 -04:00
Andromeda Yelton e2dc5e3751 Merge branch 'master' of github.com:Gluejar/regluit 2012-06-12 12:21:06 -03:00
Andromeda Yelton d0a7f9ea63 added conversion tracking code for adwords campaigns so that we can assess their performance 2012-06-12 11:29:47 -03:00
Raymond Yee c745452b4f Merge branch 'master' into fps 2012-06-11 11:44:19 -04:00
eric ed92de66be default premium description in fixture was different from TOS: username, not name to be used in acknowledgements 2012-06-11 11:39:25 -04:00
Raymond Yee 54e0ce8644 Slight change in amazon.py to avoid circular imports 2012-06-08 15:40:13 -04:00
Raymond Yee 3d07e09424 Merge branch 'master' into fps
Conflicts:
	payment/manager.py
2012-06-08 15:02:57 -04:00
Andromeda Yelton 656899105e should make correct decisions about displaying sign-up-today option [#30249919] 2012-06-04 15:50:30 -04:00
Andromeda Yelton d55d3cb54a fixes [#30249919] 2012-06-04 15:20:23 -04:00
Andromeda Yelton 17b222d69f adding prominent invitation for RHs to email us to FAQ 2012-06-04 10:29:42 -04:00
Jason ef1338f7ce Removing extra cancel operations as part of payment checkStatus 2012-06-01 13:42:48 -04:00
Jason 3b7e57ad2a Fixing bug in payment checkStatus code to test for multiple active transactions per campaign 2012-06-01 13:16:52 -04:00
Andromeda Yelton ce5ee124d9 removing pagination from work_list -- likely unnecessary and this should be faster 2012-06-01 13:15:50 -04:00