32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
9549b34d9e
parts of Description tab now conditional on campaign status, rather than offering RHs options they're not allowed to use
2012-05-08 13:48:24 -04:00
5004256f78
better wording
2012-05-08 13:47:58 -04:00
9fc2444f37
need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly
2012-05-08 10:51:04 -04:00
7dbb2e2276
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-08 09:50:32 -04:00
73157c8720
clarified manage campaign workflow
2012-05-08 09:27:03 -04:00
b06a1e218a
Merge branch 'fps' of github.com:Gluejar/regluit into ry
2012-05-07 16:50:00 -07:00
32a39635b4
[finish #29037717 ] added sentences explaining form limits
2012-05-07 18:00:52 -04:00
1ab9304475
[finish #28949611 ] rights holders are now the default campaign manager; they can remove themselves after they add another manager
2012-05-07 17:32:58 -04:00
181cf1a28b
rearchitecting for launch
2012-05-07 13:10:42 -04:00
2cf23aeac0
commented the scripts
2012-05-07 13:10:18 -04:00
5b617370a8
moved boilerplate paragraph
2012-05-07 13:09:41 -04:00
57cebd126d
[accept #28451269 ] added 2 headings and a preview link. Nice job.
2012-05-07 12:19:19 -04:00
1d005fae95
[finish #29170153 ] Improved display of no-google works
2012-05-07 11:36:34 -04:00
a32b09a4cb
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:18:11 -04:00
c0cb99e040
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
2012-05-07 01:18:11 -04:00
d334fa58b0
Revert "Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""""
...
This reverts commit b21787a590
2012-05-07 01:18:11 -04:00
e10136f1b2
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit 1bbac102a2
2012-05-07 01:18:11 -04:00
1bbac102a2
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:14:47 -04:00
b21787a590
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
2012-05-07 01:14:47 -04:00
c8be251ffa
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
2012-05-07 01:14:01 -04:00
2d344a09c6
Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"
...
This reverts commit 7043e71c39
2012-05-07 01:11:26 -04:00
7043e71c39
[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration
...
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
e09418a7a2
Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class
2012-05-04 10:30:05 -04:00
4be0cab5a0
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-04 10:05:54 -04:00
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
b9bbecb351
Merge branch 'master' of github.com:Gluejar/regluit into fps
...
Conflicts:
settings/common.py
settings/dev.py
settings/prod.py
2012-05-02 18:01:20 -07:00
a3ce812467
small formatting changes
2012-05-02 14:10:58 -04:00
b8b007c427
last_campaign_status is a string not function
2012-05-02 17:53:45 +00:00
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
c0625d78b8
banish isbn 10 display because it might not exist and prefer not to address the issue
2012-05-01 10:54:29 -04:00
fb5333be2e
only use role account email addresses in documentation pages
2012-05-01 10:02:07 -04:00
ce36f6771d
css changes per Stefan, part 1
2012-05-01 09:56:19 -04:00
8999afb7f1
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-30 11:28:52 -04:00
5421793f02
minor styling tweaks
2012-04-30 11:03:15 -04:00
4f524a792f
[ #24088823 ] ebook downloads now drop down if more than 1
2012-04-28 21:05:41 -04:00
61a4878b54
[finish #24030945 ] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.
2012-04-28 13:02:38 -04:00
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
47a22f3ccb
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-26 15:50:49 -07:00
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
c6b05bd577
footer now points to wordpress blog
2012-04-26 15:37:41 -04:00
4219149132
Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up.
2012-04-26 19:31:55 +00:00
2ab1df92c2
addressing user feedback, highlighting field validation errors better
2012-04-26 15:30:28 -04:00
061f656e63
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
...
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up: see whether this works for PayPal too.
Conflicts:
frontend/views.py
2012-04-25 13:10:53 -07:00
3bc14c1ac9
Modifying frontend/views to use new transaction status codes
2012-04-25 13:55:30 -04:00
8706e9a900
email sharing needs to populate the sender field in order to validate
2012-04-25 13:45:18 -04:00
6246b231b1
[finish #27115511 ] remove html from wishlist_active notice
2012-04-25 10:20:04 -04:00
Andromeda Yelton
Raymond Yee
eric
Jason
Ed Summers
Raymond Yee