63143bf860
removing rest of is_preview
2012-06-13 13:30:39 -03:00
d652db5c03
removing is_preview since it's no longer needed
2012-06-13 09:41:23 -03:00
9058327370
Modify checkStatus to handle the scenario in which we pass in transactions to check on
2012-06-13 08:35:18 -04:00
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
19f25d5785
Merge branch 'fps' of github.com:Gluejar/regluit into fps
2012-06-13 07:39:51 -04:00
56b6ed57cb
Adding better error/exception handling to the amazon payment return URL
2012-06-12 14:52:53 -04:00
6e922ca2be
Merge branch 'master' into fps
2012-06-12 12:28:20 -04:00
e2dc5e3751
Merge branch 'master' of github.com:Gluejar/regluit
2012-06-12 12:21:06 -03:00
d0a7f9ea63
added conversion tracking code for adwords campaigns so that we can assess their performance
2012-06-12 11:29:47 -03:00
c745452b4f
Merge branch 'master' into fps
2012-06-11 11:44:19 -04:00
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
54e0ce8644
Slight change in amazon.py to avoid circular imports
2012-06-08 15:40:13 -04:00
3d07e09424
Merge branch 'master' into fps
...
Conflicts:
payment/manager.py
2012-06-08 15:02:57 -04:00
656899105e
should make correct decisions about displaying sign-up-today option [ #30249919 ]
2012-06-04 15:50:30 -04:00
d55d3cb54a
fixes [ #30249919 ]
2012-06-04 15:20:23 -04:00
17b222d69f
adding prominent invitation for RHs to email us to FAQ
2012-06-04 10:29:42 -04:00
ef1338f7ce
Removing extra cancel operations as part of payment checkStatus
2012-06-01 13:42:48 -04:00
3b7e57ad2a
Fixing bug in payment checkStatus code to test for multiple active transactions per campaign
2012-06-01 13:16:52 -04:00
ce5ee124d9
removing pagination from work_list -- likely unnecessary and this should be faster
2012-06-01 13:15:50 -04:00
886280fe21
Adding modifications to payment/pledge modification code. The modify funciton will not cancel the existing pre-approval unless it is fully approved by the user via the co-branded API
2012-06-01 13:13:37 -04:00
d029e02bb4
Adding skeleton row locking code for demo
2012-06-01 12:20:17 -04:00
153e7eaff9
Merge branch 'master' of github.com:Gluejar/regluit
2012-06-01 11:02:35 -04:00
fd44471aae
caching the wishlist rather than calculating it for every single book_panel = potentially huge performance improvement
2012-06-01 10:22:39 -04:00
882ba635da
making capitalization consistent
2012-06-01 10:10:42 -04:00
acf6f18a1c
fixed broken link
2012-06-01 09:06:26 -04:00
56074903e7
more cleanup
2012-06-01 09:06:20 -04:00
ece63619a8
aligning official comments properly vis-a-vis other comments
2012-05-31 13:52:19 -04:00
a6d03af40d
caching repeatedly-used title
2012-05-31 13:33:16 -04:00
9e8be5695b
comments
2012-05-31 13:29:41 -04:00
90ece3a2b0
made logic less awful, cached work.id to speed things up as it's used many times
2012-05-31 13:25:19 -04:00
cfa12dd228
was missing fastcoexist article
2012-05-31 13:24:53 -04:00
d0fb4c8f59
Added some starter code to export data about unglue.it activity
2012-05-30 14:44:48 -07:00
4eab46f1d5
clarify what 'official comment' means
2012-05-30 12:36:35 -04:00
63567d8eaa
mad->made (typo fix)
2012-05-30 09:32:04 -07:00
6e9e87f402
more blog coverage
2012-05-29 21:29:22 -04:00
3f5b04f1ea
let's use a color that's within our existing color scheme
2012-05-29 21:16:32 -04:00
79bdcf3f5c
commenting
2012-05-29 21:16:01 -04:00
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
d077a81a1b
[ #29919391 ] 742d5bcd70/frontend/templates/book_panel.html (L163) was not succeeding because work.last_campaign is None. So I rearrange the logic
...
to look first for whether there are any ebooks to link to, then added a check for last_campaign == None.
I think this fixes the immediate issue of Wished by N not appearing-- but the set of if statements could take a bit more thinking through
2012-05-29 16:57:38 -07:00
742d5bcd70
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 16:25:35 -07:00
fccedc50d7
Goodreads problem has been fixed: http://www.goodreads.com/topic/show/908732?utm_medium=email&utm_source=comment_instant#comment_51301819
2012-05-29 16:23:57 -07:00
4ce0731095
[ #28011527 ] implemented comment preview form to address missing-user error
2012-05-29 19:20:00 -04:00
52ed00b80b
Marking core.GoodreadsTest.test_review_list_unauth as expected failure for now. I believe there is a problem on
...
the Goodreads side and have reported the problem: http://www.goodreads.com/topic/show/908732-api-problem-http-status-code-500-for-list-xml#comment_51296303
I will need to turn this test back on once Goodreads fixes the problem
2012-05-29 15:27:54 -07:00
40d0397bc8
Document the new modification argument for payment.manager.PaymentManager.authorize
2012-05-29 15:16:21 -07:00
8ce6ffe530
Pull which payment processor is involved from the transaction itself not from the settings.PAYMENT_PROCESSOR
2012-05-29 15:01:48 -07:00
111e10f380
Expose what http code we are getting from goodreads when we get something that is not 200
2012-05-29 12:47:38 -07:00
e27ad644b5
Merge branch 'campaignformviewnixed'
2012-05-29 11:48:41 -07:00
88d6955685
Name error --> transaction should be t
2012-05-29 11:41:36 -07:00
4e81f743b4
removed import loop
2012-05-29 12:08:28 -04:00
Andromeda Yelton
Raymond Yee
Jason
eric