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
|
26848b1774
|
Nudge up the button text size AMAP
|
2013-03-18 17:04:00 -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
|
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 |
|
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
|
9dbdafed7d
|
There IS a setting for the items per page!
|
2013-03-15 12:32:29 -04:00 |
|
eric
|
f719fb2ec3
|
migrate to pipeline
|
2013-03-15 12:29:11 -04:00 |
|
eric
|
c16b88791f
|
Merge branch 'fix_twitter_auth' into improve_avatars
|
2013-03-15 00:16:50 -04:00 |
|
eric
|
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 |
|
eric
|
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 |
|
eric
|
0d08d681cb
|
update django-social-auth to 0.7.20 and django to 1.4.5
|
2013-03-14 22:36:40 -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 |
|
eric
|
88a241fafd
|
add gravator method
|
2013-03-14 09:58:21 -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
|
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 |
|
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
|
20402f914d
|
Merge branch 'fix_cancel_transaction' into fix_description_truncate_bug
|
2013-03-12 23:12:50 -04:00 |
|
eric
|
581944c3f9
|
fix bug on cancel pledge
|
2013-03-12 23:11:59 -04:00 |
|
Andromeda Yelton
|
dd1180ab30
|
notification description field limited to 100 characters
|
2013-03-12 16:12:11 -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
|
8cadb5227d
|
Merge pull request #140 from Gluejar/comment_notifications
Comment notifications bugfix
|
2013-03-12 12:08:52 -07:00 |
|
Andromeda Yelton
|
655a0a4f35
|
Merge branch 'master' into comment_notifications
|
2013-03-12 15:01:45 -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 |
|
thatandromeda
|
99ba3499a7
|
Update signals.py
|
2013-03-12 11:58:33 -03: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
|
f3543bd914
|
googlebot likes the wishlist feeds- give it more
|
2013-03-09 17:38:47 -05:00 |
|
eric
|
c037764289
|
sitemaps! [#25581139]
|
2013-03-09 17:37:33 -05:00 |
|
eric
|
d3077c988b
|
links should not point to http from https
|
2013-03-09 13:29:03 -05:00 |
|
eric
|
22b17d08fa
|
this was causing googlebot crawl errors
|
2013-03-09 11:52:42 -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 |
|
Raymond Yee
|
861d8355b3
|
Merge branch 'scrub_descriptions'
|
2013-03-08 14:11:38 -08:00 |
|
eric
|
7ef408115e
|
fix one template
|
2013-03-08 16:46:33 -05:00 |