eric
15ea12534a
[ #32488017 ] merge conflicts
2012-07-10 16:03:36 -04:00
eric
f2a1bac760
[start #32488017 ] added some logging of send_mail task
2012-07-10 15:57:44 -04:00
Raymond Yee
c8f0143630
Merge branch 'master' into ola_fulfill
2012-07-09 14:04:21 -07:00
Raymond Yee
a5d0ef36d7
Merge branch 'feedback'
2012-07-09 10:09:59 -07:00
Raymond Yee
2f49651466
Force the from_email to be settings.DEFAULT_FROM_EMAIL unless you really want your from_email
2012-07-09 10:08:49 -07:00
Raymond Yee
d869431b43
a first pass at getting a model for getting premium feedback for the OLA campaign
2012-07-09 09:28:50 -07:00
Andromeda Yelton
dcee8182bf
restricting displayed ungluers to those with nonempty wishlists
2012-07-09 10:53:44 -04:00
eric
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
eric
21e3cb582d
fix tabs
2012-07-07 18:12:54 -04:00
eric
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
Andromeda Yelton
85247c306e
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
core/models.py
2012-07-05 10:21:08 -04:00
Andromeda Yelton
0329976165
send signal for unsuccessful campaign notifications
2012-07-05 10:04:27 -04:00
Raymond Yee
5e3cf5d7aa
Latest integration of campaign data in our own db plus the spreadsheet you can download from Amazon payments
...
to produce CVS file
2012-07-03 07:46:42 -07:00
Raymond Yee
5b733d214c
setting up to automate daily campaign status update
2012-06-29 18:05:14 -07:00
Raymond Yee
9ac4aa26bd
hook the unsuccessful_campaign to the right notice
2012-06-29 09:52:06 -07:00
Andromeda Yelton
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
Andromeda Yelton
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
Raymond Yee
d3da49cf74
Stepping stone to correlating payments with Amazon data
...
print 1 email / line
2012-06-26 19:36:14 -07:00
eric
dfe17f94fa
[finish #31637107 ] refactored transaction summary code, now considers pending and other transactions
2012-06-21 23:20:58 -04:00
eric
0a259165a1
[ fix #31498847 ] the helrond bug
2012-06-21 23:20:57 -04:00
eric
e9e9ee135b
expect the test to succeed again
2012-06-21 23:20:57 -04:00
eric
cb9eb1e24e
detab code
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
e3ec5ba1ee
don't return empty rightsholder for campaign if it's SUCCESSFUL.
...
Remaining question: why does the RH for a campaign depend at all on campaign status? If it doesn't, we should remove dependence
2012-06-21 07:36:44 -07:00
Raymond Yee
3988335072
Add a command to list queued notices
2012-06-21 05:18:12 -07:00
Raymond Yee
6389c25f11
Trying to import successful_campaign differently
2012-06-20 21:09:05 -07:00
Raymond Yee
ea4fc308a0
Allowing campaign.update_status to go SUCCESSFUL w/o regard to specific deadline.
...
Set a bookloader test to expected failure while it might be a transient error
2012-06-20 15:48:55 -07:00
Raymond Yee
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
Raymond Yee
457aba97bd
Merge branch 'master' into fps
2012-06-13 14:43:24 -04:00
Andromeda Yelton
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
Raymond Yee
c745452b4f
Merge branch 'master' into fps
2012-06-11 11:44:19 -04:00
eric
ed92de66be
default premium description in fixture was different from TOS: username, not name to be used in acknowledgements
2012-06-11 11:39:25 -04:00
Raymond Yee
3d07e09424
Merge branch 'master' into fps
...
Conflicts:
payment/manager.py
2012-06-08 15:02:57 -04:00
Jason
d029e02bb4
Adding skeleton row locking code for demo
2012-06-01 12:20:17 -04:00
Andromeda Yelton
79bdcf3f5c
commenting
2012-05-29 21:16:01 -04:00
Andromeda Yelton
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
Andromeda Yelton
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
Raymond Yee
fccedc50d7
Goodreads problem has been fixed: http://www.goodreads.com/topic/show/908732?utm_medium=email&utm_source=comment_instant#comment_51301819
2012-05-29 16:23:57 -07:00
Raymond Yee
52ed00b80b
Marking core.GoodreadsTest.test_review_list_unauth as expected failure for now. I believe there is a problem on
...
the Goodreads side and have reported the problem: http://www.goodreads.com/topic/show/908732-api-problem-http-status-code-500-for-list-xml#comment_51296303
I will need to turn this test back on once Goodreads fixes the problem
2012-05-29 15:27:54 -07:00
Raymond Yee
8ce6ffe530
Pull which payment processor is involved from the transaction itself not from the settings.PAYMENT_PROCESSOR
2012-05-29 15:01:48 -07:00
Raymond Yee
111e10f380
Expose what http code we are getting from goodreads when we get something that is not 200
2012-05-29 12:47:38 -07:00
eric
4e81f743b4
removed import loop
2012-05-29 12:08:28 -04: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
bafeb92bdd
[ #29809805 ] fixed email dedupe email at account activate fails when more than one prior account
2012-05-26 17:27:10 -04:00
Raymond Yee
a2514eb99c
Got rid of small typo in wishlist_unglued_book_released notice type description
2012-05-25 13:49:45 -07:00
eric
1bb459e71d
resolve test conficts
2012-05-25 14:54:08 -04:00
eric
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
eric
4ec7fef25c
log adding book only if it's new to the database
2012-05-25 13:13:15 -04:00
eshellman
b3610e17f3
added hard updates of campaign objects
2012-05-25 13:52:25 -03:00
eshellman
a77d2e3fea
The campaign setup for test_merge_works was wrong but fixing it causes the test to fail on my machine and I cannot fathom why. Fixing it directly on github to make sure I haven't done something else stupid.
2012-05-25 13:03:23 -03:00
Andromeda Yelton
a830d5af48
eric wanted me to write a test so I did. tests percent_of_goal
2012-05-22 11:07:05 -04:00
eric
c61bc9985d
test for factored license url [ #29884981 ]
2012-05-20 00:12:16 -04:00
eric
f72796acdf
factor license URL and badge into one class [ #29884981 ]
2012-05-20 00:10:56 -04:00
eric
61ec9db6a2
tab->spaces
2012-05-20 00:06:04 -04:00
Andromeda Yelton
085b67fb93
making sure not to run into int/float mismatch problems, and also it's ok if the percent goes over 100
2012-05-17 14:51:53 -04:00
Andromeda Yelton
d94b23e2fe
wow so calculating percents totally works better when you multiply by one hundred huh
2012-05-17 14:47:32 -04:00
eric
23b8ec4987
redeleteing UNGLUEIT_SHORTEST_DEADLINE
2012-05-17 11:36:15 -04:00
Andromeda Yelton
20a99412ab
streamlining percent_of_goal
2012-05-17 09:24:37 -04:00
Raymond Yee
57d74ecea1
Added:
...
from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE
2012-05-16 08:18:04 -07:00
Raymond Yee
bd66c62842
tell Jenkins about setting.PAYMENT_PROCESSOR (while we transition to having code look up transaction.host)
...
add missing comma
2012-05-16 07:47:16 -07:00
Andromeda Yelton
b9de19bb09
modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom
2012-05-16 10:35:58 -04:00
Andromeda Yelton
2bf67671ad
supporters should only return people with active transactions, not e.g. canceled ones
2012-05-16 10:24:03 -04:00
Andromeda Yelton
775d1d4af2
fixing rendering of successful campaign notifications
2012-05-16 10:06:26 -04:00
eric
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
Andromeda Yelton
6c3c1a8cd5
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-15 15:44:54 -04:00
Andromeda Yelton
8cba752057
more notices need html templates for display at /notifications
2012-05-15 10:27:57 -04:00
Raymond Yee
d56b7a6453
First pass at a django admin command to check integrity of payments
2012-05-15 07:23:02 -07:00
eric
d9a96c2ada
putting from email in reply-to: header [ #29498563 ]
2012-05-13 16:38:58 -04:00
Andromeda Yelton
e6467e4e85
even moar wordsmithing of notifications
2012-05-12 21:49:31 -04:00
Andromeda Yelton
33f7c99a5b
added a campaign.rightsholder property to make it not annoying to put rh names into templates
2012-05-12 21:49:18 -04:00
Andromeda Yelton
6fe7aeeabb
even more notification wordsmithing
2012-05-12 21:28:27 -04:00
Andromeda Yelton
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
Andromeda Yelton
83730badbb
more wordsmithing
2012-05-12 11:58:33 -04:00
eric
a30976373f
better default cover for works with no google id [ #29488053 ]
2012-05-11 22:46:03 -04:00
Andromeda Yelton
70a1da6713
note comments at end about context needed for notification templates
2012-05-11 21:36:08 -04:00
Andromeda Yelton
4c7fef1ce5
typo was bugging me
2012-05-11 21:35:52 -04:00
eric
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
eric
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
Raymond Yee
33642190cb
Allows set_key command to set keys that already exists
2012-05-10 08:34:45 -07:00
Raymond Yee
40a660e9b6
Add a set_key django admin command to make it easier to load keys
2012-05-09 17:17:18 -07:00
Raymond Yee
4deae23fd4
Ooops -- I forgot one migration
2012-05-09 11:42:29 -07:00
eric
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
.
2012-05-09 09:37:57 -04:00
Raymond Yee
8a8f82a9a9
[ #29272807 ] Forgot to make core.models.Key.name unique
2012-05-08 16:47:07 -07:00
Raymond Yee
9b2693ed8b
[ #29272807 ] Implementation of an encrypted keystore as core.models.Key
...
NOTE MIGRATION needed
* Immediate reason for this implementation is to make it harder for our AWS keys to be compromised -- this will allow us to store them in encrypted (AES 256) form in the db, which will require ability to run mysql on the EC2 instance
* depends on a Django settings.SECRET_KEY, which for now, we might store in settings/local.py -- we could get fancier about how to serve that up
2012-05-08 16:08:36 -07:00
Andromeda Yelton
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
Raymond Yee
687df0c415
Changing ry-dev.dyndns.org -> ry-dev.unglueit.com
2012-05-07 15:57:30 -07:00
Raymond Yee
09a8f90740
Added a site definition for just.unglueit.com
2012-05-07 13:14:31 -07:00
eric
a32b09a4cb
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
.
2012-05-07 01:18:11 -04:00
eric
c0cb99e040
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
.
2012-05-07 01:18:11 -04:00
eric
d334fa58b0
Revert "Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""""
...
This reverts commit b21787a590
.
2012-05-07 01:18:11 -04:00
eric
e10136f1b2
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit 1bbac102a2
.
2012-05-07 01:18:11 -04:00
eric
1bbac102a2
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
.
2012-05-07 01:14:47 -04:00
eric
b21787a590
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
.
2012-05-07 01:14:47 -04:00
eric
c8be251ffa
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
.
2012-05-07 01:14:01 -04:00
eric
2d344a09c6
Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"
...
This reverts commit 7043e71c39
.
2012-05-07 01:11:26 -04:00
eric
7043e71c39
[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration
...
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
eric
900bb88eaf
[ #28945859 ] create description on work, migrate data
2012-05-06 23:01:56 -04:00
eric
e93a6d7523
[ #28945859 ] now pulling description from OL, looking for all editions
2012-05-06 22:31:38 -04:00
Raymond Yee
3f1c2d6c5c
Making explicit that a Campaign needs to have an active claim in order to be activated.
2012-05-03 00:19:40 +00:00
Raymond Yee
b289a8cfd3
Fixing how now() is being called in random_campaigns command
2012-05-02 23:49:55 +00:00
eric
bbb5da7186
fixed lower case format values
2012-05-02 12:32:11 -04:00
eric
4d13953e41
We're not allowed to store descriptions from google
2012-05-01 16:25:38 -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
eric
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -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
Andromeda Yelton
6dcefd157c
typo fixes and wording clarity in notification descriptions. requires syncdb\!
2012-04-27 08:46:54 -04:00
eric
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
eric
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
eric
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
eric
78edf747a7
reorganize notifications [ #27014673 ]
2012-04-24 22:44:59 -04:00
eric
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
Raymond Yee
51d1bb938f
A change in the Goodreads API: http://www.goodreads.com/topic/show/867018-stuff-broken-since-last-thursday -- removing trailing '/' fixes the problem (for now!)
2012-04-24 14:37:33 -07:00
Andromeda Yelton
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
Raymond Yee
ac7f9afc2a
Align ry back to master while keeping changes in random_tasks.py
2012-04-18 15:08:16 -07:00
Raymond Yee
3cf232a804
Merge branch 'master' of github.com:Gluejar/regluit into ry
...
Conflicts:
core/signals.py
2012-04-18 15:01:47 -07:00
eric
5f4f381e06
fix problem where Goodreads has started to return empty descriptions
2012-04-13 17:53:18 -04:00
eric
80c3a0090f
fix spelling before it leads to bugs. will need to syncdb
2012-04-11 13:37:36 -04:00
eric
d5d26e356f
this is how to turn off emails by default for a notification type [finish #27116165 ]
2012-04-09 11:55:58 -04:00
eric
147808bd88
[finish #27470199 ] inactivate checked premium button no longer shows if there are no checked premiums
2012-04-05 22:44:45 -04:00
eric
be909bba69
change language on claim status [accept #27384493 ]
2012-04-05 11:58:26 -04:00
Raymond Yee
1031a80a5e
Merge branch 'master' of github.com:Gluejar/regluit into payment
...
Conflicts:
core/signals.py
2012-04-04 10:08:59 -07:00
eric
8cf4209b54
removed comments
2012-04-03 15:54:41 -04:00
Ed Summers
331d886a7c
need to rewrite cover image urls in googlebooks api search results too
2012-04-03 15:27:33 -04:00
Raymond Yee
7cb3c038bd
Migrating existing twitter pic urls
...
MIGRATION required
Conflicts:
core/models.py
2012-04-03 11:54:20 -07:00
Ed Summers
df36d8bf65
save https url for twitter avatar
2012-04-03 14:46:31 -04:00
Raymond Yee
0f0ef412eb
Computing the twitter picture
2012-04-03 11:29:26 -07:00
Ed Summers
cd41708237
migration to convert facebook avatar urls to https
2012-04-03 14:10:56 -04:00
Ed Summers
5e25f2f90a
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-03 13:56:25 -04:00
Ed Summers
1187a346ee
use https urls for google books cover images
2012-04-03 13:55:45 -04:00
eric
86834f5e99
remove dead import
2012-04-03 11:47:41 -04:00
eric
c90c42a2e8
linefeeds
2012-04-03 11:17:59 -04:00
eric
aab0c47eeb
reconcile linefeeds
2012-04-03 11:10:49 -04:00
eshellman
87bcf412d9
really remove campaign activate signal
2012-04-03 12:05:50 -03:00
eshellman
7cca21a4fb
merge changes
2012-04-03 12:04:12 -03:00
eric
12434c7c09
more resolving conflicts
2012-04-03 10:58:27 -04:00
eric
0319185251
resolve conflicts
2012-04-03 10:54:31 -04:00
eric
faf095408c
fixed campaign tests to include claim and rightsholder
2012-04-03 10:45:48 -04:00
eric
6f1ccde928
moved notify_active_campaign into model, removed redundant context
2012-04-03 10:45:12 -04:00
Andromeda Yelton
07f39993c3
now with fewer test failures - wrote custom signal to trigger only on campaign.activate(), not all campaign.save() events
2012-04-02 21:14:41 -04:00
Raymond Yee
01799924a9
1) Undo a mistake I had made -- I mistakenly reversed the comparison between the deadline of the campaign and now()
...
2) updated the campaign deadlines to 2013 in the tests to put the deadline into the future
3) modified campaign_status test to include a user in the transaction so that the notification works
2012-04-02 17:57:30 -07:00
Raymond Yee
f625e98b8f
1) Campaign.update_status determines that a campaign is SUCCESSFUL or UNSUCCESSFUL only after the deadline
...
2) first pass implementation of the successful_campaign notification -- using a successful_campaign custom signal
2012-04-02 16:10:56 -07:00
Andromeda Yelton
e197cd6acc
now notifications actually get sent. cleanup to follow.
2012-04-02 15:04:51 -04:00
Andromeda Yelton
679f797b74
Merge github.com:Gluejar/regluit
2012-04-02 14:17:28 -04:00
Andromeda Yelton
94aa31a950
campaign activation now sends signal which notify listens for. still need to fix actual sending of notification.
2012-04-02 14:17:18 -04:00
Raymond Yee
206c7ebcd4
I've added a send_email_task to wrap django.core.mail.send_mail -- I'm using it for testing but I think it could be useful in general.
...
I've used it to test celerybeat. In my local me.py, I added the following setting:
CELERYBEAT_SCHEDULE = {
"runs-every-30-seconds": {
"task": "regluit.core.tasks.send_mail_task",
"schedule": datetime.timedelta(seconds=60),
"args": ('hi there', 'testing 1, 2, 3', 'raymond.yee@gmail.com', ['raymond.yee@gmail.com'])
},
}
and then ran
django-admin.py celerybeat -l INFO
and started getting email sent to me every minute!
2012-03-30 17:31:54 -07:00
Raymond Yee
55b3e8398e
Hooking in djcelery admin to our admin interface
...
adding CeleryTask to the admin interface
2012-03-30 12:27:35 -07:00
Raymond Yee
313fdc5bb9
Merge branch 'master' of github.com:Gluejar/regluit into ry
...
Conflicts:
core/signals.py
2012-03-30 09:42:02 -07:00
eric
1b9a81b775
Notification back to working on celery startup. Not quite solved. but here's where it is. [ #27115145 ]
2012-03-30 03:07:23 -04:00
Raymond Yee
decdac290c
Added transaction commitment to command
2012-03-29 15:05:26 -07:00
Raymond Yee
1b9d54037a
changing deprecated celery.decorators.task to celery.task.task
...
added a bit of documentation to core/management/commands/random_tasks.py
2012-03-29 14:51:35 -07:00
eric
ec35e27b52
patched notification into celery
...
not sure where to put emit_notifications task; couldn't get it to work
in tasks because of circular imports [start #27115145 ]
2012-03-29 16:14:43 -04:00
eric
caae736432
removed unused task
2012-03-29 16:14:43 -04:00
Andromeda Yelton
28d3836175
Merge github.com:Gluejar/regluit
2012-03-29 08:54:59 -04:00
eric
4d9e279862
[finish #25980231 ] implemented a separate notification type for other commenters
...
person entering content doesn't get the notification duh
if you've commented on a wishlist item, you only get the also commented
notification, not the wishlist comment notification
2012-03-29 01:21:37 -04:00
Andromeda Yelton
619d37e0a0
blank rights holder name on rh_admin page should not validate
2012-03-28 14:12:10 -04:00
Raymond Yee
2c12d84e2a
Set NOTIFICATION_QUEUE_ALL to True for now in various settings file
...
Added a few lines of documentation to signals.py around notifications
2012-03-27 14:53:07 -07:00
eric
955f74aabe
fixed the send notification; it now sends a notification
2012-03-27 13:41:41 -04:00
eric
290aecab19
wired up notifications
2012-03-27 13:24:16 -04:00
eric
0892c7cf73
found the django admin signal to connect to
2012-03-27 12:01:09 -04:00
eric
f7974e8ad3
this commit not working yet
2012-03-27 11:52:57 -04:00
eric
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
eric
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
eric
0f61bd8d66
added license selection to campaigns. Simple migration to apply.
2012-03-23 12:30:49 -04:00
eric
08af63e055
modified default premiums to make them implementable via existing profile
2012-03-22 17:05:39 -04:00
eric
58cb0c9f2a
while mucking around, set feed to atom to match type I set in autodiscovery link [ #26402939 ]
2012-03-20 13:53:53 -04:00
Raymond Yee
dab3ecfc31
Do not override the source on a Wish if a work is already on the wishlist
2012-03-19 18:23:25 +00:00
Andromeda Yelton
a17caa3ddc
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-09 21:20:48 -05:00
Andromeda Yelton
85ce79e87a
that comment is now superfluous
2012-03-09 21:20:40 -05:00
Raymond Yee
bbec2ee92b
Merge branch 'payment' of github.com:Gluejar/regluit
2012-03-10 01:44:06 +00:00
Andromeda Yelton
f969afde3a
hey it works better if you use the supporter from the url instead of hardcoding it for testing
2012-03-09 20:04:21 -05:00
Andromeda Yelton
8d2f56c7bc
Merge branch 'master' of github.com:Gluejar/regluit
2012-03-09 19:08:39 -05:00
Andromeda Yelton
0776d68b43
supporter wishbook feed round 1! let's see if it works
2012-03-09 19:05:24 -05:00
Raymond Yee
dfd83765fe
I had missed dependencies on datetime.datetime now/utnow -- replaced it with regluit.utils.localdatetime.now()
2012-03-09 15:31:30 -08:00
Raymond Yee
3399e89541
renamed Campaign.update_success to Campaign.update_status to better reflect the purpose of the method (to update Campaign.status)
2012-03-09 14:18:11 -08: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
eric
8dea738331
fixed stupid error removing et al.
2012-03-05 17:15:23 -05:00
eric
f84c6101d4
removed "et al." from work.author() because it was almost always wrong
2012-03-05 11:12:41 -05:00
eric
65e169a8e3
changed test isbns to deal with ThingISBN issue
2012-02-29 08:51:36 -05:00
Raymond Yee
cb3027ef2a
Merge branch 'master' of github.com:Gluejar/regluit
2012-02-28 15:58:25 -08:00
eric
eebeb2476f
finish committing all changes
2012-02-28 17:28:58 -05:00
eric
039f617f17
implemented ebook contribution, included non pdf/epub, license and provider in UI
...
many changes, couldn't run all test- some failing for unrelated reasons
2012-02-28 17:28:58 -05:00
Raymond Yee
30543c6135
Change ebook.provider from 'gutenberg' to 'Project Gutenberg' for PG books
2012-02-28 13:39:08 -08:00
Raymond Yee
2cae997629
Add a load_gutenberg command to load Gutenberg editions
2012-02-27 13:47:11 -08:00
Raymond Yee
538d225ad0
Merge branch 'production'
2012-02-24 14:56:45 -08:00
Raymond Yee
f7220d9812
Programs and data for fighting Frankenworks
2012-02-24 12:06:24 -08:00
eric
4b943d1acb
fixed bug where edition.public_domain never gets set
2012-02-23 18:51:29 -05:00
Raymond Yee
c970754cea
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-02-21 15:52:48 -08:00
Raymond Yee
1751627ad6
compare the url for the ebooks that come back on id and format alone
2012-02-21 09:39:36 -08:00
Raymond Yee
09ab830c20
Return the list of google books ids that are not recognized any more when trying to add ISBNs corresponding to isbn-less Editions that have Google Books IDs
2012-02-16 13:18:22 -08:00
Raymond Yee
cf2e937969
Merge branch 'master' into ry
2012-02-16 10:45:53 -08:00
Raymond Yee
fb5ad2da76
Add tracking for google_id_not_found to add_missing_isbn_to_editions
...
Add a django-admin command to run add_missing_isbn_to_editions
2012-02-16 10:44:13 -08:00
eric
471cb62fd2
changed core.tasks to not use models
2012-02-16 13:19:36 -05:00
Raymond Yee
4752181ace
Move add_missing_isbn_to_editions to bookloader.py
2012-02-15 19:36:18 -08:00
Raymond Yee
8c397f4953
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-02-15 13:23:58 -08:00
Raymond Yee
b7f47bfee5
Add a few comments to explain how various parts of our bookloading process works
2012-02-15 13:23:10 -08:00
Raymond Yee
25f6bd5e07
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-02-15 08:46:17 -08:00
Raymond Yee
9fb57a6b4e
At this point, I have logic in regluit.test.bookloader.load_gutenberg_books to read the data from regluit/experimental/gutenberg/g_seed_isbn.json and load books into the db. Still shaking out bugs from the process though.
2012-02-14 18:01:13 -08:00
Raymond Yee
5ff810049d
OK...I had to encode work.title, not work
2012-02-13 15:02:14 -08:00
Raymond Yee
bf07c4b7ed
Encode to ascii in the printout to the recluster_singletons
2012-02-13 15:01:00 -08:00