Commit Graph

653 Commits (79b594e6cec10daa54ce66623a13f0ce119f1b31)

Author SHA1 Message Date
Andromeda Yelton 8d321d46dc final incorporation of all stray CSS changes 2013-01-02 15:55:10 -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 e305a1ee74 Merge branch 'master' into prettier_acks 2013-01-02 10:53:05 -05: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 f4a269f5ac returning empty string rather than False 2012-12-31 15:02:39 -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
Raymond Yee a726a11154 [fix #41788889] google id for book changed 2012-12-31 10:10:24 -05:00
Andromeda Yelton b7721f0fa3 management command to make sure transaction.ack_name returns something sensible for OLA on /acks/ page 2012-12-19 11:00:33 -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
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 b05beaeaa7 need to actually handle anons and pass that data 2012-12-11 13:17:28 -05: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
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 c4f32b38b5 moving ending soon notification to tasks 2012-11-21 11:09:07 -05:00
Andromeda Yelton 68a08d78c2 Revert "fire signal for time-running-out notification"
This reverts commit 4719c0b4b4.
2012-11-21 09:12:21 -05:00
Raymond Yee 7f499bb6f2 Merge branch 'master' into charge_failed 2012-11-16 10:46:28 -08:00
Raymond Yee 279399e9b5 [fix #39700567] Return a rightsholder name regardless of status of Campaign 2012-11-16 08:52:54 -08:00
Andromeda Yelton 2858ed194c bugfixing 2012-11-16 11:43:00 -05:00
Andromeda Yelton 4719c0b4b4 fire signal for time-running-out notification 2012-11-16 10:37:12 -05:00
Andromeda Yelton f25f3c81ee construct notification handler 2012-11-16 10:24:48 -05:00
Raymond Yee 02dd7a55da Merge branch 'campaign_close' into charge_failed 2012-11-15 14:38:23 -08:00
Raymond Yee 03a751626e Stepping stone to tests that will allow the adjustment of localdatetime.now() so that we can simulate campaign closing 2012-11-15 14:37:04 -08:00
Raymond Yee 1739064229 return True incorrect place in Campaign.update_status 2012-11-15 13:06:12 -08:00
Raymond Yee 4e7fac0ecd Merge branch 'campaign_close' into charge_failed 2012-11-13 10:20:49 -08:00
Raymond Yee b2ca44da31 Now automatically process transactions based on status of campaigns 2012-11-13 10:15:38 -08:00
Raymond Yee f4c8c67850 [#39477485] allow campaigns to succeed if amount sufficient before campaign deadline 2012-11-13 09:01:05 -08:00
Raymond Yee 793d984ba3 Implemented basic transaction_failed signal and notices -- THEY STILL NEED WORK
Tests handle situation of transaction_failed too
2012-11-06 11:22:25 -08:00
Raymond Yee 96b62aa163 basic skeleton for test based on loading fixture
keep the signals for create userprofile, wishlist, and credit from firing if fixtures being loaded
2012-10-31 11:08:46 -07:00
Andromeda Yelton f9f19b2043 if last transaction ack_name was blank, use username as ack_name 2012-10-23 09:37:00 -04:00
Andromeda Yelton b7ce48bfb0 fix anon_pref 2012-10-19 14:01:22 -04:00
Andromeda Yelton 41f59024f4 last_transaction now a property on the profile 2012-10-18 15:51:52 -04:00
Andromeda Yelton bcba88221f ack_name and anon_pref are now properties on user profile 2012-10-18 13:50:02 -04:00
thatandromeda 8bc66ad0fb Merge pull request #63 from Gluejar/goodreads_bug
replaced remaining text.strip() with safe_strip(text) -- and changed saf...
2012-10-16 11:11:25 -07:00
Andromeda Yelton 3831a1ea59 clarifying kwarg 2012-10-16 11:36:51 -04:00
Raymond Yee 0df16957db replaced remaining text.strip() with safe_strip(text) -- and changed safe_strip to a try/except approach to handle cases which a_string does not evaluate to False but nonetheless does not have strip method 2012-10-16 08:21:55 -07:00
Andromeda Yelton ae9a541ed5 too many ways we might add to wishlist to test for. adding argument for notification. [[#37780515] 2012-10-16 11:06:13 -04:00
Andromeda Yelton 2cd87369e1 only fire wishlist_added notification for actual new additions 2012-10-16 10:20:24 -04:00
eric bda3211a76 user can manage their account credit card [#37674369] 2012-10-14 23:41:17 -04:00
eric 3e2d65afd9 list the user's pledges [#37674453]
see result at /accounts/manage/
2012-10-14 17:44:17 -04:00
eric 5bde0da8ca [#37716025] reuse a user's credit card 2012-10-13 13:45:46 -04:00
Raymond Yee 018332d508 [#37388341] First crack at displaying campaign data -- per Melinda's request 2012-10-08 17:47:55 -07:00
eric 7f1dc2d3ca merge works wasn't merging claims 2012-10-05 17:55:14 -04:00
eshellman b5148f39fc Merge pull request #33 from Gluejar/pledged_badges
clean up two loose ends; gotta see what jenkins thinks of it
2012-10-03 17:38:02 -07:00
eric 04002e40a2 jenkins build errors suggest some environments evaluate module attributes differently 2012-10-03 20:35:05 -04:00
eric 75e0a4c534 clean up two loose ends 2012-10-03 17:36:17 -04:00
eric c26532c0fd Merge branch 'master' of https://github.com/Gluejar/regluit 2012-10-03 17:08:54 -04:00
eric 75207afb4c Merge branch 'pledged_badges' 2012-10-03 17:08:00 -04:00