Commit Graph

846 Commits (f93fe51e290757e012033a62d149a862b8a810eb)

Author SHA1 Message Date
Andromeda Yelton 287f017551 documentation for CC/PD MARC records 2013-07-22 14:23:59 -04:00
Andromeda Yelton 8285af8611 maybe we should actually provide the URL 2013-07-19 15:39:55 -04:00
eric 1bebec42af what about public domain ebooks? 2013-07-19 13:13:53 -04:00
Raymond Yee 4fc449dad5 Issue: instead of updating all Accounts in core.tasks.update_account_status -- updating only Accounts with expiration dates this month or earlier.
Possible to make this even more narrow -- see https://www.evernote.com/shard/s1/sh/35adfc05-46cc-41b7-865e-8a0edb652fd0/a18917c04c0262cd624208b7a071ec52
2013-07-18 16:14:01 -07:00
Andromeda Yelton 293b9b9db5 Merge branch 'master' into marc_provision 2013-07-18 16:39:33 -04:00
Andromeda Yelton 516c8c768a I can harvest files from the db instead of tempting error by entering them twice 2013-07-18 16:36:01 -04:00
Andromeda Yelton c3349ef5eb logging 2013-07-18 16:07:24 -04:00
Andromeda Yelton 0e143b15ba persist information about where to find AWS files 2013-07-18 15:49:54 -04:00
Raymond Yee 37ce78fda2 Merge branch 'master' into expiring_cc 2013-07-17 18:12:30 -07:00
Andromeda Yelton 54e422e217 parametrizing formats and license choices, bugfixing 2013-07-17 13:03:35 -04:00
Andromeda Yelton 87c27cecee wiring ungluify_record to front end and s3 2013-07-17 10:34:01 -04:00
Raymond Yee a6f9e524e1 [Finishes #53514857] Change ISBNS of test editions 2013-07-16 16:08:20 -07:00
Andromeda Yelton 8e2d469bb5 see if we can fix this 2013-07-16 11:45:31 -04:00
Andromeda Yelton fe2e3b72c5 argh 2013-07-16 11:42:17 -04:00
Andromeda Yelton e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04:00
Andromeda Yelton bbeb086cbc bugfixing 2013-07-08 15:54:36 -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 1e1a0eda46 MARC record support in admin site 2013-07-08 11:14:25 -04:00
Andromeda Yelton 2ea00389b3 minimal MARC support in database 2013-07-08 10:03:22 -04:00
Raymond Yee ac6f57fb31 Adding Google books api key to the search 2013-07-02 08:00:01 -07:00
eric 2a7a42fbfe Merge branch 'master' into ebook_selling
Resolved Conflicts:
	frontend/templates/download.html
	frontend/views.py
	static/css/enhanced_download.css
	static/css/enhanced_download_ie.css
	static/css/sitewide4.css
	static/js/download_page.js
	static/less/enhanced_download.less
	static/less/enhanced_download_ie.less
	static/less/sitewide4.less
2013-06-27 15:26:04 -04:00
eric b0f4eda221 show offers on work page 2013-06-27 13:10:33 -04:00
eshellman 5a207bf4e8 Merge pull request #181 from Gluejar/simpler_download
Simpler download. Yay.
2013-06-26 11:39:39 -07:00
eric f2f02237a8 fix KeyError at source, not in test 2013-06-26 14:36:04 -04:00
Andromeda Yelton b063fe6c3f don't fail for spurious reason 2013-06-26 11:25:35 -04:00
Raymond Yee 86caa9b3ed Making changes to fix breakage in core.tests.BookLoaderTests.test_add_by_isbn
2000-07-01 -> 2000
Ace Trade -> Penguin
2013-06-24 08:04:36 -07:00
Andromeda Yelton 3c950966bc Merge branch 'master' into simpler_download 2013-06-24 08:36:51 -04:00
Raymond Yee 1c86a0ae5a I'm going to modify test for reflect readmill change -- it seems like there is no extra readmill button for test scenario 2013-06-20 14:17:47 -07:00
eric 835ff4be8e Rightsholder can upload ebook files and set buy-to unglue prices [#51733385][#51745045]
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'

DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
eric 1ea77acf09 move latest ending logic from form to model/settings 2013-06-17 18:53:28 -04:00
eric 3ea697c768 create offers
must migrate core schema!
2013-06-17 18:53:28 -04:00
Andromeda Yelton f4ffd5da6f Merge branch 'master' into simpler_download 2013-06-04 10:48:49 -04:00
eric 92b4a36a41 archive now presenting both http and https 2013-06-03 16:29:52 -04:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
Andromeda Yelton 2338240540 add kindle email to profile. requires migration 2013-05-31 11:35:17 -04:00
Andromeda Yelton ffc813d8ee blank descriptions now legit 2013-05-28 10:19:01 -04:00
Raymond Yee a3cc502924 get rid of AccountTest0
renamed notice to Credit Card Number Updated
actually save account in update_account_status
2013-05-20 13:58:21 -07:00
Raymond Yee 31b978bb25 Merge branch 'master' into expiring_cc 2013-05-20 11:36:42 -07:00
eric f2e6d10469 allow new edition id oclc but no isbn; allow new publishernames 2013-05-13 17:32:30 -04:00
Raymond Yee b224e99346 Merge branch 'master' into expiring_cc 2013-05-08 14:05:57 -07:00
eshellman be78c11815 Merge pull request #174 from Gluejar/improve_admin
All the core admin bits are now useable, and display more human readable. Nice convergence.
2013-05-06 14:11:05 -07:00
thatandromeda 97bc857eab Merge pull request #168 from Gluejar/degruyter_stub_template
put status information in de gruyter initialized campaigns
2013-05-06 13:04:50 -07:00
Andromeda Yelton 53d23d9f18 grammar 2013-05-06 15:59:55 -04:00
eric d65704d675 RightsHolder, Subject, UserProfile admin useable 2013-05-03 19:21:10 -04:00
eric 356cc67785 claim admin useable 2013-05-03 18:05:43 -04:00
eric 0578a40798 changed the html, need to change the management command 2013-05-03 11:50:41 -04:00
eric 5f6abec1d5 de-button the ungluers to go 2013-05-02 15:58:28 -04:00
eric 144599ac34 fix the download page tests 2013-04-27 16:58:11 -04:00
eric 6b7fb7fd00 fix ebook url in reverse method 2013-04-26 17:49:57 -04:00
Raymond Yee 7265488484 Merge branch 'master' into expiring_cc 2013-04-26 08:58:47 -07:00
eshellman c5517df1c9 Merge pull request #167 from Gluejar/less_officious_comments
Less officious comments
2013-04-25 15:26:47 -07:00
Raymond Yee a375112e72 Merge branch 'master' into expiring_cc 2013-04-24 13:50:33 -07:00
Andromeda Yelton 7c9973319d donwload page changed, test should change to agree 2013-04-24 15:41:35 -04:00
thatandromeda babeb9e4aa Merge pull request #164 from Gluejar/manage_book_data
Manage book data
2013-04-24 11:31:07 -07:00
thatandromeda 587931a712 Merge pull request #165 from Gluejar/download_counter
Download counter
2013-04-24 11:28:22 -07:00
Andromeda Yelton 3b44e643d5 put status information in de gruyter initialized campaigns 2013-04-24 14:26:23 -04:00
Andromeda Yelton aca759447d test for staffness in template 2013-04-24 11:28:05 -04:00
Andromeda Yelton 80ee477198 disambiguate staff and RH 2013-04-23 10:22:08 -04:00
Andromeda Yelton 516f867d87 removing word 'official' 2013-04-23 10:07:59 -04:00
Raymond Yee e34f2ce3a3 I think I had a Y2.0144 problem 2013-04-22 16:10:54 +00:00
eric a2606b2e08 move download count display to work infobox and rh_tools 2013-04-20 10:08:10 -04:00
eric de442c8f63 count downloads. migrate schemas! 2013-04-20 00:02:36 -04:00
Raymond Yee aac69cf64c Fixed up account_expiring text...next step is to fix up account_expired and account_active 2013-04-17 15:43:44 -07:00
Raymond Yee 3b900e2328 Align names signals.py with those in the short.txt for notices 2013-04-17 13:24:43 -07:00
eric 31a1f46666 add split works funtionality 2013-04-16 16:46:25 -04:00
Raymond Yee 9cc2e3121e Merge branch 'master' into expiring_cc 2013-04-10 09:14:29 -07:00
Raymond Yee c60986f87c Merge pull request #159 from Gluejar/press_updater
Press updater
2013-04-05 08:21:51 -07:00
Andromeda Yelton 00ab8f4d18 better name 2013-04-04 10:15:15 -04:00
Andromeda Yelton 2db75dd1d0 models.py update requires migration 2013-04-04 10:15:05 -04:00
Andromeda Yelton 63dd344c5a adds db support for press items 2013-04-04 09:44:41 -04:00
eric 31644ffb5a revert to simpler faster query
output from speed test: old way 10% faster
2 values 0:00:18.294094
orig 0:00:16.574740
1 value 0:00:18.118002
2 values 0:00:18.266426
2013-04-03 20:21:04 -04:00
eric 4180569633 Merge branch 'master' into fix_google_id 2013-04-03 20:07:03 -04:00
eric cd7082a676 test the work identifier methods 2013-04-03 15:45:01 -04:00
Raymond Yee 044c5ba806 fix self.identifiers.values('type', 'value').filter(type='goog')[0].value -> ['value'] 2013-04-02 23:14:39 -07:00
Raymond Yee d26e97f883 need ['value'] to access value not .value 2013-04-02 23:01:24 -07:00
Raymond Yee d861aafdc3 Merge branch 'master' into landing_page 2013-04-02 07:55:42 -07:00
eric 2aabf09161 merge from master 2013-03-29 19:41:28 -04:00
eric e4259bf468 changed all_names to alternate_names, added counter to monitor progress
Be sure your mysql server is set to utf8:
http://stackoverflow.com/questions/3513773/change-mysql-default-characte
r-set-to-utf8-in-my-cnf
2nd answer
2013-03-29 14:58:54 -04:00
Raymond Yee 63c6b35a30 Merge branch 'master' into add_publisher_model 2013-03-29 08:43:15 -07:00
eric 552602f20a https gravatar 2013-03-28 12:27:37 -04:00
Andromeda Yelton 520beedfc7 made it faster 2013-03-28 11:38:40 -04:00
eric a0af1761f1 forgot to set gravatar as default for new users 2013-03-28 10:39:48 -04:00
eric 24a08d2979 Implement Andromeda suggestions 2013-03-27 21:46:52 -04:00
eric 56691cd3e0 make sure alias pubname is used for new, add tests 2013-03-27 12:51:10 -04:00
eric 3a81db3804 Implement publisher and feedback email in campaign management
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
eric 782f2bd712 can now admin the publishernames.
Setting a publisher moves the editions to that publisher's name
2013-03-26 14:12:58 -04:00
eric 3bef92b484 Publishers can now be added in Admin 2013-03-26 10:56:49 -04:00
eric 1881660089 intoduce Publisher and PublisherName Models
Also change our by publisher lists to key on the new name ids rather
than the names, which was yucky.
Migrations!
Data migration takes a while, don't be allarmed if it sits a while.
2013-03-25 23:41:19 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
Raymond Yee aca38d66a1 Merge branch 'master' into expiring_cc
Conflicts:
	payment/tests.py
2013-03-20 09:41:30 -07:00
eric 50ec6ddb06 merge from master 2013-03-19 14:38:09 -04:00
eric af8c3ff1fd merge from master 2013-03-19 10:02:06 -04:00
eric bd9a746422 merge in master 2013-03-18 21:50:22 -04:00
eric 937f17eb73 and now everything works again 2013-03-18 14:56:27 -04:00
Andromeda Yelton dc8dea0768 moving countdown out of context to models.py, standardizing button appearance 2013-03-15 15:51:17 -04:00
eric 9dbdafed7d There IS a setting for the items per page! 2013-03-15 12:32:29 -04:00
eric f719fb2ec3 migrate to pipeline 2013-03-15 12:29:11 -04:00
eric 014f15d8ee start on the profile editor mods... 2013-03-14 21:42:00 -04:00
eric 7f64189284 create and deploy avatar_source and avatar_url 2013-03-14 15:43:24 -04:00
eric 88a241fafd add gravator method 2013-03-14 09:58:21 -04:00