Commit Graph

354 Commits (d5b9f88380000d61002a07bd8d3f202f1f1c8638)

Author SHA1 Message Date
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 837de35375 selling now works up to purchase page 2013-08-16 15:49:44 -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 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
eric 91e2d41b67 moved the link target pref into a library prefs only table 2013-07-26 18:30:45 -04:00
Andromeda Yelton 5e0ee9f5f9 need a bit more flexibility and validation if we're creating CC/PD MARCrecord instances directly from admin 2013-07-25 10:36:03 -04:00
Andromeda Yelton 3a9e588fc7 replacing confusing field names 2013-07-25 10:18:36 -04:00
Andromeda Yelton ec57b7efee user preference affects which MARC records we make available 2013-07-23 16:07:47 -04:00
Andromeda Yelton bb5c1079b6 user can now change marc preferences 2013-07-23 12:23:04 -04:00
Andromeda Yelton 1414ae5fa4 add user preference for MARC record link target 2013-07-23 09:53:07 -04:00
Andromeda Yelton 6ba623a2c8 database support for MARC records that link to download page 2013-07-23 08:49:15 -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
Andromeda Yelton 87c27cecee wiring ungluify_record to front end and s3 2013-07-17 10:34:01 -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
Andromeda Yelton 2ea00389b3 minimal MARC support in database 2013-07-08 10:03:22 -04:00
eric b0f4eda221 show offers on work page 2013-06-27 13:10:33 -04: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
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 6b7fb7fd00 fix ebook url in reverse method 2013-04-26 17:49:57 -04: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 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 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
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