Commit Graph

2896 Commits (2ae6942f4f56aa1be68e822f7e7791c603c3eb82)

Author SHA1 Message Date
Raymond Yee caa03e0343 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-07 17:10:32 +00:00
Andromeda Yelton 7753c49656 James K. Polk did not actually write every book in our database 2011-11-07 11:58:48 -05:00
Andromeda Yelton 44a7ff81c4 removing icons from explore/share/support bars 2011-11-07 11:11:30 -05:00
Andromeda Yelton a1055a01aa resolving merge conflicts 2011-11-07 11:06:01 -05:00
Andromeda Yelton 7635c1a701 fixing image display in search panel view 2011-11-07 11:04:09 -05:00
eric bc2e083ce1 deleted css files in less 2011-11-07 10:50:28 -05:00
eric 9ba845ba6e Merge branch 'master' of https://github.com/Gluejar/regluit 2011-11-07 10:48:16 -05:00
eric 609b829f5c fixed missing style on support menu 2011-11-07 10:45:10 -05:00
Ed Summers e3c2ee3498 Merge branch 'master' of github.com:Gluejar/regluit 2011-11-07 10:18:58 -05:00
Ed Summers 6fe1ad049c pull in all premiums 2011-11-07 10:18:46 -05:00
Raymond Yee f98ed569c0 Added a simple adding task 2011-11-07 09:59:45 -05:00
Andromeda Yelton eab72eb48a Merge branch 'master' of github.com:Gluejar/regluit 2011-11-07 09:59:40 -05:00
Andromeda Yelton 46070801d6 changed search.html css to work with toggling (toggle toggle toggle) 2011-11-07 09:59:23 -05:00
Raymond Yee 2b5dff65e0 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-07 14:52:17 +00:00
Raymond Yee d7c0742e3e Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-07 09:51:35 -05:00
Ed Summers 3bd3467152 need pass premiums to the template 2011-11-07 09:50:26 -05:00
Raymond Yee 2e684d022f Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-07 09:22:14 -05:00
eric 7c38ff7509 wired in setup_campaign 2011-11-06 18:56:33 -05:00
Raymond Yee 2de96efb5a Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 18:47:44 -05:00
Andromeda Yelton 31b0fca4fe Merge branch 'master' of github.com:Gluejar/regluit 2011-11-06 18:45:06 -05:00
Andromeda Yelton 852125ff8a you can now toggle the supporter page between list and panel views. it's pretty badass. 2011-11-06 18:43:04 -05:00
Raymond Yee 2a060d2405 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 18:41:26 -05:00
Ed Summers 09fd66b107 need to pass premiums off to the work template if there is an active campaign 2011-11-06 18:38:33 -05:00
Raymond Yee 83b7bed56e introduce a setting to allow Celery messages to go to regular Python log 2011-11-06 18:32:43 -05:00
Raymond Yee 2340ef05d4 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 17:51:39 -05:00
Raymond Yee f73aa1b570 Added grabbing of pdf ebooks corresponding to edition 2011-11-06 17:49:25 -05:00
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
Raymond Yee 323856b0c1 Merge branch 'master' of github.com:Gluejar/regluit into goodreads 2011-11-06 15:09:17 -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