Commit Graph

4284 Commits (cc0622bd2d3de67f446af3ed68a8584d1bb3393b)

Author SHA1 Message Date
Raymond Yee f6bd35d623 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-10-03 14:16:53 +00:00
Jason 77eb1db0ce Merge branch 'master' of github.com:Gluejar/regluit 2011-10-01 08:01:48 -04:00
Jason ed1732b4ec Adding cancel,dispute,chargeback support, chained payments, user/list APIs, bug fixes 2011-10-01 08:01:40 -04:00
Raymond Yee 12e4362985 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-30 20:16:14 +00:00
Raymond Yee e41544722f Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-30 09:19:12 -07:00
Ed Summers 76e3b193d7 fixed failing tests related to interplay between django_extensions and south 2011-09-29 21:57:12 -04:00
Raymond Yee ea5dc77256 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-29 18:12:20 -07:00
Ed Summers ce080f893e Merge branch 'master' of github.com:Gluejar/regluit 2011-09-30 01:01:33 +00:00
Ed Summers dea578e019 bugfix for https://www.pivotaltracker.com/story/show/19054387 2011-09-30 01:01:28 +00:00
Raymond Yee 9c1c60e989 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-29 17:03:37 -07:00
eric 1fe7bf3dc9 Merge branch 'master' of https://github.com/Gluejar/regluit 2011-09-29 19:32:23 -04:00
eric 459ffbc549 Revert "quote style"
This reverts commit 88abca0b33.
2011-09-29 19:32:14 -04:00
eric 88abca0b33 quote style 2011-09-29 19:28:16 -04:00
eric 146bb5639f resolving errors raised by django registration tests 2011-09-29 19:27:31 -04:00
Raymond Yee 51f87eb824 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-29 12:23:44 -07:00
Ed Summers 53ceeb800c adjusted test to expect the title and isbns in the new location 2011-09-29 19:07:16 +00:00
Raymond Yee 5c40c5c2a8 attempt to merge master into tastypie2 -- tests failed 2011-09-29 11:40:45 -07:00
Ed Summers d653277da6 no longer needed since this is inline in supporter.html and search.html 2011-09-29 16:44:38 +00:00
Ed Summers 3f1eae3105 remove from wishlist functionality 2011-09-29 16:42:19 +00:00
Ed Summers 9a44cfc436 added remove from wishlist 2011-09-29 11:44:03 +00:00
Jason b267e7f822 Merge branch 'master' of github.com:Gluejar/regluit 2011-09-29 03:50:27 -04:00
Jason 42cf499a6c Adding Pre-approved payments 2011-09-29 03:50:07 -04:00
Ed Summers dde1253dea removed print statements 2011-09-29 02:30:13 -04:00
Ed Summers 5f43f87169 make on wishlist message the same 2011-09-29 02:28:10 -04:00
Ed Summers 409df080ce got search passably working and a somewhat functional ajax add to list 2011-09-29 02:23:50 -04:00
eric 41746e6063 added login form on the activation complete page
moved login form code to a separate template (DRY), which required
changing the view for activation_complete
2011-09-28 23:26:08 -04:00
Ed Summers 83f553dc36 removed tabs 2011-09-28 22:46:37 -04:00
Ed Summers 32ec8bd119 removed tabs 2011-09-28 22:02:33 -04:00
Ed Summers 23c4c48946 simplified privacy view to use direct_to_template generic view; now use render() from django 1.3 which is easier 2011-09-28 21:54:50 -04:00
Ed Summers 65457dd921 merged 2011-09-29 01:42:08 +00:00
Ed Summers 8a9f785c4e started adding back some search functionality 2011-09-29 01:36:47 +00:00
Ed Summers 46271f96c1 Edited README.md via GitHub 2011-09-28 16:51:53 -03:00
Andromeda Yelton 45aef0e947 privacy policy updated with paypal info 2011-09-28 13:28:12 -04:00
Jason 7e9517ead2 Adding missing README 2011-09-27 08:56:50 -04:00
Jason ffa3feb92b Merge branch 'master' of github.com:Gluejar/regluit 2011-09-27 08:48:18 -04:00
Jason 37b46d01c2 Adding pledge payment support 2011-09-27 08:48:11 -04:00
Ed Summers 433b853c05 removed tabs since they are evil 2011-09-27 09:45:03 +00:00
Ed Summers f8095e9513 added and used Campaign.cover_image_small 2011-09-27 09:27:47 +00:00
Ed Summers 195f6db360 redirect to supporter page if logged in 2011-09-27 09:27:15 +00:00
Ed Summers b709cf3d61 clicking on unglue.it icon takes you home 2011-09-27 09:11:26 +00:00
eshellman df05fcf3b3 <title> needed a space after "unglue.it" 2011-09-26 15:43:41 -03:00
Andromeda Yelton 1597f9284c Merge github.com:Gluejar/regluit 2011-09-26 14:26:25 -04:00
Andromeda Yelton 8e3a1430a8 Minimally styled footer area 2011-09-26 14:25:30 -04:00
eshellman 6e134b5e8c Edited README.md via GitHub 2011-09-24 12:40:38 -03:00
Andromeda Yelton 54a5cc0fbf fixed layout bug with h2 and view list icons 2011-09-21 12:02:29 -04:00
Andromeda Yelton e812cbb2d7 add settings/me.* (not just me.py) to .gitignore 2011-09-21 11:47:40 -04:00
Andromeda Yelton 781b749005 Merge remote branch 'origin_team/master' 2011-09-21 11:17:13 -04:00
Andromeda Yelton ac5e372131 new designs for home and supporter pages, take 1 2011-09-21 11:11:36 -04:00
Raymond Yee 50d1f219ea A pass at making server side panels 2011-09-20 22:22:48 -07:00
Raymond Yee 8d13aa20eb Merge branch 'master' of github.com:Gluejar/regluit 2011-09-19 14:53:10 -04:00