Commit Graph

340 Commits (09923c68e1021b08775259d182adfe3b1372811a)

Author SHA1 Message Date
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
Andromeda Yelton 2c6a7e6f94 book panel view of supporter page now half-done; visible at /supporter2/username 2011-11-03 16:28:53 -04:00
Raymond Yee 672b1b3b20 Implemented LibraryThing import as a command and separated out LT functionality into a separate module 2011-11-01 17:42:39 -07:00
Raymond Yee f7ea58a602 Integrated Goodreads shelf loading to wishlist into UI 2011-10-31 17:26:05 -07:00
Raymond Yee ed4ea516c2 Storing goodreads info in user.profile 2011-10-29 15:40:00 -07:00
Raymond Yee 07248f16c8 dded a command to load a shelf to a user's wishlist 2011-10-26 09:49:54 -07:00
Raymond Yee 4a98a96aac Added a command to load a shelf to a user's wishlist 2011-10-26 09:49:10 -07:00