eric
|
e2bd56ce9d
|
add boox model to track watermarked files
|
2013-08-25 23:35:27 -04:00 |
|
eric
|
0a2e73051a
|
Merge branch 'booxtream' into b2u_fulfillment
|
2013-08-25 17:19:05 -04:00 |
|
eric
|
10b975b839
|
initial commit
|
2013-08-23 17:14:48 -04:00 |
|
eric
|
cbc34db3d7
|
fix bug found by luc
|
2013-08-22 16:12:27 -04:00 |
|
eric
|
1c33c34f21
|
purchase complete notification, contextual wishlist active, fulfillment in signal handler
|
2013-08-22 14:30:56 -04:00 |
|
eric
|
f93fe51e29
|
days_per_copy properties
|
2013-08-22 14:23:47 -04:00 |
|
eric
|
3bdb755419
|
move constant to params file to improve import
|
2013-08-22 14:22:54 -04:00 |
|
eric
|
75ec13cb39
|
make sure the transaction isn't double charged!
|
2013-08-22 14:03:22 -04:00 |
Raymond Yee
|
cf1eae6a5f
|
Merge pull request #200 from Gluejar/ebook_selling
Ebook selling
|
2013-08-20 17:48:50 -07:00 |
|
eric
|
bec85ff82e
|
1st crack at faq revision
|
2013-08-20 14:11:11 -04:00 |
|
eric
|
ff2d995cd5
|
minor wording changes
|
2013-08-20 12:41:39 -04:00 |
|
eric
|
159ad0db05
|
fix tests, fix bugs found by tests
|
2013-08-20 01:01:36 -04:00 |
|
eric
|
80d78e624f
|
remove amazon cruft to get current_total correct
|
2013-08-19 23:23:27 -04:00 |
|
eric
|
18c836d6cd
|
connect purchases to the new Acq table which records purchases
|
2013-08-19 22:54:43 -04:00 |
|
eric
|
91f7c5f23d
|
Remove some payment dependence on campaign details
|
2013-08-19 22:52:22 -04:00 |
|
eric
|
8317356cc2
|
moved to not_maintained
|
2013-08-19 22:27:25 -04:00 |
|
eric
|
26c4d522b4
|
made the cc_date and test consistent whether its a date or a datetime
|
2013-08-19 16:01:32 -04:00 |
|
eric
|
4a3cfc6840
|
Merge branch 'master' into ebook_selling
|
2013-08-18 18:11:13 -04:00 |
|
eric
|
94eb6aeab0
|
Demphasize "wishes" on the website in preparation for B2U
|
2013-08-18 18:10:25 -04:00 |
|
eric
|
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 |
|
eric
|
bf5dcd688a
|
fix some date comparison code to get tests to pass
|
2013-08-18 15:18:01 -04:00 |
|
eric
|
52e58daa20
|
move some code to indicate it's not being maintained
|
2013-08-18 15:16:15 -04:00 |
|
Raymond Yee
|
7b90275bf4
|
Merge pull request #199 from Gluejar/social_auth_password
Social auth password
|
2013-08-18 06:26:35 -07:00 |
|
Raymond Yee
|
c007df0803
|
Merge branch 'master' into social_auth_password
|
2013-08-17 17:41:15 -04:00 |
|
eric
|
c88f8165ba
|
Merge branch 'master' into ebook_selling
|
2013-08-16 15:50:24 -04:00 |
|
eric
|
837de35375
|
selling now works up to purchase page
|
2013-08-16 15:49:44 -04:00 |
|
Raymond Yee
|
98bff34e46
|
Merge pull request #198 from Gluejar/fix_marc_upload
Fix marc upload
|
2013-08-16 07:31:19 -07:00 |
|
eric
|
f607ab026d
|
Make sign-up box validate and make error notices less in-your-face
|
2013-08-15 12:43:20 -04:00 |
|
eric
|
39251b2363
|
lightbox centering code was messed on some doc pages
|
2013-08-15 11:04:47 -04:00 |
|
eric
|
d941686c50
|
now does password reset for a socialauth account
|
2013-08-14 17:29:38 -04:00 |
|
eric
|
c415340356
|
change Pledge button to Purchase
|
2013-08-13 23:47:55 -04:00 |
|
eric
|
40bcf62f99
|
edition.ebooks is always true
|
2013-08-12 17:22:55 -04:00 |
|
eric
|
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 |
|
eric
|
2c06139a6f
|
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
|
2013-08-10 16:29:58 -04:00 |
|
eric
|
7f325c0775
|
Finish B2U Campaign setup
|
2013-08-09 19:00:54 -04:00 |
|
eric
|
75c32569e2
|
B2U campaign percentages
|
2013-08-08 22:32:58 -04:00 |
|
eric
|
c2f3910fe8
|
set approriate open campaign params
|
2013-08-08 22:32:12 -04:00 |
|
eric
|
587323196a
|
Merge branch 'master' into ebook_selling
|
2013-08-08 20:02:25 -04:00 |
|
eric
|
505e9bf9d7
|
add new migration fsequenced after MARC migration
|
2013-08-08 20:00:56 -04:00 |
|
eric
|
e64c128f7e
|
Merge branch 'master' into ebook_selling
Conflicts:
frontend/forms.py
|
2013-08-08 19:59:29 -04:00 |
|
eric
|
613c3770e0
|
Bake in CC Date concept according to blog post, up to campaign creation
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
|
2013-08-08 19:56:26 -04:00 |
|
eric
|
69f9e1838f
|
harmonization with master for merge
|
2013-08-08 18:21:33 -04:00 |
|
Raymond Yee
|
f9fad3260a
|
instance -> self in Account.update_status() -- d'oh
|
2013-08-08 16:28:34 -04:00 |
|
Raymond Yee
|
e5aa8f99e4
|
Merge pull request #176 from Gluejar/expiring_cc
Notifications for expired and expiring credit cards
|
2013-08-08 12:46:45 -07:00 |
|
Raymond Yee
|
cf7160b72d
|
Adding an optional flag to Account.update_status, which by default, send notices only if the status is *changing*.
Set send_notice_on_change_only = False to send notice based on new_status regardless of old status. (Useful for initialization)
|
2013-08-08 13:31:38 -04:00 |
|
Raymond Yee
|
27bc134fa4
|
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
|
2013-08-08 12:28:36 -04:00 |
|
Raymond Yee
|
a9b5d51b36
|
Merge branch 'master' into expiring_cc
|
2013-08-07 22:59:37 -04:00 |
|
Raymond Yee
|
1de7c631c4
|
Merge pull request #193 from Gluejar/marc_provision
Marc provision
|
2013-08-07 19:30:16 -07:00 |
|
Raymond Yee
|
f30d662cd9
|
Merge branch 'master' into marc_provision
|
2013-08-07 22:10:01 -04:00 |
|
eric
|
1bd2918bc3
|
Merge branch 'master' into ebook_selling
|
2013-08-07 15:21:57 -04:00 |