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 |
|
Andromeda Yelton
|
d92fedcdb1
|
incorporating latest round of css changes
|
2011-10-13 12:25:10 -04:00 |
|
Andromeda Yelton
|
206b722c5d
|
Added logic to generate backed/backing/wished data for badge display
|
2011-10-13 12:23:57 -04:00 |
|
Andromeda Yelton
|
62c1773090
|
incorporating latest round of supporter page css
|
2011-10-13 12:23:16 -04:00 |
|
Andromeda Yelton
|
da905147d9
|
added related_name to UserProfile to facilitate display of profile info
|
2011-10-13 12:22:38 -04:00 |
|
Andromeda Yelton
|
3773a6dd9c
|
switched to decimal to address python 2.6/2.7 compatibility bug
|
2011-10-13 12:21:53 -04:00 |
|
Raymond Yee
|
80ac5e36d1
|
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
|
2011-10-13 07:49:48 -07:00 |
|
Ed Summers
|
983c045a8c
|
added bookloader.thingisbn and a test
|
2011-10-12 21:59:46 -04:00 |
|
Raymond Yee
|
d82cda07ba
|
Load campaign with Decimal target amount.
|
2011-10-12 15:48:41 -07:00 |
|
Raymond Yee
|
f01d0c4df3
|
First cut at doing payment integration and understanding how to use class-based generic views
|
2011-10-12 10:47:48 -07:00 |
|
Raymond Yee
|
7e4f0a222b
|
Ooops....forgot some files in previous commit
|
2011-10-11 10:03:40 -07:00 |
|
Raymond Yee
|
39037c3ec6
|
Current status: ugly first cut integration
|
2011-10-11 10:02:17 -07:00 |
|
Andromeda Yelton
|
63203ae129
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-10-11 09:33:49 -04:00 |
|
Andromeda Yelton
|
cd6ec21d63
|
switching css over to a less system with aim of greater maintainability.
|
2011-10-11 09:32:52 -04:00 |
|
Ed Summers
|
c69acd54ac
|
the new initial migration for core
|
2011-10-10 22:31:45 -04:00 |
|
Ed Summers
|
030f2fbae7
|
needed to start over with clean slate for migrations since they were not being run as part of test suite, which was covering up some errors in the migrations
|
2011-10-10 22:31:24 -04:00 |
|
Ed Summers
|
35abaf4237
|
this seemed to duplicated schema changes covered in previous migrations
|
2011-10-11 01:34:32 +00:00 |
|
Ed Summers
|
5e9439b965
|
reduced number of queries needed when displaying when a book is already on a user wishlist
|
2011-10-10 18:08:53 -04:00 |
|
Ed Summers
|
b991c1d375
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-10-10 17:27:10 -04:00 |
|
Ed Summers
|
1b54ba5f6b
|
make sure there are some hits when adding a book by isbn
|
2011-10-10 17:26:38 -04:00 |
|
Ed Summers
|
b4583507d6
|
removed duplicate works until work deduping is working again
|
2011-10-10 17:25:55 -04:00 |
|
Raymond Yee
|
4803979af4
|
Change in bookloader in how to add book by isbn.
|
2011-10-10 14:11:28 -07:00 |
|
Raymond Yee
|
67a5731592
|
I had forgotten the migrations for fields to support Campaign.status -- they are included here.
Now, Campaign.current_total is a property holding current amount of $ pledged/authorized.
|
2011-10-10 13:56:53 -07:00 |
|
Ed Summers
|
461d813f6a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-10-10 20:40:28 +00:00 |
|
Ed Summers
|
89277a5e34
|
use textfield instead of charfield(10000) since Amazon RDS does not like them
|
2011-10-10 20:40:19 +00:00 |
|
Raymond Yee
|
bb849f8dc8
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-10-10 13:37:43 -07:00 |
|
Raymond Yee
|
ca2fc9afdc
|
I've wrapped Campaign.status with a property decorator -- access campaign status as campaign.status not campaign.status() now.
|
2011-10-10 13:35:22 -07:00 |
|
Ed Summers
|
57fe5f2a4b
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-10-10 20:12:26 +00:00 |
|
Ed Summers
|
fc65877871
|
mysql really only needed for production install, and is a burden for sqlite development environments
|
2011-10-10 20:12:20 +00:00 |
|
Ed Summers
|
e25894d549
|
added X-Forwarded-For for gluejar.com for the moment
|
2011-10-10 15:57:12 -04:00 |
|
Ed Summers
|
21aa09d183
|
use Decimal for campaign target
|
2011-10-10 15:39:25 -04:00 |
|
Ed Summers
|
f701cda168
|
need a jenkins settings file with a googlebooks api key for the tests to pass
|
2011-10-10 13:26:00 -04:00 |
|
Ed Summers
|
c0f4ad11c3
|
merged upstream changes
|
2011-10-10 13:09:00 -04:00 |
|
Ed Summers
|
70a620b27f
|
moved to using googlebooks api for data. required moving authors and subjects to be associated to editions, since we google books does not have a notion of a work
|
2011-10-10 12:57:10 -04:00 |
|
Raymond Yee
|
84409507da
|
Merge branch 'campaign_model' of github.com:Gluejar/regluit
|
2011-10-10 08:07:25 -07:00 |
|
Ed Summers
|
4e65134ab1
|
no need for commented out imports, eh
|
2011-10-09 15:17:43 -04:00 |
|
Ed Summers
|
a905d6c820
|
added test of required fields for Campaign
|
2011-10-09 14:48:03 -04:00 |
|
Ed Summers
|
90859811a9
|
simplified some things since the database schema does not allow for campaigns that lack a name, description or work
|
2011-10-09 14:27:27 -04:00 |
|
Raymond Yee
|
711546f414
|
First pass at incorporating status into Campaign
|
2011-10-07 20:11:57 -07:00 |
|
Raymond Yee
|
c7ac36b9fc
|
query_campaign repeated twice -- second one is query_list
|
2011-10-07 14:19:43 -07:00 |
|
Raymond Yee
|
68b94f768f
|
Changes in progress to the model
|
2011-10-07 14:17:54 -07:00 |