Commit Graph

2485 Commits (6d6c324a82788ea06682f7a39d36735e9f150f5f)

Author SHA1 Message Date
Raymond Yee 88d6955685 Name error --> transaction should be t 2012-05-29 11:41:36 -07:00
eric 4e81f743b4 removed import loop 2012-05-29 12:08:28 -04:00
Andromeda Yelton a8762dca73 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-29 08:55:36 -04:00
Andromeda Yelton 5d37a969bd phrasing needs to be sensitive to increase vs decrease 2012-05-29 08:55:16 -04:00
Andromeda Yelton 2563dda3e5 creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent 2012-05-29 08:54:57 -04:00
eric 63bc11026e two other reg templates to change when user already logged in [#29858801] 2012-05-26 20:57:59 -04:00
eric a4e15bcda3 stop showing logged-in users the login form [#29858801] 2012-05-26 18:36:10 -04:00
eric 365976933e [#29809805] made username change form more pythonic 2012-05-26 17:30:12 -04:00
eric 61f45a5716 [#29809805] fixed changed email doesn't check for duplicate email 2012-05-26 17:28:57 -04:00
eric bafeb92bdd [#29809805] fixed email dedupe email at account activate fails when more than one prior account 2012-05-26 17:27:10 -04:00
Raymond Yee acaa931445 I think that the CampaignFormView should be deleted -- but before I merge this into master, I want to let others confirm 2012-05-25 19:39:02 -07:00
eric f0dde230f3 [#27015121] forgot to add context to Pledgeview
Seems to me there's refactoring that can be done with these two views!
2012-05-25 18:44:28 -04:00
eric d784715407 Round dollar amount to nearest dollar [#30073593] 2012-05-25 18:34:16 -04:00
eric 5146e9616e forgot to add style to less [#28494261] 2012-05-25 18:19:29 -04:00
eric 7de9616e23 [finish #27015121] add going to amazon text, premium amount now inline. 2012-05-25 18:18:29 -04:00
Raymond Yee a2514eb99c Got rid of small typo in wishlist_unglued_book_released notice type description 2012-05-25 13:49:45 -07:00
Andromeda Yelton 7f0f147b9f Merge branch 'master' of github.com:Gluejar/regluit 2012-05-25 16:11:00 -04:00
eric 1bb459e71d resolve test conficts 2012-05-25 14:54:08 -04:00
eric 8ca9b7900c [start #28494261] "official" notification get sent by email too wishers by default. needs syncdb 2012-05-25 14:52:50 -04:00
eric 9203127da1 comments by campaign managers get a blue box around them [#28494261] 2012-05-25 14:51:46 -04:00
eric 4ec7fef25c log adding book only if it's new to the database 2012-05-25 13:13:15 -04:00
eshellman b3610e17f3 added hard updates of campaign objects 2012-05-25 13:52:25 -03:00
eshellman a77d2e3fea The campaign setup for test_merge_works was wrong but fixing it causes the test to fail on my machine and I cannot fathom why. Fixing it directly on github to make sure I haven't done something else stupid. 2012-05-25 13:03:23 -03:00
Raymond Yee 1335b3cb72 [#29500707]
Fleshing out exception handling for pledge_cancel
selenium tests work for both amazon and paypal on RY laptop -- now going to test them on ry-dev
2012-05-24 18:47:50 -07:00
Raymond Yee 60b84b0358 Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge 2012-05-24 14:10:10 -07:00
Andromeda Yelton 705c647682 removed an unused thing 2012-05-24 16:51:55 -04:00
Andromeda Yelton f3e5477d33 home link should also go to landing page 2012-05-24 15:33:34 -04:00
Andromeda Yelton 733893ecdb Merge branch 'master' of github.com:Gluejar/regluit 2012-05-24 15:30:01 -04:00
Andromeda Yelton 86313666ee making [#29858801] happen -- now you can get back to the home page by clicking on the logo even if logged in 2012-05-24 15:29:45 -04:00
Raymond Yee d2129a2e83 Merge branch 'master' into cancel_pledge 2012-05-24 09:37:13 -07:00
Raymond Yee ad2405243a Added missing deadline to book_panel 2012-05-24 09:35:58 -07:00
Raymond Yee 2f9d899030 Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge 2012-05-24 08:43:33 -07:00
Andromeda Yelton 6eb29f2a78 adding SLJ coverage 2012-05-23 15:38:26 -04:00
Raymond Yee b55af7977d [#29500707] The core of the cancel pledge is in place, though refinements, particularly in the UI still needs to be made.
Outstanding issues:

* Will the IPNs on a cancel come quickly enough so that the user will no longer see "Modify Pledge" when redirected to the Work page
* How to provide better feedback on the fact that a transaction has indeed been canceled?  Do we need to use notifications here?
* This code is working on RY's laptop -- but now needs to be tested where there IPNs available.
2012-05-23 09:12:21 -07:00
Andromeda Yelton 30adccdd37 put ungluer count on second line and changed text placement accordingly to prevent overflow with high ungluer count numbers 2012-05-23 10:40:13 -04:00
Raymond Yee a0bc6deefc Closing in on pledge_cancel 2012-05-23 07:22:48 -07:00
Andromeda Yelton 4829c8679e Merge branch 'master' of github.com:Gluejar/regluit 2012-05-23 09:44:31 -04:00
Andromeda Yelton 4fea78dd1c changed support and modify buttons to use same css-based input button styling as rest of site 2012-05-23 09:23:02 -04:00
Andromeda Yelton 6f3189d99c wanted that float to apply only on the work page, not here 2012-05-23 09:05:54 -04:00
Andromeda Yelton cd9ff5af63 make whole pledge/read now area on back of panel clickable, maintain styling 2012-05-23 08:47:41 -04:00
Andromeda Yelton 2f285d7300 added name attributes to submit buttons 2012-05-23 08:12:35 -04:00
Andromeda Yelton 42665150ec restored link to latest comments 2012-05-22 11:48:53 -04:00
Andromeda Yelton 7791f9a1ae added a comment 2012-05-22 11:48:23 -04:00
Andromeda Yelton 0fcdbee50a minor copy-editing type stuff 2012-05-22 11:07:40 -04:00
Andromeda Yelton a830d5af48 eric wanted me to write a test so I did. tests percent_of_goal 2012-05-22 11:07:05 -04:00
Raymond Yee 5ce95c342b Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge 2012-05-22 07:43:10 -07:00
eric 165d08663b html validation cleanup for pledge page and about lightbox [#29777801] 2012-05-22 09:16:12 -04:00
Andromeda Yelton ce1262c99f organizing/commenting 2012-05-22 07:48:56 -04:00
Andromeda Yelton 54368ffbca adding pledged checkmark next to relevant premium on work page when supporter has pledged 2012-05-22 07:34:42 -04:00
eric a9851314fa Merge branch 'master' of https://github.com/Gluejar/regluit 2012-05-21 18:43:06 -04:00