0a6480446a
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-20 22:44:09 +00:00
4e36892910
Putting in stub for campaign_admin.
...
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
12a3f7f72f
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 16:13:28 -05:00
4f624de4a1
tab width on work page
2011-12-20 16:13:18 -05:00
c7293e253a
updating look of campaign and landing page to match latest from Stefan
2011-12-20 15:33:20 -05:00
be12fa9bda
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-20 20:01:57 +00:00
c055767173
set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days.
2011-12-20 14:56:01 -05:00
47399ab23a
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 14:07:43 -05:00
10fdf1f90a
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 13:31:30 -05:00
2432b991b5
the learn more section: it toggles. toggle toggle toggle
2011-12-20 13:31:20 -05:00
6952cbde52
require googlebooks_id to be unique on Edition. this may cause errors to pop up elsewhere when we have a race to add an edition
2011-12-20 12:57:17 -05:00
dd9566c377
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 17:49:26 +00:00
9231923b88
remove duplicate editions
2011-12-20 12:37:50 -05:00
19976b2520
added beginning of a management command to remove duplicate editions
2011-12-20 12:19:23 -05:00
9f2cef6fa3
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 15:46:10 +00:00
269ebc4789
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-20 10:39:14 -05:00
c8c61b5ef9
separating the color green from an abstract call-to-action color(also at present green)
2011-12-20 10:39:02 -05:00
aab7b6f926
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-20 10:35:42 -05:00
2d6a6de487
ElementTree.fromstring expects a string of utf8, not a unicode object, which works most of the time, but not if the UnicodeString contains some non-ascii data I guess. The test suite started failing with a UnicodeEncodeError: 'ascii' codec can't encode character u'\u2014' in position 12164: ordinal not in range(128), I think when the GR bookshelf used by this test changed to include some Unicode
2011-12-20 10:31:15 -05:00
5a5ca2262e
adding TEST_RUNNER back in with latest djcelery test runner djcelery.contrib.test_runner.CeleryTestSuiteRunner to avoid deadlock when running tests
2011-12-20 09:45:10 -05:00
b22d8a82c5
removed TEST_RUNNER declaration since djcelery.contrib.test_runner.run_tests no longer seems to exist in latest djcelery package. not really sure why it was there in the first place.
2011-12-20 09:15:57 -05:00
d78a5cfe6c
blindly trying what the error messages say to do
2011-12-19 23:45:44 -05:00
f81a4e8e6d
removed isbn_10 column and fixed many isbn13 non-compliance issues
...
apply migrations!
2011-12-19 23:26:55 -05:00
bad343e3d2
views.py: wiring in the email address of partnering non-profit
...
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
22da90659c
added frontend tests; test_view_by_anonymous is now by anonymous
2011-12-19 17:09:12 -05:00
f1875201b3
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-19 13:23:40 -05:00
c703b1b367
tab coloring on support page and hover states in share column on work page
2011-12-19 12:22:00 -05:00
2eb42f681e
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-19 09:45:38 -05:00
5b4510e447
unifying badge colors and tab colors on supporter page
2011-12-19 09:44:56 -05:00
bf388a11b9
fixed subject test again
2011-12-19 02:34:29 -05:00
b6a4125e67
fixing subject test, removing settings test
2011-12-19 02:27:07 -05:00
2417886169
removing 0014_populate_subjects migration since it is problematic to run with South ORM, instead have people run add_openlibrary management command
2011-12-19 02:20:24 -05:00
3282a24f7c
remove hard tabs
2011-12-19 02:10:35 -05:00
55656e2d3d
now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS!
2011-12-19 01:33:13 -05:00
f1c0ae4b93
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-12-16 14:38:55 -08:00
ea728750ae
draft terms added
2011-12-16 17:19:59 -05:00
cd53080ac6
eleventy billion css tweaks part quattuor
2011-12-16 12:17:08 -05:00
9085ce6db3
clicking header sign up button on home page now lightboxes signup form
2011-12-16 12:16:30 -05:00
a8cb06fd4b
Merge branch 'payment' of github.com:Gluejar/regluit into payment
2011-12-15 15:59:19 -08:00
b32cf80471
eleventy billion css tweaks, part tres
2011-12-15 13:55:26 -05:00
6e152acfe8
eleventy billion css tweaks, part deux
2011-12-15 10:28:23 -05:00
901f5b4c22
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-14 16:52:03 -05:00
754fcc394e
eleventy billion css tweaks, part one
2011-12-14 16:49:36 -05:00
7cc9a1047a
Do ascii encoding of print message so that the print statement doesn't die on non-ascii words.
2011-12-14 18:04:09 +00:00
09a0e5ba8b
Merging jkace's changes into payment en route to integrating into master
2011-12-14 08:52:48 -08:00
c2c3168e5a
Updating payment code to support delayed chained payments. Adding entry points for delayed execution of payments. Creating common parent class for all paypal transactions to more accurately track metadata
2011-12-14 08:30:37 -05:00
7bfc4849a4
added a column to track amount remaining on a campaign; updated by the Transaction change signal
2011-12-14 00:53:03 -05:00
56f8151ba3
moved transaction_change handler to payment package to make testing easier
2011-12-14 00:53:03 -05:00
10ed085c29
corrected percent calculation in work.percent_unglued
2011-12-14 00:53:03 -05:00
e624a35359
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-13 16:37:55 -05:00
Raymond Yee
Raymond Yee
Andromeda Yelton
Ed Summers
eric
Jason