Commit Graph

1604 Commits (159ad0db0592f60ed97318c59df80d7f251a3d51)

Author SHA1 Message Date
Andromeda Yelton dc8dea0768 moving countdown out of context to models.py, standardizing button appearance 2013-03-15 15:51:17 -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 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
eric a4cc2ce1f0 misc template fixes 2013-03-12 21:58:29 -04:00
eric 7bf62d665e rip out old password change code 2013-03-12 21:58:15 -04:00
eric 7cbbf31268 clean up templates 2013-03-12 21:25:39 -04:00
eric 131010300a std install of email_change
decided not to use pip install because the code needs some mods, and
doesn't seem to be maintained.
2013-03-12 20:45:09 -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 cc2623e196 login form now remembers the username you picked [#23965785] 2013-03-12 14:26:40 -04: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 d3077c988b links should not point to http from https 2013-03-09 13:29:03 -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
eric 7ef408115e fix one template 2013-03-08 16:46:33 -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 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 3ccad0770b refactor work list templates 2013-03-06 21:54:48 -05:00
eric 9e65349336 turns out pubdate messes up distinct, MySQL doesn't support DISTINCT ON 2013-03-06 14:15:07 -05:00
Raymond Yee 14174ecb17 Merge pull request #135 from Gluejar/list_by_a_publisher
publisher name can now have a "/" in it. (changed URLs)
2013-03-06 10:22:32 -08:00
eric 760cbe70cf publisher name can now have a "/" in it. (changed URLs) 2013-03-06 12:45:27 -05:00
Raymond Yee 8759dad546 Merge pull request #133 from Gluejar/list_by_a_publisher
basic by-publisher list [#45617641]
2013-03-06 08:37:18 -08:00
Raymond Yee d82959c42f small typo 2013-03-05 19:10:22 -08:00
eric 06b43ed8d1 basic by-publisher list [#45617641]
a bit slow, but that's a separate issue.
Not conspicuously surfaces yet, look at the links in the editions list
in rights tab.
2013-03-05 16:18:54 -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
eric d08ca3efbd Turns out site was already in context for notifications as "current_site"
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
Raymond Yee 7fef0a65f0 refining account_* notices 2013-02-27 15:18:32 -08:00
eric 819f532624 email message needed the full urls 2013-02-27 17:27:32 -05:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
eric 89221fbe82 ajax submission and error handling 2013-02-25 18:32:22 -05:00
eric 596d19596c UI work for managers to contact supporters [#36991391] 2013-02-21 15:10:01 -05:00
Raymond Yee 1852c62e32 Merge pull request #128 from Gluejar/more_instructions_for_RHs
put PDF instructions, and both video and PDF screencasts, in context of ...
2013-02-19 09:04:10 -08:00
Raymond Yee da3d542587 Merge pull request #120 from Gluejar/no_staff_in_ungluers_list
No staff in ungluers list
2013-02-19 08:38:27 -08:00
Andromeda Yelton ab28b7d492 put PDF instructions, and both video and PDF screencasts, in context of campaign editing area 2013-02-18 16:22:20 -05:00
Andromeda Yelton 499b079049 didn't need those classes both places 2013-02-18 12:12:41 -05:00
Andromeda Yelton f674278b02 mouseover shows exact percent of goal 2013-02-18 11:58:38 -05:00
eric 08967a008e html nit 2013-02-09 19:21:04 -05:00
Andromeda Yelton 61b2859a02 testing all the edge cases and editing accordingly 2013-02-08 15:55:43 -05:00
eric 1713998c4c add google site tools verification while we're at it 2013-02-08 12:40:45 -05:00
eric 02f10de83a review of html title tag for all pages 2013-02-08 10:12:28 -05:00
Andromeda Yelton 918ce0f904 aligning book detail layout in pledge and work pages 2013-02-07 15:25:14 -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 46d373d9dd reformat URL reference for consistency with the rest 2013-02-07 09:10:20 -05:00
Andromeda Yelton c761d5819d first pass at moving big button 2013-02-06 16:26:07 -05:00
Andromeda Yelton 243f7fe08c looks weird when there are 0 ungluers 2013-02-06 15:05:05 -05:00
eshellman d2c6730d47 Merge pull request #117 from Gluejar/unglued_tabs_hijax
Unglued tabs hijax
2013-02-06 08:49:49 -08:00
eshellman baa39878ab Merge pull request #119 from Gluejar/better_remove_language
addresses [#29777727]
2013-02-06 08:33:26 -08:00
Andromeda Yelton 7b15a80f79 Merge branch 'smashwords_link' of github.com:Gluejar/regluit into smashwords_link 2013-02-06 11:25:17 -05:00
Andromeda Yelton 12e2c9fcea now faq subsection is expanded on smashwords page too 2013-02-06 11:24:05 -05:00
eric aa535ca38c asking RHs to set price to zero 2013-02-06 11:23:16 -05:00
Andromeda Yelton f998b1f93b addresses [#29777727] 2013-02-06 11:15:49 -05:00
Andromeda Yelton 852eec9a72 add that back in to highlight tabs properly 2013-02-06 09:57:27 -05:00
Andromeda Yelton 30dcab3d88 adding smashwords link to FAQ menu and improving URL hygiene 2013-02-06 09:09:20 -05:00
Andromeda Yelton 1afdd5e21f bugfixing 2013-02-04 12:09:38 -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
Andromeda Yelton 1c1f1faf72 first pass at separating unglued list into 3 tabs 2013-02-04 10:09:08 -05:00
Andromeda Yelton fbe5774fa2 should have been removed, whoops 2013-02-01 13:28:14 -05:00
Andromeda Yelton 7a357edca1 updating 2013-02-01 10:05:05 -05:00
Andromeda Yelton 45c166155b Merge branch 'libraries' of github.com:Gluejar/regluit into libraries 2013-01-26 17:36:40 -08:00
Andromeda Yelton ae67b55de3 addressing feedback 2013-01-26 17:35:52 -08:00
eric 028e16866c resolve conflicts for merge master into libraries 2013-01-24 17:08:40 -05:00
eric efa847a5e1 fix html 2013-01-24 16:55:05 -05:00
eshellman e0973a5ccb Merge pull request #110 from Gluejar/sharing_text
Sharing text
2013-01-24 13:26:12 -08:00
Andromeda Yelton b9192c13d7 discoverabilty ftw 2013-01-21 12:24:18 -05:00
Andromeda Yelton b895b86d21 libraries page has content 2013-01-21 12:02:35 -05:00
Andromeda Yelton fc76059999 we weren't using that with statement 2013-01-21 12:02:23 -05:00
Andromeda Yelton 95ae064e81 also need some content 2013-01-21 10:33:25 -05:00
Andromeda Yelton b5b2697c0b everything's better with a clearing div 2013-01-17 16:18:41 -05:00
Andromeda Yelton a322baa195 addressing pull request feedback 2013-01-17 15:46:31 -05:00
eshellman b3ef759221 Merge pull request #112 from Gluejar/pledge_links_to_work
Pledge links to work
2013-01-17 12:46:29 -08:00
eshellman c073529b58 Merge pull request #111 from Gluejar/proper_cc_text
Proper cc text
2013-01-17 12:44:57 -08:00
Andromeda Yelton b7aabf1ca4 now the pledge page links back to the work 2013-01-17 15:37:03 -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
Andromeda Yelton 68b1fd9bf7 add sharing options to front matter 2013-01-16 12:10:36 -05:00
Andromeda Yelton 1887599595 more status-sensitive email share text 2013-01-16 11:23:28 -05:00
Andromeda Yelton a27e319e5a more status-sensitive twitter share text 2013-01-16 11:13:23 -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 a3c0848b79 making text more consistent with that suggested by official license chooser 2013-01-09 15:02:48 -05:00
Andromeda Yelton 9b2928bd0a moar tutorials 2013-01-09 13:07:03 -05:00
eric 3d1da688a5 unnecessary logic 2013-01-09 11:38:33 -05:00
eric e5f3eeacb5 try to correct logic for pledigng in list view 2013-01-04 19:21:34 -05:00
Andromeda Yelton 50808f3a89 users who have already pledged should not be offered Pledge CTA 2013-01-04 16:38:15 -05:00
Andromeda Yelton fa7e0b20de addressing feedback 2013-01-04 15:12:35 -05:00
Andromeda Yelton 23d48e6183 Merge branch 'master' into rh_help 2013-01-04 14:39:13 -05:00
eric aeabfa1fde img measurements are already px 2013-01-04 13:34:50 -05:00
Andromeda Yelton caafdcf38a some lists looked wrong with new documentation list styling 2013-01-03 16:33:29 -05:00
Andromeda Yelton 38b436f647 action on booklist for active campaigns on wishlist should be pledge, not un-wishlist 2013-01-03 16:33:07 -05:00
Andromeda Yelton 8ec5f7e2a2 one more tutorial while I'm at it 2013-01-03 13:58:17 -05:00
Andromeda Yelton a4de9a0040 adding some tutorials 2013-01-03 13:46:32 -05:00
Andromeda Yelton 924300267b more pointers to contextually appropriate actions for RHs 2013-01-03 13:18:26 -05:00
eric 5b1f3380b6 finish moving wish list "withs" 2013-01-02 20:46:02 -05:00
eric 6e4f8fe3d7 configure wish list inside book_panel so it doesn't get omitted again 2013-01-02 20:26:20 -05:00
Andromeda Yelton c2bc4f6b68 tidying visibly wrong things 2013-01-02 16:10:32 -05:00
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -05:00
Andromeda Yelton 0a86448d98 addressing CSS comments and also fixing some invalid html
Conflicts:

	frontend/templates/unglued_list.html
	static/css/book_panel.css
	static/css/lists.css
	static/less/lists.less
2013-01-02 15:51:21 -05:00
Andromeda Yelton 4ac487a7c9 unwinding useful changes from discarded two-tab model 2013-01-02 15:48:49 -05:00
Andromeda Yelton 26b2f0c00f Merge branch 'master' into list_tab_vertical_centering 2013-01-02 15:36:10 -05:00
Andromeda Yelton cc4f748e36 update all list pages to have two-line tab content 2013-01-02 15:35:42 -05:00
eshellman a6186e3bc6 Merge pull request #90 from Gluejar/prettier_acks
prettifying acks page, make it easier to read
2013-01-02 10:54:24 -08:00
eric 77c007c4ba Revert "Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks""
This reverts commit c13cca20ea.
2013-01-02 13:53:00 -05:00
eric c13cca20ea Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks"
This reverts commit 949425c6ca, reversing
changes made to e305a1ee74.
2013-01-02 13:37:01 -05:00
eric 949425c6ca Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks 2013-01-02 13:34:47 -05:00
Andromeda Yelton 0eebc7c28a adjusting spacing around headers and clarifying dedication/dedicator relationship 2013-01-02 12:25:27 -05:00
eric e305a1ee74 Merge branch 'master' into prettier_acks 2013-01-02 10:53:05 -05:00
eshellman 53a62c3764 Merge pull request #101 from Gluejar/successful_works_in_inglued_tab
Successful works in unglued tab; offset on "read it now" to be fixed.
2013-01-02 07:28:14 -08:00
eshellman c22403356c Merge pull request #99 from Gluejar/correct_ungluing_date
add success_date property to campaign so we can accurately report it whe...
2012-12-31 12:28:47 -08:00
Andromeda Yelton 4c1b64c154 update successful books in unglued tab on other tabbed pages 2012-12-31 14:57:01 -05:00
Andromeda Yelton c8cb5937e8 need to apply correct styles for new status handling too 2012-12-31 13:58:42 -05:00
thatandromeda 7fd78d9349 Update frontend/templates/base.html 2012-12-31 13:07:18 -05:00
eshellman a19a060351 Merge pull request #100 from Gluejar/missing_parenthesis
it was missing a parenthesis
2012-12-31 08:54:56 -08:00
Andromeda Yelton 609c09c74d it was missing a parenthesis 2012-12-31 11:12:55 -05:00
Andromeda Yelton 47c44b20d5 add success_date property to campaign so we can accurately report it when it differs from campaign deadline 2012-12-31 11:00:45 -05:00
Andromeda Yelton 7a0e2bfbd8 addressing ul, li, dt, dd comments 2012-12-19 10:22:11 -05:00
Andromeda Yelton 4a307a1e00 addressing CSS comments and also fixing some invalid html 2012-12-17 14:23:23 -05:00
Andromeda Yelton ab2d3d51b6 Merge branch 'master' into unglued_books_tab 2012-12-14 10:46:11 -05:00
Andromeda Yelton 73266f07eb line up icons better and more clearly indicate status of books with successful campaigns 2012-12-14 10:45:16 -05:00
Andromeda Yelton 7c88279603 Merge branch 'master' of github.com:Gluejar/regluit 2012-12-14 10:03:57 -05:00
Andromeda Yelton b001aefeeb separating unglued and PD works on ready-to-read page 2012-12-13 15:25:01 -05:00
Raymond Yee 136614b8ff Merge pull request #96 from Gluejar/merge_works_management
staff only UI for merging works [finish #39297681]
2012-12-13 12:09:43 -08:00
Andromeda Yelton ec4e1a7bb3 Merge branch 'master' of github.com:Gluejar/regluit 2012-12-13 09:55:14 -05:00
thatandromeda 575d34d968 Update frontend/templates/base.html 2012-12-13 09:51:36 -05:00
eric fec7f33d9e staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
Andromeda Yelton 7501c3fdae prettifying 2012-12-11 13:17:33 -05:00
Andromeda Yelton bfbb74c0a2 providing next steps 2012-12-11 10:37:38 -05:00
Andromeda Yelton 1304a73790 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	frontend/templates/metrics.html
	frontend/views.py
2012-12-11 10:31:58 -05:00
Raymond Yee 33665abd37 Merge branch 'master' into pledges_on_info_page 2012-12-10 12:26:30 -08:00
Raymond Yee 61bb121a51 [#37736995] the old error message for a CC error was potentially confusing -- I think this should be better -- see images in
https://www.evernote.com/shard/s1/sh/b59d4cfa-81a2-42bc-a315-24996fb01e83/2cfa234f2a15042ff0bb198514771dcb
2012-12-10 11:18:46 -08:00
eric c1c3b3d1ad [#40818125] minimum target to $500 2012-12-06 21:05:15 -05:00
Andromeda Yelton 23708e15ba exclude uncollectable pledges 2012-12-06 15:31:32 -05:00
Andromeda Yelton 7decd15333 Revert "wanted to be able to track prospective revenue from info page"
This reverts commit 150ed860c9.
2012-12-06 12:37:48 -05:00
Andromeda Yelton 150ed860c9 wanted to be able to track prospective revenue from info page 2012-12-06 11:42:02 -05:00
eshellman fd7c10863e Merge pull request #91 from Gluejar/fix_lightbox
Fix lightbox. works for me.
2012-12-04 13:37:40 -08:00
thatandromeda f22312d735 Update frontend/templates/base.html
network of killers now live
2012-12-04 13:47:19 -05:00
Andromeda Yelton 88b4446bf0 force reload of hijax.js 2012-11-30 12:28:29 -05:00
eshellman 0993d393d2 Merge pull request #88 from Gluejar/smashwords
Smashwords. Looks good for the first pass.
2012-11-29 10:58:15 -08:00
Andromeda Yelton 202c10b0fb latest coverage 2012-11-29 12:04:05 -05:00
Andromeda Yelton 4fe73e110c make sure to include new file location 2012-11-29 12:00:34 -05:00
Andromeda Yelton 0aef30015b addressing comments 2012-11-29 11:20:13 -05:00
Andromeda Yelton c4ac00e8ef first pass at smashwords page 2012-11-29 10:54:07 -05:00
Raymond Yee 4d923aba5b Merge branch 'master' into charge_failed 2012-11-27 12:19:21 -08:00
Andromeda Yelton 1cd50d716f display submit buttons as loading gifs for transactions that might take a while 2012-11-27 13:32:25 -05:00
Raymond Yee 41f3da3d31 Merge branch 'master' of github.com:Gluejar/regluit into charge_failed 2012-11-26 14:36:40 -08:00
Andromeda Yelton 8692d26540 friendlifying 2012-11-26 14:23:04 -05:00
thatandromeda 1976bb14d3 Update frontend/templates/notification/pledge_charged/short.txt 2012-11-26 13:45:12 -05:00
thatandromeda 0b9827424f Merge pull request #84 from Gluejar/pledge_sidebar
Pledge sidebar
2012-11-26 08:21:02 -08:00
Raymond Yee 6ab521faa1 Merge branch 'master' into charge_failed 2012-11-23 09:20:58 -08:00
eshellman db1fdc321e Merge pull request #79 from Gluejar/ending_soon_notification
Ending soon notification
2012-11-21 14:05:26 -08:00
eric 54a8a31c8c Merge branch 'master' into pledge_sidebar 2012-11-21 17:00:33 -05:00
Raymond Yee ecea475419 a few modifications to pledge_failed notice 2012-11-21 11:40:19 -08:00
Raymond Yee cbac6f1e3c First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing 2012-11-21 09:21:01 -08:00
Andromeda Yelton 0a0b74e449 Revert "Revert "make the html validate""
This reverts commit a215471abb.

Conflicts:

	frontend/templates/base.html
2012-11-20 15:53:24 -05:00
Andromeda Yelton 3ccb10a9aa Merge branch 'pledge_sidebar' of github.com:Gluejar/regluit into pledge_sidebar
Conflicts:
	frontend/templates/base.html
2012-11-20 15:51:37 -05:00
eric 466f7b9689 ok, so this results in the same dom tree, though the css matching is off 2012-11-20 15:48:41 -05:00
Andromeda Yelton a215471abb Revert "make the html validate"
This reverts commit f5e3cc1670.
2012-11-20 15:40:32 -05:00
eric f5e3cc1670 make the html validate 2012-11-20 15:28:45 -05:00
Raymond Yee 02b17ea81f Merge branch 'master' into charge_failed 2012-11-20 12:08:36 -08:00
Andromeda Yelton 7fcd0ba3af change css filenames so that we can force user refresh 2012-11-20 14:26:06 -05:00
Andromeda Yelton 9f43c9a43c this one too 2012-11-20 13:41:00 -05:00
Andromeda Yelton ba3c0d3871 & not & 2012-11-20 13:40:25 -05:00
Andromeda Yelton 029cd9740d that line looks better outside the form 2012-11-20 10:10:30 -05:00
Andromeda Yelton 810580779e fixing nits 2012-11-20 10:06:40 -05:00
Andromeda Yelton a2abb92038 makes pledge action clearer by describing in more contexts and using Pledge rather than Support 2012-11-20 09:56:04 -05:00
Andromeda Yelton 81e27e234e decided that phrasing was confusing 2012-11-20 09:09:03 -05:00
Raymond Yee 8b3287d85d Merge branch 'master' into charge_failed 2012-11-19 10:28:18 -08:00
Raymond Yee af8a661eb7 Merge branch 'master' into webhooks 2012-11-19 09:21:38 -08:00
Andromeda Yelton 0b657cf1c1 clarify that acks are in the unglued ebook itself 2012-11-19 11:23:32 -05:00
eshellman 2fd4743e4c Merge pull request #77 from Gluejar/hijaxify_signin
Hijaxify signin and make forms more good
2012-11-16 13:25:28 -08:00
Andromeda Yelton 3253bcca6f also suppress sign up box on /accounts/register 2012-11-16 15:47:03 -05:00
Raymond Yee 645c7d41da Merge branch 'master' into webhooks 2012-11-16 10:48:17 -08:00
thatandromeda fce06ca854 Update frontend/templates/press.html 2012-11-16 13:22:36 -05:00
Andromeda Yelton 2858ed194c bugfixing 2012-11-16 11:43:00 -05:00
eric e613fe9365 added version to js url to force reload 2012-11-16 11:32:27 -05:00
Andromeda Yelton 87da5ae50e tweaking phrasing following user feedback 2012-11-16 10:07:45 -05:00
Andromeda Yelton 1433be3856 customizing this on a per-user basis is going to be a pain, hence no amount 2012-11-16 10:07:19 -05:00
thatandromeda acfdbfdf9c Stephen's campaign closed :/ 2012-11-16 08:00:22 -05:00
Raymond Yee b02a289e01 Add templates for pledge_failed notification 2012-11-15 09:06:55 -08:00
Andromeda Yelton 2dc20d18ec Merge branch 'master' into hijaxify_signin 2012-11-12 10:10:59 -05:00
Andromeda Yelton 097241493c separating out rest of hijax vs non-hijax styling 2012-11-07 15:56:37 -05:00
Andromeda Yelton c5ed14b6dc further rectifying css 2012-11-07 15:34:10 -05:00
Andromeda Yelton d9905df303 first pass at hijaxifying signin link 2012-11-07 14:58:40 -05:00
Andromeda Yelton d7e4384236 add badge link to notifications page and suppress menu drop-down when clicking on it 2012-11-07 13:45:10 -05:00
Andromeda Yelton 304ddb6bdc add badge to avatar when there are unseen notifications 2012-11-06 10:06:10 -05:00
Andromeda Yelton 50c51bd058 supporter not always in context, so use something that is 2012-11-06 09:54:42 -05:00
Andromeda Yelton 271741ead4 more consistent capitalization 2012-11-06 09:36:54 -05:00
Andromeda Yelton 0bcf845058 suppress top signup button on landing page 2012-11-06 09:34:31 -05:00
Andromeda Yelton b3f21ecce3 consistent sign in/sign up capitalization 2012-11-06 09:31:53 -05:00
Andromeda Yelton 78c62ef553 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	frontend/templates/work.html
2012-10-25 09:43:29 -04:00
thatandromeda ec20417039 Update frontend/templates/press.html 2012-10-25 10:14:40 -03:00
thatandromeda 1a83b6cfc4 Merge pull request #73 from Gluejar/clarify_acknowledgements
Clarify acknowledgements
2012-10-24 09:14:12 -07:00
thatandromeda 08e49036d1 Merge pull request #74 from Gluejar/fix_nav_menu
Fix nav menu
2012-10-24 09:13:43 -07:00
Andromeda Yelton 4a87253ca7 only show the premiums section if there actually are premiums 2012-10-24 11:34:22 -04:00
Andromeda Yelton 9eb0323768 add case where ungluer has not yet pledged 2012-10-24 11:30:37 -04:00
Andromeda Yelton d4549dfdb6 explain about acknowledgements in campaign management page 2012-10-24 11:25:37 -04:00
Andromeda Yelton 89b92b4dba add acknowledgements to support menu 2012-10-24 11:25:17 -04:00
Andromeda Yelton cc18eb20d3 add acknowledgements to support menu 2012-10-24 11:24:46 -04:00
Andromeda Yelton e6ed4c3074 explain about acknowledgements in campaign management page 2012-10-24 11:00:35 -04:00
Raymond Yee b4c1d09e88 Merge pull request #64 from Gluejar/prepopulate_ack_name
Prepopulate ack name
2012-10-23 10:35:40 -07:00
Andromeda Yelton 673b890e42 add production setting and only use google analytics in production 2012-10-23 10:24:16 -04:00
Andromeda Yelton aa338e9811 amazon situation now resolved 2012-10-23 09:08:09 -04:00
Andromeda Yelton 6b348f2b76 don't need that conditional any more 2012-10-22 15:45:11 -04:00
Andromeda Yelton 4effa6faf9 communicate current outage, provide CTAs for current and future ones 2012-10-22 15:44:56 -04:00
Andromeda Yelton 02f803291a communicate current outage, provide CTAs for current and future ones 2012-10-22 15:43:45 -04:00
Andromeda Yelton 002298d51a don't need that conditional any more 2012-10-22 15:43:25 -04:00
Andromeda Yelton 104992612b first pass at making things visually distinct if there are notifications 2012-10-19 15:01:06 -04:00
Andromeda Yelton 836a957d97 add profile settings link to dropdown 2012-10-19 12:31:23 -04:00
Andromeda Yelton 09d5b00e50 highlight editing area if #edit is in url 2012-10-19 12:26:11 -04:00
Andromeda Yelton 1bf4743667 making notifications prettier 2012-10-19 12:19:56 -04:00
Andromeda Yelton 11aac359e6 adding drop-down menu 2012-10-19 12:01:28 -04:00
Andromeda Yelton 21ef0c1bf2 now passing data through initial form values, not hidden divs 2012-10-18 14:16:05 -04:00
Andromeda Yelton e3cdf397d3 Merge branch 'master' of github.com:Gluejar/regluit into prepopulate_ack_name 2012-10-18 10:12:13 -04:00
eric 6b78ff7685 message for no pledges, html nits 2012-10-18 09:04:22 -04:00
Andromeda Yelton 96918d60a5 if not modifying pledge use ack data from previous transaction to prefill ack boxes [#37939351] 2012-10-17 11:54:29 -04:00
thatandromeda 79fca69cf9 Update frontend/templates/press.html 2012-10-16 16:41:37 -03:00
Andromeda Yelton 102937567b better syntax 2012-10-16 10:20:41 -04:00
thatandromeda 80fae98b88 Merge pull request #60 from Gluejar/manage_user_cc
tweak error page, other nits
2012-10-15 07:50:45 -07:00
eric 5ddbcd8d67 Improve error message to encourage user to try again 2012-10-15 10:47:18 -04:00
eric 48be5a1191 xhtml nits 2012-10-15 10:28:31 -04:00
thatandromeda 13a5d8cb93 Merge pull request #53 from Gluejar/is_preview_message
when we trn is_preview off the message on top should change
2012-10-15 07:05:24 -07:00
thatandromeda 824b6d3ff7 Merge pull request #54 from Gluejar/slideshow
Slideshow
2012-10-15 07:04:43 -07:00
Andromeda Yelton 5955445fbb tweaks 2012-10-15 09:52:39 -04:00
Andromeda Yelton 5c96382220 now that we have comprehensive account management page, link should go to it 2012-10-15 09:52:32 -04:00
eric 1ccc45875c This message may be more intelligible to those new to the site. 2012-10-15 00:49:22 -04:00
eric 4484e504f8 resolve merge conflicts 2012-10-15 00:31:45 -04:00
eric b1e9acac11 a bit prettier by stealing pledge complete styling 2012-10-15 00:22:23 -04:00
eric 1964eec782 add links to account management page [#37674453] 2012-10-15 00:16:56 -04:00
eric bda3211a76 user can manage their account credit card [#37674369] 2012-10-14 23:41:17 -04:00
eric b923f741ce DRY stuff that makes stripe work 2012-10-14 23:38:18 -04:00
Raymond Yee 168df09ac4 Display error message if make_account fails 2012-10-14 19:47:40 -07:00
eshellman 1778427b01 Merge pull request #56 from Gluejar/proof_notifications
Proof notifications
2012-10-14 14:52:16 -07:00
eric 3e2d65afd9 list the user's pledges [#37674453]
see result at /accounts/manage/
2012-10-14 17:44:17 -04:00
eric 80ec41422e DRY the transaction summary 2012-10-14 17:42:28 -04:00
Andromeda Yelton 386a30e3da missing endif 2012-10-14 17:27:52 -04:00
Andromeda Yelton 590320f555 that period looks weird if the user's dedication already includes one 2012-10-14 17:27:38 -04:00