Commit Graph

1284 Commits (5b18d47866d2137611f99b4c3a51be2e1cf3ac9d)

Author SHA1 Message Date
Raymond Yee 4c9bf21ce8 Got rid of a bunch of print statements 2011-12-21 13:49:24 -05:00
Andromeda Yelton 614b36d15c Merge branch 'master' of github.com:Gluejar/regluit 2011-12-21 13:48:45 -05:00
Andromeda Yelton d0b2809c9e moving badges for recommended and popular into tab area 2011-12-21 13:48:34 -05:00
Raymond Yee fb9fc99545 Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-21 17:34:50 +00:00
Raymond Yee 322f03a460 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-21 12:33:44 -05:00
Raymond Yee c3c0249b42 Added a PaymentManager.finish_campaign()
Fixed a small bug in which r['status'] is None and being attached as a text node in PaymentManager.checkStatus()
2011-12-21 12:31:58 -05:00
Andromeda Yelton e8860238e0 on-wishlist checkmark now displays properly on supporter page 2011-12-21 11:34:35 -05:00
Andromeda Yelton 2428a5eef9 moved support button on work page to be more prominent and align better with other icons 2011-12-21 10:59:49 -05:00
Raymond Yee 75fceed7c5 Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view 2011-12-20 20:36:27 -05:00
Raymond Yee 0a6480446a Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-20 22:44:09 +00:00
Raymond Yee 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
Andromeda Yelton 12a3f7f72f Merge branch 'master' of github.com:Gluejar/regluit 2011-12-20 16:13:28 -05:00
Andromeda Yelton 4f624de4a1 tab width on work page 2011-12-20 16:13:18 -05:00
Andromeda Yelton c7293e253a updating look of campaign and landing page to match latest from Stefan 2011-12-20 15:33:20 -05:00
Raymond Yee be12fa9bda Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-20 20:01:57 +00:00
Raymond Yee 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
Raymond Yee 47399ab23a Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 14:07:43 -05:00
Andromeda Yelton 10fdf1f90a Merge branch 'master' of github.com:Gluejar/regluit 2011-12-20 13:31:30 -05:00
Andromeda Yelton 2432b991b5 the learn more section: it toggles. toggle toggle toggle 2011-12-20 13:31:20 -05:00
Ed Summers 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
Raymond Yee dd9566c377 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 17:49:26 +00:00
Ed Summers 9231923b88 remove duplicate editions 2011-12-20 12:37:50 -05:00
Ed Summers 19976b2520 added beginning of a management command to remove duplicate editions 2011-12-20 12:19:23 -05:00
Raymond Yee 9f2cef6fa3 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 15:46:10 +00:00
Andromeda Yelton 269ebc4789 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-20 10:39:14 -05:00
Andromeda Yelton c8c61b5ef9 separating the color green from an abstract call-to-action color(also at present green) 2011-12-20 10:39:02 -05:00
Raymond Yee aab7b6f926 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 10:35:42 -05:00
Ed Summers 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
Ed Summers 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
Ed Summers 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
eric d78a5cfe6c blindly trying what the error messages say to do 2011-12-19 23:45:44 -05:00
eric f81a4e8e6d removed isbn_10 column and fixed many isbn13 non-compliance issues
apply migrations!
2011-12-19 23:26:55 -05:00
Raymond Yee 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
eric 22da90659c added frontend tests; test_view_by_anonymous is now by anonymous 2011-12-19 17:09:12 -05:00
Raymond Yee f1875201b3 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-19 13:23:40 -05:00
Andromeda Yelton c703b1b367 tab coloring on support page and hover states in share column on work page 2011-12-19 12:22:00 -05:00
Andromeda Yelton 2eb42f681e Merge branch 'master' of github.com:Gluejar/regluit 2011-12-19 09:45:38 -05:00
Andromeda Yelton 5b4510e447 unifying badge colors and tab colors on supporter page 2011-12-19 09:44:56 -05:00
Ed Summers bf388a11b9 fixed subject test again 2011-12-19 02:34:29 -05:00
Ed Summers b6a4125e67 fixing subject test, removing settings test 2011-12-19 02:27:07 -05:00
Ed Summers 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
Ed Summers 3282a24f7c remove hard tabs 2011-12-19 02:10:35 -05:00
Ed Summers 55656e2d3d now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS! 2011-12-19 01:33:13 -05:00
Raymond Yee f1c0ae4b93 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-16 14:38:55 -08:00
Andromeda Yelton ea728750ae draft terms added 2011-12-16 17:19:59 -05:00
Andromeda Yelton cd53080ac6 eleventy billion css tweaks part quattuor 2011-12-16 12:17:08 -05:00
Andromeda Yelton 9085ce6db3 clicking header sign up button on home page now lightboxes signup form 2011-12-16 12:16:30 -05:00
Raymond Yee a8cb06fd4b Merge branch 'payment' of github.com:Gluejar/regluit into payment 2011-12-15 15:59:19 -08:00
Andromeda Yelton b32cf80471 eleventy billion css tweaks, part tres 2011-12-15 13:55:26 -05:00
Andromeda Yelton 6e152acfe8 eleventy billion css tweaks, part deux 2011-12-15 10:28:23 -05:00