Commit Graph

1900 Commits (ff65b6b7dd8039051adf6f7fee6dd4e27f13bd47)

Author SHA1 Message Date
Andromeda Yelton 830e1248c3 probably more efficient 2013-05-17 11:30:22 -04:00
Andromeda Yelton 2ecf4d94e4 work lists with active campaigns should highlight them 2013-05-16 11:43:25 -04:00
eshellman 8dbf20e143 added submit warning 2013-05-16 11:25:20 -03:00
eric f2e6d10469 allow new edition id oclc but no isbn; allow new publishernames 2013-05-13 17:32:30 -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
eric 1788705bd7 fix bad links from stupid robots [#49219467] 2013-05-03 14:48:36 -04:00
eric 6b7fb7fd00 fix ebook url in reverse method 2013-04-26 17:49:57 -04:00
eshellman c5517df1c9 Merge pull request #167 from Gluejar/less_officious_comments
Less officious comments
2013-04-25 15:26:47 -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 e7cea6c8f4 clarifying 2013-04-24 14:30:39 -04: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
eric 08d4adf50b implement adromeda suggestions 2013-04-24 11:14:25 -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
eric fb77f5a372 fixed ebook admin to allow setting of counts, etc 2013-04-20 10:34:44 -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 aaaa9e0e56 need a link to repeat the proces 2013-04-18 11:29:34 -04:00
eric 11381a99c9 add edition management links 2013-04-16 16:46:45 -04:00
eric 31a1f46666 add split works funtionality 2013-04-16 16:46:25 -04:00
eric 3c61e292d9 Fix edition editing, add other identifiers 2013-04-13 10:59:11 -04:00
Raymond Yee d977fd6338 Merge pull request #161 from Gluejar/fix_authcanceled
add a special response for failed social auths
2013-04-10 08:38:14 -07:00
eshellman 7e95d5f0d7 Merge pull request #162 from Gluejar/rh_is_not_user_friendly
altering term 'rights holder' in places where non-RHs are likely to enco...
2013-04-09 12:22:40 -07:00
thatandromeda 70cf09403d Merge pull request #163 from Gluejar/press_updater
missing </div>
2013-04-09 12:10:27 -07:00
eric 24392c5b3e missing </div> 2013-04-09 15:07:30 -04:00
Andromeda Yelton 075dfc3c55 altering term 'rights holder' in places where non-RHs are likely to encounter it and be confused 2013-04-09 12:31:19 -04:00
eshellman 97e750867b Merge pull request #160 from Gluejar/press_updater
point press page at new version, tidy up submitterator
2013-04-09 05:46:05 -07:00
eric 1ee2d5c634 add a special response for failed social auths 2013-04-09 00:05:31 -04:00
Raymond Yee 74c8d52176 Restored mistakenly deleted import: 6cf42b1a67 (L0L43) 2013-04-08 13:51:08 -07:00
Andromeda Yelton 71306108b0 point press page at new version, tidy up submitterator 2013-04-08 14:16:08 -04:00
Raymond Yee 2bb69d9e82 Merge pull request #149 from Gluejar/verify_email_change
Verify email change
2013-04-08 07:28:32 -07:00
eric 6cf42b1a67 resolve conflict 2013-04-05 13:10:03 -04:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Andromeda Yelton a3ca1d3867 press coverage should be ordered by date 2013-04-04 11:40:44 -04:00
Andromeda Yelton a7adca844e submitterator needs to allow us to submit past press coverage 2013-04-04 11:40:03 -04:00
Andromeda Yelton 04aa440cd2 including untracked files is fun and useful 2013-04-04 11:34:54 -04:00
Andromeda Yelton 57f7c81ec0 adds press item submission functionality 2013-04-04 11:09:18 -04:00
Andromeda Yelton db0a967963 new press template and view 2013-04-04 10:15:29 -04:00
Andromeda Yelton 7e2d57b299 force css reload 2013-04-02 11:58:50 -04:00
eric 040cd6d144 add de gruyter news by hand 2013-04-02 11:21:44 -04:00
Raymond Yee d861aafdc3 Merge branch 'master' into landing_page 2013-04-02 07:55:42 -07:00
Andromeda Yelton 7dd1b994cd fixing syntax error 2013-04-01 10:28:19 -04:00
thatandromeda 6505384a1a Merge pull request #152 from Gluejar/improve_login_to_add
"login to add" now adds, uses triple login page [#30497175]
2013-04-01 07:15:25 -07:00
Raymond Yee f029da02c6 Merge pull request #154 from Gluejar/fix_null_search
fix error when search has no q
2013-03-30 10:31:36 -07:00
Raymond Yee f958693931 Merge pull request #150 from Gluejar/add_publisher_model
Add publisher model
2013-03-30 10:03:30 -07:00
Raymond Yee 1992c15c65 put production into maintenance mode 2013-03-30 09:55:32 -07:00
Raymond Yee 1f522e0112 maintenance mode 2013-03-30 09:47:45 -07:00
eric d19b9e7d8e fix error when search has no q 2013-03-29 21:11:01 -04:00
eric 2aabf09161 merge from master 2013-03-29 19:41:28 -04:00
Andromeda Yelton 1a5477b271 as we can link straihgt to the comments tab, let's 2013-03-29 16:25:58 -04:00
Andromeda Yelton b5af0fd98b Merge branch 'landing_page' of github.com:Gluejar/regluit into landing_page 2013-03-29 16:24:34 -04:00
Andromeda Yelton d90c8580e4 adds arrows for more, removes placeholder, changes header bars to pale-blue 2013-03-29 16:23:43 -04:00
Andromeda Yelton 35b4c7b91f remove placeholder until I come up with a video to go here 2013-03-29 15:23:37 -04:00
eric 097127ab7c resolve conficts in merge from master 2013-03-29 12:03:15 -04:00
eric 1ace0a5479 "login to add" now adds, uses triple login page [#30497175] 2013-03-29 11:50:07 -04:00
Raymond Yee 63c6b35a30 Merge branch 'master' into add_publisher_model 2013-03-29 08:43:15 -07:00
Raymond Yee c832f2f281 Merge pull request #148 from Gluejar/improve_avatars
Improve avatars (gravatar, update social_auth, avatars selectable)
2013-03-29 08:26:41 -07:00
Raymond Yee 44daa18f30 Merge branch 'master' into add_publisher_model 2013-03-28 22:46:38 -07:00
eric 5bb546bd0d fixed bad url 2013-03-28 14:16:52 -04:00
Andromeda Yelton 520beedfc7 made it faster 2013-03-28 11:38:40 -04:00
Andromeda Yelton 9661c97bf3 whoops ordering queryset on wrong thing 2013-03-28 11:12:55 -04:00
Andromeda Yelton f804a0df66 adding read-faq option into learn-more area, since we've removed it from giant graphic 2013-03-28 10:59:36 -04:00
Andromeda Yelton 17a9847b66 segregating learn_more area css fully into learnmore.less 2013-03-28 10:38:57 -04:00
eric 24a08d2979 Implement Andromeda suggestions 2013-03-27 21:46:52 -04:00
eric 70beef83d5 display of works in our db were being excluded from google search results 2013-03-27 21:31:30 -04:00
eric 8366b08c69 get email_change working again 2013-03-27 17:57:08 -04:00
Andromeda Yelton af0d42b9ff removed unused sharing features 2013-03-27 15:06:28 -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
Andromeda Yelton 5c2b639e98 as seen on section 2013-03-27 10:33:47 -04:00
Andromeda Yelton 79ddb02df9 need to have a content-block id around book panels for greenpanel.js to bind 2013-03-26 15:31:44 -04:00
Andromeda Yelton 6e801e6841 adding bookish activity to main content area 2013-03-26 14:55:50 -04:00
eric 2b28add6a8 first pass at publisher page
in admin created publisher "De Gruyter" url=http://degruyter.com/"
logo_url=https://www.degruyter.com/skin/20130326/images/logo.png
description=For more than two-hundred and sixty years the name De
Gruyter has been synonymous with high-quality, landmark publications in
the humanities and natural sciences. The scope of our publishing
program includes theology and philosophy, biology and chemistry,
linguistics and literature, mathematics and physics, history and
archaeology, as well as law and medicine. In all these areas De Gruyter
has consistently partnered with exceptional scholars to establish
itself as a key international publisher.

page at http://localhost:8000/bypub/all/de%20gruyter and
http://localhost:8000/pid/all/4702 (my db pubname id for de gruyter is
4702)
2013-03-26 14:53:48 -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
Andromeda Yelton 7f59be6ada kill crowdfunding graphic and slideshow 2013-03-26 13:55:14 -04:00
Andromeda Yelton 998f33c770 more exciting news feed for home page 2013-03-26 13:54:03 -04:00
Andromeda Yelton b3a5e0ce45 add placeholder 2013-03-26 13:53:53 -04:00
eric 3bef92b484 Publishers can now be added in Admin 2013-03-26 10:56:49 -04:00
eric 90d01894d2 don't ask people to add books by publisher 2013-03-25 23:41:59 -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 c26f9e1505 merge from master 2013-03-22 16:39:23 -04:00
Andromeda Yelton e4a39647b9 expand and rename who's ungluing what area 2013-03-22 15:47:03 -04:00
Andromeda Yelton 750ced0686 Merge branch 'improve_registration' of github.com:Gluejar/regluit into improve_registration
Conflicts:
	static/css/book_panel.css
	static/css/registration2.css
2013-03-22 11:25:06 -04:00
Andromeda Yelton edb174fc96 Merge branch 'master' into improve_registration
Conflicts:
	frontend/templates/pledge_complete.html
	static/css/sitewide2.css
2013-03-22 11:22:23 -04:00
thatandromeda 543adf2bc4 Merge pull request #144 from Gluejar/fix_bookpanel_button
Fix bookpanel read it now button [#45869489]
2013-03-22 07:48:56 -07:00
eric a5a000ef7f triple sign-in form when non-logged-in user tries to pledge 2013-03-21 14:24:11 -04:00
eric 1fcd0e54ed fixed bug that broke return path to pledge 2013-03-21 10:14:23 -04:00
eric cc48ef8362 merge from master 2013-03-21 08:44:43 -04:00
eric f3cbd82336 fix "On Wishlist" link when it's not my wishlist 2013-03-21 08:38:46 -04:00
Andromeda Yelton 9a15545567 Merge branch 'search_on_campaigns' 2013-03-20 16:46:40 -04:00
eric 53ee1c8b29 Addressed Andromeda's comments
Didn't know LESS well enough to remove hover state on "Pledged!", so
added a link; removed extra "pledged!"; all ebook links now point to
download page.
2013-03-20 15:24:53 -04:00
eric 6ebdd1610d urldecode the next path when pulled from cookie 2013-03-20 14:15:30 -04:00
eric f19cb8935b fix cookiepusher javascript on landing page, persist it
on the landing page, what is the first signup for for?
2013-03-20 13:45:16 -04:00
Raymond Yee e8a87e498e Merge branch 'list_by_a_publisher' 2013-03-19 20:30:16 -07:00
eric 25937e1016 fix stupid bug on page2+ of search result 2013-03-19 16:43:23 -04:00
eric 6de3b806a6 change name of book_panel stylesheet to force reload on deployment 2013-03-19 14:53:11 -04:00
eric 50ec6ddb06 merge from master 2013-03-19 14:38:09 -04:00
eric a22e5e95e5 fix bad welcome page and login 2013-03-19 10:33:57 -04:00
eric af8c3ff1fd merge from master 2013-03-19 10:02:06 -04:00