d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
e4a39647b9
expand and rename who's ungluing what area
2013-03-22 15:47:03 -04:00
e9264e281f
Merge pull request #141 from Gluejar/improve_registration
...
general cleanup of useability and registration issues
2013-03-22 08:36:36 -07:00
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
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
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
a5a000ef7f
triple sign-in form when non-logged-in user tries to pledge
2013-03-21 14:24:11 -04:00
1fcd0e54ed
fixed bug that broke return path to pledge
2013-03-21 10:14:23 -04:00
5229af0e3f
session cookie from 2 weeks to 6 weeks
2013-03-21 10:13:32 -04:00
cc48ef8362
merge from master
2013-03-21 08:44:43 -04:00
f3cbd82336
fix "On Wishlist" link when it's not my wishlist
2013-03-21 08:38:46 -04:00
9a15545567
Merge branch 'search_on_campaigns'
2013-03-20 16:46:40 -04:00
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
6ebdd1610d
urldecode the next path when pulled from cookie
2013-03-20 14:15:30 -04:00
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
e8a87e498e
Merge branch 'list_by_a_publisher'
2013-03-19 20:30:16 -07:00
7c83f2b1fb
Merge branch 'master' of github.com:Gluejar/regluit
2013-03-19 19:52:40 -07:00
4cbbf50fd1
Updated a starter sql file used in Se test (to match new social_auth migration)
2013-03-19 19:51:38 -07:00
25937e1016
fix stupid bug on page2+ of search result
2013-03-19 16:43:23 -04:00
6de3b806a6
change name of book_panel stylesheet to force reload on deployment
2013-03-19 14:53:11 -04:00
50ec6ddb06
merge from master
2013-03-19 14:38:09 -04:00
b2327e5094
use .one-border-radius
2013-03-19 13:15:50 -04:00
a22e5e95e5
fix bad welcome page and login
2013-03-19 10:33:57 -04:00
af8c3ff1fd
merge from master
2013-03-19 10:02:06 -04:00
e2ab3d75a8
Big merge from master
2013-03-19 09:40:18 -04:00
094b18aed1
Merge pull request #124 from Gluejar/work_page_CTAs
...
Work page CTAs at long last
2013-03-18 19:20:49 -07:00
392a751abb
html nits
2013-03-18 22:07:19 -04:00
bd9a746422
merge in master
2013-03-18 21:50:22 -04:00
26848b1774
Nudge up the button text size AMAP
2013-03-18 17:04:00 -04:00
ff58e5cd97
add link to gravatar in ui
2013-03-18 16:30:43 -04:00
937f17eb73
and now everything works again
2013-03-18 14:56:27 -04:00
f4f326ace8
Merge pull request #147 from Gluejar/fix_twitter_auth
...
update social auth and django to fix broken twitter auth
2013-03-15 15:48:37 -07:00
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
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
dc8dea0768
moving countdown out of context to models.py, standardizing button appearance
2013-03-15 15:51:17 -04:00
9dbdafed7d
There IS a setting for the items per page!
2013-03-15 12:32:29 -04:00
f719fb2ec3
migrate to pipeline
2013-03-15 12:29:11 -04:00
c16b88791f
Merge branch 'fix_twitter_auth' into improve_avatars
2013-03-15 00:16:50 -04:00
c93762b8ee
update social auth and django
...
before this can be installed on an existing database, the following
south command must be applied:
django-admin.py convert_to_south social_auth
2013-03-14 23:46:01 -04:00
ac49c90767
Revert "update django-social-auth to 0.7.20 and django to 1.4.5"
...
This reverts commit 0d08d681cb
2013-03-14 22:42:48 -04:00
0d08d681cb
update django-social-auth to 0.7.20 and django to 1.4.5
2013-03-14 22:36:40 -04:00
014f15d8ee
start on the profile editor mods...
2013-03-14 21:42:00 -04:00
7f64189284
create and deploy avatar_source and avatar_url
2013-03-14 15:43:24 -04:00
6143c6a3aa
normalize invocation of supporter url, fix wrong user for comment links
2013-03-14 15:33:00 -04:00
88a241fafd
add gravator method
2013-03-14 09:58:21 -04:00
db0eec3b6c
Merge branch 'master' into work_page_CTAs
2013-03-13 11:30:28 -04:00
54d0aa1d59
merge master into seo
...
schema.org stuff into work page
2013-03-13 10:48:36 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
9efa131f27
Merge pull request #146 from Gluejar/fix_description_truncate_bug
...
fix test failures --> tests run ok on my laptop and Se tests also.
2013-03-12 20:44:12 -07:00
eric
Andromeda Yelton
Raymond Yee