Andromeda Yelton
|
38b436f647
|
action on booklist for active campaigns on wishlist should be pledge, not un-wishlist
|
2013-01-03 16:33:07 -05:00 |
eshellman
|
79b594e6ce
|
Merge pull request #106 from Gluejar/notice_for_wrong_number
[#41908015] 'incorrect_number' and 'processing_error' error should also ...
|
2013-01-03 12:35:03 -08:00 |
Raymond Yee
|
9493897a42
|
[#41908015] 'incorrect_number' and 'processing_error' error should also result in pledge_failed notice ->
catch incorrect_number (and processing_error for now) for sending the pledge_failed notice
|
2013-01-03 14:10:05 -05:00 |
|
Raymond Yee
|
2cc388a82a
|
Merge pull request #104 from Gluejar/fix_wishlist_actions
[fix #41860481] fix wishlist actions
|
2013-01-02 18:54:36 -08:00 |
|
eric
|
5b1f3380b6
|
finish moving wish list "withs"
|
2013-01-02 20:46:02 -05:00 |
|
eric
|
6e4f8fe3d7
|
configure wish list inside book_panel so it doesn't get omitted again
|
2013-01-02 20:26:20 -05:00 |
|
eshellman
|
606d531ab9
|
Merge pull request #103 from Gluejar/list_tab_vertical_centering
List tab vertical centering
|
2013-01-02 14:32:07 -08:00 |
|
Andromeda Yelton
|
c2bc4f6b68
|
tidying visibly wrong things
|
2013-01-02 16:10:32 -05:00 |
|
Andromeda Yelton
|
8d321d46dc
|
final incorporation of all stray CSS changes
|
2013-01-02 15:55:10 -05:00 |
|
Andromeda Yelton
|
d6b7f9d925
|
addressing ul, li, dt, dd comments
|
2013-01-02 15:52:12 -05:00 |
|
Andromeda Yelton
|
1b407e6819
|
management command to make sure transaction.ack_name returns something sensible for OLA on /acks/ page
|
2013-01-02 15:51:57 -05:00 |
|
Andromeda Yelton
|
0a86448d98
|
addressing CSS comments and also fixing some invalid html
Conflicts:
frontend/templates/unglued_list.html
static/css/book_panel.css
static/css/lists.css
static/less/lists.less
|
2013-01-02 15:51:21 -05:00 |
|
Andromeda Yelton
|
b7ae54948e
|
line up icons better and more clearly indicate status of books with successful campaigns
Conflicts:
frontend/templates/book_panel.html
static/css/book_panel.css
|
2013-01-02 15:50:13 -05:00 |
|
Andromeda Yelton
|
4ac487a7c9
|
unwinding useful changes from discarded two-tab model
|
2013-01-02 15:48:49 -05:00 |
|
Andromeda Yelton
|
26b2f0c00f
|
Merge branch 'master' into list_tab_vertical_centering
|
2013-01-02 15:36:10 -05:00 |
|
Andromeda Yelton
|
cc4f748e36
|
update all list pages to have two-line tab content
|
2013-01-02 15:35:42 -05:00 |
|
eshellman
|
a6186e3bc6
|
Merge pull request #90 from Gluejar/prettier_acks
prettifying acks page, make it easier to read
|
2013-01-02 10:54:24 -08:00 |
|
eric
|
77c007c4ba
|
Revert "Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks""
This reverts commit c13cca20ea.
|
2013-01-02 13:53:00 -05:00 |
|
eric
|
c13cca20ea
|
Revert "Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks"
This reverts commit 949425c6ca, reversing
changes made to e305a1ee74.
|
2013-01-02 13:37:01 -05:00 |
|
eric
|
949425c6ca
|
Merge branch 'prettier_acks' of https://github.com/Gluejar/regluit into prettier_acks
|
2013-01-02 13:34:47 -05:00 |
|
Andromeda Yelton
|
0eebc7c28a
|
adjusting spacing around headers and clarifying dedication/dedicator relationship
|
2013-01-02 12:25:27 -05:00 |
|
eric
|
e305a1ee74
|
Merge branch 'master' into prettier_acks
|
2013-01-02 10:53:05 -05:00 |
|
eshellman
|
53a62c3764
|
Merge pull request #101 from Gluejar/successful_works_in_inglued_tab
Successful works in unglued tab; offset on "read it now" to be fixed.
|
2013-01-02 07:28:14 -08:00 |
|
eshellman
|
b29032b1c8
|
Merge pull request #102 from Gluejar/default_unglued_tab
fix [#41795521]
|
2012-12-31 12:41:16 -08:00 |
|
eshellman
|
c22403356c
|
Merge pull request #99 from Gluejar/correct_ungluing_date
add success_date property to campaign so we can accurately report it whe...
|
2012-12-31 12:28:47 -08:00 |
|
Andromeda Yelton
|
40cff261ba
|
fix [#41795521]
|
2012-12-31 15:20:03 -05:00 |
|
Andromeda Yelton
|
f4a269f5ac
|
returning empty string rather than False
|
2012-12-31 15:02:39 -05:00 |
|
Andromeda Yelton
|
4c1b64c154
|
update successful books in unglued tab on other tabbed pages
|
2012-12-31 14:57:01 -05:00 |
|
Andromeda Yelton
|
c8cb5937e8
|
need to apply correct styles for new status handling too
|
2012-12-31 13:58:42 -05:00 |
|
Andromeda Yelton
|
bf6cfb7cb2
|
Merge branch 'master' into successful_works_in_inglued_tab
|
2012-12-31 13:47:17 -05:00 |
|
Andromeda Yelton
|
92163d62e6
|
better querysets for work page tabs
|
2012-12-31 13:46:23 -05:00 |
|
thatandromeda
|
7fd78d9349
|
Update frontend/templates/base.html
|
2012-12-31 13:07:18 -05:00 |
|
eshellman
|
649188f328
|
Merge pull request #98 from Gluejar/fix_lightbox
position lightbox relative to top of viewport, allow for scrolling
|
2012-12-31 09:01:37 -08:00 |
|
eshellman
|
a19a060351
|
Merge pull request #100 from Gluejar/missing_parenthesis
it was missing a parenthesis
|
2012-12-31 08:54:56 -08:00 |
|
Andromeda Yelton
|
609c09c74d
|
it was missing a parenthesis
|
2012-12-31 11:12:55 -05:00 |
|
Andromeda Yelton
|
47c44b20d5
|
add success_date property to campaign so we can accurately report it when it differs from campaign deadline
|
2012-12-31 11:00:45 -05:00 |
|
Raymond Yee
|
a726a11154
|
[fix #41788889] google id for book changed
|
2012-12-31 10:10:24 -05:00 |
|
Andromeda Yelton
|
83d3e5ba82
|
position lightbox relative to top of viewport, allow for scrolling
|
2012-12-31 09:49:09 -05:00 |
|
Andromeda Yelton
|
b7721f0fa3
|
management command to make sure transaction.ack_name returns something sensible for OLA on /acks/ page
|
2012-12-19 11:00:33 -05:00 |
|
Andromeda Yelton
|
7a0e2bfbd8
|
addressing ul, li, dt, dd comments
|
2012-12-19 10:22:11 -05:00 |
|
Andromeda Yelton
|
4a307a1e00
|
addressing CSS comments and also fixing some invalid html
|
2012-12-17 14:23:23 -05:00 |
|
Andromeda Yelton
|
ab2d3d51b6
|
Merge branch 'master' into unglued_books_tab
|
2012-12-14 10:46:11 -05:00 |
|
Andromeda Yelton
|
73266f07eb
|
line up icons better and more clearly indicate status of books with successful campaigns
|
2012-12-14 10:45:16 -05:00 |
|
Andromeda Yelton
|
7c88279603
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-12-14 10:03:57 -05:00 |
|
Andromeda Yelton
|
b001aefeeb
|
separating unglued and PD works on ready-to-read page
|
2012-12-13 15:25:01 -05:00 |
|
Raymond Yee
|
136614b8ff
|
Merge pull request #96 from Gluejar/merge_works_management
staff only UI for merging works [finish #39297681]
|
2012-12-13 12:09:43 -08:00 |
|
Andromeda Yelton
|
ec4e1a7bb3
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-12-13 09:55:14 -05:00 |
|
thatandromeda
|
575d34d968
|
Update frontend/templates/base.html
|
2012-12-13 09:51:36 -05:00 |
|
eric
|
fec7f33d9e
|
staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
|
2012-12-12 22:35:35 -05:00 |
|
Andromeda Yelton
|
658783306c
|
Merge branch 'master' into prettier_acks
Conflicts:
frontend/templates/front_matter.html
|
2012-12-11 13:18:57 -05:00 |