EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,683 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

2683 Commits (d1941de032e0cbed7295d548fc41742234cb2df4)

Author SHA1 Message Date
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
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
Raymond Yee 30f1cad6f1 A revised requirements_versioned.pip for relaunch 2012-09-24 12:46:52 -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 de4092d23d Merge pull request #14 from Gluejar/nonprofit_switch 
Nonprofit switch [deliver #36476831]
 2012-09-24 09:50:22 -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
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 b100b04f10 Fix version of pycrypto to 2.5 2012-09-20 16:23:06 -07: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 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
eric 3ce8d605a6 add stripe stuff to donation form 2012-09-19 14:04:28 -04:00
eric b2df67e22f removed reconcile_pledge.js on pages that don't need it 2012-09-19 14:01:05 -04:00
Andromeda Yelton a7040f47ce Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch 
Conflicts:
	core/signals.py
 2012-09-19 12:48:36 -04:00
Andromeda Yelton 756c1da430 download page test needs to cover readmill addition and new unglued flag handling 2012-09-19 12:37:37 -04:00
Andromeda Yelton 5419c869ed now the readmill script works on the lightbox too 2012-09-19 12:08:27 -04:00
eshellman 4d562b64d5 Merge pull request #8 from Gluejar/lockss 
lockss needs a page listing the books unglued in each year to crawl
 2012-09-19 07:31:27 -07:00
Andromeda Yelton efa3187535 dynamically generate the readmill download url don't hardcode it you moron 2012-09-19 10:25:23 -04:00
eshellman 6221e4f750 Merge pull request #4 from Gluejar/relaunch_ry 
fleshing out of Account & recording as preapprovals & now needing to write a stripe module to handle Preapproval
 2012-09-18 16:32:21 -07:00
Andromeda Yelton f2e4647e73 lockss needs a page listing the books unglued in each year to crawl 2012-09-18 14:16:59 -04:00
eshellman 499b1f78b2 Merge pull request #6 from Gluejar/fix_zero_wisher_grammar 
Fix zero wisher grammar
 2012-09-18 10:41:09 -07:00
Andromeda Yelton f581dd354b readmill support 2012-09-18 13:40:52 -04:00
Andromeda Yelton 0de46d0bb6 DRM-free logo 2012-09-18 13:35:14 -04:00
Andromeda Yelton 82f6ceffd4 addressing comment 2012-09-18 13:09:19 -04:00
Andromeda Yelton b0c2f0926b whoops there are other cases 2012-09-18 12:12:50 -04:00
thatandromeda 33ef8f6844 Update frontend/templates/press.html 2012-09-18 12:45:36 -03:00
Raymond Yee ebb2144055 Responding to Eric's comment: yes Account.date_created should have auto_now_add not auto_add 
I modified migration and model.
 2012-09-18 08:16:12 -07:00
Andromeda Yelton 35180252e0 bugfix [#36104625] 2012-09-18 11:10:53 -04:00
Andromeda Yelton f03855f2de bugfix [#36104625] 2012-09-18 11:10:01 -04:00
Raymond Yee 6a650affc8 Now recording pledge as such -- and not charging immediately. 
running into exception at https://github.com/Gluejar/regluit/blob/relaunch_ry/payment/manager.py#L554-- have to start implementing a baseclass for stripelib to handle pledge modification
 2012-09-17 16:56:07 -07:00
Raymond Yee f88017c607 Merge branch 'relaunch' into relaunch_ry 2012-09-17 14:56:58 -07:00
Raymond Yee 69e959a0c8 fleshing out of payment.models.Account 2012-09-17 14:55:28 -07:00
eric 389e01d1cc fixed out of order migrations. 2012-09-17 16:00:28 -04:00
eshellman 1f1737c328 Merge pull request #3 from Gluejar/relaunch_ry 
A first pass at storing Stripe Customer data in relaunch branch
 2012-09-17 11:33:54 -07:00
Raymond Yee f08206c5d0 got rid of repeated line (thanks, Eric -- fd1887ea44 (commitcomment-1865176) ) 2012-09-17 10:54:39 -07:00
Raymond Yee e39e5348e5 Merge branch 'relaunch' into relaunch_ry 2012-09-17 09:11:27 -07:00
Raymond Yee da2f1e0665 Merge branch 'master' into relaunch 2012-09-14 17:05:29 -07:00
Raymond Yee 7ecf4494db Merge branch 'master' into relaunch_ry 2012-09-14 17:04:55 -07:00
Raymond Yee fd1887ea44 [#36028929] Work to pull out relevant fields in stripe Customer and Charge model with goal of figuring out which to add to payment.models.{Account | Transaction} 2012-09-14 17:00:21 -07:00
thatandromeda 503049afee Merge pull request #1 from Gluejar/fix_google_id 
the google books id is always the first in our db. changing to the id fo...
 2012-09-14 11:58:26 -07:00
eshellman a3390b88bb Merge pull request #2 from Gluejar/fix_wishlist_js 
adding functionality erroneously removed, plus updating to use recent jq...[#35857177]
 2012-09-14 07:07:17 -07:00
Andromeda Yelton 6a2efa9c68 adding functionality erroneously removed, plus updating to use recent jquery function 2012-09-14 09:21:05 -04:00