Commit Graph

323 Commits (38b16f4f0f366ab61db090d2a30b399b41f1d2cc)

Author SHA1 Message Date
eric 157d41eead make the purchase options reflect user libraries 2013-10-11 17:50:54 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
eric 18c836d6cd connect purchases to the new Acq table which records purchases 2013-08-19 22:54:43 -04:00
eric 94eb6aeab0 Demphasize "wishes" on the website in preparation for B2U 2013-08-18 18:10:25 -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
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 e64c128f7e Merge branch 'master' into ebook_selling
Conflicts:
	frontend/forms.py
2013-08-08 19:59:29 -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 a1b8ac6dba change Rghts tab to More… tab 2013-08-05 17:40:42 -04:00
eric 1872180c22 add upload MARC link to work page 2013-07-29 16:35:50 -04:00
eric 8576a7fb7b Make marc records accessible from work page 2013-07-29 15:57:33 -04:00
eric 7eeb114d03 tweek status messages 2013-06-29 23:14:33 -04:00
eric b0f4eda221 show offers on work page 2013-06-27 13:10:33 -04:00
Andromeda Yelton b943e82012 CSS for streamlined downloads 2013-05-24 14:54:05 -04: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
thatandromeda babeb9e4aa Merge pull request #164 from Gluejar/manage_book_data
Manage book data
2013-04-24 11:31:07 -07:00
Andromeda Yelton 3b44e643d5 put status information in de gruyter initialized campaigns 2013-04-24 14:26:23 -04:00
eric 08d4adf50b implement adromeda suggestions 2013-04-24 11:14:25 -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
eric 11381a99c9 add edition management links 2013-04-16 16:46:45 -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 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 392a751abb html nits 2013-03-18 22:07:19 -04:00
eric bd9a746422 merge in master 2013-03-18 21:50:22 -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 7f64189284 create and deploy avatar_source and avatar_url 2013-03-14 15:43:24 -04:00
eric 6143c6a3aa normalize invocation of supporter url, fix wrong user for comment links 2013-03-14 15:33:00 -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
Andromeda Yelton fae6c8f3a9 reverting to earlir add-wishlist functionality 2013-03-12 14:48:20 -04:00
eric cb55922036 Doublecheck the merge 2013-03-11 22:46:26 -04:00
eric 57ebbc087e merge master into work_page_CTAs 2013-03-11 22:39:48 -04:00
eric 55b30f494e schema.org metadata! 2013-03-09 20:25:47 -05:00
eric 62627a80cf fix "next" behavior, poor sign-up/pledge flow [#40841931]
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
eric 339d4653ab migrate and clean urls 2013-03-07 21:53:32 -05:00
eric 06b43ed8d1 basic by-publisher list [#45617641]
a bit slow, but that's a separate issue.
Not conspicuously surfaces yet, look at the links in the editions list
in rights tab.
2013-03-05 16:18:54 -05:00
eric 2153a6c589 added hover to message icon, moved css and js to files 2013-03-04 23:25:22 -05:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
eric 89221fbe82 ajax submission and error handling 2013-02-25 18:32:22 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
Andromeda Yelton f674278b02 mouseover shows exact percent of goal 2013-02-18 11:58:38 -05:00
eric 08967a008e html nit 2013-02-09 19:21:04 -05:00
Andromeda Yelton 61b2859a02 testing all the edge cases and editing accordingly 2013-02-08 15:55:43 -05:00
eric 02f10de83a review of html title tag for all pages 2013-02-08 10:12:28 -05:00
Andromeda Yelton 918ce0f904 aligning book detail layout in pledge and work pages 2013-02-07 15:25:14 -05:00
Andromeda Yelton a060cf0f51 improving gradient 2013-02-07 14:10:00 -05:00
Andromeda Yelton cf58570c2e moving informational and call-to-action elements of work page 2013-02-07 13:37:54 -05:00
Andromeda Yelton c761d5819d first pass at moving big button 2013-02-06 16:26:07 -05:00
Andromeda Yelton a322baa195 addressing pull request feedback 2013-01-17 15:46:31 -05:00
Andromeda Yelton a27e319e5a more status-sensitive twitter share text 2013-01-16 11:13:23 -05:00
Andromeda Yelton fa7e0b20de addressing feedback 2013-01-04 15:12:35 -05:00
Andromeda Yelton 924300267b more pointers to contextually appropriate actions for RHs 2013-01-03 13:18:26 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
Andromeda Yelton 4ac487a7c9 unwinding useful changes from discarded two-tab model 2013-01-02 15:48:49 -05:00
eshellman c22403356c Merge pull request #99 from Gluejar/correct_ungluing_date
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08: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 4a307a1e00 addressing CSS comments and also fixing some invalid html 2012-12-17 14:23:23 -05:00
Andromeda Yelton ab2d3d51b6 Merge branch 'master' into unglued_books_tab 2012-12-14 10:46:11 -05:00
Andromeda Yelton b001aefeeb separating unglued and PD works on ready-to-read page 2012-12-13 15:25:01 -05:00
eric fec7f33d9e staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
Andromeda Yelton a2abb92038 makes pledge action clearer by describing in more contexts and using Pledge rather than Support 2012-11-20 09:56:04 -05:00
Andromeda Yelton 81e27e234e decided that phrasing was confusing 2012-11-20 09:09:03 -05:00
Andromeda Yelton 0b657cf1c1 clarify that acks are in the unglued ebook itself 2012-11-19 11:23:32 -05:00
Andromeda Yelton 78c62ef553 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	frontend/templates/work.html
2012-10-25 09:43:29 -04:00
Andromeda Yelton 4a87253ca7 only show the premiums section if there actually are premiums 2012-10-24 11:34:22 -04:00
Andromeda Yelton 9eb0323768 add case where ungluer has not yet pledged 2012-10-24 11:30:37 -04:00
Andromeda Yelton 89b92b4dba add acknowledgements to support menu 2012-10-24 11:25:17 -04:00
Andromeda Yelton cc18eb20d3 add acknowledgements to support menu 2012-10-24 11:24:46 -04:00
Andromeda Yelton 82e0e17017 stopgap for [#37714043] 2012-10-14 15:20:55 -04:00
Andromeda Yelton ec0ba04d76 created editions may have cover images but not google books ids 2012-10-11 09:48:55 -04:00
eric 94ed8fa8df removed unbalanced <span> 2012-09-28 17:09:21 -04:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch
Relaunch
2012-09-28 07:55:07 -07:00
eshellman f327db6efd Merge pull request #19 from Gluejar/improvify_download_page
Improvify download page with readmill [finish #36156381]
2012-09-26 13:04:39 -07:00
Andromeda Yelton 38d115e5a1 no longer need readmill script since we're pulling send script directly 2012-09-25 10:53:23 -04:00
eric ccc082545a [#32289887] add worldcat learn more...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
Raymond Yee a91a70e6ef Merge pull request #12 from Gluejar/master
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
eshellman 5589e5d209 Merge pull request #7 from Gluejar/improvify_download_page
Improvify download page
2012-09-20 12:58:45 -07:00
Andromeda Yelton 5419c869ed now the readmill script works on the lightbox too 2012-09-19 12:08:27 -04:00
Andromeda Yelton 82f6ceffd4 addressing comment 2012-09-18 13:09:19 -04:00
Andromeda Yelton b0c2f0926b whoops there are other cases 2012-09-18 12:12:50 -04:00
Andromeda Yelton 35180252e0 bugfix [#36104625] 2012-09-18 11:10:53 -04:00
Andromeda Yelton f03855f2de bugfix [#36104625] 2012-09-18 11:10:01 -04:00
Raymond Yee b08643a0ac Merge branch 'master' into relaunch 2012-09-13 10:50:43 -07:00
Andromeda Yelton b383c9717d hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger 2012-09-11 14:14:57 -04:00
Raymond Yee deee2ab75a Merge branch 'master' into relaunch
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:25:43 -07:00
Andromeda Yelton 3a0d09db33 edition-adding on rights tab was hard to read with multiple editions 2012-09-10 14:37:37 -04:00
eric 4700e63b06 resolve conflict 2012-09-07 16:26:09 -04:00
eric 6f63c047ce DRY pub year code moved to work model 2012-09-07 16:07:47 -04:00
Andromeda Yelton 48e20a7cdd bringing all the lightboxes under the hijax.js system 2012-08-27 15:35:29 -04:00
Andromeda Yelton a6e034a36a rudimentary download page plus logic to serve it 2012-08-24 15:14:32 -04:00