eshellman
|
53a62c3764
|
Merge pull request #101 from Gluejar/successful_works_in_inglued_tab
Successful works in unglued tab; offset on "read it now" to be fixed.
|
2013-01-02 07:28:14 -08:00 |
|
eshellman
|
b29032b1c8
|
Merge pull request #102 from Gluejar/default_unglued_tab
fix [#41795521]
|
2012-12-31 12:41:16 -08:00 |
|
eshellman
|
c22403356c
|
Merge pull request #99 from Gluejar/correct_ungluing_date
add success_date property to campaign so we can accurately report it whe...
|
2012-12-31 12:28:47 -08:00 |
Andromeda Yelton
|
40cff261ba
|
fix [#41795521]
|
2012-12-31 15:20:03 -05:00 |
|
Andromeda Yelton
|
f4a269f5ac
|
returning empty string rather than False
|
2012-12-31 15:02:39 -05:00 |
|
Andromeda Yelton
|
4c1b64c154
|
update successful books in unglued tab on other tabbed pages
|
2012-12-31 14:57:01 -05:00 |
|
Andromeda Yelton
|
c8cb5937e8
|
need to apply correct styles for new status handling too
|
2012-12-31 13:58:42 -05:00 |
|
Andromeda Yelton
|
bf6cfb7cb2
|
Merge branch 'master' into successful_works_in_inglued_tab
|
2012-12-31 13:47:17 -05:00 |
|
Andromeda Yelton
|
92163d62e6
|
better querysets for work page tabs
|
2012-12-31 13:46:23 -05:00 |
|
thatandromeda
|
7fd78d9349
|
Update frontend/templates/base.html
|
2012-12-31 13:07:18 -05:00 |
|
eshellman
|
649188f328
|
Merge pull request #98 from Gluejar/fix_lightbox
position lightbox relative to top of viewport, allow for scrolling
|
2012-12-31 09:01:37 -08:00 |
|
eshellman
|
a19a060351
|
Merge pull request #100 from Gluejar/missing_parenthesis
it was missing a parenthesis
|
2012-12-31 08:54:56 -08:00 |
|
Andromeda Yelton
|
609c09c74d
|
it was missing a parenthesis
|
2012-12-31 11:12:55 -05:00 |
|
Andromeda Yelton
|
47c44b20d5
|
add success_date property to campaign so we can accurately report it when it differs from campaign deadline
|
2012-12-31 11:00:45 -05:00 |
Raymond Yee
|
a726a11154
|
[fix #41788889] google id for book changed
|
2012-12-31 10:10:24 -05:00 |
|
Andromeda Yelton
|
83d3e5ba82
|
position lightbox relative to top of viewport, allow for scrolling
|
2012-12-31 09:49:09 -05:00 |
|
Raymond Yee
|
136614b8ff
|
Merge pull request #96 from Gluejar/merge_works_management
staff only UI for merging works [finish #39297681]
|
2012-12-13 12:09:43 -08:00 |
|
thatandromeda
|
575d34d968
|
Update frontend/templates/base.html
|
2012-12-13 09:51:36 -05:00 |
|
eric
|
fec7f33d9e
|
staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
|
2012-12-12 22:35:35 -05:00 |
|
eshellman
|
139124c5dd
|
Merge pull request #95 from Gluejar/helpful_new_edition_errors
Helpful new edition errors and I guess we don't like spaces
|
2012-12-11 09:24:39 -08:00 |
|
Andromeda Yelton
|
d73c1157b8
|
whoops lost some context in merge
|
2012-12-11 10:53:12 -05:00 |
|
Andromeda Yelton
|
bfbb74c0a2
|
providing next steps
|
2012-12-11 10:37:38 -05:00 |
|
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 |
|
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 |