Commit Graph

527 Commits (fe8c0607504d199aed368e2ec5f2ccd7f0330eef)

Author SHA1 Message Date
Andromeda Yelton 9a09dfcc58 site prominently identified as preview. campaign elements of explore bar labeled as coming soon and pages will show alpha content on unglue.it (they still show full content elsewhere for development purposes) 2012-01-15 12:04:43 -05:00
thatandromeda 3178aae597 Update frontend/templates/registration/password_reset_done.html 2012-01-15 10:52:51 -05:00
thatandromeda 01ac391c24 Update frontend/templates/home.html 2012-01-15 09:59:35 -05:00
thatandromeda 2766ee7a13 Update frontend/templates/home.html 2012-01-15 09:50:40 -05:00
Andromeda Yelton 8022add137 now the rest of the registration-related stuff is prettier 2012-01-13 16:24:34 -05:00
Andromeda Yelton 13bee78c38 making styling of sign in, password change, etc. less grody 2012-01-13 12:34:42 -05:00
Andromeda Yelton 60f9bc29da Merge branch 'master' of github.com:Gluejar/regluit 2012-01-12 13:58:03 -05:00
Andromeda Yelton f80226fe5e minor additions to the press page, plus new users now go to supporter page on login 2012-01-12 13:57:50 -05:00
thatandromeda c054c45f0f press link in footer should actually link to press page, huh 2012-01-11 12:12:56 -05:00
Andromeda Yelton 5654b5cd5e Merge branch 'master' of github.com:Gluejar/regluit 2012-01-11 10:01:14 -05:00
Andromeda Yelton b6998daac3 now the press page has pretty images. and links get a text decoration on hover, to be more obvious. 2012-01-11 10:00:10 -05:00
Raymond Yee 7a16029d72 Small bug in the feedback view: user -> request.user 2012-01-10 17:21:37 -08:00
Raymond Yee 54f2411ab9 Put in a basic page for a pledge completion. 2012-01-10 17:15:39 -08:00
Raymond Yee 86ff9ccdee Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-01-10 15:27:38 -08:00
Raymond Yee 01f5664bf5 Some very basic functionality associated with cancel_url, including the ability to try again on the pledge. 2012-01-10 15:26:04 -08:00
Andromeda Yelton 9b6524c6fd fleshing out the press kit 2012-01-10 16:27:31 -05:00
eric d7e5e6e1ed Merge branch 'master' into generic_id 2012-01-10 15:40:15 -05:00
eric 0d19018e62 api tests working; non-google id's working 2012-01-10 15:20:02 -05:00
Raymond Yee 3abd29f225 First pass at passing in campaign id into cancel_url (which is now calculated in payment/manager.py) 2012-01-10 12:16:04 -08:00
Andromeda Yelton 7ca9a5f0a7 it is the skeleton of a press kit 2012-01-10 11:10:27 -05:00
Andromeda Yelton 95f32400ec Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 16:13:49 -05:00
Andromeda Yelton 556ecf8a06 now users can give us feedback on alpha 2012-01-09 15:53:09 -05:00
eric 0b91017dd5 Did what edso told me not to do- re-architected db to use generic ids 2012-01-09 13:55:22 -05:00
Raymond Yee a4957a5bf6 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 12:47:51 -05:00
Andromeda Yelton a7009b1998 whoops, should probably commit the version that passes tests 2012-01-09 12:44:35 -05:00
Raymond Yee 2d1ab0dba6 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-09 12:40:03 -05:00
Raymond Yee a174b3eb93 Putting in skeleton for pledge cancel and complete PayPal callbacks 2012-01-09 12:36:03 -05:00
Andromeda Yelton a9fc98b771 work page now displays a modify-pledge button where appropriate. not yet wired to modification functionality. 2012-01-09 11:50:48 -05:00
Andromeda Yelton 9d8bf7be69 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-06 11:04:17 -05:00
Andromeda Yelton 8460fba0bb organizing the FAQ 2012-01-06 10:42:17 -05:00
Raymond Yee 8ba7570ea1 Adding a "thank you" to the pledge page 2012-01-04 21:14:58 -05:00
Raymond Yee 9182affeda Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-01-04 17:21:39 -05:00
Raymond Yee 13b01c2838 Added a test to ensure that a user needs to be logged in for the pledge view. 2012-01-04 17:14:37 -05:00
Andromeda Yelton 96587a0a2d Merge branch 'master' of github.com:Gluejar/regluit 2012-01-04 12:51:45 -05:00
Andromeda Yelton 8e04bf3419 expanding the faq 2012-01-04 12:51:34 -05:00
Raymond Yee 68f0c255d5 Force login on PledgeView as a whole 2012-01-04 12:03:50 -05:00
thatandromeda 79e7d9d7df grammar! 2012-01-04 11:34:31 -05:00
Andromeda Yelton aa10713e49 menu is more location-specific 2012-01-03 16:47:00 -05:00
Andromeda Yelton 7de1051448 it is not unlike a sidebar organizing the FAQs 2012-01-03 16:17:04 -05:00
Andromeda Yelton 1986b37857 tidying book panel 2012-01-03 09:59:17 -05:00
Andromeda Yelton 69087b0a33 suppressing useless add-wishlist element 2012-01-03 09:47:06 -05:00
Andromeda Yelton 8a59fc75f8 green circle+arrow in learn more area makes no sense outside of landing page 2012-01-03 09:19:50 -05:00
Andromeda Yelton 2ede7d7e7b size of unglue definition text box does not change now as definitions change 2012-01-03 09:12:31 -05:00
eric 9030e87b70 unhid wished_by from search results. Why was it hidden? 2012-01-02 19:08:24 -05:00
eric 739fccbe83 roemoved vestigial code from search view 2012-01-02 19:08:23 -05:00
Andromeda Yelton 8d7f7fe612 now the unglue definitions are not placeholders 2012-01-02 17:17:35 -05:00
Andromeda Yelton 1e2e76cc69 Merge branch 'master' of github.com:Gluejar/regluit 2012-01-02 16:31:53 -05:00
Andromeda Yelton 4e23363a80 now the text before the learn more button randomizes onload and onclick 2012-01-02 16:20:07 -05:00
Andromeda Yelton dfd20a7957 needed a comma 2012-01-02 13:39:58 -05:00
Andromeda Yelton fba09f60a3 comments needs padding between avatar and text 2012-01-02 13:10:20 -05:00
eric 8e383ce229 embed needs protocol 2012-01-02 12:59:26 -05:00
Andromeda Yelton 3a6ae3da94 maybe a more robust way to obtain the url base 2012-01-02 11:22:03 -05:00
Andromeda Yelton 29e6ba7ee0 build_absolute_uri returns the WHOLE uri, not the base, so lines had to be rewritten accordingly. don't use it for the embed line since that requires ONLY the url base 2012-01-02 11:10:33 -05:00
Andromeda Yelton e287f6028d replacing remove-this option with pledged where applicable 2012-01-02 11:09:48 -05:00
Andromeda Yelton fb6d715429 user now sees pledged indicator rather than remove-wishlist option for pledged works 2012-01-02 10:59:00 -05:00
Andromeda Yelton 30703cdabc Merge branch 'master' of github.com:Gluejar/regluit 2012-01-02 09:41:16 -05:00
Andromeda Yelton 03d94bfbc5 tweaking email sharing 2012-01-02 09:39:11 -05:00
eric 1cad25da28 detab source file 2011-12-31 13:49:23 -05:00
eric 9d6066c929 catch IndexErrors to fix HermanCain bug; there is a work with zero editions 2011-12-31 13:48:54 -05:00
eric c2789350d0 We have comments! sync your dbs. 2011-12-30 22:08:04 -05:00
Andromeda Yelton a2ebda17b1 one more place to truncate 2011-12-29 12:57:43 -05:00
Andromeda Yelton 1ddbbf55a5 now there is a truncatechars filter, applied where relevant 2011-12-29 12:50:09 -05:00
Andromeda Yelton 9358004c9b Merge branch 'master' of github.com:Gluejar/regluit 2011-12-29 10:40:51 -05:00
Andromeda Yelton 0550f9ac43 added some default field prepopulation to email share form 2011-12-29 10:40:35 -05:00
eric 4f17b86878 more reversion to make login?next= work correctly 2011-12-29 00:11:28 -05:00
eric afccb45fe4 fixed redirect loop 2011-12-28 23:31:42 -05:00
Andromeda Yelton a742773799 merging work.html changes 2011-12-28 23:19:18 -05:00
Andromeda Yelton 79bc9ac15a now email share has marginal styling and returns users to their original page after form submission 2011-12-28 23:17:39 -05:00
eric f9adbd0bc3 social widgets on basedocumentation lit up 2011-12-28 21:13:32 -05:00
Andromeda Yelton 0717479238 lo-fi email sharing now works 2011-12-28 20:43:52 -05:00
eric a348743385 discovered at d applied the useful request.build_absolute_uri 2011-12-28 20:41:07 -05:00
eric 57939300b1 another try for email activation 2011-12-28 15:02:12 -05:00
eric 4c7e5e7f8c revert; will need to use http rewrite in apache to enforce https 2011-12-28 13:58:28 -05:00
eric f493312782 Revert "added htmlbase to enforce https login"
This reverts commit 93afadcf46.
2011-12-28 13:51:24 -05:00
eric 93afadcf46 added htmlbase to enforce https login 2011-12-28 12:34:43 -05:00
eric 697ee04a43 added site fixtures to make email registration emails work 2011-12-28 12:34:41 -05:00
Andromeda Yelton 97ee0a7fc4 shortened publication date in work page header, made book list cover clickable 2011-12-28 07:27:56 -05:00
Andromeda Yelton f0e1d47ac4 remove this button on work page returns page to add-to-wishlist state 2011-12-27 21:39:40 -05:00
Andromeda Yelton 50aae788c6 further tidying up panel view hover state and making sure it works properly in widget form too 2011-12-27 19:17:44 -05:00
eric 5fb28b709f revived book covers 2011-12-27 13:00:42 -05:00
Andromeda Yelton d940c9a46a tidied up panel hover state: layout, more sensitivity to campaign status, live pledge link 2011-12-26 21:10:32 -05:00
Andromeda Yelton a35ffb2ffa Merge branch 'master' of github.com:Gluejar/regluit 2011-12-26 12:53:36 -05:00
Andromeda Yelton c79b3bdd10 replaced useless status indicators with wished-by indicators on supporter page for status = initailized or no campaign and destroyed GR/LT modal dialog 2011-12-26 12:53:28 -05:00
Raymond Yee ad2dd36613 Changed order of campaign classes in campaign_admin 2011-12-23 11:46:09 -05:00
Raymond Yee c721c9c6b2 Now in campaign admin, you can pick specific campaign to take action on. 2011-12-23 09:59:07 -05:00
Raymond Yee a757f6f99b Versions that include movement to utcnow() and changing what comes out PaymentManager.checkStatus() -- but payment to primary recipient is now broken. Need to investigate 2011-12-22 20:34:24 -05:00
Andromeda Yelton 5c8f3beccc working on goodreads/librarything import UI. in an intermediate state right now. 2011-12-22 16:03:15 -05:00
Andromeda Yelton 6f64434b4e Merge branch 'master' of github.com:Gluejar/regluit 2011-12-22 09:51:59 -05:00
Andromeda Yelton 7130ee5625 progress icon replaced by wished-by-N text for books on supporter page with no campaign yet 2011-12-22 09:51:49 -05:00
Raymond Yee 81c99c8724 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-21 18:37:22 -05:00
Raymond Yee 17d4acceab changed PaymentManager.cancel to PaymentManager.cancel_transaction and added PaymentManager.cancel_campaign to parallel other methods in PaymentManager
morphing the campaign_admin view towards being able to push all the campaigns through the various states
2011-12-21 17:32:08 -05:00
Andromeda Yelton ddcee58eeb badges on supporter page now stay put regardless of whose page you're looking at and whether they have a tagline 2011-12-21 14:33:48 -05:00
Andromeda Yelton 614b36d15c Merge branch 'master' of github.com:Gluejar/regluit 2011-12-21 13:48:45 -05:00
Andromeda Yelton d0b2809c9e moving badges for recommended and popular into tab area 2011-12-21 13:48:34 -05:00
Raymond Yee 322f03a460 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-21 12:33:44 -05:00
Andromeda Yelton e8860238e0 on-wishlist checkmark now displays properly on supporter page 2011-12-21 11:34:35 -05:00
Andromeda Yelton 2428a5eef9 moved support button on work page to be more prominent and align better with other icons 2011-12-21 10:59:49 -05:00
Raymond Yee 75fceed7c5 Now display the campaigns with three different types of transactions: ACTIVE, INCOMPLETE, COMPLETED on the campaign_admin view 2011-12-20 20:36:27 -05:00
Raymond Yee 4e36892910 Putting in stub for campaign_admin.
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
Andromeda Yelton 12a3f7f72f Merge branch 'master' of github.com:Gluejar/regluit 2011-12-20 16:13:28 -05:00