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

3246 Commits (c2bc4f6b68ec1046b9e0741d368efa1ff3b4c8df)

Author SHA1 Message Date
Andromeda Yelton 1304a73790 Merge branch 'master' of github.com:Gluejar/regluit 
Conflicts:
	frontend/templates/metrics.html
	frontend/views.py
 2012-12-11 10:31:58 -05:00
Raymond Yee aab4d768a6 Merge pull request #92 from Gluejar/pledges_on_info_page 
wanted to be able to track prospective revenue from info page
 2012-12-10 13:03:32 -08:00
Raymond Yee 43c9087d2b Rewrite filter to include Transactions that are active or complete rather than filter out ones not to count. 2012-12-10 13:01:50 -08:00
Raymond Yee 33665abd37 Merge branch 'master' into pledges_on_info_page 2012-12-10 12:26:30 -08:00
thatandromeda 385786ec67 Merge pull request #94 from Gluejar/card_error_template 
[#37736995] the old error message for a CC error was potentially confusing
 2012-12-10 11:35:19 -08:00
Raymond Yee 61bb121a51 [#37736995] the old error message for a CC error was potentially confusing -- I think this should be better -- see images in 
https://www.evernote.com/shard/s1/sh/b59d4cfa-81a2-42bc-a315-24996fb01e83/2cfa234f2a15042ff0bb198514771dcb
 2012-12-10 11:18:46 -08:00
Raymond Yee a8275a71de Merge pull request #93 from Gluejar/minimum_goals 
[#40818125] minimum target to $500
 2012-12-07 08:39:53 -08:00
eric c1c3b3d1ad [#40818125] minimum target to $500 2012-12-06 21:05:15 -05:00
Andromeda Yelton 23708e15ba exclude uncollectable pledges 2012-12-06 15:31:32 -05:00
Andromeda Yelton 7decd15333 Revert "wanted to be able to track prospective revenue from info page" 
This reverts commit 150ed860c9.
 2012-12-06 12:37:48 -05:00
Andromeda Yelton 150ed860c9 wanted to be able to track prospective revenue from info page 2012-12-06 11:42:02 -05:00
eshellman fd7c10863e Merge pull request #91 from Gluejar/fix_lightbox 
Fix lightbox. works for me.
 2012-12-04 13:37:40 -08:00
thatandromeda f22312d735 Update frontend/templates/base.html 
network of killers now live
 2012-12-04 13:47:19 -05:00
eshellman 0b7c24a0ac Merge pull request #89 from Gluejar/webhook_to_pm 
move logic out of webhooks and into PaymentManager
 2012-12-03 10:26:16 -08:00
Andromeda Yelton 3dfc81dd5e fix [#40374577] 2012-11-30 12:28:45 -05:00
Andromeda Yelton 88b4446bf0 force reload of hijax.js 2012-11-30 12:28:29 -05:00
Andromeda Yelton 37bc427a75 prettifying acks page, make it easier to read 2012-11-30 10:20:13 -05:00
Raymond Yee 0db13cd84a [finish #40315289] I move the notice on transaction charged or failed from webhooks handler into stripelib.Processor.Execute 2012-11-29 16:24:51 -08:00
eshellman 0993d393d2 Merge pull request #88 from Gluejar/smashwords 
Smashwords. Looks good for the first pass.
 2012-11-29 10:58:15 -08:00
Andromeda Yelton 202c10b0fb latest coverage 2012-11-29 12:04:05 -05:00
Andromeda Yelton 4fe73e110c make sure to include new file location 2012-11-29 12:00:34 -05:00
Andromeda Yelton 0aef30015b addressing comments 2012-11-29 11:20:13 -05:00
Andromeda Yelton 6098940970 this should have made it in to the loader graphic branch and didn't somehow... 2012-11-29 10:54:28 -05:00
Andromeda Yelton c4ac00e8ef first pass at smashwords page 2012-11-29 10:54:07 -05:00
Raymond Yee bf23675f5c get rid of PAYMENT_PROCESSOR setting in jenkins.py 2012-11-27 13:09:45 -08:00
Raymond Yee 3d5f8a55f4 Merge pull request #86 from Gluejar/charge_failed 
Charge failed
 2012-11-27 12:57:32 -08:00
Raymond Yee 4d923aba5b Merge branch 'master' into charge_failed 2012-11-27 12:19:21 -08:00
Raymond Yee 57d3f9e2aa Merge pull request #87 from Gluejar/indicator_graphic 
display submit buttons as loading gifs for transactions that might take ...
 2012-11-27 12:12:37 -08:00
Raymond Yee c5936227e9 Updated Sn script to run properly 2012-11-27 12:00:55 -08:00
Andromeda Yelton 1cd50d716f display submit buttons as loading gifs for transactions that might take a while 2012-11-27 13:32:25 -05:00
Raymond Yee 41f3da3d31 Merge branch 'master' of github.com:Gluejar/regluit into charge_failed 2012-11-26 14:36:40 -08:00
Andromeda Yelton 8692d26540 friendlifying 2012-11-26 14:23:04 -05:00
thatandromeda 1976bb14d3 Update frontend/templates/notification/pledge_charged/short.txt 2012-11-26 13:45:12 -05:00
thatandromeda 0b9827424f Merge pull request #84 from Gluejar/pledge_sidebar 
Pledge sidebar
 2012-11-26 08:21:02 -08:00
Raymond Yee 6ab521faa1 Merge branch 'master' into charge_failed 2012-11-23 09:20:58 -08:00
Raymond Yee 28eca2999c put checks for notices in proper context 2012-11-21 16:42:04 -08:00
eshellman db1fdc321e Merge pull request #79 from Gluejar/ending_soon_notification 
Ending soon notification
 2012-11-21 14:05:26 -08:00
eric 54a8a31c8c Merge branch 'master' into pledge_sidebar 2012-11-21 17:00:33 -05:00
eric e1c2862f1a prevent line break in user_menu 2012-11-21 16:58:10 -05:00
eshellman ea212bd167 Merge pull request #82 from Gluejar/empty_stripe_token 
Empty stripe token reports error
 2012-11-21 13:37:48 -08:00
Raymond Yee ecea475419 a few modifications to pledge_failed notice 2012-11-21 11:40:19 -08:00
Raymond Yee cbac6f1e3c First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing 2012-11-21 09:21:01 -08:00
Andromeda Yelton 84e13a42bf scheduling ending soon notification 2012-11-21 11:09:18 -05:00
Andromeda Yelton c4f32b38b5 moving ending soon notification to tasks 2012-11-21 11:09:07 -05:00
Andromeda Yelton 68a08d78c2 Revert "fire signal for time-running-out notification" 
This reverts commit 4719c0b4b4.
 2012-11-21 09:12:21 -05:00
Raymond Yee ce6e7f865d tests pass on this commit 2012-11-20 13:56:14 -08:00
Andromeda Yelton b615a7598d fix CSS in case of short usernames 2012-11-20 16:05:52 -05:00
Andromeda Yelton 0a0b74e449 Revert "Revert "make the html validate"" 
This reverts commit a215471abb.

Conflicts:

	frontend/templates/base.html
 2012-11-20 15:53:24 -05:00
Andromeda Yelton 3ccb10a9aa Merge branch 'pledge_sidebar' of github.com:Gluejar/regluit into pledge_sidebar 
Conflicts:
	frontend/templates/base.html
 2012-11-20 15:51:37 -05:00
eric 466f7b9689 ok, so this results in the same dom tree, though the css matching is off 2012-11-20 15:48:41 -05:00