eric
|
34dd5237af
|
merged with raymond's commit
|
2011-12-02 19:37:27 -05:00 |
|
eric
|
dd6add1e44
|
Implemented WorkListView- does popular and recommended lists
|
2011-12-02 19:29:23 -05:00 |
|
eric
|
569342c8a1
|
removed counter on search and cleaned js ordering while trying to debug broken add-to-wishlist
|
2011-12-02 19:28:13 -05:00 |
|
eric
|
9ad77a952e
|
fixed broken add to wishlist
|
2011-12-02 19:26:41 -05:00 |
|
eric
|
1ae38663f4
|
removed ref to "book-panel.css"; "book_panel.css" is what we're using.
|
2011-12-02 19:24:12 -05:00 |
|
eric
|
87f07bd9c3
|
removed "closest" campaign list; added most pledges list and biggest campaign list
|
2011-12-01 17:32:53 -05:00 |
|
eric
|
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 |
|
eric
|
0bd6475906
|
OK, the explore bar now explores!
|
2011-12-01 09:41:08 -05:00 |
|
eric
|
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 |
|
eric
|
b1cd55b6ca
|
fixed bookpanel indication of works "on your wishlist"
|
2011-12-01 08:42:03 -05:00 |
|
eric
|
552ede6089
|
yes, I really want to change book-panel
|
2011-11-30 21:24:12 -05:00 |
|
eric
|
461fc48c32
|
made the tab active.
|
2011-11-30 21:07:17 -05:00 |
|
eric
|
a83586b981
|
made this more readable while disassembling book-panel and fixing html validation
changing a span to a div broke the book panel; the next commit fixes
it. some class rearrangement as well.
|
2011-11-30 21:05:19 -05:00 |
|
eric
|
819753a268
|
book-panel.js reoved; appears to have been replaced by greenpanel.js
|
2011-11-30 20:57:28 -05:00 |
|
eric
|
828ca6f022
|
1st pass at new UI for /campaigns/
|
2011-11-30 13:14:38 -05:00 |
|
eric
|
e0c31ca6a4
|
minor html corrections; toggle icons now have alt text
|
2011-11-30 12:23:25 -05:00 |
Raymond Yee
|
6567369ed7
|
Tweaked work.html to handle the case of a single Ungluer who has pledged.
Added comment to pledge.html
|
2011-11-30 09:13:00 -08:00 |
|
Raymond Yee
|
b8cebfa0dd
|
Refining the interaction of Premium choice and pledge amount
|
2011-11-30 08:58:26 -08:00 |
|
Raymond Yee
|
b44379e6cd
|
First pass at tying the premium selected and the pledge amount
|
2011-11-29 18:02:51 -08:00 |
|
eric
|
8768a55571
|
added statcounter code to base template; the javascript was messing up the supporter page hidden settings, so I omitted the js there
also added a css block so we can have all css load before js
|
2011-11-29 18:15:33 -05:00 |
|
eric
|
1fc644aacd
|
implemented a minimum campaign term; other campaign management tweaks
|
2011-11-29 10:48:37 -05:00 |
|
eric
|
9cbcea0f72
|
the open campaign form now automatically sets the end date and target to allowed values
|
2011-11-28 23:37:31 -05:00 |
Raymond Yee
|
45885be2e6
|
Listing for campaign detail
|
2011-11-29 00:42:31 +00:00 |
|
Raymond Yee
|
2cbdd797d5
|
Stripped some parameters from payment/parameters that belong in settings
|
2011-11-28 16:38:28 -08:00 |
|
Raymond Yee
|
f6a5c98b4e
|
Adding more details to transaction display (for debugging)
|
2011-11-28 16:21:57 -08:00 |
|
Raymond Yee
|
42a8af4c5e
|
Link from campaigns to the respective work page (not campaign page)
|
2011-11-28 16:13:06 -08:00 |
|
Raymond Yee
|
57640ec7b2
|
First pass at unwiring campaign_detail from the real pledge view.
|
2011-11-28 15:39:06 -08: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
|
f96b5e4637
|
fixed bug where anonymous user can't view work page
|
2011-11-26 17:09:33 -05:00 |
|
eric
|
e38d78ecc3
|
rights holder FAQ
|
2011-11-25 21:59:17 -05:00 |
|
eric
|
b398a948dc
|
refactored campaign management savable constraints out of view and into form
|
2011-11-25 21:23:37 -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 |
|
eric
|
3671b0a182
|
marked campaign description and details as safe
|
2011-11-23 19:28:30 -05:00 |
|
eric
|
a89485be01
|
campaign data now appears in campaign tab; campaign stuff is now triggered only by active campaigns
|
2011-11-23 17:28:29 -05:00 |
|
Raymond Yee
|
83b006b2d3
|
Turning off embedded PayPal UI to see whether paypal redirect works properly on please
|
2011-11-23 13:14:39 -08:00 |
|
Raymond Yee
|
38d38ff844
|
I keep forgetting to import sys
|
2011-11-23 10:54:02 -08:00 |
|
Raymond Yee
|
0ec0416c0f
|
Print out to stderr the PayPal URL
|
2011-11-23 10:50:29 -08:00 |
|
Andromeda Yelton
|
017fb9fac9
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-23 12:29:15 -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 |
|
eric
|
20cc607193
|
claim form now uses ModelChoiceField; tests for previous claims
|
2011-11-23 12:23:53 -05:00 |
|
eric
|
39eface590
|
Merge branch 'master' of https://github.com/Gluejar/regluit
|
2011-11-22 17:27:59 -05:00 |
|
eric
|
50bdf7b312
|
minor template enhancements
|
2011-11-22 17:27:41 -05:00 |
|
Raymond Yee
|
4cfabf6efe
|
Turning on embedded view to test
|
2011-11-22 14:17:54 -08:00 |
|
Raymond Yee
|
9b815e7e28
|
Merge branch 'master' of github.com:Gluejar/regluit into payment
|
2011-11-22 11:53:06 -08:00 |
|
Raymond Yee
|
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 |
|
Andromeda Yelton
|
47754ddd6c
|
now you can get embed code from the work page
|
2011-11-22 14:28:27 -05:00 |
|
Andromeda Yelton
|
f544b7684a
|
now there is Twitter sharing
|
2011-11-22 13:59:37 -05:00 |
|
Andromeda Yelton
|
c9e899bac1
|
fixed widget sizing
|
2011-11-22 13:59:25 -05:00 |
|
Andromeda Yelton
|
25d2177ca4
|
restoring background color alternation of books in list view of supporter page after widgetization
|
2011-11-22 13:33:57 -05:00 |
|
Raymond Yee
|
5f4496a290
|
Merge branch 'master' of github.com:Gluejar/regluit into campaign_widget
|
2011-11-22 06:45:07 -08:00 |
Jason
|
58eb67e0aa
|
Adding code to support embedded payments
|
2011-11-22 06:14:58 -05:00 |
|
eric
|
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 |
|
Raymond Yee
|
726f086c4c
|
Adjust the size of the iframe
|
2011-11-21 20:36:14 -08:00 |
|
Raymond Yee
|
78339e3de5
|
Added a rough textarea for someone to copy embedding iframe for widget
|
2011-11-21 18:06:44 -08:00 |
|
Raymond Yee
|
e09cf8186d
|
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
|
2011-11-21 17:34:44 -08:00 |
|
Raymond Yee
|
994be3f732
|
Attempt to factor out book panel so it can be used in widget and supporter page
|
2011-11-21 17:21:06 -08:00 |
Ed Summers
|
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 |
|
Andromeda Yelton
|
bdf30251c4
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-21 16:08:12 -05:00 |
|
Andromeda Yelton
|
b48d6c1091
|
styling tweaks; working on making sure everything can & does use same version of jquery (1.6.3)
|
2011-11-21 16:05:55 -05:00 |
|
eric
|
a6c84aea89
|
should now be back where I was
|
2011-11-21 15:49:29 -05:00 |
|
eric
|
6e5d51f24f
|
is_staff, not is_staff()
|
2011-11-21 15:08:28 -05:00 |
|
Andromeda Yelton
|
b865086cb4
|
figured out why documentation.css was not being applied to all descendants of basedocumentation.html; fixed that. descendant extrahead content should go in the extra_extra_head block now.
|
2011-11-21 15:07:10 -05:00 |
|
Andromeda Yelton
|
495f447b1a
|
now the supporters tab on the work page is populated
|
2011-11-21 13:06:23 -05:00 |
|
Andromeda Yelton
|
a749c165cb
|
fixing layout of pagination div to avoid clashes with panel view
|
2011-11-21 11:32:05 -05:00 |
|
Andromeda Yelton
|
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 |
|
eric
|
43d3f3f553
|
halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas!
|
2011-11-20 22:23:51 -05:00 |
|
eric
|
8169e7ecb3
|
fixed assorted html errors
|
2011-11-20 17:43:55 -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
|
fa68e52260
|
switched campaign manager field to AutoCompleteSelectMultipleField
|
2011-11-20 14:02:09 -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
|
9638ff9a97
|
moved claiming form back to Details Tab
|
2011-11-19 22:54:59 -05:00 |
|
eric
|
3eb3653947
|
robots.txt
|
2011-11-19 22:15:26 -05:00 |
|
Ed Summers
|
f193ea396e
|
use local mailserver instead of google mail ; also now routing all /admin and /accounts traffic through ssl
|
2011-11-20 02:48:26 +00:00 |
|
eric
|
409c9746cb
|
renamed file
|
2011-11-19 21:22:54 -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
|
c167ed2965
|
admin view uses default login page
|
2011-11-19 18:27:15 -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
|
0d096737be
|
unix line endings
|
2011-11-19 10:51:51 -05:00 |
|
eric
|
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 |
|
eric
|
d73304e1a6
|
cleaning up user change form
|
2011-11-18 17:57:36 -05:00 |
|
Andromeda Yelton
|
3b80d18829
|
wording tweaks
|
2011-11-18 15:11:17 -05:00 |
|
Andromeda Yelton
|
c7637586fb
|
merging simultaneous changes to rights holder template
|
2011-11-18 13:34:25 -05:00 |
|
Andromeda Yelton
|
43912006ae
|
prettifying the documentation pages with new css
|
2011-11-18 13:27:26 -05:00 |
|
eric
|
6cc05817a8
|
woo hoo! autocomplete input on rightsholder creation form. uses app django-selectable
|
2011-11-18 09:24:31 -05:00 |
|
Ed Summers
|
6a9a213632
|
added pagination with django-endless-pagination
|
2011-11-17 23:09:23 -05:00 |
|
eric
|
a720089525
|
unglue it admin users can now approve rightsholder claims!
|
2011-11-17 14:35:41 -05:00 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
11027f6bc1
|
First attempt at placing a Librarything import button
|
2011-11-16 16:47:29 -08:00 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
2ac1909ce0
|
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
|
2011-11-16 12:47:02 -08:00 |
|
Raymond Yee
|
3ebcf2edae
|
Wired Goodreads authorization into the supporter settings panel.
|
2011-11-16 12:45:33 -08:00 |
|
Andromeda Yelton
|
f748bb220e
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-16 15:25:06 -05:00 |
|
Andromeda Yelton
|
d431fecbfc
|
don't need supporter_panel any more; it's been integrated into supporter.html
|
2011-11-16 15:24:47 -05: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
|
73596b33e8
|
Forgot the template file for librarything
|
2011-11-16 10:30:02 -08:00 |
|
Raymond Yee
|
3be4e6fab4
|
First pass at integrating LT into the UI
|
2011-11-16 10:20:10 -08:00 |
|
Andromeda Yelton
|
8bbee39312
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-16 12:38:18 -05:00 |
|
Andromeda Yelton
|
f2fcd05a33
|
updating supporter page with new icons
|
2011-11-16 12:36:24 -05:00 |