Raymond Yee
|
27d0a808e0
|
get rid of more paypal references
|
2012-10-02 10:16:34 -07:00 |
Raymond Yee
|
166afece62
|
made some changes to reduce the likelihood of circular import dependencies in stripe code.
Made sure there is a core_key table in campaidgn_starter sql
|
2012-10-01 16:38:51 -07:00 |
Raymond Yee
|
8952886171
|
Merge branch 'master' into relaunch_ry
|
2012-09-27 20:15:57 -07:00 |
Raymond Yee
|
100ec44c0a
|
Adjust library versions -- still experimenting
|
2012-09-28 03:14:40 +00:00 |
Raymond Yee
|
62e89f469f
|
Adjusting library versions
seems like lxml 3.0alpha2 gone -> back to 2.3.5
|
2012-09-27 20:12:40 -07:00 |
Raymond Yee
|
81708661bb
|
Adding a requirements_relaunch.pip to see whether I can test whether I can the current master branch to run with the environment tested for relaunch
|
2012-09-27 19:12:46 -07:00 |
Raymond Yee
|
d72df702aa
|
Merge branch 'master' into relaunch_ry
|
2012-09-27 15:01:20 -07:00 |
Raymond Yee
|
fe5df0fab8
|
Merge branch 'relaunch' into relaunch_ry
|
2012-09-27 14:39:50 -07:00 |
Raymond Yee
|
7ee772a16d
|
Merge pull request #22 from Gluejar/automanage_db_changes
now adding credit records in migration [start #36325665]
|
2012-09-27 14:38:56 -07:00 |
Raymond Yee
|
859f62a3d7
|
Merge branch 'automanage_db_changes' into relaunch_ry
|
2012-09-27 14:17:30 -07:00 |
Raymond Yee
|
3b04ddb4a9
|
Merge branch 'relaunch' into relaunch_ry
|
2012-09-27 14:07:47 -07:00 |
Raymond Yee
|
800dc128ab
|
Merge branch 'campaign_relaunch' into relaunch
Conflicts:
frontend/templates/manage_campaign.html
|
2012-09-27 14:04:00 -07:00 |
Raymond Yee
|
2211cf1231
|
Added a few comments to Campaign.clone() and Campaign.clonable() to make more explicit the behavior and construction of these methods
|
2012-09-27 13:45:13 -07:00 |
Andromeda Yelton
|
a859771c5c
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
|
2012-09-27 13:30:46 -04:00 |
Andromeda Yelton
|
81f45984e8
|
prevent campaign launch button from being visible to non-staff during preview
|
2012-09-27 13:11:19 -04:00 |
eric
|
880a9f14bd
|
now adding credit records in migration [start #36325665]
that wasn't so hard
|
2012-09-27 12:58:47 -04:00 |
Andromeda Yelton
|
2b2bea8978
|
not using that any more
|
2012-09-27 12:40:30 -04:00 |
Andromeda Yelton
|
57df9c116e
|
removing references to paypal and amazon
|
2012-09-27 12:35:23 -04:00 |
Raymond Yee
|
4a10edce1d
|
[#36469239] Now handles modifications where new amount > previous amount and cancellation of pledge
|
2012-09-27 09:32:29 -07:00 |
Andromeda Yelton
|
d1941de032
|
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
|
2012-09-27 11:34:15 -04:00 |
thatandromeda
|
99d4a3dd1c
|
need to be in preview mode until relaunch
|
2012-09-27 12:14:41 -03:00 |
thatandromeda
|
a48f61793d
|
only staff can launch campaigns during preview
|
2012-09-27 12:14:09 -03:00 |
Raymond Yee
|
8bd7a5eb65
|
[deliver #36743191] move stripe implementation UI back to stripe.js
|
2012-09-26 15:03:46 -07:00 |
Raymond Yee
|
1ab2383fec
|
Reverting to using stripe.js on stripe/test as a stepping stone to changing fund_the_pledge.html
|
2012-09-26 13:52:36 -07:00 |
eshellman
|
f327db6efd
|
Merge pull request #19 from Gluejar/improvify_download_page
Improvify download page with readmill [finish #36156381]
|
2012-09-26 13:04:39 -07:00 |
Andromeda Yelton
|
9af9c09e5d
|
more thoughtful handling of readmill url
|
2012-09-26 14:59:13 -04:00 |
eric
|
b75bb0c3a6
|
now adding credit records in migration [start #36325665]
that wasn't so hard
|
2012-09-26 13:52:21 -04:00 |
thatandromeda
|
77abb2d048
|
Merge pull request #18 from Gluejar/add_oclc
Add worldcat links and oclcnum editing [#32289887]
|
2012-09-26 06:36:07 -07:00 |
Raymond Yee
|
5833f8c0d3
|
Successfully able to modify transaction from $10 -> $5 in selenium script
|
2012-09-25 18:30:36 -07:00 |
eric
|
e23d706469
|
Added tests for campaign.clone and Premiums
|
2012-09-25 16:43:25 -04:00 |
Raymond Yee
|
973255ef53
|
Merge branch 'relaunch' into relaunch_ry
|
2012-09-25 13:35:03 -07:00 |
eshellman
|
45318c4e81
|
stop using id as variable name
|
2012-09-25 17:26:45 -03:00 |
thatandromeda
|
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 |
thatandromeda
|
f18b7e80cb
|
anchor text shouldn't be confusing
|
2012-09-25 16:46:58 -03:00 |
Raymond Yee
|
1cbe62d573
|
Redirecting to pledge_complete works now -- though there's definitely clean up to do
|
2012-09-25 11:52:56 -07:00 |
Andromeda Yelton
|
e62484f46a
|
whoops wrong edition
|
2012-09-25 12:27:39 -04:00 |
Andromeda Yelton
|
278a36e2f2
|
unglued_epub_url should be looking only at unglued books, not all epubs
|
2012-09-25 11:42:20 -04:00 |
Andromeda Yelton
|
2e23ddfd54
|
with format icons now in download page link counts are different
|
2012-09-25 11:10:23 -04:00 |
Andromeda Yelton
|
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 |
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 |
Raymond Yee
|
6a4d8fd3ff
|
Merge branch 'relaunch' into paymentmanager_account
|
2012-09-24 09:52:24 -07:00 |