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 |
Raymond Yee
|
51cf2d1d1f
|
Merge pull request #157 from Gluejar/fix_value
Fix value ---> all these annoying open_library related exceptions
|
2013-04-02 23:25:42 -07:00 |
|
Raymond Yee
|
044c5ba806
|
fix self.identifiers.values('type', 'value').filter(type='goog')[0].value -> ['value']
|
2013-04-02 23:14:39 -07:00 |
|
Raymond Yee
|
d26e97f883
|
need ['value'] to access value not .value
|
2013-04-02 23:01:24 -07:00 |
|
Raymond Yee
|
05d07f8712
|
Merge pull request #156 from Gluejar/force_css_reload
force css reload
|
2013-04-02 09:05:39 -07:00 |
Andromeda Yelton
|
7e2d57b299
|
force css reload
|
2013-04-02 11:58:50 -04:00 |
|
Raymond Yee
|
3d66a95fac
|
Merge pull request #153 from Gluejar/landing_page
Landing page
|
2013-04-02 08:46:17 -07: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 |
|
Raymond Yee
|
e6321536e4
|
Merge pull request #155 from Gluejar/fix_notification_settings
fixing syntax error
|
2013-04-01 07:29:29 -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
|
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
|
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 |