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 |
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 |