Commit Graph

561 Commits (d6a19d97547d9ac018aaa29d4d9f4dde9d3fe5c3)

Author SHA1 Message Date
Andromeda Yelton 311e15a948 should work in all campaign states 2013-04-29 14:50:49 -04:00
Andromeda Yelton d8ebec9f67 expand author names and titles on hover in book list 2013-04-29 12:19:00 -04:00
Andromeda Yelton 51dddd9353 just stashing marc records somewhere commonly accessible. can build infrastructure later. 2013-04-24 10:38:07 -04:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Andromeda Yelton 7e2d57b299 force css reload 2013-04-02 11:58:50 -04:00
Raymond Yee d861aafdc3 Merge branch 'master' into landing_page 2013-04-02 07:55:42 -07: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
eric 2aabf09161 merge from master 2013-03-29 19:41:28 -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
eric 1ace0a5479 "login to add" now adds, uses triple login page [#30497175] 2013-03-29 11:50:07 -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
Andromeda Yelton 17a9847b66 segregating learn_more area css fully into learnmore.less 2013-03-28 10:38:57 -04:00
Andromeda Yelton af0d42b9ff removed unused sharing features 2013-03-27 15:06:28 -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 6e801e6841 adding bookish activity to main content area 2013-03-26 14:55:50 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
eric c26f9e1505 merge from master 2013-03-22 16:39:23 -04:00
Andromeda Yelton e4a39647b9 expand and rename who's ungluing what area 2013-03-22 15:47:03 -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