5a8d7e8fa3
put a real query into landing page campaign slider
2011-12-08 08:10:58 -05:00
d00adef207
campaign searches now use the status field
2011-12-06 16:37:03 -05:00
3f8c6321c7
Merge github.com:Gluejar/regluit
2011-12-06 15:08:55 -05:00
2396a3ff69
now there are book panels on the landing page with real (albeit silly) data. hover state of panels not working yet.
2011-12-06 15:08:36 -05:00
2adc23b380
when a lookup on openlibrary fails, fall back to doing a search
2011-12-06 09:53:53 -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
97daddea5d
Merge branch 'master' of github.com:Gluejar/regluit
2011-12-02 23:08:10 -05:00
641e4904d9
link to googlebooks
2011-12-02 23:07:55 -05:00
e0fbb3d324
Added Ungluers and facet display to CampaignListView
2011-12-02 22:53:39 -05:00
7f4976bde5
added ungluers to WorkListViews
2011-12-02 22:32:25 -05:00
34dd5237af
merged with raymond's commit
2011-12-02 19:37:27 -05:00
dd6add1e44
Implemented WorkListView- does popular and recommended lists
2011-12-02 19:29:23 -05:00
87f07bd9c3
removed "closest" campaign list; added most pledges list and biggest campaign list
2011-12-01 17:32:53 -05:00
68b0d4b73a
implemented a generic view class for campaigns.
...
Ending and newest views are reverse sorted. campaign status is dealt
with except for successful campaigns
2011-12-01 13:17:33 -05:00
f094efdca2
removed superfluous "shared_works" code
...
this is more efficiently done by accessing request.user.wishlist in the
templates.
2011-12-01 08:47:58 -05:00
b8cebfa0dd
Refining the interaction of Premium choice and pledge amount
2011-11-30 08:58:26 -08:00
b44379e6cd
First pass at tying the premium selected and the pledge amount
2011-11-29 18:02:51 -08:00
9cbcea0f72
the open campaign form now automatically sets the end date and target to allowed values
2011-11-28 23:37:31 -05:00
57640ec7b2
First pass at unwiring campaign_detail from the real pledge view.
2011-11-28 15:39:06 -08:00
f96b5e4637
fixed bug where anonymous user can't view work page
2011-11-26 17:09:33 -05:00
b398a948dc
refactored campaign management savable constraints out of view and into form
2011-11-25 21:23: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
83b006b2d3
Turning off embedded PayPal UI to see whether paypal redirect works properly on please
2011-11-23 13:14:39 -08:00
38d38ff844
I keep forgetting to import sys
2011-11-23 10:54:02 -08:00
0ec0416c0f
Print out to stderr the PayPal URL
2011-11-23 10:50:29 -08:00
017fb9fac9
Merge branch 'master' of github.com:Gluejar/regluit
2011-11-23 12:29:15 -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
20cc607193
claim form now uses ModelChoiceField; tests for previous claims
2011-11-23 12:23:53 -05:00
4cfabf6efe
Turning on embedded view to test
2011-11-22 14:17:54 -08:00
9b815e7e28
Merge branch 'master' of github.com:Gluejar/regluit into payment
2011-11-22 11:53:06 -08:00
979a403a06
Merge branch 'jkace' of github.com:Gluejar/regluit into payment
...
Conflicts:
frontend/templates/campaign_detail.html
frontend/views.py
2011-11-22 11:30:45 -08:00
47754ddd6c
now you can get embed code from the work page
2011-11-22 14:28:27 -05:00
5f4496a290
Merge branch 'master' of github.com:Gluejar/regluit into campaign_widget
2011-11-22 06:45:07 -08:00
58eb67e0aa
Adding code to support embedded payments
2011-11-22 06:14:58 -05:00
0bad939bfb
Though the form is ugly, a campaign manager can now launch a campaign and set info
...
I also learned what it means when a form is bound to a model object
2011-11-22 00:28:16 -05:00
78339e3de5
Added a rough textarea for someone to copy embedding iframe for widget
2011-11-21 18:06:44 -08:00
8008a5df51
added /googlebooks/{googlebooks_id}/ route which will add the book to gluejar and redirect to the new work url, for use on the search results page
2011-11-21 20:12:13 -05:00
6e5d51f24f
is_staff, not is_staff()
2011-11-21 15:08:28 -05:00
495f447b1a
now the supporters tab on the work page is populated
2011-11-21 13:06:23 -05:00
44e14ab2a8
pushed some logic into views so that work page will be making fewer db calls on net
2011-11-21 10:51:50 -05: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
497d883a43
fixed no results bug in gluejar-search; started passing remote IP address to google api
2011-11-20 09:20:08 -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
e5eaf14ad0
prettied up logins. fixed not-logged-in on admin bug. provided path to password reset for social auth users
2011-11-18 19:50:47 -05:00
6a9a213632
added pagination with django-endless-pagination
2011-11-17 23:09:23 -05:00
a720089525
unglue it admin users can now approve rightsholder claims!
2011-11-17 14:35:41 -05:00
7b5b1456dc
Since the librarything key is being used right now only for a librarything debug page, I've added exception handling in case there is no settings with a librarything api key.
2011-11-17 07:40:40 -08:00
11027f6bc1
First attempt at placing a Librarything import button
2011-11-16 16:47:29 -08:00
a22d23b184
The setting page now sends Goodreads auth to /goodreads/auth instead of calling Goodreads immediately to generate an auth request
2011-11-16 14:16:57 -08:00
3ebcf2edae
Wired Goodreads authorization into the supporter settings panel.
2011-11-16 12:45:33 -08:00
5df81cc52e
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-16 11:58:39 -08:00
d5a2b88768
Awesome Unglue.it Administration page added; will require a migration to add claim status
2011-11-16 14:45:37 -05:00
3be4e6fab4
First pass at integrating LT into the UI
2011-11-16 10:20:10 -08:00
6a2e690f18
claim form now creates a claim
2011-11-16 00:22:29 -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
daef075f5b
Fixing the incorrect passing of a Goodreads shelf name -- and also incorrect display of number of books on wishlist.
2011-11-15 12:51:38 -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
64bf1dc57f
improving url encoding of parameters to handle spaces
2011-11-15 11:47:47 -05:00
fdd8e55d9f
merging conflicts after creating workstub page
2011-11-15 11:32:30 -05:00
4424ee513f
titles on search results now link to work stub page
2011-11-15 11:27:32 -05:00
0328430169
first cut at UI for unglue.it admins to create rights holders and delegate ownership
2011-11-14 23:28:55 -05:00
4e2e460903
added rudimentary view of subjects to get an idea of what is in there already
2011-11-14 21:13:39 -05:00
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
6a82ec5f1d
explore column now shows up to 5 "randomly" chosen ungluers
2011-11-14 15:16:36 -05:00
4c65a11696
de-association from twitter and facebook are now supported
2011-11-14 13:23:26 -05:00
38105c3de9
First pass at writing the celery tasks to the db and displaying them.
2011-11-10 15:14:33 -08:00
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
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
49aca6428c
The /pledge page now has the correct radio button to correpond to the premium clicked on.
...
HOWEVER, there's no enforcement currently of the pledge amount to be the same as the premium clicked on.
Also, no form validation on pledge page yet too.
2011-11-09 10:05:03 -08:00
3a7ba8cb45
fixed bug https://www.pivotaltracker.com/story/show/20482327
...
also added error output on profile edit form
2011-11-09 12:24:26 -05:00
7cf40e88de
need to import Q
2011-11-07 16:04:37 -05:00
a40cab0184
First take on integrating pledge
2011-11-07 16:01:08 -05:00
110b996769
added logic to display ebooks, badly for now
2011-11-07 15:39:02 -05:00
6fe1ad049c
pull in all premiums
2011-11-07 10:18:46 -05:00
3bd3467152
need pass premiums to the template
2011-11-07 09:50:26 -05:00
7c38ff7509
wired in setup_campaign
2011-11-06 18:56:33 -05:00
09fd66b107
need to pass premiums off to the work template if there is an active campaign
2011-11-06 18:38:33 -05:00
214e1c5ff8
pull in premiums from the campaign
2011-11-06 17:44:50 -05:00
e76df1d76a
removed old work view and converted campaign view to work view
2011-11-06 16:46:46 -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
91c3ccb0e7
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-02 16:47:12 -07:00
0b891cc8b5
pages we need but do not yet have now link to stubs
2011-11-02 15:40:43 -04:00
fa1806759b
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-01 14:24:18 -07:00
c139e4dcfc
adding option for supporters to pledge anonymously
2011-11-01 17:08:09 -04:00
60f29fc98c
needed some exception handling
2011-11-01 16:21:38 -04:00
90cfdb9007
Added ability to clear wishlist
2011-11-01 10:41:39 -07:00
6f1ebb3247
Embedding api_key and username to get a functioning API call into goodreads_display.html
2011-11-01 09:50:05 -07:00
f7ea58a602
Integrated Goodreads shelf loading to wishlist into UI
2011-10-31 17:26:05 -07: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
1aa6dff8f7
First pass at reading list of books from user
2011-10-25 14:20:10 -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
7c645886bd
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-10-24 18:53:23 -07:00
809517e99a
Ooops...forgot other files I had actually changed.
2011-10-24 18:29:01 -07:00
b1cce24154
using post_save signal to make sure every user has a profile
2011-10-24 13:36:26 -04:00
e6216e35ac
creates a profile if there's not one already
2011-10-23 14:40:06 -04:00
9901408b00
added list of supporters to the work page, just as a proof of concept more than anything.
2011-10-20 18:16:42 +00:00
e164744872
order editions by most recent to oldest
2011-10-20 05:42:49 +00: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
d9e4b06f99
don't render settings on somebody else's supporter page
2011-10-19 12:55:48 -04:00
74e6f7a374
wired user profile edit form to supporter page
...
you can now edit tagline from supporter page
2011-10-19 03:13:29 -04:00
8cab4dc425
First pass integration of preapproval into campaign pledge form
2011-10-18 16:27:20 -07:00
8d27cfc89e
Merge branch 'master', remote branch 'origin' into payment_integration
2011-10-18 07:43:42 -07:00
d09bc33989
fix for https://www.pivotaltracker.com/story/show/19784723
2011-10-17 18:16:34 +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
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
5138e3d817
added back a search box so at least we can search for books to add to a wishlist while logged in, until we know where the search box should go
2011-10-13 22:32:30 -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
319906774c
Merge branch 'master' of github.com:Gluejar/regluit into payment_integration
2011-10-13 14:25:51 -07:00
e0f1ef50cc
Rewrote pledging to a campaign to integrate the testview into logic of CampaignFormView directly.
...
Allow configuration of where PayPal should return after transaction is completed.
2011-10-13 14:13:37 -07:00
da3b41af9d
fixing date format
2011-10-13 12:55:44 -04:00
206b722c5d
Added logic to generate backed/backing/wished data for badge display
2011-10-13 12:23:57 -04:00
f01d0c4df3
First cut at doing payment integration and understanding how to use class-based generic views
2011-10-12 10:47:48 -07:00
7e4f0a222b
Ooops....forgot some files in previous commit
2011-10-11 10:03:40 -07: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
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
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
dea578e019
bugfix for https://www.pivotaltracker.com/story/show/19054387
2011-09-30 01:01:28 +00:00
3f1eae3105
remove from wishlist functionality
2011-09-29 16:42:19 +00:00
9a44cfc436
added remove from wishlist
2011-09-29 11:44:03 +00:00
dde1253dea
removed print statements
2011-09-29 02:30:13 -04:00
409df080ce
got search passably working and a somewhat functional ajax add to list
2011-09-29 02:23:50 -04:00
23c4c48946
simplified privacy view to use direct_to_template generic view; now use render() from django 1.3 which is easier
2011-09-28 21:54:50 -04:00
8a9f785c4e
started adding back some search functionality
2011-09-29 01:36:47 +00:00
195f6db360
redirect to supporter page if logged in
2011-09-27 09:27:15 +00:00
ac5e372131
new designs for home and supporter pages, take 1
2011-09-21 11:11:36 -04:00
a8dffead58
privacy policy now displays in footer
2011-09-13 14:35:06 -04:00
bb4003ecab
should have been supporter not contributor ...
2011-09-12 18:20:36 +00:00
ab3216f778
renamed user view to contributor, since that is what eric has been calling it
2011-09-12 15:23:33 +00:00
962543c541
need to distinguish between the user being viewed (subscriber for now) and the logged in user
2011-09-12 15:13:21 +00:00
7720a73fb0
beginnings of a user wishlist display...
2011-09-12 01:53:54 -04:00
4352743f13
initial pass at pulling in stefan's book panel templates
2011-09-11 23:44:21 -04:00
6bd5824fc4
introduced django-registration for user management
2011-09-04 00:21:51 -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
Andromeda Yelton
Ed Summers
Raymond Yee
Jason
Andromeda Yelton