Raymond Yee
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
Andromeda Yelton
f2e4647e73
lockss needs a page listing the books unglued in each year to crawl
2012-09-18 14:16:59 -04:00
Raymond Yee
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
Raymond Yee
69e959a0c8
fleshing out of payment.models.Account
2012-09-17 14:55:28 -07:00
Raymond Yee
c545173793
First pass at payment.models.Account
2012-09-13 16:43:54 -07:00
Raymond Yee
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
Raymond Yee
b85fbfc78b
Merge branch 'master' into relaunch_ry
2012-09-13 10:42:35 -07:00
Raymond Yee
eac0e24b1b
Small change: now storing amount and status for transaction with new pledge.
2012-09-13 10:39:42 -07:00
Andromeda Yelton
18a598f628
need to change lockss page since unglued adheres to editions
2012-09-12 10:11:49 -04:00
Raymond Yee
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
Raymond Yee
2ab1f8c7ea
Now creating a charge based on token
2012-09-11 15:17:37 -07:00
Raymond Yee
5636637266
Merge branch 'master' into relaunch_ry
...
Conflicts:
frontend/views.py
2012-09-11 10:42:49 -07:00
eric
2df3047dc0
display all editions for staff
2012-09-10 23:51:22 -04:00
eric
e5804a4d4d
please use spaces, not tabs to indent
2012-09-10 23:47:06 -04:00
Raymond Yee
0e1839d531
Merge branch 'master' into relaunch_ry
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:18:30 -07:00
Raymond Yee
bcceaa719b
integrating stripe into fund_the_pledge
2012-09-10 13:17:30 -07:00
Andromeda Yelton
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
eric
92a2ccc7ce
cleaned up the response when a pledge is modified rather than created
2012-09-07 17:48:48 -04:00
eric
f3ecec8410
just some tweaking to get the premium selection right
2012-09-07 17:11:25 -04:00
eric
4700e63b06
resolve conflict
2012-09-07 16:26:09 -04:00
eric
f1b22649a5
cruft
2012-09-07 16:20:12 -04:00
eric
18608d3e7d
preapproval amount is now amount for requested premium, not previously pledged amount
2012-09-07 16:13:53 -04:00
eric
a361d7b53d
so we didn't really need to put premium description directly into context
2012-09-07 16:12:32 -04:00
Raymond Yee
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
eric
6f63c047ce
DRY pub year code moved to work model
2012-09-07 16:07:47 -04:00
eric
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
eric
6bbd973f62
only ask the donation for required amount [ #21784207 ]]
2012-09-07 09:39:36 -04:00
eric
c2636f5bba
removed legacy DonateView
2012-09-07 01:11:28 -04:00
eric
4d4e61d338
donation modification now works [ #21784207 ]
2012-09-06 16:55:32 -04:00
eric
bd794a2ac5
clean up the donation endpoint pages so they work (if a bit ugly!)
2012-09-06 14:04:47 -04:00
eric
9395cd058b
now donating cents works, too
2012-09-06 11:36:13 -04:00
eric
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
eric
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
eric
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
Andromeda Yelton
8c030df830
adding some tests for my recent commits hooray
2012-08-29 15:56:14 -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
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
a6e034a36a
rudimentary download page plus logic to serve it
2012-08-24 15:14:32 -04:00
Andromeda Yelton
aa3667d260
working on download page
2012-08-23 13:38:48 -04: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
eric
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -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
eric
403420a283
Add user-to-user credit transfers [ #21784207 ]
2012-08-13 21:00:28 -04:00
eric
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
Andromeda Yelton
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
Andromeda Yelton
8db1e5b59a
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
2012-08-06 13:35:29 -04:00
Andromeda Yelton
6d4044bcde
intermediate state
2012-07-24 08:08:34 -04:00
Andromeda Yelton
5855593c5b
adding support for acknowledgement fields throughout data pipeline
2012-07-23 08:31:57 -04:00
Andromeda Yelton
3de4c40647
pledge page shows only custom premiums in main list
2012-07-23 07:43:21 -04:00
Andromeda Yelton
c4a96a5d34
work page will now display only custom premiums
2012-07-23 07:41:20 -04:00
eric
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
eric
d7638463b1
reporting facility for languages
2012-07-20 14:29:04 -04:00
Raymond Yee
167bd8a4c1
Fixing a situation in which there is an error in the pledge view
2012-07-18 11:09:48 -07:00
Raymond Yee
1e49732693
almost ready to send this out to supporters with failed pledges
2012-07-13 15:55:41 -07:00
Raymond Yee
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
Raymond Yee
94384fcb59
Work in progress
2012-07-11 19:51:36 -07:00
Raymond Yee
7a76a2cbaf
Merge branch 'master' into ola_fulfill
2012-07-10 14:15:28 -07:00
Raymond Yee
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
eric
94787951ad
allowed staff to manage campaigns
2012-07-10 15:58:19 -04:00
eric
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
eric
8977734bd7
[ fix #31636971 ] update campaign.left when campaign changes
2012-06-21 23:20:57 -04:00
Raymond Yee
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
Raymond Yee
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
Raymond Yee
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
Andromeda Yelton
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
Andromeda Yelton
d652db5c03
removing is_preview since it's no longer needed
2012-06-13 09:41:23 -03:00
Andromeda Yelton
ce5ee124d9
removing pagination from work_list -- likely unnecessary and this should be faster
2012-06-01 13:15:50 -04:00
Raymond Yee
e27ad644b5
Merge branch 'campaignformviewnixed'
2012-05-29 11:48:41 -07:00
Andromeda Yelton
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
Andromeda Yelton
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
eric
365976933e
[ #29809805 ] made username change form more pythonic
2012-05-26 17:30:12 -04:00
eric
61f45a5716
[ #29809805 ] fixed changed email doesn't check for duplicate email
2012-05-26 17:28:57 -04:00
Raymond Yee
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
eric
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
eric
7de9616e23
[finish #27015121 ] add going to amazon text, premium amount now inline.
2012-05-25 18:18:29 -04:00
Raymond Yee
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
Raymond Yee
60b84b0358
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 14:10:10 -07:00
Andromeda Yelton
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
Raymond Yee
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
Raymond Yee
a0bc6deefc
Closing in on pledge_cancel
2012-05-23 07:22:48 -07:00
Raymond Yee
b8336c4ed6
En route to implementing pledge cancellation
2012-05-21 07:56:18 -07:00
Raymond Yee
272d795ded
Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
...
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
eric
9d33a95147
[ fixed #29647161 ] fixed login redirect which was failing when next included a query string
2012-05-15 14:18:17 -04:00
thatandromeda
0e59ee746b
Update frontend/views.py
2012-05-14 18:23:13 -03:00
Andromeda Yelton
6d14ba1c30
only really need to set context for site once, not separately for view and triggered notification
2012-05-14 16:56:36 -04:00
Andromeda Yelton
3fe2800dfa
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-14 13:51:06 -04:00
Andromeda Yelton
2b9b4a7331
share links in pledge_complete need to include url base
2012-05-14 13:42:34 -04:00
Raymond Yee
b07d6c267d
Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet
2012-05-14 10:15:40 -07:00
eric
6bb564aca6
[finish #28851641 ]campaign managers now have access to edition creation and editing for works they manage
2012-05-14 01:07:02 -04:00
eric
ea9ac7508e
repaired the invocation ot I_just_pledged emailshare [ #27785469 ]
2012-05-13 22:59:07 -04:00
eric
296b5b5b20
countdown broke preview
2012-05-13 22:13:45 -04:00
Raymond Yee
66f08eab10
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-13 13:55:08 -07:00
eric
d9a96c2ada
putting from email in reply-to: header [ #29498563 ]
2012-05-13 16:38:58 -04:00
Raymond Yee
9badabb53b
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-13 13:33:53 -07:00
Andromeda Yelton
193e4ef324
methods are not properties, whoops
2012-05-13 15:33:54 -04:00
Raymond Yee
a54aa1a342
First pass -- pledge view will redirect to pledge modify view if there is already an active transaction
2012-05-13 12:18:48 -07:00
Andromeda Yelton
d2cf8a773b
improvifying pledge front end around modify and cancel
2012-05-13 10:49:23 -04:00
Andromeda Yelton
ae76f89034
fixing problems with context for you_have_pledged notification
2012-05-12 22:42:09 -04:00
eric
77a66e5420
[ #29498563 ] fixed urls by moving email share messages to django templates; eliminated sender from form
2012-05-12 11:12:43 -04:00
Raymond Yee
fbd58d5e4e
Add import of notification
2012-05-11 14:14:49 -07:00
Raymond Yee
ba36838dfa
must import notification
2012-05-11 14:03:28 -07:00
eric
17d641cf65
wired pledge_you_have_pledged [ #27785469 ]
2012-05-11 15:53:46 -04:00
eric
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
Andromeda Yelton
c6186c7808
need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want
2012-05-09 16:33:22 -04:00
Andromeda Yelton
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
Andromeda Yelton
11c19b950d
preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns
2012-05-08 15:51:17 -04:00
Andromeda Yelton
6e1aa4dfd0
changed work_list page to clearly communicate that it's staff picks when facet = recommended
2012-05-08 14:28:06 -04:00
Andromeda Yelton
9fc2444f37
need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly
2012-05-08 10:51:04 -04:00
Raymond Yee
b06a1e218a
Merge branch 'fps' of github.com:Gluejar/regluit into ry
2012-05-07 16:50:00 -07:00
eric
1ab9304475
[finish #28949611 ] rights holders are now the default campaign manager; they can remove themselves after they add another manager
2012-05-07 17:32:58 -04:00
Jason
e09418a7a2
Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class
2012-05-04 10:30:05 -04:00
Andromeda Yelton
4be0cab5a0
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-04 10:05:54 -04:00
Andromeda Yelton
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
Raymond Yee
b9bbecb351
Merge branch 'master' of github.com:Gluejar/regluit into fps
...
Conflicts:
settings/common.py
settings/dev.py
settings/prod.py
2012-05-02 18:01:20 -07:00
Ed Summers
b8b007c427
last_campaign_status is a string not function
2012-05-02 17:53:45 +00:00
Andromeda Yelton
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
Andromeda Yelton
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
eric
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
Andromeda Yelton
ce36f6771d
css changes per Stefan, part 1
2012-05-01 09:56:19 -04:00
eric
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
Raymond Yee
47a22f3ccb
Merge branch 'master' of github.com:Gluejar/regluit into fps
2012-04-26 15:50:49 -07:00
Raymond Yee
4219149132
Small tweaks to get rid of remnants of PayPal IPN_* variables -- I can now use campaign_admin to actually move fake amazon bucks. Still some IPN_* stuff remaining to clean up.
2012-04-26 19:31:55 +00:00
Raymond Yee
061f656e63
Merge branch 'jkace' of github.com:Gluejar/regluit into fps
...
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up: see whether this works for PayPal too.
Conflicts:
frontend/views.py
2012-04-25 13:10:53 -07:00
Jason
3bc14c1ac9
Modifying frontend/views to use new transaction status codes
2012-04-25 13:55:30 -04:00
Andromeda Yelton
8706e9a900
email sharing needs to populate the sender field in order to validate
2012-04-25 13:45:18 -04:00
eric
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
eric
2a79a82dd7
detab text
2012-04-24 22:17:30 -04:00
Raymond Yee
709cb4ce41
now stuck on the status of an ACTIVE transaction in amazon in campaign_test
2012-04-24 18:03:57 -07:00
Andromeda Yelton
911f6f6212
pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY
2012-04-19 10:50:40 -04:00
eric
d88a908082
[finish #27470423 ] provide preview of unlaunched campaigns
2012-04-10 16:13:28 -04:00
Andromeda Yelton
edf3617f5a
partial de-suckification of pledge_complete page
2012-04-10 15:00:28 -04:00
eric
e36facbeda
[finish #27468521 ] campaign form must also be valid to launch it
2012-04-09 16:52:24 -04:00
eric
163c7a924a
[finish #27522103 ] clear rightsholder creation form when new rightsholder successfully created
2012-04-07 15:31:11 -04:00
eric
e764a44ace
fixed issues with campaign setup [ fix #27468285 ]
2012-04-07 14:12:54 -04:00
eric
26c0ad2b27
fixed failure when editing campaign managers [ fix #27468285 ] [finish #27531719 ]
2012-04-05 17:53:00 -04:00
eric
db736818fc
[finish #27524965 ] fixed issue where released claim prevents new claim
2012-04-05 16:55:10 -04:00
Raymond Yee
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
eric
5d5c60993e
added form to edit campaign managers [start #27468285 ]
2012-04-03 15:54:41 -04:00
Andromeda Yelton
24b7a77228
modifying display of claim status
2012-04-03 09:56:41 -04:00
Raymond Yee
6d50897508
Clarify the pledge modification process for the supporter.
2012-03-28 10:12:09 -07:00
Andromeda Yelton
81c2c7a935
default to active tab when supporter has active campaigns, else wishlist tab
2012-03-28 09:08:05 -04:00
Andromeda Yelton
2ab92b6a2f
Merge github.com:Gluejar/regluit
2012-03-28 09:00:31 -04:00
eric
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
Andromeda Yelton
1a53a79752
merge all the things
2012-03-26 16:16:57 -04:00
eric
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
Andromeda Yelton
66d62ef3aa
making pledge complete page prettier and more featureful: next actions, more speciic email sharing text, enforce login
2012-03-26 15:26:47 -04:00
Raymond Yee
0e61d7477a
[ #22756079 ] Changed name of constants (e.g., IPN_PAY_STATUS_ACTIVE to IPN_PREAPPROVAL_STATUS_ACTIVE to make the meaning of these constants clearer
...
Also fixed an error in how I'm using transaction management in regluit.test.campaigntest.support_campaign
2012-03-23 11:28:09 -07:00
eric
6237fcebfe
detabbing views code
2012-03-23 11:15:37 -04:00
eric
360d11f88a
yes we should deprecate setup_work
2012-03-23 11:09:51 -04:00
eric
d03459922e
fixed stuff I broke when making html validate
2012-03-22 21:25:04 -04:00
Raymond Yee
6d0e5c6a3e
[ #23019867 ] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now.
2012-03-22 12:12:46 -07:00
Raymond Yee
ffb7c8cd33
[ #23019867 ] I believe this commit implements the rest of the pledge changing functionality and works as far as I can tell so far.
...
The one part I don't get yet is why the regluit.test.campaigntest.support_campaign script can successfully drive the browser to create a transction and then
change that pledge to create 2 transactions in total -- and yet until regluit.payment.manager.PaymentManager.check_status is run twice, there seems to be only
one transaction visible to the script.
Does this have to do with Django transactions? I don't know yet.
2012-03-21 15:06:56 -07:00
Raymond Yee
9ece33899a
support_campaign test is now able to run all the way to doing a modification of pledge for lesser amounts
2012-03-20 11:21:06 -07:00
Raymond Yee
46ca784030
[ #23019867 ] First pass at allow for pledges to be modified
2012-03-19 16:32:37 -07:00
Raymond Yee
744693f178
1) Fix an error in which I wasn't checking properly that the pledge_complete page should allow only the pledging user to see the results.
...
2) Now tests.campaigntest.support_campaign takes us all the way through pledging for the first campaign
2012-03-19 11:46:41 -07:00
Raymond Yee
46c4c3fdce
[ #20640595 ] Add a work to a user's wishlist upon a successful return from a PayPal pledge.
...
(Still need to implement warning upon trying to remove a work that user has pledged too.)
2012-03-16 13:03:38 -07:00
Raymond Yee
571e565b5e
[ Fixes #26515771 ] Now if you hit submit on default blank campaign pledge page, we won't get an error.
2012-03-15 14:54:38 -07:00
Andromeda Yelton
506f06f4cf
ensuring that the slideshow returns the right set of books and they display properly
2012-03-14 09:19:06 -04:00
eric
89e6afe82c
You can't delete a cookie that ain't there, you lunkhead [ #24981847 ]
2012-03-13 18:01:26 -04:00
eric
62038dce9c
implement cookie based redirect for login/signup from a wishlist action [deliver #24981847 ]
2012-03-13 17:04:05 -04:00
eric
b6a5d28f09
followed Raymond's suggestion to simplify yesterday
2012-03-13 17:04:05 -04:00
Andromeda Yelton
ffcea5c3d6
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-13 16:27:39 -04:00
Andromeda Yelton
201ff7b38f
fixing empty slideshow for is_preview
2012-03-13 16:26:57 -04:00
eric
6d0e5455f9
metrics enhancements [finish #26329807 ]
2012-03-12 23:34:10 -04:00
eric
b659d80855
we can only have one order_by per facet!
2012-03-12 16:40:45 -04:00
Andromeda Yelton
6205417b8c
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-12 14:46:53 -04:00
Andromeda Yelton
b5c284cc2d
better text for twitter and email sharing
2012-03-12 13:18:11 -04:00
eric
3d5ab78f3f
exception handling to log openlibrary json failures and send user on to fallback
2012-03-10 11:03:58 -05:00
eric
3a70949f36
added handling for moved works to wishlist action
2012-03-09 16:05:01 -05:00
eric
87eee4ed9f
add prefix to forms so html will validate [ #26203269 ]
2012-03-09 13:00:16 -05:00
Raymond Yee
a252f9d173
[ #22561067 ] Implemented regluit.utils.localdatetime.now is by default datetime.datetime.now() (in Django 1.3) and django.utils.timezone.now() in Django 1.4+
...
One overrides regluit.utils.localdatetime._now to do "time travel" -- useful for testing scenarios requiring time changes (such as Campaigns)
Get rid of call references to datetime.datetime.now() or utcnow() and datetime.date.today() in favor of regluit.utils.localdatetime.now() and date_today().
2012-03-09 00:45:39 +00:00
Andromeda Yelton
2c1ceeaf22
merge all the things
2012-03-08 10:49:04 -05:00
Andromeda Yelton
a3378efb17
factored the reused slideshow code from home and supporter into its own function
2012-03-08 09:36:59 -05:00
eric
142fe72f93
added db metrics page [deliver #26022545 ] /info/metrics.html
2012-03-07 22:07:01 -05:00
Andromeda Yelton
cea2979ade
oh harrumph jenkins, it worked locally
2012-03-07 14:24:05 -05:00
Andromeda Yelton
05860bfa06
foregrounding search and browse features when own wishlist is empty
2012-03-07 13:23:34 -05:00
Andromeda Yelton
c9be954972
can now set default tab for ungluedlist, worklist, supporter in views.py. pagination remembers user tab, overrides default.
2012-03-02 09:40:10 -05:00
Andromeda Yelton
369d8c527e
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-01 09:27:27 -05:00
Andromeda Yelton
b9e9f6f213
reconciling worklistview and supporter page querysets so they will both play nice with book_panel. adding some sorting to worklistview.
2012-03-01 09:11:35 -05:00
eric
c43fe2fcb3
replaced python urllib with django.utils.http to handle url encoding of non-ascii
2012-03-01 08:53:55 -05:00
eric
d6a04f66f2
fixed guery bugs noted by andromeda
2012-02-29 14:20:50 -05:00
eric
094f4e56ee
fixed work_view tabbing
2012-02-29 13:15:38 -05:00
eric
5ce023d322
fixed unglued list tabbing
2012-02-29 12:34:21 -05:00
Andromeda Yelton
cb06d2a36a
merging
2012-02-29 08:57:24 -05:00
Andromeda Yelton
34fbeb805d
moving unglued-but-not-ebooked back to Active tab, adjusting sorting of querysets in supporter page tabs, fixing active tab on list pages
2012-02-29 08:41:30 -05:00
eric
eebeb2476f
finish committing all changes
2012-02-28 17:28:58 -05:00
Andromeda Yelton
8d38579606
more logical sorting of supporter page book lists
2012-02-27 16:12:25 -05:00
Andromeda Yelton
b55c53467d
comments should show most recent first
2012-02-23 15:40:45 -05:00
Andromeda Yelton
477de72b77
clarifying what goes in each supporter tab and fixing interaction with pagination
2012-02-21 22:00:23 -05:00
Andromeda Yelton
e97550bf5f
adding support for contextual FAQs to pledge pages
2012-02-21 09:24:23 -05:00
eric
471cb62fd2
changed core.tasks to not use models
2012-02-16 13:19:36 -05:00
eric
7b6b1d067f
userlist queries now only look at first 100 works
2012-02-11 19:08:05 -05:00
eric
41f41aa76e
fixed NameError: global name 'Http404' is not defined
2012-02-11 15:14:31 -05:00
eric
107e6ffd0c
apply migrations! added num_wishes on work model. "popular" page now 10x faster
2012-02-11 14:15:06 -05:00
eric
1a62f8634e
missed this charge; only affects rights holder claims forms for redirected works
2012-02-10 19:30:09 -05:00
eric
07e578699d
Added WasWork model to track deleted works. Apply migrations!
2012-02-09 22:30:33 -05:00
Ed Summers
f55330365e
added endless scroll for search results
2012-02-04 16:06:53 -08:00
Andromeda Yelton
8d17e2d0d6
tweak all the things
2012-02-03 12:05:02 -05:00
Andromeda Yelton
98e2189014
now there is a latest comments page
2012-02-03 10:22:53 -05:00
eric
3333c51bf3
fix name error for HttpResponseNotFound
2012-02-02 09:05:41 -05:00
Andromeda Yelton
bc351e0895
Merge branch 'master' of github.com:Gluejar/regluit
2012-02-01 15:57:10 -05:00
Andromeda Yelton
03b58d14ca
wished by n thing is now clickable and goes to supporter tab. also you can now specify the active tab on a work page with a get parameter.
2012-02-01 15:57:03 -05:00
Raymond Yee
fb77d1a08d
Resolve ambiguity in Work lists order -- sort by Work.id as a secondary sort key
2012-02-01 09:43:46 -08:00
Raymond Yee
268e188082
Clean up the debugging messages I had left in frontend.views.wishlist
2012-01-31 15:15:03 -08:00
Raymond Yee
2610be2c35
Need a distinct() to properly filter out duplicates for popular and new list
2012-01-31 15:07:40 -08:00
Raymond Yee
886233a68a
Filter the popular and new lists to show only works that are on a wishlist
...
https://www.pivotaltracker.com/story/show/24232005
2012-01-31 14:56:34 -08:00
Raymond Yee
0924b0de9a
Merge branch 'master' of github.com:Gluejar/regluit into ry
...
Conflicts:
frontend/views.py
2012-01-31 12:12:39 -08:00
Raymond Yee
7e39492cd4
Debugging the wishlist functionality
2012-01-31 11:54:48 -08:00
eric
aa1f99ee56
handle gb lookup errors in views
2012-01-31 10:08:43 -05:00
eric
76eb9a1760
detabbing??
2012-01-31 10:07:52 -05:00
Andromeda Yelton
317c1d2901
adding user agent reporting to feedback form
2012-01-25 14:55:03 -05:00
Raymond Yee
d255fa0335
Made change so that Goodreads API is hit only when supporter wants to load books: https://www.pivotaltracker.com/story/show/23590565
...
Also allow supporter to clear association with Goodreads account
2012-01-24 09:36:45 -08:00
Raymond Yee
a1e944b795
A round of changes to speed up /list/popular
2012-01-20 16:35:13 -08:00
Raymond Yee
2a0c572211
First take at speeding up /unglued/recent
2012-01-20 15:35:37 -08:00
eric
7ecffddc9f
fix some isbn issues, incl. bad Openlibrary link
2012-01-17 16:50:19 -05:00
eric
c3dcd3d294
fixed issues with null pubdates
2012-01-16 23:28:34 -05:00
eric
7affe92c8d
Merge branch 'generic_id'
2012-01-16 13:21:47 -05:00
Andromeda Yelton
e94219fd0e
improving data we get from our feedback form
2012-01-15 19:02:50 -05:00
Andromeda Yelton
e34aba9be2
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-15 18:12:04 -05:00
Andromeda Yelton
d50e9471a4
preview site will now show most-wished, not campaigns ending soonest
2012-01-15 18:03:54 -05:00
eric
9eaa08bf71
added unglued lists
2012-01-15 16:48:36 -05:00
Raymond Yee
7a16029d72
Small bug in the feedback view: user -> request.user
2012-01-10 17:21:37 -08:00
Raymond Yee
54f2411ab9
Put in a basic page for a pledge completion.
2012-01-10 17:15:39 -08:00
Raymond Yee
01f5664bf5
Some very basic functionality associated with cancel_url, including the ability to try again on the pledge.
2012-01-10 15:26:04 -08:00
eric
d7e5e6e1ed
Merge branch 'master' into generic_id
2012-01-10 15:40:15 -05:00
eric
0d19018e62
api tests working; non-google id's working
2012-01-10 15:20:02 -05:00
Raymond Yee
3abd29f225
First pass at passing in campaign id into cancel_url (which is now calculated in payment/manager.py)
2012-01-10 12:16:04 -08:00
Andromeda Yelton
95f32400ec
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 16:13:49 -05:00
Andromeda Yelton
556ecf8a06
now users can give us feedback on alpha
2012-01-09 15:53:09 -05:00
eric
0b91017dd5
Did what edso told me not to do- re-architected db to use generic ids
2012-01-09 13:55:22 -05:00
Raymond Yee
a4957a5bf6
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 12:47:51 -05:00
Andromeda Yelton
a7009b1998
whoops, should probably commit the version that passes tests
2012-01-09 12:44:35 -05:00
Raymond Yee
2d1ab0dba6
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-09 12:40:03 -05:00
Raymond Yee
a174b3eb93
Putting in skeleton for pledge cancel and complete PayPal callbacks
2012-01-09 12:36:03 -05:00
Andromeda Yelton
a9fc98b771
work page now displays a modify-pledge button where appropriate. not yet wired to modification functionality.
2012-01-09 11:50:48 -05:00
Andromeda Yelton
8460fba0bb
organizing the FAQ
2012-01-06 10:42:17 -05:00
Raymond Yee
68f0c255d5
Force login on PledgeView as a whole
2012-01-04 12:03:50 -05:00
Andromeda Yelton
7de1051448
it is not unlike a sidebar organizing the FAQs
2012-01-03 16:17:04 -05:00
eric
739fccbe83
roemoved vestigial code from search view
2012-01-02 19:08:23 -05:00
Andromeda Yelton
30703cdabc
Merge branch 'master' of github.com:Gluejar/regluit
2012-01-02 09:41:16 -05:00
Andromeda Yelton
03d94bfbc5
tweaking email sharing
2012-01-02 09:39:11 -05:00
eric
1cad25da28
detab source file
2011-12-31 13:49:23 -05:00
eric
9d6066c929
catch IndexErrors to fix HermanCain bug; there is a work with zero editions
2011-12-31 13:48:54 -05:00
Andromeda Yelton
0550f9ac43
added some default field prepopulation to email share form
2011-12-29 10:40:35 -05:00
Andromeda Yelton
79bc9ac15a
now email share has marginal styling and returns users to their original page after form submission
2011-12-28 23:17:39 -05:00