b07c49a87e
Merge branch 'relaunch_ry' of github.com:Gluejar/regluit into pledge_pretty_stick
...
Conflicts:
requirements_versioned.pip
2012-10-03 11:43:15 -04:00
ae857b3c8f
restyle badges and edit profile function
2012-10-03 10:59:57 -04:00
deb67de0b8
Revert "try this placement of the star"
...
This reverts commit e4cccc277f
2012-10-03 08:57:35 -04:00
ceebcb690d
step one: fix media links [ #37068821 ]
2012-10-02 18:12:44 -04:00
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
1dad4342c9
remove acknowledgements from premium display
2012-10-02 14:42:39 -04:00
e4cccc277f
try this placement of the star
2012-10-02 14:17:26 -04:00
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04:00
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07:00
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
1cb2461daa
merging changes
2012-10-02 13:36:30 -04:00
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
0ec9789e56
merging in relaunch_ry in hopes that stripe wil work
2012-10-02 10:25:43 -04:00
4cf4787a95
don't display username
2012-10-02 09:32:33 -04:00
2c2ce2a34f
suppress display of any amount premium if it's the only premium
2012-10-02 09:29:18 -04:00
2371aad994
update FAQ to reflect new payment system
2012-10-02 09:18:44 -04:00
a9d9cde55a
grammar
2012-10-02 07:55:11 -04:00
d54f45d511
further aesthetic refinements
2012-10-01 15:53:41 -04:00
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
6a6045e9ab
first pass at prettifying stripe process
2012-10-01 15:31:17 -04:00
99c228323e
fix double toggle when clicking on star
2012-10-01 15:24:11 -04:00
fd845d627b
is unglued is not grammatical here
2012-10-01 09:47:32 -04:00
753ca046a0
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-01 09:35:19 -04:00
38b2567a02
Merge pull request #27 from Gluejar/deannoyify_email_notices
...
[finish #31209035 ] removes first line from the email notices
2012-10-01 06:28:57 -07:00
0955dc0f78
Merge pull request #29 from Gluejar/trivial_edits
...
Trivial edits
2012-10-01 06:16:46 -07:00
6117b8475f
minor style edits
2012-10-01 09:15:38 -04:00
abea3a67de
updating handling of premiums and anonymity
2012-10-01 09:12:40 -04:00
96a54adc4a
Merge pull request #25 from Gluejar/new_wisher_notification_improvement
...
include clickable links, make grammar singular/plural sensitive
2012-09-28 14:47:47 -07:00
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
51f8e90487
fixed markup syntax of faq
2012-09-28 17:16:25 -04:00
94ed8fa8df
removed unbalanced <span>
2012-09-28 17:09:21 -04:00
87e2d0e0b4
fix OLA work number 29340547
2012-09-28 16:02:03 -04:00
f336730800
[finish #31209035 ] found where that extra line came from
...
This is why I got email leakage
2012-09-28 15:50:43 -04:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
839a864149
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-28 10:40:56 -04:00
079487783c
incorporating AM's revisions to FAQ
2012-09-28 10:40:44 -04:00
d72df702aa
Merge branch 'master' into relaunch_ry
2012-09-27 15:01:20 -07:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
81f45984e8
prevent campaign launch button from being visible to non-staff during preview
2012-09-27 13:11:19 -04:00
2b2bea8978
not using that any more
2012-09-27 12:40:30 -04:00
57df9c116e
removing references to paypal and amazon
2012-09-27 12:35:23 -04:00
a48f61793d
only staff can launch campaigns during preview
2012-09-27 12:14:09 -03:00
8bd7a5eb65
[deliver #36743191 ] move stripe implementation UI back to stripe.js
2012-09-26 15:03:46 -07:00
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
9af9c09e5d
more thoughtful handling of readmill url
2012-09-26 14:59:13 -04:00
77abb2d048
Merge pull request #18 from Gluejar/add_oclc
...
Add worldcat links and oclcnum editing [#32289887 ]
2012-09-26 06:36:07 -07:00
f18b7e80cb
anchor text shouldn't be confusing
2012-09-25 16:46:58 -03:00
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
278a36e2f2
unglued_epub_url should be looking only at unglued books, not all epubs
2012-09-25 11:42:20 -04:00
b03decfb00
wrap ebook link separately around each icon so underline doesn't show up in spaces onhover
2012-09-25 11:09:33 -04:00
0989319430
inline script wasn't actually doing anything
2012-09-25 10:53:54 -04:00
38d115e5a1
no longer need readmill script since we're pulling send script directly
2012-09-25 10:53:23 -04:00
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
6a4d8fd3ff
Merge branch 'relaunch' into paymentmanager_account
2012-09-24 09:52:24 -07:00
de4092d23d
Merge pull request #14 from Gluejar/nonprofit_switch
...
Nonprofit switch [deliver #36476831 ]
2012-09-24 09:50:22 -07:00
59f530f8b7
Merge branch 'relaunch_ry' into paymentmanager_account
2012-09-24 09:09:57 -07:00
4a82d59a49
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:09:11 -07:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
44ed8fdfcf
stop referring to acknowledgements as rewards to avoid confusing people
2012-09-24 11:52:30 -03:00
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
f940c3e239
more removing dates
2012-09-22 23:49:43 -04:00
72eb8f9e26
made the tab badge mouseover text stop saying "I" when it's another supporter's page
2012-09-22 23:48:53 -04:00
fde2202661
try removing dates again
2012-09-22 23:46:00 -04:00
91ab80d112
Revert "remove user's join date (need the space!)"
...
This reverts commit 756f6f6498
2012-09-22 23:43:59 -04:00
756f6f6498
remove user's join date (need the space!)
2012-09-22 23:38:39 -04:00
1de7dd1654
Merge branch 'master' into improvify_download_page
2012-09-22 13:51:28 -04:00
bd77dc0638
Download page: Added format icons, alt text to images and source for non-unglued ebooks
2012-09-21 22:23:17 -04:00
e8494864d4
This code is BROKEN -- but I'm committing this to capture current state of work -- problem is
...
global name 'stripe_token' is not defined
Exception Location: /Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py in __init__, line 285
when you run the selenium test -- brings up issue of where to create Stripe account in PaymentManager abstraction
2012-09-21 17:40:33 -07:00
9a65996644
Merge pull request #16 from Gluejar/improvify_download_page
...
Improvify download page [#36156381 ]
2012-09-21 17:09:08 -07:00
c4a2db66f7
Fix index out of bounds errors when no unglued epub is available [ #36156381 ]
2012-09-21 19:54:43 -04:00
d8cbf39849
removed odd semicolons from non-working readmill code [ #36156381 ]
2012-09-21 18:19:11 -04:00
a7210ad778
fund pledge_the_pledge page [ #36476831 ]
2012-09-21 17:31:28 -04:00
422826c4c2
Merge branch 'relaunch' into nonprofit_switch
2012-09-21 17:17:07 -04:00
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
2ea3059682
[ #36469239 ] get rid of retain_cc_info since we will retain CC info for all pledges
2012-09-21 12:51:21 -07:00
b6862cad3d
fix copying the premiums [ #36192903 ]
2012-09-21 13:54:59 -04:00
d39b098cc1
[ #36197947 ] revised description of "paypal" email address
2012-09-21 13:08:54 -04:00
40a5b09359
rh_tools now shows campaign totals by campaign [ #16581715 ]
2012-09-21 12:32:32 -04:00
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
1383d4b1f4
update description of rewards
2012-09-20 17:48:54 -04:00
5589e5d209
Merge pull request #7 from Gluejar/improvify_download_page
...
Improvify download page
2012-09-20 12:58:45 -07:00
acf1763672
Update frontend/templates/press.html
2012-09-20 15:27:36 -03:00
1f6fd19918
Merge branch 'relaunch' into relaunch_ry
2012-09-20 10:39:56 -07:00
381f59fe62
Merge branch 'relaunch' into stripe_for_donation
2012-09-20 11:02:38 -04:00
05d082604c
updating selenium script for relaunch
2012-09-19 14:30:47 -07:00
3ce8d605a6
add stripe stuff to donation form
2012-09-19 14:04:28 -04:00
b2df67e22f
removed reconcile_pledge.js on pages that don't need it
2012-09-19 14:01:05 -04:00
5419c869ed
now the readmill script works on the lightbox too
2012-09-19 12:08:27 -04:00
2f084e2a7b
Merge branch 'master' into relaunch_ry
2012-09-19 08:20:35 -07:00
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
efa3187535
dynamically generate the readmill download url don't hardcode it you moron
2012-09-19 10:25:23 -04:00
980bb218a0
stripe2.Execute actually charges the transaction -- NEED to do some more error checking
2012-09-18 17:56:38 -07:00
be45a27b45
moving transaction.host None -> PAYMENT_HOST_NONE
...
a few typos (t->transaction, missing host)
skeleton for stripe2.py -- the module to implement various methods used by payment.manager
2012-09-18 17:01:07 -07:00
f2e4647e73
lockss needs a page listing the books unglued in each year to crawl
2012-09-18 14:16:59 -04:00
499b1f78b2
Merge pull request #6 from Gluejar/fix_zero_wisher_grammar
...
Fix zero wisher grammar
2012-09-18 10:41:09 -07:00
f581dd354b
readmill support
2012-09-18 13:40:52 -04:00
0de46d0bb6
DRM-free logo
2012-09-18 13:35:14 -04:00
82f6ceffd4
addressing comment
2012-09-18 13:09:19 -04:00
b0c2f0926b
whoops there are other cases
2012-09-18 12:12:50 -04:00
33ef8f6844
Update frontend/templates/press.html
2012-09-18 12:45:36 -03:00
35180252e0
bugfix [ #36104625 ]
2012-09-18 11:10:53 -04:00
f03855f2de
bugfix [ #36104625 ]
2012-09-18 11:10:01 -04:00
2216369bbf
include clickable links, make grammar singular/plural sensitive
2012-09-18 10:16:08 -04:00
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
69e959a0c8
fleshing out of payment.models.Account
2012-09-17 14:55:28 -07:00
c545173793
First pass at payment.models.Account
2012-09-13 16:43:54 -07:00
a68cd81823
Merge branch 'master' into relaunch_ry
2012-09-13 15:55:43 -07:00
c5f22742c1
In making a stripe charge, record transaction.type and transaction.approved.
...
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257)
2012-09-13 14:12:49 -07:00
cbd9640287
Update frontend/templates/base.html
...
better link, now that that blog post exists
2012-09-13 15:42:11 -03:00
b85fbfc78b
Merge branch 'master' into relaunch_ry
2012-09-13 10:42:35 -07:00
eac0e24b1b
Small change: now storing amount and status for transaction with new pledge.
2012-09-13 10:39:42 -07:00
4cd685a61a
communicate about lack of active campaigns
2012-09-13 11:22:40 -04:00
7bd44fb93e
link to work page not download page
2012-09-13 11:17:05 -04:00
fdf27c4029
make work title on download page a link
2012-09-13 11:14:32 -04:00
d4309dd46c
digital shift coverage of OLA unglued ebook launch
2012-09-12 11:55:27 -04:00
de78548a32
list press releases on press page
2012-09-12 11:31:22 -04:00
fb648bbb5c
Merge branch 'fix_lockss'
2012-09-12 10:37:29 -04:00
18a598f628
need to change lockss page since unglued adheres to editions
2012-09-12 10:11:49 -04:00
3733780ef3
Merge branch 'master' of github.com:Gluejar/regluit
2012-09-12 10:00:31 -04:00
d8316c76ec
user isn't in the context so we shouldn't reference it
2012-09-12 08:41:22 -04:00
c457dec497
helpful ebook format notations
2012-09-12 00:20:09 -04:00
64461cc49e
one letter typo was messing up unglued ebooks display
2012-09-12 00:09:29 -04:00
e6f94223f4
Merge branch 'master' into relaunch_ry
2012-09-11 15:55:58 -07:00
77ceed03ad
Now -- a checkbox for whether to retain CC info and functionality for creating Customer / charge vs charge directly
2012-09-11 15:53:39 -07:00
2ab1f8c7ea
Now creating a charge based on token
2012-09-11 15:17:37 -07:00
b383c9717d
hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger
2012-09-11 14:14:57 -04:00
ba6c7165b3
OLA launch announcement
2012-09-11 14:03:33 -04:00
5636637266
Merge branch 'master' into relaunch_ry
...
Conflicts:
frontend/views.py
2012-09-11 10:42:49 -07:00
5ddc050ff9
[finished #35857177 ] fixed missing user wishlist context for bookpanel on supporter page
...
bug introduced in
https://github.com/Gluejar/regluit/commit/fd44471aaecc08c30dd1688b060cd1
18174d910e
2012-09-11 13:41:53 -04:00
2df3047dc0
display all editions for staff
2012-09-10 23:51:22 -04:00
e5804a4d4d
please use spaces, not tabs to indent
2012-09-10 23:47:06 -04:00
a161b1f28b
integrating Credit card form in
2012-09-10 17:02:34 -07:00
35e399553f
restore CCForm
2012-09-10 16:47:36 -07:00
0e1839d531
Merge branch 'master' into relaunch_ry
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:18:30 -07:00
bcceaa719b
integrating stripe into fund_the_pledge
2012-09-10 13:17:30 -07:00
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
3a0d09db33
edition-adding on rights tab was hard to read with multiple editions
2012-09-10 14:37:37 -04:00
e0bc5ee996
Merge branch 'master' into relaunch
2012-09-10 08:52:23 -07:00
add83c9d9e
fixed case of LOCKSSpreserved.png
2012-09-10 08:49:12 -07:00
d9147fd088
clarifying instructions
2012-09-10 10:51:52 -04:00
3a1a523acb
typo
2012-09-10 10:51:43 -04:00
92a2ccc7ce
cleaned up the response when a pledge is modified rather than created
2012-09-07 17:48:48 -04:00
f3ecec8410
just some tweaking to get the premium selection right
2012-09-07 17:11:25 -04:00
4700e63b06
resolve conflict
2012-09-07 16:26:09 -04:00
f1b22649a5
cruft
2012-09-07 16:20:12 -04:00
18608d3e7d
preapproval amount is now amount for requested premium, not previously pledged amount
2012-09-07 16:13:53 -04:00
a361d7b53d
so we didn't really need to put premium description directly into context
2012-09-07 16:12:32 -04:00
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
6f63c047ce
DRY pub year code moved to work model
2012-09-07 16:07:47 -04:00
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
6bbd973f62
only ask the donation for required amount [ #21784207 ]]
2012-09-07 09:39:36 -04:00
c2636f5bba
removed legacy DonateView
2012-09-07 01:11:28 -04:00
4d4e61d338
donation modification now works [ #21784207 ]
2012-09-06 16:55:32 -04:00
bd794a2ac5
clean up the donation endpoint pages so they work (if a bit ugly!)
2012-09-06 14:04:47 -04:00
9395cd058b
now donating cents works, too
2012-09-06 11:36:13 -04:00
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
f2e9559a3a
beginning of a notification to RHs when someone wishlists their work
2012-08-31 13:47:01 -04:00
94270f33c6
add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
...
also removed unused target, lists, ack-link,
2012-08-31 03:16:04 -04:00
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
8c030df830
adding some tests for my recent commits hooray
2012-08-29 15:56:14 -04:00
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
13171f6472
making sure the styling works no matter where download link is clicked from
2012-08-28 10:22:47 -04:00
07c529a715
read it now should link to download page
2012-08-28 10:22:30 -04:00
24abca09b7
revising download instructions per feedback from testers
2012-08-28 10:08:06 -04:00
075792880b
needs to handle exception where unglued ebook does not exist
2012-08-27 16:48:07 -04:00
55fc10e813
hm that wasn't how context.update works. moved countdown back to main context
2012-08-27 16:46:21 -04:00
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
58be27670e
whoops typo, %w is not %s
2012-08-27 16:38:35 -04:00
48e20a7cdd
bringing all the lightboxes under the hijax.js system
2012-08-27 15:35:29 -04:00
307e0d41c7
completed first draft of download instructions
2012-08-27 14:13:50 -04:00
cc70ff1765
adding download instructions
2012-08-24 18:48:28 -04:00
a6e034a36a
rudimentary download page plus logic to serve it
2012-08-24 15:14:32 -04:00
9c602cf530
typo
2012-08-23 18:24:52 -04:00
4fe0c3ff05
Merge branch 'master' of github.com:Gluejar/regluit
2012-08-23 14:10:11 -04:00
aa3667d260
working on download page
2012-08-23 13:38:48 -04:00
599d333e34
typo
2012-08-22 14:38:49 -04:00
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
368a3ca8ec
making license display more standards-compliant
2012-08-15 10:05:10 -04:00
28670ed01a
building LOCKSS manifest page
2012-08-15 09:40:37 -04:00
9e8a0f16b7
ebook adding form should also exclude unglued field now that it exists
2012-08-15 09:40:20 -04:00
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
6d6c324a82
tweaking
2012-08-14 15:03:33 -04:00
e2957abf25
tweaking
2012-08-14 14:53:48 -04:00
25ce01716c
also include no-mpremium option in pledge modify
2012-08-14 14:44:07 -04:00
2369d6508e
include no-premium option in pledgeview
2012-08-14 14:32:54 -04:00
07f1177c08
we kinda got a lot of press coverage following the amazon shutdown
2012-08-14 10:11:31 -04:00
403420a283
Add user-to-user credit transfers [ #21784207 ]
2012-08-13 21:00:28 -04:00
e928a2dfa1
edit alert, make the box red again
2012-08-09 06:28:42 -04:00
e902c3c704
announcement at top of site edited to reflect Amazon situation
2012-08-08 16:11:52 -03:00
8ef30302d4
notice templates for campaign shutoffs due to amazon payment suspension
2012-08-08 14:19:04 -04:00
0d13fe9ba4
2 more minus_amount s [ #21784207 ]
2012-08-07 16:18:03 -04:00
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
8db1e5b59a
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
2012-08-06 13:35:29 -04:00
270a686049
Merge branch 'master' of github.com:Gluejar/regluit into mandatory_premiums
...
Conflicts:
static/css/lists.css
2012-08-06 09:37:09 -04:00
2b16fc06a8
clarifying where the acks will happen
2012-08-01 12:08:52 -04:00
f6f624fe87
addressing some questions we actually get about Amazon and Paypal and making sure answers on page are correct
2012-08-01 09:19:09 -04:00
b041430731
front end for new pledge page, plus just enough back end that it displays
2012-08-01 08:52:39 -04:00
e8bd5ab2dc
added ckeditor to manage campaign forms to provide rich text editing and image uploads [ #32447975 ]
2012-07-27 14:23:44 -04:00
d478836e0e
use profile.home_url in acks page where it's been set [ #32366341 ]
2012-07-26 12:07:16 -04:00
29fd89011c
removing reference to "donate"
2012-07-25 11:51:05 -03:00
7f6b1fd684
refining script to produce data for OLA
...
add user profile tagline to acks
2012-07-25 07:15:51 -07:00
b691c8f896
Update frontend/templates/notification/notice_template.html
2012-07-24 14:52:39 -03:00
0d8604e1bd
to be safe, removed the word "donation" from website
2012-07-24 10:45:49 -04:00
6d4044bcde
intermediate state
2012-07-24 08:08:34 -04:00
5855593c5b
adding support for acknowledgement fields throughout data pipeline
2012-07-23 08:31:57 -04:00
3de4c40647
pledge page shows only custom premiums in main list
2012-07-23 07:43:21 -04:00
fd5e73ea9b
don't need adwords code for oral lit any more
2012-07-23 07:41:56 -04:00
c4a96a5d34
work page will now display only custom premiums
2012-07-23 07:41:20 -04:00
ed12a0d460
[ #32290103 ] fixed html error- <hr /> not allowed in span
2012-07-22 14:53:53 -04:00
3044507e2b
{#22431977] tweaked wording on unglued header
2012-07-22 14:18:29 -04:00
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
d7638463b1
reporting facility for languages
2012-07-20 14:29:04 -04:00
eaa69612e2
custom template filter to help language display
2012-07-20 14:28:31 -04:00
6a6ee190e4
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-18 15:15:31 -04:00
c47f9326f6
erroneously referred to learn_more.css rather than learnmore.css
2012-07-18 15:14:48 -04:00
167bd8a4c1
Fixing a situation in which there is an error in the pledge view
2012-07-18 11:09:48 -07:00
ce8a36580a
whoops, mixed up some attributions
2012-07-18 07:51:30 -04:00
b8f9155789
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-17 09:24:27 -07:00
97c2d0b63d
need to make sure base.html About link in header works with new expand_about.js
2012-07-17 12:17:43 -04:00
f57ac97e81
die zeit, german NPR coverage
2012-07-17 09:04:10 -04:00
c9871b29a2
Merge branch 'wishlist_tabs'
...
Conflicts:
frontend/templates/base.html
2012-07-17 08:53:28 -04:00
f32cb39d9a
added conditionals to make sure phrasing made sense for empty wishlists, and clarified who chooses the ungluing fee
2012-07-17 08:47:53 -04:00
ba6762e781
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 11:56:13 -07:00
362a4d2b85
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 14:52:38 -04:00
d5056441e8
oops...forgot to commit pledge_recharge.html
2012-07-16 11:48:10 -07:00
abdb4ddfc7
adding separator between headline and notification text
2012-07-16 14:46:45 -04:00
c9d57bb08b
making the sharing block work
2012-07-16 13:47:18 -04:00
f000c01267
fixing more syntax after testing
2012-07-16 13:29:20 -04:00
f56b342b00
fixing syntax errors found while testing
2012-07-16 12:44:27 -04:00
a226669109
bleah, django-notification fails around the with tags. removed.
2012-07-16 11:50:31 -04:00
1e49732693
almost ready to send this out to supporters with failed pledges
2012-07-13 15:55:41 -07:00
de415480ae
first pass at calculating transactions that need to be recharged
...
modification to fabfile to download a file of emails
2012-07-13 10:17:51 -07:00
da1386d7ab
Merge branch 'master' into ola_fulfill
2012-07-12 06:16:40 -07:00
7353731db5
4 campaigns now
2012-07-11 21:39:21 -07:00
94384fcb59
Work in progress
2012-07-11 19:51:36 -07:00
df147937aa
phrasing was unclear, scary. we're not space-limited here like we used to be.
2012-07-11 12:37:23 -03:00
4540263a6d
Merge branch 'master' into ola_fulfill
2012-07-11 07:39:19 -07:00
99057859e9
Setting up the URLs in progress.
2012-07-11 06:54:15 -07:00
e3be202189
"benefactors", not patrons [ #30516251 ]
2012-07-11 09:18:14 -04:00
7a76a2cbaf
Merge branch 'master' into ola_fulfill
2012-07-10 14:15:28 -07:00
94bd6fff2d
First pass at having a pledge recharge view (DON'T KNOW WHETHER THIS EVEN BUILDS PROPERLY)
2012-07-10 13:36:32 -07:00
94787951ad
allowed staff to manage campaigns
2012-07-10 15:58:19 -04:00
95c95dfcc8
added comment to explain about url dispatcher situation
2012-07-09 15:49:36 -04:00
69502b75ee
need to convert urls to template variables or django-notification can't find them
2012-07-09 15:47:38 -04:00
59b3657808
we were using this verbatim in five different templates. DRY
2012-07-09 15:47:09 -04:00
ac682c2c47
whoa hey. if we're using a TEMPLATING SYSTEM the notification content should probably be blocks inserted into a TEMPLATE, huh.
2012-07-09 11:33:21 -04:00
d53ea242b6
changing 'staff picks' to 'noteworthy'
2012-07-09 10:53:58 -04:00
01cb96e65d
reported email as notices, not accounts
2012-07-09 09:25:31 -04:00
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
a7af78cc9a
[start #31995801 ] manage campaign form now handles the 11:59PM closing time
2012-07-06 22:10:55 -04:00
b6d77a7645
usernames were not being URLescaped. [#finish #32365703 ]
2012-07-06 12:25:20 -04:00
011dc4ffde
[ #32289649 ] validation nit
2012-07-06 11:19:51 -04:00
9152655587
list ungluers in two-column format by reverse of date wished [ #32289815 ]
2012-07-05 11:33:57 -04:00
b9aaff2968
david brin hooray
2012-07-05 11:33:18 -04:00
3ce4db8e9a
change support to premiums and make it clickable [ #32289833 ]
2012-07-05 10:39:19 -04:00
1bf0fe8d26
moving notification alert inline [ #32289941 ]
2012-07-05 10:30:26 -04:00
85247c306e
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
core/models.py
2012-07-05 10:21:08 -04:00
325765e453
loose ends from anaheim [ #32290011 ] [ #32289649 ] [ #32289951 ]
2012-07-05 10:05:04 -04:00
6ccaf81f06
updated to reflect Amazon email so supporters won't be surprised by it
2012-07-02 11:07:10 -04:00
bfe02fc39d
4->3 active campaigns
2012-06-29 18:38:19 -07:00
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
17cbab1fc4
temporarily stop checking for end date changes
2012-06-28 16:23:29 -04:00
8be8883e63
draft of front matter template (not used yet)
2012-06-28 16:23:29 -04:00
cbef02e3fc
moar boingboing
2012-06-28 12:45:21 -07:00
5f16b07174
alert header now trumpets our success
2012-06-22 00:41:20 -04:00
8977734bd7
[ fix #31636971 ] update campaign.left when campaign changes
2012-06-21 23:20:57 -04:00
d37792c813
[ #31605173 ] This plugs .../pledge/work_id where work_id tied to no campaign or a campaign that is not ACTIVE
2012-06-21 10:16:51 -07:00
4bb48c64e6
changing future to present continuous tense for when credit card charged
2012-06-21 09:07:05 -07:00
bc2e5ac3be
better handling of successful campaigns on work page
2012-06-21 10:49:55 -04:00
0c88c77733
forgot the easy-to-forget endswith
2012-06-21 06:14:37 -07:00
013ddb5a3c
Another template problem in the pledge_charged notices
2012-06-21 06:09:37 -07:00
20e5baa6ba
work -> transaction.campaign.work
2012-06-21 05:09:51 -07:00
7482a19cd1
work.id -> campaign.work.id
2012-06-20 21:29:23 -07:00
31cf653e63
Five -> four active campaigns
2012-06-20 20:47:42 -07:00
f7282d4e11
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-06-19 07:34:52 -04:00
001f654880
trivial cleanup in unglued ebook notification
2012-06-19 07:34:37 -04:00
1f77371b7b
1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys'
...
2) using humanize tag naturalday on the book panel
2012-06-18 13:55:45 -07:00
30bf30177c
Added a case for pledge_modified to have a up_or_down to be 'canceled' -- and change in template text to handle the canceling of a pledge
2012-06-15 16:14:26 -04:00
2b7da6e91e
First attempt to place the notices properly coming from a pledge modify -- inside payment.manager.cancel_related_transaction -- but current problem is now that we get too many notices
2012-06-15 11:38:38 -04:00
eda96f716b
ending time should round up, not down. also times less than days were not going to display right due to type errors. now they will.
2012-06-15 12:06:38 -03:00
12dca9c36d
reducing redundancy in comment notification lead-in
2012-06-15 11:32:12 -03:00
2beb4e5dbb
commenting
2012-06-14 17:15:11 -03:00
2c14edd8ad
updating press coverage
2012-06-14 11:35:57 -03:00
ad23fc3c4c
refactoring to work with new expand_about.js
2012-06-13 16:50:57 -03:00
df7ea263a0
adding a wishlist-tabs explanation section [ #22431977 ]
2012-06-13 16:50:03 -03:00
3d5cf5107f
embiggening font sitewide (almost nothing below 13px), making font size a less variable so it's easier to change in future and we don't have so many different font sizes
2012-06-13 13:31:21 -03:00
d652db5c03
removing is_preview since it's no longer needed
2012-06-13 09:41:23 -03:00
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
d0a7f9ea63
added conversion tracking code for adwords campaigns so that we can assess their performance
2012-06-12 11:29:47 -03:00
656899105e
should make correct decisions about displaying sign-up-today option [ #30249919 ]
2012-06-04 15:50:30 -04:00
d55d3cb54a
fixes [ #30249919 ]
2012-06-04 15:20:23 -04:00
17b222d69f
adding prominent invitation for RHs to email us to FAQ
2012-06-04 10:29:42 -04:00
ce5ee124d9
removing pagination from work_list -- likely unnecessary and this should be faster
2012-06-01 13:15:50 -04:00
153e7eaff9
Merge branch 'master' of github.com:Gluejar/regluit
2012-06-01 11:02:35 -04:00
fd44471aae
caching the wishlist rather than calculating it for every single book_panel = potentially huge performance improvement
2012-06-01 10:22:39 -04:00
882ba635da
making capitalization consistent
2012-06-01 10:10:42 -04:00
acf6f18a1c
fixed broken link
2012-06-01 09:06:26 -04:00
56074903e7
more cleanup
2012-06-01 09:06:20 -04:00
a6d03af40d
caching repeatedly-used title
2012-05-31 13:33:16 -04:00
9e8be5695b
comments
2012-05-31 13:29:41 -04:00
90ece3a2b0
made logic less awful, cached work.id to speed things up as it's used many times
2012-05-31 13:25:19 -04:00
cfa12dd228
was missing fastcoexist article
2012-05-31 13:24:53 -04:00
4eab46f1d5
clarify what 'official comment' means
2012-05-30 12:36:35 -04:00
63567d8eaa
mad->made (typo fix)
2012-05-30 09:32:04 -07:00
6e9e87f402
more blog coverage
2012-05-29 21:29:22 -04:00
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
d077a81a1b
[ #29919391 ] 742d5bcd70/frontend/templates/book_panel.html (L163) was not succeeding because work.last_campaign is None. So I rearrange the logic
...
to look first for whether there are any ebooks to link to, then added a check for last_campaign == None.
I think this fixes the immediate issue of Wished by N not appearing-- but the set of if statements could take a bit more thinking through
2012-05-29 16:57:38 -07:00
4ce0731095
[ #28011527 ] implemented comment preview form to address missing-user error
2012-05-29 19:20:00 -04:00
e27ad644b5
Merge branch 'campaignformviewnixed'
2012-05-29 11:48:41 -07:00
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
5d37a969bd
phrasing needs to be sensitive to increase vs decrease
2012-05-29 08:55:16 -04:00
2563dda3e5
creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent
2012-05-29 08:54:57 -04:00
63bc11026e
two other reg templates to change when user already logged in [ #29858801 ]
2012-05-26 20:57:59 -04:00
a4e15bcda3
stop showing logged-in users the login form [ #29858801 ]
2012-05-26 18:36:10 -04:00
365976933e
[ #29809805 ] made username change form more pythonic
2012-05-26 17:30:12 -04:00
61f45a5716
[ #29809805 ] fixed changed email doesn't check for duplicate email
2012-05-26 17:28:57 -04:00
acaa931445
I think that the CampaignFormView should be deleted -- but before I merge this into master, I want to let others confirm
2012-05-25 19:39:02 -07:00
f0dde230f3
[ #27015121 ] forgot to add context to Pledgeview
...
Seems to me there's refactoring that can be done with these two views!
2012-05-25 18:44:28 -04:00
d784715407
Round dollar amount to nearest dollar [ #30073593 ]
2012-05-25 18:34:16 -04:00
7de9616e23
[finish #27015121 ] add going to amazon text, premium amount now inline.
2012-05-25 18:18:29 -04:00
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
9203127da1
comments by campaign managers get a blue box around them [ #28494261 ]
2012-05-25 14:51:46 -04:00
1335b3cb72
[ #29500707 ]
...
Fleshing out exception handling for pledge_cancel
selenium tests work for both amazon and paypal on RY laptop -- now going to test them on ry-dev
2012-05-24 18:47:50 -07:00
60b84b0358
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 14:10:10 -07:00
f3e5477d33
home link should also go to landing page
2012-05-24 15:33:34 -04:00
733893ecdb
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-24 15:30:01 -04:00
86313666ee
making [ #29858801 ] happen -- now you can get back to the home page by clicking on the logo even if logged in
2012-05-24 15:29:45 -04:00
d2129a2e83
Merge branch 'master' into cancel_pledge
2012-05-24 09:37:13 -07:00
ad2405243a
Added missing deadline to book_panel
2012-05-24 09:35:58 -07:00
2f9d899030
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 08:43:33 -07:00
6eb29f2a78
adding SLJ coverage
2012-05-23 15:38:26 -04:00
b55af7977d
[ #29500707 ] The core of the cancel pledge is in place, though refinements, particularly in the UI still needs to be made.
...
Outstanding issues:
* Will the IPNs on a cancel come quickly enough so that the user will no longer see "Modify Pledge" when redirected to the Work page
* How to provide better feedback on the fact that a transaction has indeed been canceled? Do we need to use notifications here?
* This code is working on RY's laptop -- but now needs to be tested where there IPNs available.
2012-05-23 09:12:21 -07:00
30adccdd37
put ungluer count on second line and changed text placement accordingly to prevent overflow with high ungluer count numbers
2012-05-23 10:40:13 -04:00
a0bc6deefc
Closing in on pledge_cancel
2012-05-23 07:22:48 -07:00
4829c8679e
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-23 09:44:31 -04:00
cd9ff5af63
make whole pledge/read now area on back of panel clickable, maintain styling
2012-05-23 08:47:41 -04:00
2f285d7300
added name attributes to submit buttons
2012-05-23 08:12:35 -04:00
42665150ec
restored link to latest comments
2012-05-22 11:48:53 -04:00
7791f9a1ae
added a comment
2012-05-22 11:48:23 -04:00
0fcdbee50a
minor copy-editing type stuff
2012-05-22 11:07:40 -04:00
5ce95c342b
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-22 07:43:10 -07:00
165d08663b
html validation cleanup for pledge page and about lightbox [ #29777801 ]
2012-05-22 09:16:12 -04:00
54368ffbca
adding pledged checkmark next to relevant premium on work page when supporter has pledged
2012-05-22 07:34:42 -04:00
Andromeda Yelton
eric
Raymond Yee