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

409 Commits (997b771a6bd120928a51c789c91554542a171a68)

Author SHA1 Message Date
Ed Summers 997b771a6b Merge branch 'master' of github.com:Gluejar/regluit 2011-11-06 17:44:56 -05:00
Ed Summers 214e1c5ff8 pull in premiums from the campaign 2011-11-06 17:44:50 -05:00
Ed Summers e1ea725d0f ebooks must have a downloadUrl 2011-11-06 17:42:09 -05:00
eric 66e6de0ffa templatize campaignsetup; add last class to premium display 2011-11-06 17:33:11 -05:00
eric e18a6dd98c campaign display tweaks 2011-11-06 16:53:39 -05:00
Ed Summers e76df1d76a removed old work view and converted campaign view to work view 2011-11-06 16:46:46 -05:00
Ed Summers 45045b4e44 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-06 16:33:17 -05:00
Ed Summers 22d904f1bf added ebook model and add_b_oclc 2011-11-06 16:33:04 -05:00
Andromeda Yelton cba17474c9 refactoring CSS. now sitewide.css is part of base.html and other files should be applied as appropriate. 2011-11-06 16:16:23 -05:00
Andromeda Yelton 96a3039434 fixing bugs resulting from am addition of last_campaign method 2011-11-06 15:24:16 -05:00
Ed Summers 3915cef5d4 valid json (again) 2011-11-06 15:02:40 -05:00
Ed Summers 882a0490aa valid json (again) 2011-11-06 15:01:41 -05:00
Ed Summers dcc87644ab jiggering things around so that the premium fixture works 2011-11-06 14:58:51 -05:00
eric fdcc679d28 migration for premiums 2011-11-06 14:51:56 -05:00
Ed Summers 29afdb2ffd valid json 2011-11-06 14:49:33 -05:00
Raymond Yee be44e36c61 Another syntax error fixed 2011-11-06 14:43:10 -05:00
Raymond Yee 02de354ae2 syntax error fix 2011-11-06 14:41:14 -05:00
thatandromeda 26280b9c75 needs to use last_campaign_status method, not last_campaign.status, lest last_campaign return None 2011-11-06 14:34:15 -05:00
thatandromeda c948a6b090 fixing campaign status display 2011-11-06 14:32:29 -05:00
thatandromeda 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
thatandromeda 773789dc99 percent_unglued function should handle case where last_campaign returns None 2011-11-06 14:24:54 -05:00
thatandromeda 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
eric 92b91d2dbe model for premiums 2011-11-06 14:04:39 -05:00
Andromeda Yelton 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
Andromeda Yelton 2dcf1dfbee Merge branch 'master' of github.com:Gluejar/regluit 2011-11-03 16:30:36 -04:00
Andromeda Yelton 2c6a7e6f94 book panel view of supporter page now half-done; visible at /supporter2/username 2011-11-03 16:28:53 -04:00
Raymond Yee 91c3ccb0e7 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 
Conflicts:
	frontend/urls.py
 2011-11-02 16:47:12 -07:00
Raymond Yee ee097ffd97 Added changes to zotero proof of concept code 2011-11-02 16:42:36 -07:00
Andromeda Yelton 0b891cc8b5 pages we need but do not yet have now link to stubs 2011-11-02 15:40:43 -04:00
Raymond Yee 672b1b3b20 Implemented LibraryThing import as a command and separated out LT functionality into a separate module 2011-11-01 17:42:39 -07:00
Raymond Yee 6ddebadf87 Enough on goodreads for now. 2011-11-01 15:23:54 -07:00
Raymond Yee fa1806759b Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-01 14:24:18 -07:00
Raymond Yee 6102b03c36 Allow Transaction.secret to be null. Created migration for payment/models 2011-11-01 14:16:27 -07:00
Raymond Yee d6fc0b6230 Refining display of Goodreads import 2011-11-01 14:09:04 -07:00
Andromeda Yelton c139e4dcfc adding option for supporters to pledge anonymously 2011-11-01 17:08:09 -04:00
Andromeda Yelton 60f29fc98c needed some exception handling 2011-11-01 16:21:38 -04:00
Raymond Yee 90cfdb9007 Added ability to clear wishlist 2011-11-01 10:41:39 -07:00
Andromeda Yelton 9e395e0a9f converted all text-oriented pages to run on basedocumentation.html style template 2011-11-01 13:18:44 -04:00
Raymond Yee 6f1ebb3247 Embedding api_key and username to get a functioning API call into goodreads_display.html 2011-11-01 09:50:05 -07:00
Raymond Yee f7ea58a602 Integrated Goodreads shelf loading to wishlist into UI 2011-10-31 17:26:05 -07:00
Raymond Yee ed4ea516c2 Storing goodreads info in user.profile 2011-10-29 15:40:00 -07:00
Raymond Yee db957c7ff6 Merge branch 'master' into goodreads 2011-10-28 12:48:31 -07:00
Raymond Yee 76e37a88a9 In supporter page: 
* setting tab3 as the active one by default
* first attempt to sort books into the proper tab (though it's not totally accurate to say that books with successful last campaigns are the only unglued books
 2011-10-28 12:36:04 -07:00
Raymond Yee 41b955245a Some basic code for zotero, Librarything, amazon wishilst 2011-10-28 10:54:06 -07:00
Jason f049e5ec91 Implementing check of paypal PAY transaction using PaymentDetails 2011-10-27 04:05:21 -04:00
Jason 9a6a3d260a Adding unique tracking ID to paypal payments 2011-10-27 02:35:46 -04:00
Raymond Yee 07248f16c8 dded a command to load a shelf to a user's wishlist 2011-10-26 09:49:54 -07:00
Raymond Yee 4a98a96aac Added a command to load a shelf to a user's wishlist 2011-10-26 09:49:10 -07:00
Raymond Yee a4dd33b047 Displaying some of the books from user shelf. 2011-10-25 16:07:44 -07:00
Raymond Yee 2f81b8cebd Quick and dirty display of Goodreads books from user's shelf. 2011-10-25 16:00:52 -07:00