Commit Graph

1829 Commits (3b44e643d5b68360b5281dc893b1fe21b2c2e053)

Author SHA1 Message Date
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
eric e2ab3d75a8 Big merge from master 2013-03-19 09:40:18 -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
eric ff58e5cd97 add link to gravatar in ui 2013-03-18 16:30:43 -04:00
eric 937f17eb73 and now everything works again 2013-03-18 14:56:27 -04:00
Raymond Yee 494457ae73 Merge pull request #143 from Gluejar/seo
sitemap, schema.org and fix bad urls in wishlist feeds
2013-03-15 14:43:55 -07:00
thatandromeda f3b48fa9a9 Merge pull request #142 from Gluejar/fix_stripe_spinny_thing
one line js fix to stop the spinny thing when stripe reports an error
2013-03-15 12:55:41 -07: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 6143c6a3aa normalize invocation of supporter url, fix wrong user for comment links 2013-03-14 15:33:00 -04:00
Andromeda Yelton db0eec3b6c Merge branch 'master' into work_page_CTAs 2013-03-13 11:30:28 -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
Raymond Yee 037c917d74 Change expected http response code from 302 to 200 on wishlist add to match change in UI. 2013-03-12 20:37:53 -07:00
eric 581944c3f9 fix bug on cancel pledge 2013-03-12 23:11:59 -04:00
eric a4cc2ce1f0 misc template fixes 2013-03-12 21:58:29 -04:00
eric 7bf62d665e rip out old password change code 2013-03-12 21:58:15 -04:00
eric 7cbbf31268 clean up templates 2013-03-12 21:25:39 -04:00
eric 131010300a std install of email_change
decided not to use pip install because the code needs some mods, and
doesn't seem to be maintained.
2013-03-12 20:45:09 -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 cc2623e196 login form now remembers the username you picked [#23965785] 2013-03-12 14:26:40 -04:00
eric 5dd70006c9 conditional to correct add-to-wishlist on slideshow [#32295071] 2013-03-12 10:35:27 -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 c724786c97 remove redundant with clauses 2013-03-11 16:23:52 -04:00
eric 88c2edb58d refactor 2013-03-11 16:09:40 -04:00
eric 4e8f1b2fdc reshuffle back of bookpanel to allow front bottom buttons to be clicked 2013-03-11 15:38:04 -04:00
eric 55b30f494e schema.org metadata! 2013-03-09 20:25:47 -05:00
eric d3077c988b links should not point to http from https 2013-03-09 13:29:03 -05:00
eric 303c53c82e While I'm looking at this, make the cvc input a password [#41678953] 2013-03-08 18:50:35 -05:00
eric e757eae0a3 one line js fix 2013-03-08 18:33:10 -05:00
eric a2329de3b1 merge master into improve_registration 2013-03-08 17:14:22 -05:00
eric 7ef408115e fix one template 2013-03-08 16:46:33 -05:00
eric 800d0ffdeb cleanup of css and js imports, also mapping 2013-03-08 14:16:24 -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 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 3ccad0770b refactor work list templates 2013-03-06 21:54:48 -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
eric 9e65349336 turns out pubdate messes up distinct, MySQL doesn't support DISTINCT ON 2013-03-06 14:15:07 -05:00
Raymond Yee 14174ecb17 Merge pull request #135 from Gluejar/list_by_a_publisher
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 10:22:32 -08:00
eric 760cbe70cf publisher name can now have a "/" in it. (changed URLs) 2013-03-06 12:45:27 -05:00
Raymond Yee 8759dad546 Merge pull request #133 from Gluejar/list_by_a_publisher
basic by-publisher list [#45617641]
2013-03-06 08:37:18 -08:00
Raymond Yee d82959c42f small typo 2013-03-05 19:10:22 -08: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 4cd83d69d4 added logging so we know what happens when messages fail to send 2013-03-04 23:35:43 -05:00
eric 2153a6c589 added hover to message icon, moved css and js to files 2013-03-04 23:25:22 -05:00
eric a56222426e set queueing to use the master switch
use NOTIFICATION_QUEUE_ALL = False in m.py for testing
2013-03-04 23:11:50 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric 989fff8926 Added unglue.it search at top of search page [finish #37199475] 2013-03-01 12:07:15 -05:00
eric a53c99e295 decided that supporter_message signal belonged in core 2013-03-01 09:46:52 -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 819f532624 email message needed the full urls 2013-02-27 17:27:32 -05:00
eric d7f73c1247 make wishlists more efficient 2013-02-26 15:30:14 -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 9811012bf3 fix rare bugs 2013-02-25 18:31:37 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
Raymond Yee 1852c62e32 Merge pull request #128 from Gluejar/more_instructions_for_RHs
put PDF instructions, and both video and PDF screencasts, in context of ...
2013-02-19 09:04:10 -08:00
Raymond Yee da3d542587 Merge pull request #120 from Gluejar/no_staff_in_ungluers_list
No staff in ungluers list
2013-02-19 08:38:27 -08:00
Andromeda Yelton ab28b7d492 put PDF instructions, and both video and PDF screencasts, in context of campaign editing area 2013-02-18 16:22:20 -05:00
Andromeda Yelton 499b079049 didn't need those classes both places 2013-02-18 12:12:41 -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 1713998c4c add google site tools verification while we're at it 2013-02-08 12:40:45 -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