Commit Graph

2738 Commits (38b2567a025526977f8436a17057d58f03997fcc)

Author SHA1 Message Date
Raymond Yee 5183c206b4 Merge branch 'relaunch' into newpayment 2012-08-29 08:26:24 -07:00
Raymond Yee 55d170e798 trivial change to try to trigger the display of the latest commit in github for newpayment 2012-08-29 08:22:35 -07:00
Raymond Yee d00e434d41 Merge branch 'master' into newpayment
Conflicts:
	frontend/views.py
2012-08-29 08:10:49 -07:00
Raymond Yee bd48fdb437 Adding stripe payment tag use 2012-08-29 07:34:20 -07:00
Andromeda Yelton 863bfe5856 /about/ pages need appropriate styling and should not conflict if user clicks on About in header 2012-08-28 13:47:29 -04:00
Andromeda Yelton 13171f6472 making sure the styling works no matter where download link is clicked from 2012-08-28 10:22:47 -04:00
Andromeda Yelton 07c529a715 read it now should link to download page 2012-08-28 10:22:30 -04:00
Andromeda Yelton 24abca09b7 revising download instructions per feedback from testers 2012-08-28 10:08:06 -04:00
Andromeda Yelton 075792880b needs to handle exception where unglued ebook does not exist 2012-08-27 16:48:07 -04:00
Andromeda Yelton 55fc10e813 hm that wasn't how context.update works. moved countdown back to main context 2012-08-27 16:46:21 -04:00
Andromeda Yelton eb5eb17d83 was driving me crazy that that went to preview rather than campaign itself for active campaigns 2012-08-27 16:40:40 -04:00
Andromeda Yelton 58be27670e whoops typo, %w is not %s 2012-08-27 16:38:35 -04:00
Andromeda Yelton 48e20a7cdd bringing all the lightboxes under the hijax.js system 2012-08-27 15:35:29 -04:00
Andromeda Yelton af8bb1ab6d replaced with better hijax.js 2012-08-27 15:34:42 -04:00
Andromeda Yelton a258660138 moving to ajax system means these files should live in templates/ 2012-08-27 15:26:40 -04:00
Andromeda Yelton 307e0d41c7 completed first draft of download instructions 2012-08-27 14:13:50 -04:00
Raymond Yee 981790883e Merge branch 'master' into newpayment
Conflicts:
	frontend/views.py
2012-08-27 07:59:12 -07:00
Raymond Yee ec9c6d8fc0 add keys for partner non-profit in stripelib 2012-08-27 07:49:43 -07:00
Raymond Yee 196944ac14 Merge branch 'master' into newpayment 2012-08-27 07:48:43 -07:00
Andromeda Yelton cc70ff1765 adding download instructions 2012-08-24 18:48:28 -04:00
Andromeda Yelton a6e034a36a rudimentary download page plus logic to serve it 2012-08-24 15:14:32 -04:00
Andromeda Yelton 07a50bfa45 we should have non-input-buttons that are styled the same for calls to action 2012-08-24 15:14:08 -04:00
Andromeda Yelton 4643bf4ac5 tweak to be compatible with download page 2012-08-24 15:13:29 -04:00
eric 9c602cf530 typo 2012-08-23 18:24:52 -04:00
Andromeda Yelton 4fe0c3ff05 Merge branch 'master' of github.com:Gluejar/regluit 2012-08-23 14:10:11 -04:00
Raymond Yee 228029e8e5 add sysadmin/__init__.py 2012-08-23 11:08:14 -07:00
Andromeda Yelton aa3667d260 working on download page 2012-08-23 13:38:48 -04:00
Raymond Yee f9e7df4316 Merge branch 'master' into newpayment 2012-08-22 13:29:30 -07:00
eric 599d333e34 typo 2012-08-22 14:38:49 -04:00
Raymond Yee 214bc4b9e5 A pass to get a charge iframe show up for wepay 2012-08-20 15:19:27 -07:00
Raymond Yee 6c4f98095f First pass at balancedpayment prototype 2012-08-17 22:57:56 -07:00
Raymond Yee 084973b988 Merge branch 'relaunch' into newpayment 2012-08-16 17:26:11 -07:00
Raymond Yee e81a25b1bd Now documenting more of what we need to do next with stripe if we go for a fullblown implementation 2012-08-16 17:24:18 -07:00
Raymond Yee 0d88a395cb First pass at stripe prototype --> /stripe/test will now let you type in a test credit card and display resulting stripeToken 2012-08-16 14:11:32 -07:00
Andromeda Yelton adef29f536 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
Conflicts:
	core/signals.py
2012-08-16 17:11:12 -04:00
Andromeda Yelton 368a3ca8ec making license display more standards-compliant 2012-08-15 10:05:10 -04:00
Andromeda Yelton 28670ed01a building LOCKSS manifest page 2012-08-15 09:40:37 -04:00
Andromeda Yelton 9e8a0f16b7 ebook adding form should also exclude unglued field now that it exists 2012-08-15 09:40:20 -04:00
Andromeda Yelton 291a2f5d67 need to know which ebook is the unglued one. migration needed 2012-08-15 09:39:58 -04:00
eric 10560fb36b merge credit into relaunch 2012-08-14 21:15:31 -04:00
Andromeda Yelton 6d6c324a82 tweaking 2012-08-14 15:03:33 -04:00
Andromeda Yelton 2a008416b9 now minified 2012-08-14 14:53:56 -04:00
Andromeda Yelton e2957abf25 tweaking 2012-08-14 14:53:48 -04:00
Andromeda Yelton 2c555ef98d widths of ack boxes should add up to 100 2012-08-14 14:53:28 -04:00
Andromeda Yelton 25ce01716c also include no-mpremium option in pledge modify 2012-08-14 14:44:07 -04:00
Andromeda Yelton 2369d6508e include no-premium option in pledgeview 2012-08-14 14:32:54 -04:00
Andromeda Yelton 69d85e6565 need a no-premium option. make sure to syncdb 2012-08-14 14:14:03 -04:00
Andromeda Yelton 07f1177c08 we kinda got a lot of press coverage following the amazon shutdown 2012-08-14 10:11:31 -04:00
eric 403420a283 Add user-to-user credit transfers [#21784207] 2012-08-13 21:00:28 -04:00
eric 3d7cd7fdae management command to set active campaigns to UNSUCCESSFUL, trigger amazon notice 2012-08-09 09:47:10 -04:00