Commit Graph

3744 Commits (c3349ef5eba2baec92437dd1952e1dc593d6a892)

Author SHA1 Message Date
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 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 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
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
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 2ae38dfd8a news box shouldn't be wider than page content 2013-03-28 10:59:04 -04:00
eric a0af1761f1 forgot to set gravatar as default for new users 2013-03-28 10:39:48 -04:00
Andromeda Yelton 17a9847b66 segregating learn_more area css fully into learnmore.less 2013-03-28 10:38:57 -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 8366b08c69 get email_change working again 2013-03-27 17:57:08 -04:00
eric 11390f6f41 remove email_change code 2013-03-27 17:52:42 -04:00
Andromeda Yelton af0d42b9ff removed unused sharing features 2013-03-27 15:06:28 -04:00
eric df443b41a5 Revert "'email_change' -> 'regluit.email_change'"
This reverts commit 329d35590a.
2013-03-27 15:03:30 -04:00
eric 75c0dc2927 Revert "changed import"
This reverts commit 754e6c9288.
2013-03-27 15:03:07 -04:00
eric 49522b6004 Revert "some more import changes"
This reverts commit 6d344ab105.
2013-03-27 15:02:52 -04:00
eric 427393acb9 Revert "urls need change"
This reverts commit de82e6a5b0.
2013-03-27 15:02:36 -04:00
eric 867ed6fbbf Revert "two more places..."
This reverts commit da24b392d3.
2013-03-27 15:02:12 -04:00
eric da24b392d3 two more places... 2013-03-27 13:10:46 -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
Andromeda Yelton eab5aa72bc images needed for as seen on section 2013-03-27 10:34:00 -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
Raymond Yee de82e6a5b0 urls need change 2013-03-26 11:28:41 -07:00
Raymond Yee 6d344ab105 some more import changes 2013-03-26 11:24:30 -07: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
Raymond Yee 754e6c9288 changed import 2013-03-26 18:00:51 +00:00
Raymond Yee 329d35590a 'email_change' -> 'regluit.email_change' 2013-03-26 10:58:49 -07: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