Commit Graph

408 Commits (f5d97bcbfc9cca999b7092b6797cacde6b7af173)

Author SHA1 Message Date
eric 159ad0db05 fix tests, fix bugs found by tests 2013-08-20 01:01:36 -04:00
eric 18c836d6cd connect purchases to the new Acq table which records purchases 2013-08-19 22:54:43 -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 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 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
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 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
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 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
eric 54d0aa1d59 merge master into seo
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
Andromeda Yelton 2da23dbd64 Merge branch 'master' into work_page_CTAs
Conflicts:
	frontend/templates/work.html
	frontend/views.py
	static/css/campaign.css
2013-03-12 15:59:24 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
eric 57ebbc087e merge master into work_page_CTAs 2013-03-11 22:39:48 -04:00
eric c037764289 sitemaps! [#25581139] 2013-03-09 17:37:33 -05:00
eric a2329de3b1 merge master into improve_registration 2013-03-08 17:14:22 -05:00
eric 80536a491a superlogin- failed logins check for socialauth and if so, as user to use it
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
eric a44a505157 optimize the shit out of work lists [#45623361]
so, it turns out you need a migration to apply db-index changes to your
db. blazing speed ensues.
2013-03-06 21:54:12 -05:00
Raymond Yee 0abeb92a23 on_ml is already boolean 2013-03-06 07:27:51 -08:00
eric d6a8dedfaa mailchimp ops now example.org aware, test users, now all changed to example.org 2013-03-06 09:39:06 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric d08ca3efbd Turns out site was already in context for notifications as "current_site"
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
eric 9811012bf3 fix rare bugs 2013-02-25 18:31:37 -05:00
eric 242cb66451 mitigate bug for campaigns that didn't get a success date 2013-02-21 15:57:49 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
Andromeda Yelton cd40fe99ef making it faster 2013-02-04 13:32:21 -05:00
Andromeda Yelton fa7e0b20de addressing feedback 2013-01-04 15:12:35 -05:00
Andromeda Yelton 8867724ae9 make a work's rightsholders accessible from the templates 2013-01-03 13:18:00 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
eshellman a6186e3bc6 Merge pull request #90 from Gluejar/prettier_acks
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
Andromeda Yelton f4a269f5ac returning empty string rather than False 2012-12-31 15:02:39 -05:00
Andromeda Yelton 47c44b20d5 add success_date property to campaign so we can accurately report it when it differs from campaign deadline 2012-12-31 11:00:45 -05:00
Andromeda Yelton 73266f07eb line up icons better and more clearly indicate status of books with successful campaigns 2012-12-14 10:45:16 -05:00
Andromeda Yelton b05beaeaa7 need to actually handle anons and pass that data 2012-12-11 13:17:28 -05:00
Raymond Yee cbac6f1e3c First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing 2012-11-21 09:21:01 -08:00
Raymond Yee 279399e9b5 [fix #39700567] Return a rightsholder name regardless of status of Campaign 2012-11-16 08:52:54 -08:00
Raymond Yee 1739064229 return True incorrect place in Campaign.update_status 2012-11-15 13:06:12 -08:00
Raymond Yee b2ca44da31 Now automatically process transactions based on status of campaigns 2012-11-13 10:15:38 -08:00
Andromeda Yelton f9f19b2043 if last transaction ack_name was blank, use username as ack_name 2012-10-23 09:37:00 -04:00
Andromeda Yelton b7ce48bfb0 fix anon_pref 2012-10-19 14:01:22 -04:00
Andromeda Yelton 41f59024f4 last_transaction now a property on the profile 2012-10-18 15:51:52 -04:00