2260437cfc
Merge branch 'relaunch'
2012-09-26 15:01:39 -04:00
9af9c09e5d
more thoughtful handling of readmill url
2012-09-26 14:59:13 -04:00
b75bb0c3a6
now adding credit records in migration [start #36325665 ]
...
that wasn't so hard
2012-09-26 13:52:21 -04:00
77abb2d048
Merge pull request #18 from Gluejar/add_oclc
...
Add worldcat links and oclcnum editing [#32289887 ]
2012-09-26 06:36:07 -07:00
5833f8c0d3
Successfully able to modify transaction from $10 -> $5 in selenium script
2012-09-25 18:30:36 -07:00
e23d706469
Added tests for campaign.clone and Premiums
2012-09-25 16:43:25 -04:00
973255ef53
Merge branch 'relaunch' into relaunch_ry
2012-09-25 13:35:03 -07:00
45318c4e81
stop using id as variable name
2012-09-25 17:26:45 -03:00
d8d035988a
Merge pull request #17 from Gluejar/requirements_versioned_fix
...
A revised requirements_versioned.pip for relaunch
2012-09-25 13:13:36 -07:00
f18b7e80cb
anchor text shouldn't be confusing
2012-09-25 16:46:58 -03:00
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
e62484f46a
whoops wrong edition
2012-09-25 12:27:39 -04:00
278a36e2f2
unglued_epub_url should be looking only at unglued books, not all epubs
2012-09-25 11:42:20 -04:00
2e23ddfd54
with format icons now in download page link counts are different
2012-09-25 11:10:23 -04:00
b03decfb00
wrap ebook link separately around each icon so underline doesn't show up in spaces onhover
2012-09-25 11:09:33 -04:00
0f546f50a3
invoke target script directly rather than invoking script that (inconsistently) invokes it
2012-09-25 10:54:31 -04:00
0989319430
inline script wasn't actually doing anything
2012-09-25 10:53:54 -04:00
38d115e5a1
no longer need readmill script since we're pulling send script directly
2012-09-25 10:53:23 -04:00
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
3f110d6422
Merge branch 'paymentmanager_account' into relaunch_ry
2012-09-24 16:32:05 -07:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
30f1cad6f1
A revised requirements_versioned.pip for relaunch
2012-09-24 12:46:52 -07:00
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
ed6bb5f3e0
BROKEN CODE -- checked in while I switch to working on other branch
2012-09-24 11:30:21 -07:00
d84c1ef617
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-24 14:21:33 -04:00
adefc43154
first pass
2012-09-24 14:21:15 -04:00
6a4d8fd3ff
Merge branch 'relaunch' into paymentmanager_account
2012-09-24 09:52:24 -07:00
57514e4ba0
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:51:48 -07:00
de4092d23d
Merge pull request #14 from Gluejar/nonprofit_switch
...
Nonprofit switch [deliver #36476831 ]
2012-09-24 09:50:22 -07:00
59f530f8b7
Merge branch 'relaunch_ry' into paymentmanager_account
2012-09-24 09:09:57 -07:00
4a82d59a49
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:09:11 -07:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
44ed8fdfcf
stop referring to acknowledgements as rewards to avoid confusing people
2012-09-24 11:52:30 -03:00
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
8611f73382
give badges to users who've pledged! [ #29340547 ]
2012-09-22 23:54:06 -04:00
f940c3e239
more removing dates
2012-09-22 23:49:43 -04:00
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
fde2202661
try removing dates again
2012-09-22 23:46:00 -04:00
91ab80d112
Revert "remove user's join date (need the space!)"
...
This reverts commit 756f6f6498
2012-09-22 23:43:59 -04:00
756f6f6498
remove user's join date (need the space!)
2012-09-22 23:38:39 -04:00
1de7dd1654
Merge branch 'master' into improvify_download_page
2012-09-22 13:51:28 -04:00
376dbdac37
Update core/models.py
...
added comment to Campaign.clone method
2012-09-22 13:00:17 -03:00
bd77dc0638
Download page: Added format icons, alt text to images and source for non-unglued ebooks
2012-09-21 22:23:17 -04:00
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
9a65996644
Merge pull request #16 from Gluejar/improvify_download_page
...
Improvify download page [#36156381 ]
2012-09-21 17:09:08 -07:00
c4a2db66f7
Fix index out of bounds errors when no unglued epub is available [ #36156381 ]
2012-09-21 19:54:43 -04:00
d8cbf39849
removed odd semicolons from non-working readmill code [ #36156381 ]
2012-09-21 18:19:11 -04:00
a7210ad778
fund pledge_the_pledge page [ #36476831 ]
2012-09-21 17:31:28 -04:00
422826c4c2
Merge branch 'relaunch' into nonprofit_switch
2012-09-21 17:17:07 -04:00
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
eric
Andromeda Yelton
Raymond Yee