Andromeda Yelton
|
3c33ca8bfa
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-08 11:28:55 -05:00 |
|
Andromeda Yelton
|
2173f16d4e
|
panel view now has a hover state on supporter page
|
2011-11-08 11:28:35 -05:00 |
eric
|
4c29afdb94
|
fixed work template errror
|
2011-11-07 17:01:21 -05:00 |
|
eric
|
a6686dac67
|
css thrashing
|
2011-11-07 16:56:49 -05:00 |
|
eric
|
ec9b69e012
|
removed support button if no campaign
|
2011-11-07 16:56:23 -05:00 |
|
Andromeda Yelton
|
2b063e78d1
|
merge conflicts
|
2011-11-07 16:16:36 -05:00 |
|
Andromeda Yelton
|
abf3ec131e
|
wiring supporter and search icons and percent unglued to live data
|
2011-11-07 16:12:53 -05:00 |
|
eric
|
9e9a05d153
|
unminify css
|
2011-11-07 16:12:11 -05:00 |
Ed Summers
|
7cf40e88de
|
need to import Q
|
2011-11-07 16:04:37 -05:00 |
Raymond Yee
|
a40cab0184
|
First take on integrating pledge
|
2011-11-07 16:01:08 -05:00 |
|
eric
|
b644b062de
|
added models for Claim and Rightsholder - be sure to migrate!
|
2011-11-07 15:42:03 -05:00 |
|
Ed Summers
|
7d44516189
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-07 15:39:05 -05:00 |
|
Ed Summers
|
110b996769
|
added logic to display ebooks, badly for now
|
2011-11-07 15:39:02 -05:00 |
|
Andromeda Yelton
|
268c669b76
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2011-11-07 15:12:12 -05:00 |
|
Andromeda Yelton
|
51d8c71069
|
aligned search box with main content container; fixed flow of panel view in search page; added bottom-padding to allow for cover images to be fully displayed in list view
|
2011-11-07 15:11:52 -05:00 |
|
Raymond Yee
|
fa601f7dd4
|
fixed which wishlist being read by Ajax update for goodreads
|
2011-11-07 12:19:45 -05: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 |
|
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 |
|
Ed Summers
|
3bd3467152
|
need pass premiums to the template
|
2011-11-07 09:50:26 -05:00 |
|
eric
|
7c38ff7509
|
wired in setup_campaign
|
2011-11-06 18:56:33 -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 |
|
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
|
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 |
|
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 |