Commit Graph

3511 Commits (7dd1b994cd44bfc93746e5fcbf03de97767f6c52)

Author SHA1 Message Date
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 25fedc69ee get prod out of production mode 2013-03-30 10:25:32 -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 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
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 552602f20a https gravatar 2013-03-28 12:27:37 -04:00
eric a0af1761f1 forgot to set gravatar as default for new users 2013-03-28 10:39:48 -04:00
thatandromeda 94f0624c11 Merge pull request #151 from Gluejar/fix_borked_search
display of works in our db were being excluded from google search result...
2013-03-28 07:01:18 -07: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 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 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
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
thatandromeda e9264e281f Merge pull request #141 from Gluejar/improve_registration
general cleanup of useability and registration issues
2013-03-22 08:36:36 -07: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 5229af0e3f session cookie from 2 weeks to 6 weeks 2013-03-21 10:13:32 -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
Raymond Yee 7c83f2b1fb Merge branch 'master' of github.com:Gluejar/regluit 2013-03-19 19:52:40 -07:00
Raymond Yee 4cbbf50fd1 Updated a starter sql file used in Se test (to match new social_auth migration) 2013-03-19 19:51:38 -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 b2327e5094 use .one-border-radius 2013-03-19 13:15:50 -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
eshellman 094b18aed1 Merge pull request #124 from Gluejar/work_page_CTAs
Work page CTAs at long last
2013-03-18 19:20:49 -07:00