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 |
Andromeda Yelton
|
a215471abb
|
Revert "make the html validate"
This reverts commit f5e3cc1670 .
|
2012-11-20 15:40:32 -05:00 |
eric
|
f5e3cc1670
|
make the html validate
|
2012-11-20 15:28:45 -05:00 |
Raymond Yee
|
02b17ea81f
|
Merge branch 'master' into charge_failed
|
2012-11-20 12:08:36 -08:00 |
Raymond Yee
|
4025413728
|
Merge pull request #85 from Gluejar/emergency_css_fix
Emergency css fix
|
2012-11-20 11:59:11 -08:00 |
Andromeda Yelton
|
7fcd0ba3af
|
change css filenames so that we can force user refresh
|
2012-11-20 14:26:06 -05:00 |
Andromeda Yelton
|
9f43c9a43c
|
this one too
|
2012-11-20 13:41:00 -05:00 |
Andromeda Yelton
|
ba3c0d3871
|
& not &
|
2012-11-20 13:40:25 -05:00 |
Raymond Yee
|
c034e10b30
|
Putting in some code to record a PaymentResponse to track errors in stripelib.Execute
|
2012-11-20 09:28:10 -08:00 |
Andromeda Yelton
|
029cd9740d
|
that line looks better outside the form
|
2012-11-20 10:10:30 -05:00 |
Andromeda Yelton
|
810580779e
|
fixing nits
|
2012-11-20 10:06:40 -05:00 |
Andromeda Yelton
|
a2abb92038
|
makes pledge action clearer by describing in more contexts and using Pledge rather than Support
|
2012-11-20 09:56:04 -05:00 |
Andromeda Yelton
|
81e27e234e
|
decided that phrasing was confusing
|
2012-11-20 09:09:03 -05:00 |
Raymond Yee
|
8b3287d85d
|
Merge branch 'master' into charge_failed
|
2012-11-19 10:28:18 -08:00 |
Raymond Yee
|
716468cf0d
|
Merge branch 'webhooks' into charge_failed
|
2012-11-19 10:26:13 -08:00 |
Raymond Yee
|
570394aa3d
|
Merge pull request #81 from Gluejar/clarify_acks_more
Clarify acks more -- looks good
|
2012-11-19 10:17:11 -08:00 |
Raymond Yee
|
2a8a3d5752
|
Merge pull request #83 from Gluejar/too_much_opacity
fixing errors in display of underlying page elements when lightboxed
|
2012-11-19 10:16:32 -08:00 |
Andromeda Yelton
|
b6fa40a281
|
fixing errors in display of underlying page elements when lightboxed
|
2012-11-19 13:03:21 -05:00 |
Raymond Yee
|
4544fb05a5
|
Merge branch 'master' into charge_failed
|
2012-11-19 09:22:19 -08:00 |
Raymond Yee
|
af8a661eb7
|
Merge branch 'master' into webhooks
|
2012-11-19 09:21:38 -08:00 |
Raymond Yee
|
4da9b6ae36
|
Merge branch 'master' into empty_stripe_token
|
2012-11-19 09:21:01 -08:00 |