Commit Graph

306 Commits (f7a5195ac3e52de476b34c0b92644af882dd6ae5)

Author SHA1 Message Date
eric 314847459b remove readmill, add dropbox 2014-05-20 12:19:34 -04:00
eric de6b8555d1 move CC constants into a module 2014-05-08 10:21:50 -04:00
Raymond Yee f5fdcb17cd I'd like to have locals.py as the last item in the file 2014-05-02 11:19:05 -07:00
eric ac7d77965d our production account 2014-05-02 14:14:44 -04:00
Raymond Yee 58896c9b2b updating bucket name on unglue.it 2014-02-19 17:22:45 -08:00
Raymond Yee b8aaab0d4c Setting up jenkins-unglueit S3 bucket for jenkins 2014-02-19 15:24:23 -08:00
Raymond Yee 41bbe5bac5 just_unglueit -> just-unglueit bucket name 2014-02-19 15:16:17 -08:00
Raymond Yee 854bc28612 registered a new Google Books API for jenkins under rdhyee@gluejar.com account 2013-12-10 14:48:04 -08:00
eric 188d34ea51 added test for b2u ungluify
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -05:00
Raymond Yee d3a784812c drop emit_notifications from celery right now since we're using crontab for now 2013-11-12 06:40:34 -08:00
eric 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05:00
eric ab473f5411 libraries, phase 1.
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
Raymond Yee 3b34c43581 Merge branch 'insert_dated_copyright' 2013-09-20 18:00:30 -07:00
Raymond Yee 8543a9ac2f change pyepub to regluit.pyepub 2013-09-20 17:59:40 -07:00
Raymond Yee 2143d5854f Merge branch 'master' of github.com:Gluejar/regluit 2013-09-20 17:52:48 -07:00
Raymond Yee 78a7d69513 Add pyepub to installed modules 2013-09-20 17:51:58 -07:00
eric e075fd0081 not using unglueit.com any more 2013-09-11 13:43:49 -04:00
Raymond Yee 6b4898c700 for now add s3 keys to jenkins -- ideally, we should set up separate keys 2013-08-30 12:13:44 -07:00
eric 55d84deaf9 not sure why this problem didn't surface before... 2013-08-30 14:17:45 -04:00
Raymond Yee 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
eric e5a162061d only epub files to be uploaded for now 2013-08-26 23:54:19 -04:00
eric 10b975b839 initial commit 2013-08-23 17:14:48 -04:00
eric 7f325c0775 Finish B2U Campaign setup 2013-08-09 19:00:54 -04:00
eric 587323196a Merge branch 'master' into ebook_selling 2013-08-08 20:02:25 -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 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 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
eric 6da8d16770 moved the payment tasks to payment from core 2013-08-03 18:42:33 -04:00
eric f2fbfed79e Merge branch 'master' into expiring_cc 2013-08-03 16:19:53 -04:00
eric 84c18ee65d Make sure current staff is described accurately on ungluue.it site 2013-08-01 19:28:20 -04:00
eric 1307ae7091 move 856 documentation to template from settings 2013-07-26 22:31:41 -04:00
Andromeda Yelton ec57b7efee user preference affects which MARC records we make available 2013-07-23 16:07:47 -04:00
Andromeda Yelton 1414ae5fa4 add user preference for MARC record link target 2013-07-23 09:53:07 -04:00
eric 1bebec42af what about public domain ebooks? 2013-07-19 13:13:53 -04:00
Andromeda Yelton 0e143b15ba persist information about where to find AWS files 2013-07-18 15:49:54 -04:00
Andromeda Yelton 54e422e217 parametrizing formats and license choices, bugfixing 2013-07-17 13:03:35 -04:00
Raymond Yee 46d1d4f767 Merge branch 'master' into expiring_cc
Conflicts:
	payment/models.py
	payment/tests.py
2013-07-08 10:52:44 -07:00
Andromeda Yelton 2ea00389b3 minimal MARC support in database 2013-07-08 10:03:22 -04:00
Raymond Yee 63a3bac876 Trying a new key for prod.py too to see whether that will fix breakage in api calls 2013-07-02 07:37:12 -07:00
Raymond Yee 4333a480de Testing out new Google Books API key on just 2013-07-02 07:24:18 -07:00
eric 1ea77acf09 move latest ending logic from form to model/settings 2013-06-17 18:53:28 -04:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
Raymond Yee 9cc2e3121e Merge branch 'master' into expiring_cc 2013-04-10 09:14:29 -07:00
eric 1ee2d5c634 add a special response for failed social auths 2013-04-09 00:05:31 -04:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Raymond Yee 25fedc69ee get prod out of production mode 2013-03-30 10:25:32 -07:00