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
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
a30976373f
better default cover for works with no google id [ #29488053 ]
2012-05-11 22:46:03 -04:00
4c7fef1ce5
typo was bugging me
2012-05-11 21:35:52 -04:00
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
2012-05-09 09:37:57 -04:00
8a8f82a9a9
[ #29272807 ] Forgot to make core.models.Key.name unique
2012-05-08 16:47:07 -07: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
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04: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
900bb88eaf
[ #28945859 ] create description on work, migrate data
2012-05-06 23:01:56 -04:00
e93a6d7523
[ #28945859 ] now pulling description from OL, looking for all editions
2012-05-06 22:31:38 -04:00
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
bbb5da7186
fixed lower case format values
2012-05-02 12:32:11 -04:00
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
147808bd88
[finish #27470199 ] inactivate checked premium button no longer shows if there are no checked premiums
2012-04-05 22:44:45 -04:00
be909bba69
change language on claim status [accept #27384493 ]
2012-04-05 11:58:26 -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
8cf4209b54
removed comments
2012-04-03 15:54:41 -04:00
7cb3c038bd
Migrating existing twitter pic urls
...
MIGRATION required
Conflicts:
core/models.py
2012-04-03 11:54:20 -07:00
df36d8bf65
save https url for twitter avatar
2012-04-03 14:46:31 -04:00
0f0ef412eb
Computing the twitter picture
2012-04-03 11:29:26 -07:00
cd41708237
migration to convert facebook avatar urls to https
2012-04-03 14:10:56 -04:00
5e25f2f90a
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-03 13:56:25 -04:00
1187a346ee
use https urls for google books cover images
2012-04-03 13:55:45 -04:00
86834f5e99
remove dead import
2012-04-03 11:47:41 -04:00
c90c42a2e8
linefeeds
2012-04-03 11:17:59 -04:00
aab0c47eeb
reconcile linefeeds
2012-04-03 11:10:49 -04:00
7cca21a4fb
merge changes
2012-04-03 12:04:12 -03:00
12434c7c09
more resolving conflicts
2012-04-03 10:58:27 -04:00
0319185251
resolve conflicts
2012-04-03 10:54:31 -04:00
6f1ccde928
moved notify_active_campaign into model, removed redundant context
2012-04-03 10:45:12 -04:00
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
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
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
679f797b74
Merge github.com:Gluejar/regluit
2012-04-02 14:17:28 -04:00
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
55b3e8398e
Hooking in djcelery admin to our admin interface
...
adding CeleryTask to the admin interface
2012-03-30 12:27:35 -07:00
619d37e0a0
blank rights holder name on rh_admin page should not validate
2012-03-28 14:12:10 -04:00
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
0f61bd8d66
added license selection to campaigns. Simple migration to apply.
2012-03-23 12:30:49 -04:00
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
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
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
8dea738331
fixed stupid error removing et al.
2012-03-05 17:15:23 -05:00
f84c6101d4
removed "et al." from work.author() because it was almost always wrong
2012-03-05 11:12:41 -05:00
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
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
0380ae838a
fixed error in Edition.get_by_isbn class method
2012-02-09 20:49:52 -05:00
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
e268af16e1
fixed bug where first_ebook() is always None
2012-01-19 19:58:18 -05:00
98a7c3f73b
added googlebooks_id method on work, cleaned access
2012-01-17 16:28:58 -05:00
c3dcd3d294
fixed issues with null pubdates
2012-01-16 23:28:34 -05:00
789b3ec118
relax publisher and pubdate requirement on edition
2012-01-16 15:15:35 -05:00
7affe92c8d
Merge branch 'generic_id'
2012-01-16 13:21:47 -05:00
97c9c03ba7
get works with ebooks into unglued tab
2012-01-16 12:16:58 -05:00
d50e9471a4
preview site will now show most-wished, not campaigns ending soonest
2012-01-15 18:03:54 -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
eeb594588e
Merge branch 'master' into generic_id
2012-01-07 17:46:29 -05:00
eb147b3cd4
Added support for incomplete and completed payments in the PaymentManger query function
2012-01-03 14:49:37 -05:00
7c018687d0
Add a simple comment to list the possible states of a Campaign
2012-01-03 10:20:17 -05:00
e1cc56a163
added Identifier model
2012-01-02 17:22:25 -05:00
fb6d715429
user now sees pledged indicator rather than remove-wishlist option for pledged works
2012-01-02 10:59:00 -05:00
9d6066c929
catch IndexErrors to fix HermanCain bug; there is a work with zero editions
2011-12-31 13:48:54 -05:00
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
f81a4e8e6d
removed isbn_10 column and fixed many isbn13 non-compliance issues
...
apply migrations!
2011-12-19 23:26:55 -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
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
10ed085c29
corrected percent calculation in work.percent_unglued
2011-12-14 00:53:03 -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
5695aea5da
restored missing "through" to model
2011-12-09 08:07:44 -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
e603f5a3c6
updated tests to match new campaign model
2011-12-06 10:36:20 -05:00
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
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
1d1a8e16ed
order wishlist results alphabetically
2011-12-03 18:04:53 -05:00
641e4904d9
link to googlebooks
2011-12-02 23:07:55 -05:00
5a02fb4ec5
persist goodreads and librarything identifiers when loading wishlists from there
2011-12-02 22:16:11 -05:00
b8cebfa0dd
Refining the interaction of Premium choice and pledge amount
2011-11-30 08:58:26 -08:00
1fc644aacd
implemented a minimum campaign term; other campaign management tweaks
2011-11-29 10:48:37 -05:00
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
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
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
43d3f3f553
halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas!
2011-11-20 22:23:51 -05:00
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
a6bf130b24
Andromeda von Rightsholder can now open campaigns from her rightsholder tools page; apply migrations!
2011-11-19 21:22:54 -05:00
b798ef9912
added __unicode__ for wishlist
2011-11-19 12:07:44 -05:00
7dd821fccb
enabling admin, and added created column on models that did not have them
2011-11-19 11:55:35 -05:00
bb4bf65a9d
disable admin until we can figure out why it overrides /accounts/password/change/
2011-11-18 17:03:52 -05:00
9d43fd89a5
need to add as a list
2011-11-18 16:40:31 -05:00
8c92495a03
trying to enable some more models in admin
2011-11-18 16:26:13 -05:00
267d3c5aef
tried to speed up some queries
2011-11-17 22:11:40 -05:00
a720089525
unglue it admin users can now approve rightsholder claims!
2011-11-17 14:35:41 -05:00
d5a2b88768
Awesome Unglue.it Administration page added; will require a migration to add claim status
2011-11-16 14:45:37 -05:00
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
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
20b0ede3fc
make the function_args nullable in the model for CeleryTask
2011-11-15 13:35:50 -08:00
45f58ae955
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-15 10:37:19 -08:00
5211e774a8
fixed librarything username length. migrate your schemas!
2011-11-14 10:17:31 -05:00
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
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
2e00f6bbd0
added facebook association
2011-11-12 13:58:31 -05:00
bc3b8333b6
added librarything_id and facebook_id to profile model, wired to supporter template; started faq
2011-11-11 22:51:22 -05:00
08053cc4ba
added my goodreads api key for please.unglueit.com
2011-11-11 17:33:58 -05:00
374196d763
Refined model for CeleryTask
2011-11-10 09:33:22 -08:00
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
2b063e78d1
merge conflicts
2011-11-07 16:16:36 -05:00
abf3ec131e
wiring supporter and search icons and percent unglued to live data
2011-11-07 16:12:53 -05:00
b644b062de
added models for Claim and Rightsholder - be sure to migrate!
2011-11-07 15:42:03 -05:00
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
45045b4e44
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-06 16:33:17 -05:00
22d904f1bf
added ebook model and add_b_oclc
2011-11-06 16:33:04 -05:00
96a3039434
fixing bugs resulting from am addition of last_campaign method
2011-11-06 15:24:16 -05:00
dcc87644ab
jiggering things around so that the premium fixture works
2011-11-06 14:58:51 -05:00
be44e36c61
Another syntax error fixed
2011-11-06 14:43:10 -05:00
02de354ae2
syntax error fix
2011-11-06 14:41:14 -05:00
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
773789dc99
percent_unglued function should handle case where last_campaign returns None
2011-11-06 14:24:54 -05:00
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
92b91d2dbe
model for premiums
2011-11-06 14:04:39 -05:00
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
2dcf1dfbee
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-03 16:30:36 -04:00
2c6a7e6f94
book panel view of supporter page now half-done; visible at /supporter2/username
2011-11-03 16:28:53 -04:00
ed4ea516c2
Storing goodreads info in user.profile
2011-10-29 15:40:00 -07:00
a4dd33b047
Displaying some of the books from user shelf.
2011-10-25 16:07:44 -07:00
260a8ffa4d
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-25 07:11:50 -07:00
559ff63aa3
added homepage url and twitter id to user profile model and form; reverted signalling
...
relying on signals to ensure that there's always a profile record
turned out to be a bad idea; django social auth signals are poorly
architected for this; and so it doesn't work. Catching exceptions
worked just fine, so I went back to that. Homepage and twitter buttons
now show only if they've been entered in settings. Twitter handle works
with or without '@' entered.
2011-10-24 23:32:32 -04:00
809517e99a
Ooops...forgot other files I had actually changed.
2011-10-24 18:29:01 -07:00
246924c03f
still merging changes after internet librarian
2011-10-21 15:35:31 -04:00
c7a760b4d3
added last campaign method to Work class to help with status display in frontend
2011-10-21 14:47:23 -04:00
e41e1e7b6d
just merging my local codebase post-internet librarian...
2011-10-21 12:51:07 -04:00
0c1411f2e8
added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend
2011-10-19 23:31:16 -04:00
0d21e77fd3
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-17 07:23:59 -07:00
491914a531
trying to fix campaign constraints with a migration
2011-10-14 19:37:22 +00: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
b045f9388a
typo fix
2011-10-14 11:28:41 -03: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
a468012270
created methods to allow front end to see last campaign and percent unglued
2011-10-14 09:43:30 -04: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
319906774c
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-13 14:25:51 -07:00
c0bd998732
First attempt to write out transactions associated with Campaign
2011-10-13 10:28:23 -07:00
da905147d9
added related_name to UserProfile to facilitate display of profile info
2011-10-13 12:22:38 -04:00
5e9439b965
reduced number of queries needed when displaying when a book is already on a user wishlist
2011-10-10 18:08:53 -04:00
1b54ba5f6b
make sure there are some hits when adding a book by isbn
2011-10-10 17:26:38 -04:00
67a5731592
I had forgotten the migrations for fields to support Campaign.status -- they are included here.
...
Now, Campaign.current_total is a property holding current amount of $ pledged/authorized.
2011-10-10 13:56:53 -07:00
461d813f6a
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-10 20:40:28 +00:00
89277a5e34
use textfield instead of charfield(10000) since Amazon RDS does not like them
2011-10-10 20:40:19 +00: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
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
d67d77a9a0
Changed currency amounts to DecimalField in core and payment
...
Added south migrations to payment
Changed print statements to logger.info in payment
Added primitive paymentcomplete page in payment
2011-10-05 17:56:20 -07:00
a4344e0afa
didn't need django-profiles at all, Sorry!
2011-10-03 17:39:54 -04:00
73c4ebde29
allow username setting and tagline in profile
...
started work on user profiles, with "tagline" field
the first a user signs in this google, they are redirected to a page
where they can set their username
2011-10-03 12:36:22 -04:00
76e3b193d7
fixed failing tests related to interplay between django_extensions and south
2011-09-29 21:57:12 -04:00
409df080ce
got search passably working and a somewhat functional ajax add to list
2011-09-29 02:23:50 -04:00
f8095e9513
added and used Campaign.cover_image_small
2011-09-27 09:27:47 +00:00
6d6af629f4
added some api unit tests
2011-09-15 22:05:47 -04:00
7720a73fb0
beginnings of a user wishlist display...
2011-09-12 01:53:54 -04:00
67ef77a757
added management command to create random campaigns for any works that lack a campaign
2011-09-12 00:04:22 -04:00
1b5472f819
extra space
2011-09-10 11:41:36 +00:00
2c7f858125
handle duplicates using openlibrary ids for edition, work and author
2011-09-10 11:36:38 +00:00
c30d37064d
fall back to isbn-13 lookup on open library if isbn-10 is not there
2011-09-09 18:27:29 +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
0ce0369792
small style changes, and signal to update email if available from facebook
2011-09-06 03:50:38 +00:00
79f9f88213
added wishlist model, and a simplistic module books.py for looking up books by isbn at googlebooks and openlibrary
2011-09-02 00:10:54 -04:00
139a866bf6
setup api, core and frontend apps, also added initial homepage template from stefan
2011-08-30 23:46:55 -04:00
Andromeda Yelton
eric
Raymond Yee
Raymond Yee
Ed Summers
Andromeda Yelton