Commit Graph

409 Commits (997b771a6bd120928a51c789c91554542a171a68)

Author SHA1 Message Date
Raymond Yee 8d27cfc89e Merge branch 'master', remote branch 'origin' into payment_integration 2011-10-18 07:43:42 -07:00
Raymond Yee fa3dfe19a0 getting basic comparison of current status of a transaction with that in the database 2011-10-18 07:42:56 -07:00
Ed Summers a086143495 pointer cursor when hovering over "find" 2011-10-18 05:13:57 +00:00
Ed Summers 5965687dbb added some hopefully not too cheesy info about adding to wishlist when a user has an empty wishlist 2011-10-18 00:21:49 -04:00
Ed Summers b33ea3ac34 put a bit of space between "add to wishlist" and status. attempted to remove redundant book list css since it was confusing 2011-10-18 02:58:15 +00:00
Ed Summers fd5cf49460 Merge branch 'master' of github.com:Gluejar/regluit 2011-10-17 22:32:40 -04:00
Ed Summers 1ddf12ddab anon user gets redirected to login page when attempting to add an item to a wishlist. fixes https://www.pivotaltracker.com/story/show/19249923 2011-10-17 22:32:31 -04:00
eric ffcb298376 again 2011-10-17 22:07:34 -04:00
eric f8b599ffcc removed capitalization style in .header-text 2011-10-17 22:03:06 -04:00
Ed Summers cdca7c6525 include book_list.css so we the remove/add areas appear clickable 2011-10-17 21:35:58 -04:00
Ed Summers f870cc6243 added regression test for non-logged in user viewing the supporter page 2011-10-17 18:37:31 +00:00
Ed Summers d09bc33989 fix for https://www.pivotaltracker.com/story/show/19784723 2011-10-17 18:16:34 +00:00
Ed Summers cd805d14ab added raymond to the admins who get emailed with exceptions 2011-10-17 18:06:11 +00:00
Raymond Yee 0d21e77fd3 Merge branch 'master' of github.com:Gluejar/regluit into payment_integration 2011-10-17 07:23:59 -07:00
Ed Summers bb3a445a79 put a bit of temporary whitespace in between the footer 2011-10-14 20:48:40 +00:00
Ed Summers d5badd0f7e shortened width of search box a teensy bit so that it does not break in half 2011-10-14 20:43:29 +00:00
Ed Summers 7596ceeebd these are important for when you are running with debug off 2011-10-14 20:38:09 +00:00
Ed Summers a621f9f2d9 turning off debug for prod settings 2011-10-14 20:37:44 +00:00
Ed Summers d69c881035 forgot the initial migration :-) 2011-10-14 16:13:06 -04:00
Ed Summers 5b102a6685 wiping migrations again and hoping they work this time. also catch exceptions when adding related editions. 2011-10-14 16:03:43 -04:00
Ed Summers 491914a531 trying to fix campaign constraints with a migration 2011-10-14 19:37:22 +00:00
Raymond Yee 38166177c4 First cut of PaymentDetails
small fix to explicitly calculate URI of PayPalIPN url pattern
update status of a PAY transaction to CREATED instead of leaving as None
2011-10-14 10:52:17 -07:00
Raymond Yee d79b228d39 Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
Conflicts:
	core/tests.py
2011-10-14 07:42:33 -07:00
Ed Summers 84337fae23 model change needs a migration 2011-10-14 14:36:02 +00:00
thatandromeda b045f9388a typo fix 2011-10-14 11:28:41 -03:00
Ed Summers bc24d0ea71 activate the random campaigns 2011-10-14 14:26:57 +00:00
Ed Summers 93404d42ff when a user views another users contributor page, works they already have on their wishlist show up that way instead of as "add to wishlist" 2011-10-14 14:18:38 +00:00
Andromeda Yelton 25b0e90141 updating with supporter page css 2011-10-14 09:50:18 -04:00
Andromeda Yelton 548c48d03a added logic to determine wishlist and backing status info for profile 2011-10-14 09:49:52 -04:00
Andromeda Yelton a3de52e5f9 wiring live data into the css 2011-10-14 09:49:27 -04:00
Andromeda Yelton 1619724853 canonicalizing filenames 2011-10-14 09:46:10 -04:00
Andromeda Yelton 6d51c521af add/remove functionality and alternate row styling 2011-10-14 09:44:23 -04:00
Andromeda Yelton a468012270 created methods to allow front end to see last campaign and percent unglued 2011-10-14 09:43:30 -04:00
Ed Summers 97e630c196 removed tabs 2011-10-14 05:29:23 +00:00
Ed Summers 2c1b4ed8ad added ability to add books from someone elses wishlist 2011-10-14 05:23:46 +00:00
Ed Summers 7057887bf0 s/tweeter/twitter/ 2011-10-14 05:09:34 +00:00
Ed Summers be66e3372e put remove from wishlist back 2011-10-14 01:05:19 -04:00
Ed Summers 44449f56a3 added some comments 2011-10-14 00:12:20 -04:00
Ed Summers ffe84fa46a got bookloader.add_related working w/ some tests. also added Edition.language because it looks like it will be useful to know. 2011-10-14 00:02:19 -04:00
Ed Summers 5138e3d817 added back a search box so at least we can search for books to add to a wishlist while logged in, until we know where the search box should go 2011-10-13 22:32:30 -04:00
Ed Summers ff5aea310c removed tabs 2011-10-13 22:19:14 -04:00
Raymond Yee e8c8f2dfc2 Got rid of a lot of code that was there to help RY learn about class based generic views.
Inserted a setting for the Gluejar paypal account email.
2011-10-13 19:16:28 -07:00
Raymond Yee 47a17e6888 The receiver status should be IPN_TXN_STATUS_COMPLETED if the transaction is complete,, I think. 2011-10-13 15:12:11 -07:00
Raymond Yee ad9bad997e Display total current pledge/authorization in campaign_detail 2011-10-13 14:40:07 -07:00
Raymond Yee 319906774c Merge branch 'master' of github.com:Gluejar/regluit into payment_integration 2011-10-13 14:25:51 -07:00
Raymond Yee e0f1ef50cc Rewrote pledging to a campaign to integrate the testview into logic of CampaignFormView directly.
Allow configuration of where PayPal should return after transaction is completed.
2011-10-13 14:13:37 -07:00
Raymond Yee c0bd998732 First attempt to write out transactions associated with Campaign 2011-10-13 10:28:23 -07:00
Andromeda Yelton da3b41af9d fixing date format 2011-10-13 12:55:44 -04:00
Andromeda Yelton 145c275795 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	core/management/commands/random_campaigns.py
2011-10-13 12:46:52 -04:00
Andromeda Yelton 03e49f5fdd latest images 2011-10-13 12:26:33 -04:00