75c32569e2
B2U campaign percentages
2013-08-08 22:32:58 -04:00
613c3770e0
Bake in CC Date concept according to blog post, up to campaign creation
...
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
2013-08-08 19:56:26 -04:00
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
0b0bd9c41f
[ #54240150 ] Changed ISBN of the Chinese book in https://github.com/Gluejar/regluit/blob/master/core/tests.py#L95 because old ISBN no longer in Google Book
2013-07-29 14:49:18 -07:00
a6f9e524e1
[Finishes #53514857 ] Change ISBNS of test editions
2013-07-16 16:08:20 -07:00
2a7a42fbfe
Merge branch 'master' into ebook_selling
...
Resolved Conflicts:
frontend/templates/download.html
frontend/views.py
static/css/enhanced_download.css
static/css/enhanced_download_ie.css
static/css/sitewide4.css
static/js/download_page.js
static/less/enhanced_download.less
static/less/enhanced_download_ie.less
static/less/sitewide4.less
2013-06-27 15:26:04 -04:00
5a207bf4e8
Merge pull request #181 from Gluejar/simpler_download
...
Simpler download. Yay.
2013-06-26 11:39:39 -07:00
f2f02237a8
fix KeyError at source, not in test
2013-06-26 14:36:04 -04:00
b063fe6c3f
don't fail for spurious reason
2013-06-26 11:25:35 -04:00
86caa9b3ed
Making changes to fix breakage in core.tests.BookLoaderTests.test_add_by_isbn
...
2000-07-01 -> 2000
Ace Trade -> Penguin
2013-06-24 08:04:36 -07:00
3c950966bc
Merge branch 'master' into simpler_download
2013-06-24 08:36:51 -04:00
1c86a0ae5a
I'm going to modify test for reflect readmill change -- it seems like there is no extra readmill button for test scenario
2013-06-20 14:17:47 -07:00
835ff4be8e
Rightsholder can upload ebook files and set buy-to unglue prices [ #51733385 ][ #51745045 ]
...
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
144599ac34
fix the download page tests
2013-04-27 16:58:11 -04:00
7c9973319d
donwload page changed, test should change to agree
2013-04-24 15:41:35 -04:00
a2606b2e08
move download count display to work infobox and rh_tools
2013-04-20 10:08:10 -04:00
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
4180569633
Merge branch 'master' into fix_google_id
2013-04-03 20:07:03 -04:00
cd7082a676
test the work identifier methods
2013-04-03 15:45:01 -04:00
56691cd3e0
make sure alias pubname is used for new, add tests
2013-03-27 12:51:10 -04:00
d6a8dedfaa
mailchimp ops now example.org aware, test users, now all changed to example.org
2013-03-06 09:39:06 -05:00
cc6a9b1200
Merge pull request #132 from Gluejar/mailchimp_integration
...
mailchimp integration [finish #37732465 ]
2013-03-05 19:14:09 -08:00
392a275ded
test that everything's chimpy
2013-03-04 17:19:39 -05:00
99c434d940
[ fix #45405325 ] fix merge subjects, also added test
2013-03-01 13:13:14 -05:00
df0c781f67
change instance for bookloader test -- old example no longer in Google Books
2013-02-18 09:17:15 -08:00
a726a11154
[ fix #41788889 ] google id for book changed
2012-12-31 10:10:24 -05:00
02dd7a55da
Merge branch 'campaign_close' into charge_failed
2012-11-15 14:38:23 -08:00
03a751626e
Stepping stone to tests that will allow the adjustment of localdatetime.now() so that we can simulate campaign closing
2012-11-15 14:37:04 -08:00
96b62aa163
basic skeleton for test based on loading fixture
...
keep the signals for create userprofile, wishlist, and credit from firing if fixtures being loaded
2012-10-31 11:08:46 -07:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
e23d706469
Added tests for campaign.clone and Premiums
2012-09-25 16:43:25 -04:00
e62484f46a
whoops wrong edition
2012-09-25 12:27:39 -04:00
2e23ddfd54
with format icons now in download page link counts are different
2012-09-25 11:10:23 -04:00
756c1da430
download page test needs to cover readmill addition and new unglued flag handling
2012-09-19 12:37:37 -04:00
8c030df830
adding some tests for my recent commits hooray
2012-08-29 15:56:14 -04:00
e76f30ed28
Lowering expected editiion and subject count for bookloader.add_by_googlebooks_id('c_dBPgAACAAJ') in the test
2012-07-30 08:23:38 -07:00
12671ddcdf
unpack openlibrary descriptions delivered as dicts [ #33377581 ]
2012-07-26 12:07:16 -04:00
0c0b807385
Adjusting number of editions required from at least 20 to at least 15 for test to pass (latest count 18)
2012-07-23 07:22:14 -07:00
6c7e9594c0
[ #33125113 ] Marking the language test for Cat's Eye as expected failure because I think Google has bad data for this work.
...
Worth looking at other books
2012-07-20 09:28:14 -07:00
9a985176bc
Fixed problems in tests stemming from an edition of Neuromancer no longer in Google Books -- switched to another one
...
We still have issues about language of editions for Cat's Cradle
2012-07-20 08:40:11 -07:00
e9e9ee135b
expect the test to succeed again
2012-06-21 23:20:57 -04:00
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
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
1bb459e71d
resolve test conficts
2012-05-25 14:54:08 -04:00
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
b3610e17f3
added hard updates of campaign objects
2012-05-25 13:52:25 -03:00
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
a830d5af48
eric wanted me to write a test so I did. tests percent_of_goal
2012-05-22 11:07:05 -04:00
c61bc9985d
test for factored license url [ #29884981 ]
2012-05-20 00:12:16 -04:00
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
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
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
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
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
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
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
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
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
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
e93a6d7523
[ #28945859 ] now pulling description from OL, looking for all editions
2012-05-06 22:31:38 -04:00
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
5f4f381e06
fix problem where Goodreads has started to return empty descriptions
2012-04-13 17:53:18 -04:00
1031a80a5e
Merge branch 'master' of github.com:Gluejar/regluit into payment
...
Conflicts:
core/signals.py
2012-04-04 10:08:59 -07:00
331d886a7c
need to rewrite cover image urls in googlebooks api search results too
2012-04-03 15:27:33 -04:00
faf095408c
fixed campaign tests to include claim and rightsholder
2012-04-03 10:45:48 -04:00
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
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
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
65e169a8e3
changed test isbns to deal with ThingISBN issue
2012-02-29 08:51:36 -05:00
eebeb2476f
finish committing all changes
2012-02-28 17:28:58 -05:00
4b943d1acb
fixed bug where edition.public_domain never gets set
2012-02-23 18:51:29 -05:00
1751627ad6
compare the url for the ebooks that come back on id and format alone
2012-02-21 09:39:36 -08:00
471cb62fd2
changed core.tasks to not use models
2012-02-16 13:19:36 -05:00
25f6bd5e07
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-02-15 08:46:17 -08:00
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
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
107e6ffd0c
apply migrations! added num_wishes on work model. "popular" page now 10x faster
2012-02-11 14:15:06 -05:00
07e578699d
Added WasWork model to track deleted works. Apply migrations!
2012-02-09 22:30:33 -05:00
346bb79e38
merge comments when works are merged
2012-02-09 20:51:10 -05:00
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
08e10fb0ed
added test for pagination
2012-02-04 16:22:04 -08:00
ac4a6b7570
Merge branch 'master' of github.com:Gluejar/regluit
2012-02-04 16:07:05 -08:00
f55330365e
added endless scroll for search results
2012-02-04 16:06:53 -08:00
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
b584684390
add "update edition" method in bookloader
2012-02-02 09:05:41 -05:00
85366cc21a
handle locale in language
2012-01-28 22:16:14 -05:00
c3dcd3d294
fixed issues with null pubdates
2012-01-16 23:28:34 -05:00
7affe92c8d
Merge branch 'generic_id'
2012-01-16 13:21:47 -05:00
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
0d19018e62
api tests working; non-google id's working
2012-01-10 15:20:02 -05:00
0b91017dd5
Did what edso told me not to do- re-architected db to use generic ids
2012-01-09 13:55:22 -05:00
f81a4e8e6d
removed isbn_10 column and fixed many isbn13 non-compliance issues
...
apply migrations!
2011-12-19 23:26:55 -05:00
bf388a11b9
fixed subject test again
2011-12-19 02:34:29 -05:00
b6a4125e67
fixing subject test, removing settings test
2011-12-19 02:27:07 -05:00
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
55656e2d3d
now getting subjects from openlibrary instead of from googlebooks. You will need to APPLY MIGRATIONS!
2011-12-19 01:33:13 -05:00
deabe01385
moved as-yet unsaid campaign actions into their own table. Apply migrations!
2011-12-13 16:24:56 -05:00
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
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
70d1eeca39
removed bad test
2011-12-06 10:45:11 -05:00
e603f5a3c6
updated tests to match new campaign model
2011-12-06 10:36:20 -05:00
5a02fb4ec5
persist goodreads and librarything identifiers when loading wishlists from there
2011-12-02 22:16:11 -05:00
0e33932435
improving display of hover state of book panel (still in progress)
2011-11-28 10:13:21 -05:00
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
c8cb7853c6
Sorry, wrong test!
2011-11-20 09:28:53 -05:00
cd8dc2d825
Oh yeah, the tests
2011-11-20 09:25:18 -05:00
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
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
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
84c2b5bade
Some first tests for Goodreads and Librarything
2011-11-18 06:14:33 -08:00
ca526e1afb
Basic tests for Goodreads and LibraryThing
2011-11-17 16:45:26 -08:00
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
f73aa1b570
Added grabbing of pdf ebooks corresponding to edition
2011-11-06 17:49:25 -05:00
e1ea725d0f
ebooks must have a downloadUrl
2011-11-06 17:42:09 -05:00
22d904f1bf
added ebook model and add_b_oclc
2011-11-06 16:33:04 -05:00
76b70f3676
minor doc fix
2011-10-18 23:47:48 -04:00
5c88878a30
added merge_works function for merging the one work into another when adding related editions based on ThingISBN. also added a test that makes sure related campaigns and wishlists are appropriately updated.
2011-10-18 23:00:07 -04:00
f92f39dc35
don't run settings.me/settings.dev alignment if we can't import modules
2011-10-18 08:02:49 -07:00
38166177c4
First cut of PaymentDetails
...
small fix to explicitly calculate URI of PayPalIPN url pattern
update status of a PAY transaction to CREATED instead of leaving as None
2011-10-14 10:52:17 -07:00
d79b228d39
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
...
Conflicts:
core/tests.py
2011-10-14 07:42:33 -07:00
93404d42ff
when a user views another users contributor page, works they already have on their wishlist show up that way instead of as "add to wishlist"
2011-10-14 14:18:38 +00:00
ffe84fa46a
got bookloader.add_related working w/ some tests. also added Edition.language because it looks like it will be useful to know.
2011-10-14 00:02:19 -04:00
e8c8f2dfc2
Got rid of a lot of code that was there to help RY learn about class based generic views.
...
Inserted a setting for the Gluejar paypal account email.
2011-10-13 19:16:28 -07:00
983c045a8c
added bookloader.thingisbn and a test
2011-10-12 21:59:46 -04:00
030f2fbae7
needed to start over with clean slate for migrations since they were not being run as part of test suite, which was covering up some errors in the migrations
2011-10-10 22:31:24 -04:00
1b54ba5f6b
make sure there are some hits when adding a book by isbn
2011-10-10 17:26:38 -04:00
ca2fc9afdc
I've wrapped Campaign.status with a property decorator -- access campaign status as campaign.status not campaign.status() now.
2011-10-10 13:35:22 -07:00
c0f4ad11c3
merged upstream changes
2011-10-10 13:09:00 -04:00
70a620b27f
moved to using googlebooks api for data. required moving authors and subjects to be associated to editions, since we google books does not have a notion of a work
2011-10-10 12:57:10 -04:00
a905d6c820
added test of required fields for Campaign
2011-10-09 14:48:03 -04:00
90859811a9
simplified some things since the database schema does not allow for campaigns that lack a name, description or work
2011-10-09 14:27:27 -04:00
711546f414
First pass at incorporating status into Campaign
2011-10-07 20:11:57 -07:00
68b94f768f
Changes in progress to the model
2011-10-07 14:17:54 -07:00
53ceeb800c
adjusted test to expect the title and isbns in the new location
2011-09-29 19:07:16 +00:00
409df080ce
got search passably working and a somewhat functional ajax add to list
2011-09-29 02:23:50 -04:00
2c7f858125
handle duplicates using openlibrary ids for edition, work and author
2011-09-10 11:36:38 +00:00
0f5ff789ff
lots of changes to support dynamically loading from openlibrary based on an isbn...which still needs some work to prevent duplication
2011-09-09 01:38:28 -04:00
19d73f8bf8
added core edition googlebooks lookup and test, plus the start of a load_books management command
2011-09-07 05:34:03 -04:00
139a866bf6
setup api, core and frontend apps, also added initial homepage template from stefan
2011-08-30 23:46:55 -04:00
eric
Raymond Yee
Andromeda Yelton
Ed Summers