EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,006 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

386 Commits (d7e5e6e1ed8d0a0ccd7eb8d2636ceb0f1e10dcdb)

Author SHA1 Message Date
Andromeda Yelton eb79099fbe moving all the rightsholder stuff to the top of the details tab so editions stuff doesn't hide it 2011-12-09 16:17:10 -05:00
Andromeda Yelton 27e88e5458 Merge branch 'master' of github.com:Gluejar/regluit 2011-12-09 16:15:24 -05:00
Andromeda Yelton 66ebeaf07e links to edition-specific google books in detail view 2011-12-09 16:15:11 -05:00
eric e5aab951a7 googreads, librarything links now show only when a member is logged in 2011-12-09 13:03:28 -05:00
eric eca82b3911 wired recent events to landing page ungluers 2011-12-08 19:12:26 -05:00
Andromeda Yelton aa0a935d16 details tab displays editions 2011-12-08 16:23:31 -05:00
Andromeda Yelton 1c623dcac7 made sure arrow and graphic aligned in a cross-browser way and moved long text to learn more space 2011-12-08 15:24:38 -05:00
Andromeda Yelton 1bef255813 now the embed text is in a textarea 2011-12-08 15:24:05 -05:00
Andromeda Yelton 80a4fa5618 now the slideshow does not autoadvance 2011-12-07 15:07:39 -05:00
Andromeda Yelton 53f9f1d87e you can create accounts from the landing page now\! hooray\! 2011-12-07 12:56:23 -05:00
Andromeda Yelton e07c5506b4 wishlist add/remove now working on work page 2011-12-07 12:05:31 -05:00
Andromeda Yelton 3f8c6321c7 Merge github.com:Gluejar/regluit 2011-12-06 15:08:55 -05:00
Andromeda Yelton 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
eric 93cb548b42 fixed bug where non-logged in user trips on missing work.id in search results 2011-12-06 14:40:29 -05:00
eric 7dba126848 when a user is not logged in, clicking add to wishlist now ends them at the work page 
...where we need to have the add functionality
 2011-12-05 23:31:03 -05:00
Andromeda Yelton 8c63b29785 we now have half a landing page. more changes to come. 2011-12-05 16:16:42 -05:00
Ed Summers ec09c4754b for crawlers so they do not activate lookups at librarything, goodreads, etc 2011-12-05 07:37:10 -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
eric 95c89d06fc "Remove from Wishlist" shortened to "Remove This" to pretty list 2011-12-03 15:20:28 -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 c171741c5b added facet name to work list display 2011-12-02 22:32:26 -05:00
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 0bd6475906 OK, the explore bar now explores! 2011-12-01 09:41:08 -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 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 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
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 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
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 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 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
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
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
Andromeda Yelton 1a7a04cbc3 adding 404 page and improving footer layout 2011-11-16 11:01:45 -05:00
eric 6a2e690f18 claim form now creates a claim 2011-11-16 00:22:29 -05: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
Andromeda Yelton d4fd3748dc Merge branch 'master' of github.com:Gluejar/regluit 
Conflicts:
	frontend/templates/base.html
 2011-11-15 16:16:35 -05:00
Andromeda Yelton 74a5710921 prettifying the footer 2011-11-15 16:14:09 -05:00
Raymond Yee d0336fdb59 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-15 12:58:07 -08:00
eric 04831c7011 fixed the tab scripts on works page- seems to be a jquery version issue 2011-11-15 15:53:38 -05:00
Raymond Yee 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
eric 4348c08d3b fixed html errors in base.html footer 2011-11-15 15:00:48 -05:00
eric 83c48b5a92 somebody messed up the work page title 2011-11-15 14:40:23 -05:00
eric 769348bf2e more stuff rhtools 2011-11-15 14:35:03 -05:00
Raymond Yee c6e9d33685 Merge branch 'goodreads' of github.com:Gluejar/regluit 2011-11-15 11:20:18 -08:00
Raymond Yee 96d264c8a1 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-15 11:08:58 -08:00
Andromeda Yelton da108d0ae1 who wants a favicon? aw yeah 2011-11-15 13:54:13 -05:00
Raymond Yee d139a4b693 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-15 10:40:44 -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
Andromeda Yelton 5ff5485194 grammar fix to hover text on badges 2011-11-15 13:12:03 -05:00
Andromeda Yelton fdd8e55d9f merging conflicts after creating workstub page 2011-11-15 11:32:30 -05:00
Andromeda Yelton 4424ee513f titles on search results now link to work stub page 2011-11-15 11:27:32 -05:00
eric 8478f3c4a7 rights holder tools now lists platform agreements that user administers; rights@gluejar.com is now an admin account 2011-11-15 10:01:01 -05:00
eric 0328430169 first cut at UI for unglue.it admins to create rights holders and delegate ownership 2011-11-14 23:28:55 -05:00
Ed Summers 4e2e460903 added rudimentary view of subjects to get an idea of what is in there already 2011-11-14 21:13:39 -05:00
Ed Summers 8c3a4528fc real title 2011-11-14 19:09:34 -05:00
Ed Summers 008ae17e1e trying to add facebook link 2011-11-14 19:04:49 -05:00
eric 6a82ec5f1d explore column now shows up to 5 "randomly" chosen ungluers 2011-11-14 15:16:36 -05:00
Andromeda Yelton cee723524c Merge branch 'master' of github.com:Gluejar/regluit 2011-11-14 13:45:11 -05:00
Andromeda Yelton 34e245362f added tooltips to clarify badges 2011-11-14 13:43:47 -05:00
eric 4c65a11696 de-association from twitter and facebook are now supported 2011-11-14 13:23:26 -05:00
Andromeda Yelton 6b38e7d9b4 more comprehensively handling campaign states; grammar fix for singular vs. plural ungluers 2011-11-14 13:07:07 -05:00
Andromeda Yelton 1d9109a7d7 modified work.html to handle all campaign status options 2011-11-14 11:42:33 -05:00
Andromeda Yelton 17a382cbc8 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-14 10:21:39 -05:00
Andromeda Yelton 93acfc6348 improving work page's handling of campaign statuses 2011-11-14 10:19:52 -05:00
eric f3122e5161 corrected alt in avatars 2011-11-13 20:35:29 -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
Andromeda Yelton aa79208a14 adding display of author name 2011-11-11 15:09:39 -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