Commit Graph

846 Commits (f93fe51e290757e012033a62d149a862b8a810eb)

Author SHA1 Message Date
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
Raymond Yee 4024d9d3c9 book_loader was calling a merge_works more than once on the same pair of works, causing an integrity exception in WasWorks.
Changes made in add_related so that merge_works called only once for a given pair of works.   Also put in some safeguards in merge_works to prevent from self-merging and from merging when either works is missing an id (which should happen if a work has been deleted.)  Maybe we should check also to see whether the id for was is already in WasWorks
2012-02-13 14:35:08 -08:00
eric 7b6b1d067f userlist queries now only look at first 100 works 2012-02-11 19:08:05 -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 07e578699d Added WasWork model to track deleted works. Apply migrations! 2012-02-09 22:30:33 -05:00
eric 346bb79e38 merge comments when works are merged 2012-02-09 20:51:10 -05:00
eric 0380ae838a fixed error in Edition.get_by_isbn class method 2012-02-09 20:49:52 -05:00
Raymond Yee e4285400ea Changed the isbn.ISBN class to not throw exceptions on invalid ISBNs but rather return None at various places 2012-02-08 09:19:17 -08:00
Raymond Yee 26e8024eb2 Compute the number of works corresponding to new editions 2012-02-06 11:34:11 -08:00
Raymond Yee 3a2cece7dd Adding a bit more info to recluster_singletons but now requires a max parameter
Also adding __unicode__ method to Identifier
2012-02-06 11:26:48 -08:00
eric 4a7f82d513 decided we should recluster by language 2012-02-06 12:42:15 -05:00
Ed Summers 08e10fb0ed added test for pagination 2012-02-04 16:22:04 -08:00
Ed Summers ac4a6b7570 Merge branch 'master' of github.com:Gluejar/regluit 2012-02-04 16:07:05 -08:00
Ed Summers f55330365e added endless scroll for search results 2012-02-04 16:06:53 -08:00
eric f0a390d78d new management command: recluster_singletons 2012-02-04 18:36:06 -05:00
Raymond Yee d207dbc6b4 Reduce the number of related editions to expect to be greater than 9 (instead of greater than 10) to allow test to pass
Don't know why the number of edtions should go down
2012-02-04 12:40:10 -08:00
eric 6215a7c8d8 turns out some records in googlebooks have no title!
https://www.googleapis.com/books/v1/volumes/?q=isbn:9780867130768
2012-02-02 11:33:51 -05:00
eric f9de2d229f add relookup_isbns management command 2012-02-02 09:05:41 -05:00
eric b584684390 add "update edition" method in bookloader 2012-02-02 09:05:41 -05:00
Raymond Yee 3957c9f96a Print out the number of Editions tied to Works w/o identifiers 2012-01-31 14:19:10 -08:00
Raymond Yee 7f2cc341d5 Trying to nail down what happens to editions tied to orphan that we delete 2012-01-31 14:02:01 -08:00
eric c354dcb41b fixed sloppiness in setting .new on editions. headslap. 2012-01-31 15:07:31 -05:00
eric d79bf7fb6b this should stop the generation of orphan works 2012-01-31 10:01:10 -05:00
eric e10e8e2842 catch lookup failures so as not to ruin clustering 2012-01-30 23:57:42 -05:00
eric 2d8210785f smarter handling of null titles 2012-01-30 23:57:42 -05:00
Raymond Yee a37a401171 Ooop: the last test was tautological...fixed typo 2012-01-30 18:35:52 -08:00
Raymond Yee b187663299 Adding integrity checks for ties between Works, Editions, and Identifiers 2012-01-30 18:32:49 -08:00
Raymond Yee 874964a1d4 Ooops...didn't sort the Works w/o identifiers in reverse chronological order 2012-01-30 13:37:48 -08:00
Raymond Yee f5029004bb Added a display of the last 20 Works w/o identifiers 2012-01-30 13:34:10 -08:00
Raymond Yee 078c853baf Now listing number of editions w/o works and number of identifiers not tied to work 2012-01-30 12:30:18 -08:00
Raymond Yee d285e32b2b First draft of check_works_integrity command to check for data integrity issues with Works, Editions, Identifiers 2012-01-30 12:22:53 -08:00
eric 052e523f22 new management command to check for editions without attached works 2012-01-30 12:52:53 -05:00
eric 8dcca8c1e7 deprecated managemetn command 2012-01-28 22:17:58 -05:00
eric b92ce71ea0 make load_wishlist safer 2012-01-28 22:17:11 -05:00
eric 85366cc21a handle locale in language 2012-01-28 22:16:14 -05:00
eric 4259e055d0 management command to remove orphans (works with no ids pointing at them) 2012-01-27 22:09:58 -05:00
eric efa8da19ff pass isbn to add_by_googlebooks_id to address occasional missing isbns 2012-01-27 21:44:02 -05:00
eric c395405f7d Merge branch 'master' of https://github.com/Gluejar/regluit 2012-01-27 21:18:20 -05:00
eric be988f43f3 minor Librarything tweaks 2012-01-27 21:18:00 -05:00
Raymond Yee 4bd25d4ea0 Merge branch 'production2' 2012-01-27 17:19:40 -08:00
Raymond Yee cadd242259 Merge branch 'production2' of github.com:Gluejar/regluit into production2 2012-01-27 16:22:41 -08:00
Raymond Yee 5fba8be6a6 Changed the URL so that "all collections" loaded from Librarything, not just "my library"
In add_related, make sure edition is not None before trying to add related editions
A demo test
2012-01-27 16:16:46 -08:00
Raymond Yee b3bfa2edc2 Added a site for ry-dyndns 2012-01-27 15:45:58 +00:00
eric a7d867bbf8 populate edition was never running for works imported from library thing. started saving lccn. 186 errors today 2012-01-27 07:10:21 -08:00
eric 6fffbcd3d0 added guard against concurrent threads adding same googlebooks id 2012-01-27 09:35:00 -05:00
eric 9500fb2b8f fixed bug where first_ebook() is always None 2012-01-26 17:20:14 -08:00
Raymond Yee dcf477c34a Adding a site for ry-dev to initial_data.json
Creating a separate celeryd_please.conf to handle please
Added SITE_ID to dev.py
More instructions for README.md
2012-01-26 07:29:46 -08:00
Raymond Yee 2173695bbd Merge branch 'production' 2012-01-20 16:41:20 -08:00
Raymond Yee a1e944b795 A round of changes to speed up /list/popular 2012-01-20 16:35:13 -08:00
eric 9d748c8e2d populate edition was never running for works imported from library thing. started saving lccn. 186 errors today 2012-01-19 23:20:06 -05:00
eric e268af16e1 fixed bug where first_ebook() is always None 2012-01-19 19:58:18 -05:00
Ed Summers db576571bb minor formatting changes 2012-01-17 23:22:07 -05:00
Ed Summers 23c3758e84 log content from http responses that are errors 2012-01-17 23:15:24 -05:00
eric 98a7c3f73b added googlebooks_id method on work, cleaned access 2012-01-17 16:28:58 -05:00
eric 45a02cbcaf this sort of dupe now prevented by an integrety constraint 2012-01-17 10:37:15 -05:00
Ed Summers 285be53900 only add to wishlist if an edition was found 2012-01-17 09:46:12 -05:00
Ed Summers 245fefe1f1 a management command to load a user wishlist based on a file of isbns 2012-01-17 09:42:16 -05:00
eric c3dcd3d294 fixed issues with null pubdates 2012-01-16 23:28:34 -05:00
eric 5dea6b7fea fixed same bug for library thing loading 2012-01-16 20:25:36 -05:00
eric 6f11308ab9 fixed goodreads loader 2012-01-16 19:34:35 -05:00
eric 789b3ec118 relax publisher and pubdate requirement on edition 2012-01-16 15:15:35 -05:00
eric 61b81219cb migrations off for dry runs 2012-01-16 13:31:12 -05:00
eric 7affe92c8d Merge branch 'generic_id' 2012-01-16 13:21:47 -05:00
eric 97c9c03ba7 get works with ebooks into unglued tab 2012-01-16 12:16:58 -05:00
Andromeda Yelton d50e9471a4 preview site will now show most-wished, not campaigns ending soonest 2012-01-15 18:03:54 -05:00
Raymond Yee 51cc7d4389 IMPORTANT: Transactions that are ACTIVE status must also have approved=True to be counted as an effectlvely active Transaction.
Changes in two tests are made to reflect this change.
2012-01-11 15:31:26 -08:00
eric 0d19018e62 api tests working; non-google id's working 2012-01-10 15:20:02 -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
eric eeb594588e Merge branch 'master' into generic_id 2012-01-07 17:46:29 -05:00
Raymond Yee eb147b3cd4 Added support for incomplete and completed payments in the PaymentManger query function 2012-01-03 14:49:37 -05:00
Raymond Yee 7c018687d0 Add a simple comment to list the possible states of a Campaign 2012-01-03 10:20:17 -05:00
eric e1cc56a163 added Identifier model 2012-01-02 17:22:25 -05:00
Andromeda Yelton fb6d715429 user now sees pledged indicator rather than remove-wishlist option for pledged works 2012-01-02 10:59:00 -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
eric 49ffafc838 fixed bug where social auth breaks if user also registers password
now, the password will get attached to the social auth account
2011-12-28 23:31:42 -05:00
eric 697ee04a43 added site fixtures to make email registration emails work 2011-12-28 12:34:41 -05:00
eric a931b9d2b3 same optimization in librarything loader 2011-12-22 14:51:12 -05:00
eric 68d6ef93fd General cleanup and optimization of goodreads loading 2011-12-22 14:29:46 -05:00
eric 4c50d53ad8 response from oath client doesn't need hard utf encoding! 2011-12-22 11:06:30 -05:00
eric ffe2ab5bd6 fixed Goodreads loading; unicode in exception message was a nono 2011-12-22 01:17:30 -05:00
Raymond Yee 47399ab23a Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 14:07:43 -05:00
Ed Summers 6952cbde52 require googlebooks_id to be unique on Edition. this may cause errors to pop up elsewhere when we have a race to add an edition 2011-12-20 12:57:17 -05:00
Ed Summers 9231923b88 remove duplicate editions 2011-12-20 12:37:50 -05:00
Ed Summers 19976b2520 added beginning of a management command to remove duplicate editions 2011-12-20 12:19:23 -05:00
Raymond Yee aab7b6f926 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-20 10:35:42 -05:00
Ed Summers 2d6a6de487 ElementTree.fromstring expects a string of utf8, not a unicode object, which works most of the time, but not if the UnicodeString contains some non-ascii data I guess. The test suite started failing with a UnicodeEncodeError: 'ascii' codec can't encode character u'\u2014' in position 12164: ordinal not in range(128), I think when the GR bookshelf used by this test changed to include some Unicode 2011-12-20 10:31:15 -05:00
eric d78a5cfe6c blindly trying what the error messages say to do 2011-12-19 23:45:44 -05:00
eric f81a4e8e6d removed isbn_10 column and fixed many isbn13 non-compliance issues
apply migrations!
2011-12-19 23:26:55 -05:00
Raymond Yee f1875201b3 Merge branch 'master' of github.com:Gluejar/regluit into payment 2011-12-19 13:23:40 -05:00
Ed Summers bf388a11b9 fixed subject test again 2011-12-19 02:34:29 -05:00
Ed Summers b6a4125e67 fixing subject test, removing settings test 2011-12-19 02:27:07 -05:00
Ed Summers 2417886169 removing 0014_populate_subjects migration since it is problematic to run with South ORM, instead have people run add_openlibrary management command 2011-12-19 02:20:24 -05:00
Ed Summers 55656e2d3d now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS! 2011-12-19 01:33:13 -05:00
Raymond Yee 7cc9a1047a Do ascii encoding of print message so that the print statement doesn't die on non-ascii words. 2011-12-14 18:04:09 +00:00
eric 7bfc4849a4 added a column to track amount remaining on a campaign; updated by the Transaction change signal 2011-12-14 00:53:03 -05:00
eric 56f8151ba3 moved transaction_change handler to payment package to make testing easier 2011-12-14 00:53:03 -05:00
eric 10ed085c29 corrected percent calculation in work.percent_unglued 2011-12-14 00:53:03 -05:00
eric deabe01385 moved as-yet unsaid campaign actions into their own table. Apply migrations! 2011-12-13 16:24:56 -05:00
Ed Summers e8339697f6 works are mono-lingual now. language is now a property of Work instead of Edition. YOU WILL NEED TO APPLY MIGRATIONS! 2011-12-13 09:55:26 -05:00
eric 5695aea5da restored missing "through" to model 2011-12-09 08:07:44 -05:00
eric 167dccf574 Wishlists are now filled using the Wishes intermediate table. It's named the same as previous intermediate table, and I've edited the migration so data is not lost.
Also, I've added methods od Wishlists to add and remove Works. There
are "source" and created columns on the Wishes table
2011-12-08 18:22:20 -05:00
eric 70d1eeca39 removed bad test 2011-12-06 10:45:11 -05:00
eric e603f5a3c6 updated tests to match new campaign model 2011-12-06 10:36:20 -05:00
eric b2eda1f562 added status column to Campaign model, wrote a South data migration
As always, it's not a bad idea to backup you database before doing a
migration!
2011-12-06 10:36:20 -05:00
Ed Summers 411a254ee6 got librarything, goodreads and openlibrary links working when ids are available, with fallbacks to isbn routing and canned search urls 2011-12-05 00:56:24 -05:00
Ed Summers 1d1a8e16ed order wishlist results alphabetically 2011-12-03 18:04:53 -05:00
eric 4899c140da Oh, the humanity! 2011-12-03 12:02:26 -05:00
eric 13d490b304 even more embarrassing spelling error 2011-12-03 11:29:13 -05:00
eric 2262e0e48d fixed embarrassing copy and past bug for users>5 2011-12-03 11:14:31 -05:00
Ed Summers 97daddea5d Merge branch 'master' of github.com:Gluejar/regluit 2011-12-02 23:08:10 -05:00
Ed Summers 641e4904d9 link to googlebooks 2011-12-02 23:07:55 -05:00
eric e0fbb3d324 Added Ungluers and facet display to CampaignListView 2011-12-02 22:53:39 -05:00
eric 7f4976bde5 added ungluers to WorkListViews 2011-12-02 22:32:25 -05:00
Ed Summers 5a02fb4ec5 persist goodreads and librarything identifiers when loading wishlists from there 2011-12-02 22:16:11 -05:00
Raymond Yee 2e28139c00 A stub signal for Transaction.post_save() event 2011-12-01 10:59:34 -08:00
Raymond Yee b8cebfa0dd Refining the interaction of Premium choice and pledge amount 2011-11-30 08:58:26 -08:00
eric 1fc644aacd implemented a minimum campaign term; other campaign management tweaks 2011-11-29 10:48:37 -05:00
Andromeda Yelton 440047145a making errors more obvious on campaign management page and goal more obvious on work page 2011-11-28 11:38:31 -05:00
Andromeda Yelton 0e33932435 improving display of hover state of book panel (still in progress) 2011-11-28 10:13:21 -05:00
eric d5bae40c00 refactored launchable into campaign model. fixed date camparison bug. moved target and deadline limits to settings file 2011-11-23 21:41:06 -05:00
Andromeda Yelton 24f9122a85 modified the name of a key in search.py for integration with book_panel, need to modify corresponding name in test 2011-11-23 13:18:32 -05:00
Andromeda Yelton 14a008421d refactored search.html to use book_panel.html. required altering labels of some data sources so that they have the same names when they hit book_panel regardless of where it's included from 2011-11-23 12:28:59 -05:00
Raymond Yee 5512f221db I think we need to change _last_change to something like _last_change_ so that the variable doesn't alreay exist in Work. Also return None if there are no campaigns. 2011-11-22 12:55:05 -08:00
Ed Summers 3b777f87aa allow empty publication date, also make sure test database uses charset utf8 or else tests will fail 2011-11-21 14:13:29 -05:00
Ed Summers d57f93f6f2 added new migrations 2011-11-21 11:29:37 -05:00
Ed Summers a98ce5373c removing migrations 2011-11-21 11:26:31 -05:00
eric 43d3f3f553 halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas! 2011-11-20 22:23:51 -05:00
eric 1189ab02c4 switched to using is_staff set by django admin to determine website "staff" (also fixed a bug from last commit) 2011-11-20 14:22:51 -05:00
eric c8cb7853c6 Sorry, wrong test! 2011-11-20 09:28:53 -05:00
eric cd8dc2d825 Oh yeah, the tests 2011-11-20 09:25:18 -05:00
eric 497d883a43 fixed no results bug in gluejar-search; started passing remote IP address to google api 2011-11-20 09:20:08 -05:00
eric a6bf130b24 Andromeda von Rightsholder can now open campaigns from her rightsholder tools page; apply migrations! 2011-11-19 21:22:54 -05:00
Ed Summers b798ef9912 added __unicode__ for wishlist 2011-11-19 12:07:44 -05:00
Ed Summers 8b1171a7e2 forgot to add migration 2011-11-19 11:56:00 -05:00
Ed Summers 7dd821fccb enabling admin, and added created column on models that did not have them 2011-11-19 11:55:35 -05:00
Ed Summers bb4bf65a9d disable admin until we can figure out why it overrides /accounts/password/change/ 2011-11-18 17:03:52 -05:00
Ed Summers 9d43fd89a5 need to add as a list 2011-11-18 16:40:31 -05:00
Ed Summers 8138f64742 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-18 16:37:27 -05:00
Ed Summers 8c92495a03 trying to enable some more models in admin 2011-11-18 16:26:13 -05:00
Raymond Yee 50ac0c6991 Added checking for non-978/979 ISBN-13 and also checks against converting 979 ISBN 13 to ISBN-10. 2011-11-18 11:25:13 -08:00
Raymond Yee 161e92877c Forgot to include core/isbn.py changes 2011-11-18 10:23:06 -08:00
Raymond Yee ee76eb136a Changed the behavior of __str__ and __unicode__ of ISBN to spit back a representation matching the type of the ISBN -- and not automatically push to ISBN 13 format 2011-11-18 10:21:29 -08:00
Raymond Yee a1eee9682c Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-18 10:03:36 -08:00
Raymond Yee bc771274e4 An ISBN class that will take ISBN-10 or ISBN-13, convert between formats, handles hyphenation, tested for equality, and validated
Corresponding tests show how to use the ISBN class
2011-11-18 10:01:37 -08:00
eric 6cc05817a8 woo hoo! autocomplete input on rightsholder creation form. uses app django-selectable 2011-11-18 09:24:31 -05:00
Raymond Yee 3fcc1b9947 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-18 06:15:06 -08:00
Raymond Yee 84c2b5bade Some first tests for Goodreads and Librarything 2011-11-18 06:14:33 -08:00
Ed Summers 267d3c5aef tried to speed up some queries 2011-11-17 22:11:40 -05:00
Raymond Yee ca526e1afb Basic tests for Goodreads and LibraryThing 2011-11-17 16:45:26 -08:00
Ed Summers 186823942f new initial migrations 2011-11-17 23:05:27 +00:00
Ed Summers f119c7f3a7 starting fresh with migrations 2011-11-17 23:05:01 +00:00
eric a720089525 unglue it admin users can now approve rightsholder claims! 2011-11-17 14:35:41 -05:00
Raymond Yee 603fa59906 Editing the migration to get rid of what seem to be repetitions of earlier migrations having to do with facebook, librarything 2011-11-17 08:08:12 -08:00
Raymond Yee 11027f6bc1 First attempt at placing a Librarything import button 2011-11-16 16:47:29 -08:00
Raymond Yee 5df81cc52e Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-16 11:58:39 -08:00
eric d5a2b88768 Awesome Unglue.it Administration page added; will require a migration to add claim status 2011-11-16 14:45:37 -05:00
Raymond Yee 3be4e6fab4 First pass at integrating LT into the UI 2011-11-16 10:20:10 -08:00
eric 2cc4d718a1 Added claim list on rh-tools. omitted claim display for non-rightsholders. fixed related name on claim model 2011-11-16 12:20:19 -05:00
Ed Summers 86565dba6d removed a conflicting migration. hopefully it will be this simple. 2011-11-15 21:13:42 -05:00
Raymond Yee 27d162c9d7 Now scraping LibraryThing view_style 5 to get at ISBNs of works -- as well as LC classification, subjects. Explicit parsing out of work_id and book_id 2011-11-15 17:14:28 -08:00
eric 354b46085f Approved rights holders get a claim form on work pages; still need to make a view that does the actual claiming 2011-11-15 18:20:29 -05:00
Raymond Yee f83f046c7a Make CeleryTask.function_args nullable: I forgot to commit migration 2011-11-15 13:50:04 -08:00
Raymond Yee 20b0ede3fc make the function_args nullable in the model for CeleryTask 2011-11-15 13:35:50 -08:00
Raymond Yee 45f58ae955 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	frontend/urls.py
2011-11-15 10:37:19 -08:00
eric 95f3991846 ungluer lists now shown in work view (the wished_by users) and search view( same as supporter) 2011-11-14 15:40:33 -05:00
eric 6a82ec5f1d explore column now shows up to 5 "randomly" chosen ungluers 2011-11-14 15:16:36 -05:00
eric 5211e774a8 fixed librarything username length. migrate your schemas! 2011-11-14 10:17:31 -05:00
eric db3163b01b added twitter account association and profile image acquisiton
also added goodreads association url to UI for good measure
2011-11-12 16:36:31 -05:00
eric f2ecff619f added pic_url to user profile. migrate your schemas! connect to facebook adds your facebook profile pic 2011-11-12 15:02:47 -05:00
eric 2e00f6bbd0 added facebook association 2011-11-12 13:58:31 -05:00
eric bc3b8333b6 added librarything_id and facebook_id to profile model, wired to supporter template; started faq 2011-11-11 22:51:22 -05:00
Raymond Yee c8c5bd08d8 First pass at parsing LibraryThing collections by scraping HTML -- try it out using the librarything_load_books_2.py command
e.g.,

django-admin.py librarything_load_books_2 rdhyee

The command doesn't load books yet but just displays some info
2011-11-11 18:42:48 -08:00
Ed Summers 08053cc4ba added my goodreads api key for please.unglueit.com 2011-11-11 17:33:58 -05:00
Raymond Yee 38105c3de9 First pass at writing the celery tasks to the db and displaying them. 2011-11-10 15:14:33 -08:00
Raymond Yee 374196d763 Refined model for CeleryTask 2011-11-10 09:33:22 -08:00
Raymond Yee df8d1d9506 Put more logging into Goodreads handling to try to debug why shelf loading not working in some cases. 2011-11-10 07:36:17 -08:00
Raymond Yee a959d00508 Experiments with creating tasks and seeing how to manage them, especially how to create a custom state to track status of tasks. 2011-11-09 17:31:31 -08:00
Raymond Yee 274d4f691c Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-08 09:51:54 -08:00
Raymond Yee 96939b59b7 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	settings/dev.py
2011-11-08 09:51:27 -08:00
Andromeda Yelton 2b063e78d1 merge conflicts 2011-11-07 16:16:36 -05:00
Andromeda Yelton abf3ec131e wiring supporter and search icons and percent unglued to live data 2011-11-07 16:12:53 -05:00
eric b644b062de added models for Claim and Rightsholder - be sure to migrate! 2011-11-07 15:42:03 -05:00
Ed Summers 110b996769 added logic to display ebooks, badly for now 2011-11-07 15:39:02 -05:00
Andromeda Yelton 7635c1a701 fixing image display in search panel view 2011-11-07 11:04:09 -05:00
Raymond Yee f98ed569c0 Added a simple adding task 2011-11-07 09:59:45 -05:00
Raymond Yee 2340ef05d4 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 17:51:39 -05:00
Raymond Yee f73aa1b570 Added grabbing of pdf ebooks corresponding to edition 2011-11-06 17:49:25 -05:00
Ed Summers e1ea725d0f ebooks must have a downloadUrl 2011-11-06 17:42:09 -05:00
Ed Summers 45045b4e44 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-06 16:33:17 -05:00
Ed Summers 22d904f1bf added ebook model and add_b_oclc 2011-11-06 16:33:04 -05:00
Andromeda Yelton 96a3039434 fixing bugs resulting from am addition of last_campaign method 2011-11-06 15:24:16 -05:00
Raymond Yee 323856b0c1 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 15:09:17 -05:00
Ed Summers 3915cef5d4 valid json (again) 2011-11-06 15:02:40 -05:00
Ed Summers 882a0490aa valid json (again) 2011-11-06 15:01:41 -05:00
Ed Summers dcc87644ab jiggering things around so that the premium fixture works 2011-11-06 14:58:51 -05:00
eric fdcc679d28 migration for premiums 2011-11-06 14:51:56 -05:00
Ed Summers 29afdb2ffd valid json 2011-11-06 14:49:33 -05:00
Raymond Yee be44e36c61 Another syntax error fixed 2011-11-06 14:43:10 -05:00
Raymond Yee 02de354ae2 syntax error fix 2011-11-06 14:41:14 -05:00
thatandromeda 6e81dce947 we need both last_campaign and last_campaign_status after all; template can't handle all the logic for status in event of last_campaign = None 2011-11-06 14:31:08 -05:00
thatandromeda 773789dc99 percent_unglued function should handle case where last_campaign returns None 2011-11-06 14:24:54 -05:00
thatandromeda c1db972208 last_campaign should return None when there's no campaign rather than a string of text only relevant in one place 2011-11-06 14:16:29 -05:00
eric 92b91d2dbe model for premiums 2011-11-06 14:04:39 -05:00
Raymond Yee 308730d90f Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 14:03:30 -05:00
Andromeda Yelton f428634bf7 adding campaign page with live data; working on ability to switch between list and panel views on supporter page 2011-11-06 14:02:29 -05:00
Raymond Yee 705876dd8b The shelf loading now uses the Oauth credential of the logged in user 2011-11-04 14:18:06 -07:00
Raymond Yee 820107bd4d Got oauth signing to work with goodreads reviews_list 2011-11-04 14:04:32 -07:00
Andromeda Yelton 2dcf1dfbee Merge branch 'master' of github.com:Gluejar/regluit 2011-11-03 16:30:36 -04:00