Andromeda Yelton
0f546f50a3
invoke target script directly rather than invoking script that (inconsistently) invokes it
2012-09-25 10:54:31 -04:00
Andromeda Yelton
0989319430
inline script wasn't actually doing anything
2012-09-25 10:53:54 -04:00
Andromeda Yelton
38d115e5a1
no longer need readmill script since we're pulling send script directly
2012-09-25 10:53:23 -04:00
eric
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
Raymond Yee
3f110d6422
Merge branch 'paymentmanager_account' into relaunch_ry
2012-09-24 16:32:05 -07:00
Raymond Yee
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
Raymond Yee
30f1cad6f1
A revised requirements_versioned.pip for relaunch
2012-09-24 12:46:52 -07:00
eric
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
Raymond Yee
ed6bb5f3e0
BROKEN CODE -- checked in while I switch to working on other branch
2012-09-24 11:30:21 -07:00
Andromeda Yelton
d84c1ef617
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-24 14:21:33 -04:00
Andromeda Yelton
adefc43154
first pass
2012-09-24 14:21:15 -04:00
Raymond Yee
6a4d8fd3ff
Merge branch 'relaunch' into paymentmanager_account
2012-09-24 09:52:24 -07:00
Raymond Yee
57514e4ba0
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:51:48 -07:00
Raymond Yee
de4092d23d
Merge pull request #14 from Gluejar/nonprofit_switch
...
Nonprofit switch [deliver #36476831 ]
2012-09-24 09:50:22 -07:00
Raymond Yee
59f530f8b7
Merge branch 'relaunch_ry' into paymentmanager_account
2012-09-24 09:09:57 -07:00
Raymond Yee
4a82d59a49
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:09:11 -07:00
Raymond Yee
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
thatandromeda
44ed8fdfcf
stop referring to acknowledgements as rewards to avoid confusing people
2012-09-24 11:52:30 -03:00
eric
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
eric
8611f73382
give badges to users who've pledged! [ #29340547 ]
2012-09-22 23:54:06 -04:00
eric
f940c3e239
more removing dates
2012-09-22 23:49:43 -04:00
eric
72eb8f9e26
made the tab badge mouseover text stop saying "I" when it's another supporter's page
2012-09-22 23:48:53 -04:00
eric
fde2202661
try removing dates again
2012-09-22 23:46:00 -04:00
eric
91ab80d112
Revert "remove user's join date (need the space!)"
...
This reverts commit 756f6f6498
.
2012-09-22 23:43:59 -04:00
eric
756f6f6498
remove user's join date (need the space!)
2012-09-22 23:38:39 -04:00
eric
1de7dd1654
Merge branch 'master' into improvify_download_page
2012-09-22 13:51:28 -04:00
eshellman
376dbdac37
Update core/models.py
...
added comment to Campaign.clone method
2012-09-22 13:00:17 -03:00
eric
bd77dc0638
Download page: Added format icons, alt text to images and source for non-unglued ebooks
2012-09-21 22:23:17 -04:00
Raymond Yee
e8494864d4
This code is BROKEN -- but I'm committing this to capture current state of work -- problem is
...
global name 'stripe_token' is not defined
Exception Location: /Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py in __init__, line 285
when you run the selenium test -- brings up issue of where to create Stripe account in PaymentManager abstraction
2012-09-21 17:40:33 -07:00
Raymond Yee
9a65996644
Merge pull request #16 from Gluejar/improvify_download_page
...
Improvify download page [#36156381 ]
2012-09-21 17:09:08 -07:00
eric
c4a2db66f7
Fix index out of bounds errors when no unglued epub is available [ #36156381 ]
2012-09-21 19:54:43 -04:00
eric
d8cbf39849
removed odd semicolons from non-working readmill code [ #36156381 ]
2012-09-21 18:19:11 -04:00
eric
a7210ad778
fund pledge_the_pledge page [ #36476831 ]
2012-09-21 17:31:28 -04:00
eric
422826c4c2
Merge branch 'relaunch' into nonprofit_switch
2012-09-21 17:17:07 -04:00
eric
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
Raymond Yee
2ea3059682
[ #36469239 ] get rid of retain_cc_info since we will retain CC info for all pledges
2012-09-21 12:51:21 -07:00
Raymond Yee
df4e434c45
Fold stripe2.py into stripelib.py
2012-09-21 11:24:42 -07:00
eric
b6862cad3d
fix copying the premiums [ #36192903 ]
2012-09-21 13:54:59 -04:00
eric
d39b098cc1
[ #36197947 ] revised description of "paypal" email address
2012-09-21 13:08:54 -04:00
eric
40a5b09359
rh_tools now shows campaign totals by campaign [ #16581715 ]
2012-09-21 12:32:32 -04:00
eric
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
Raymond Yee
b100b04f10
Fix version of pycrypto to 2.5
2012-09-20 16:23:06 -07:00
eric
1383d4b1f4
update description of rewards
2012-09-20 17:48:54 -04:00
eshellman
5589e5d209
Merge pull request #7 from Gluejar/improvify_download_page
...
Improvify download page
2012-09-20 12:58:45 -07:00
thatandromeda
acf1763672
Update frontend/templates/press.html
2012-09-20 15:27:36 -03:00
Raymond Yee
1f6fd19918
Merge branch 'relaunch' into relaunch_ry
2012-09-20 10:39:56 -07:00
Raymond Yee
bdaedcc148
Merge pull request #9 from Gluejar/stripe_for_donation
...
Stripe for donation
2012-09-20 10:38:58 -07:00
eric
381f59fe62
Merge branch 'relaunch' into stripe_for_donation
2012-09-20 11:02:38 -04:00
Raymond Yee
cf0d6455e4
Now I can show that payment.stripe2.Execute works -- can be invoked in the campaigntest.test_relaunch
2012-09-19 16:45:40 -07:00
Raymond Yee
05d082604c
updating selenium script for relaunch
2012-09-19 14:30:47 -07:00