678372b863
Merge branch 'b2u_fulfillment'
2013-08-30 12:14:28 -07:00
6b4898c700
for now add s3 keys to jenkins -- ideally, we should set up separate keys
2013-08-30 12:13:44 -07:00
aceeba2cd8
Merge branch 'master' of github.com:Gluejar/regluit
2013-08-30 11:32:04 -07:00
55d84deaf9
not sure why this problem didn't surface before...
2013-08-30 14:17:45 -04:00
c5048c15b5
Merge pull request #202 from Gluejar/b2u_fulfillment
...
B2u file upload, testing and watermarking
2013-08-30 11:08:29 -07:00
715bf049bc
Merge branch 'b2u_fulfillment' of https://github.com/Gluejar/regluit into b2u_fulfillment
...
Conflicts:
core/signals.py
2013-08-29 22:16:42 -04:00
f8df110163
only watermark on purchase
2013-08-29 11:57:41 -04:00
646c8f09e3
I think it's right to move the logic into the else: https://github.com/Gluejar/regluit/pull/202#discussion_r6059064
2013-08-29 06:29:45 -07:00
4e161bebe6
explicit import of regluit.core.parameters
...
move to using the openly available github hosted version of Eric's Open Access Ebooks for core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
2f1d99418c
Merge pull request #201 from Gluejar/more_b2u
...
More b2u
2013-08-27 08:51:18 -07:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
e5a162061d
only epub files to be uploaded for now
2013-08-26 23:54:19 -04:00
ef3de5bd88
fix error handling, remove dead code
2013-08-26 23:43:40 -04:00
567f20d5a2
move more constants
2013-08-25 23:52:09 -04:00
e2bd56ce9d
add boox model to track watermarked files
2013-08-25 23:35:27 -04:00
0a2e73051a
Merge branch 'booxtream' into b2u_fulfillment
2013-08-25 17:19:05 -04:00
10b975b839
initial commit
2013-08-23 17:14:48 -04:00
cbc34db3d7
fix bug found by luc
2013-08-22 16:12:27 -04:00
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
f93fe51e29
days_per_copy properties
2013-08-22 14:23:47 -04:00
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
75ec13cb39
make sure the transaction isn't double charged!
2013-08-22 14:03:22 -04:00
cf1eae6a5f
Merge pull request #200 from Gluejar/ebook_selling
...
Ebook selling
2013-08-20 17:48:50 -07:00
bec85ff82e
1st crack at faq revision
2013-08-20 14:11:11 -04:00
ff2d995cd5
minor wording changes
2013-08-20 12:41:39 -04:00
159ad0db05
fix tests, fix bugs found by tests
2013-08-20 01:01:36 -04:00
80d78e624f
remove amazon cruft to get current_total correct
2013-08-19 23:23:27 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
91f7c5f23d
Remove some payment dependence on campaign details
2013-08-19 22:52:22 -04:00
8317356cc2
moved to not_maintained
2013-08-19 22:27:25 -04:00
26c4d522b4
made the cc_date and test consistent whether its a date or a datetime
2013-08-19 16:01:32 -04:00
4a3cfc6840
Merge branch 'master' into ebook_selling
2013-08-18 18:11:13 -04:00
94eb6aeab0
Demphasize "wishes" on the website in preparation for B2U
2013-08-18 18:10:25 -04:00
d5b9f88380
move "extra data" into a json field dict to improve payment code tidieness
...
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
bf5dcd688a
fix some date comparison code to get tests to pass
2013-08-18 15:18:01 -04:00
52e58daa20
move some code to indicate it's not being maintained
2013-08-18 15:16:15 -04:00
7b90275bf4
Merge pull request #199 from Gluejar/social_auth_password
...
Social auth password
2013-08-18 06:26:35 -07:00
c007df0803
Merge branch 'master' into social_auth_password
2013-08-17 17:41:15 -04:00
c88f8165ba
Merge branch 'master' into ebook_selling
2013-08-16 15:50:24 -04:00
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
98bff34e46
Merge pull request #198 from Gluejar/fix_marc_upload
...
Fix marc upload
2013-08-16 07:31:19 -07:00
f607ab026d
Make sign-up box validate and make error notices less in-your-face
2013-08-15 12:43:20 -04:00
39251b2363
lightbox centering code was messed on some doc pages
2013-08-15 11:04:47 -04:00
d941686c50
now does password reset for a socialauth account
2013-08-14 17:29:38 -04:00
c415340356
change Pledge button to Purchase
2013-08-13 23:47:55 -04:00
40bcf62f99
edition.ebooks is always true
2013-08-12 17:22:55 -04:00
b05b622609
not all records have 050 and 082; code for 082 was putting call number in Dewey!
2013-08-12 17:22:24 -04:00
2c06139a6f
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
2013-08-10 16:29:58 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
Raymond Yee
eric