Commit Graph

542 Commits (1881660089db232e31111f296ef7d22d73d0c4b8)

Author SHA1 Message Date
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04: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 cc48ef8362 merge from master 2013-03-21 08:44:43 -04:00
eric 6de3b806a6 change name of book_panel stylesheet to force reload on deployment 2013-03-19 14:53:11 -04:00
eric b2327e5094 use .one-border-radius 2013-03-19 13:15:50 -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
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
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 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -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 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 57ebbc087e merge master into work_page_CTAs 2013-03-11 22:39:48 -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 303c53c82e While I'm looking at this, make the cvc input a password [#41678953] 2013-03-08 18:50:35 -05:00
eric 800d0ffdeb cleanup of css and js imports, also mapping 2013-03-08 14:16:24 -05:00
eric 62627a80cf fix "next" behavior, poor sign-up/pledge flow [#40841931]
Sign In lightbox had broken cookie pusher on reg/auth pages.
Many holes had developed that broke return-to-page-after-auth (for
example, sign-in from pledge page).
Sporadic encoding issues.
2013-03-08 02:43:11 -05:00
eric 90d15b5c9b modify .errorlist style to round both corners- more flexible 2013-03-07 21:54:32 -05:00
eric 339d4653ab migrate and clean urls 2013-03-07 21:53:32 -05:00
eric 80536a491a superlogin- failed logins check for socialauth and if so, as user to use it
superlogin injects extra_context into regular login method
2013-03-07 21:48:56 -05:00
eric 2153a6c589 added hover to message icon, moved css and js to files 2013-03-04 23:25:22 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric 989fff8926 Added unglue.it search at top of search page [finish #37199475] 2013-03-01 12:07:15 -05:00
Andromeda Yelton 7e6efeda7c pledge buttons have embiggened border and color change on hover 2013-02-18 12:08:35 -05:00
Andromeda Yelton f674278b02 mouseover shows exact percent of goal 2013-02-18 11:58:38 -05:00
eric f23ad3a9cb oh, so that's how this works! [fix #44116341] 2013-02-08 18:21:16 -05:00
Andromeda Yelton 61b2859a02 testing all the edge cases and editing accordingly 2013-02-08 15:55:43 -05:00
Andromeda Yelton ffe4ea2943 needs to bind to actions on big green button. also, streamliniing 2013-02-08 15:55:28 -05:00
Andromeda Yelton a060cf0f51 improving gradient 2013-02-07 14:10:00 -05:00
Andromeda Yelton cf58570c2e moving informational and call-to-action elements of work page 2013-02-07 13:37:54 -05:00
Andromeda Yelton 145ba865db fade back in feedback div, streamline syntax, make sure to bind to hijax links in footer too 2013-02-07 09:10:46 -05:00
Andromeda Yelton c761d5819d first pass at moving big button 2013-02-06 16:26:07 -05:00
Andromeda Yelton 1afdd5e21f bugfixing 2013-02-04 12:09:38 -05:00
Andromeda Yelton b952bbb897 now can bind to download links not present at page creation, so needs delegated event handling 2013-02-04 12:09:29 -05:00
Andromeda Yelton 8c07df1fb1 making load of books ajaxy to spare reload of rest of page 2013-02-04 11:28:58 -05:00
eric 028e16866c resolve conflicts for merge master into libraries 2013-01-24 17:08:40 -05:00
Andromeda Yelton b895b86d21 libraries page has content 2013-01-21 12:02:35 -05:00
Andromeda Yelton 95ae064e81 also need some content 2013-01-21 10:33:25 -05:00
Andromeda Yelton a870408d68 we need this in the refactor too 2013-01-16 13:42:39 -05:00
Andromeda Yelton ed28106a1e factoring out some shared css 2013-01-16 13:08:37 -05:00
Andromeda Yelton e00b43870c it would be great if the embed thing actually worked 2013-01-16 13:08:21 -05:00
Andromeda Yelton 5fb880c9da sharing options on download page 2013-01-16 12:50:20 -05:00
thatandromeda db8977ca16 Merge pull request #107 from Gluejar/book_panel_nits
Book panel nits
2013-01-10 06:36:56 -08:00
Andromeda Yelton 9b2928bd0a moar tutorials 2013-01-09 13:07:03 -05:00