Andromeda Yelton
|
9dc8a5c42a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2013-01-09 14:57:17 -05:00 |
|
Andromeda Yelton
|
9b2928bd0a
|
moar tutorials
|
2013-01-09 13:07:03 -05:00 |
eric
|
3d1da688a5
|
unnecessary logic
|
2013-01-09 11:38:33 -05:00 |
Raymond Yee
|
fe45fdc2ab
|
update which SSLCertificateChainFile being used by unglue.it
|
2013-01-07 21:11:39 -05:00 |
|
Raymond Yee
|
4fa7ea75ba
|
update just.conf to move from just.unglueit.com -> just.unglue.it and for using a different CA
|
2013-01-07 20:53:43 -05:00 |
|
Raymond Yee
|
f09af77837
|
Merge branch 'master' into ssl_cert
|
2013-01-07 20:39:21 -05:00 |
|
eshellman
|
664087d67e
|
Merge pull request #105 from Gluejar/rh_help
Rh help
|
2013-01-04 16:37:25 -08:00 |
|
eric
|
e5f3eeacb5
|
try to correct logic for pledigng in list view
|
2013-01-04 19:21:34 -05:00 |
|
Andromeda Yelton
|
50808f3a89
|
users who have already pledged should not be offered Pledge CTA
|
2013-01-04 16:38:15 -05:00 |
|
Andromeda Yelton
|
30b4e6d5c7
|
Revert "users who have alraedy pledged should not get Pledge CTA"
This reverts commit f501ede24a.
|
2013-01-04 16:35:14 -05:00 |
|
Andromeda Yelton
|
f501ede24a
|
users who have alraedy pledged should not get Pledge CTA
|
2013-01-04 16:33:33 -05:00 |
|
Andromeda Yelton
|
869d89b7ad
|
for coordinating Less settings
|
2013-01-04 16:18:51 -05:00 |
|
Andromeda Yelton
|
fa7e0b20de
|
addressing feedback
|
2013-01-04 15:12:35 -05:00 |
|
Andromeda Yelton
|
23d48e6183
|
Merge branch 'master' into rh_help
|
2013-01-04 14:39:13 -05:00 |
|
thatandromeda
|
876644ed49
|
Merge pull request #108 from Gluejar/validation_nits
img measurements are already px
|
2013-01-04 11:37:03 -08:00 |
|
Raymond Yee
|
66f78f335f
|
Have a shell script for generating the certificate signing request (CSR) for unglue.it
|
2013-01-04 14:16:43 -05:00 |
|
eric
|
aeabfa1fde
|
img measurements are already px
|
2013-01-04 13:34:50 -05:00 |
|
Andromeda Yelton
|
6285f3e286
|
why were these not minified
|
2013-01-03 16:33:35 -05:00 |
|
Andromeda Yelton
|
caafdcf38a
|
some lists looked wrong with new documentation list styling
|
2013-01-03 16:33:29 -05:00 |
|
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 |
|
Andromeda Yelton
|
8ec5f7e2a2
|
one more tutorial while I'm at it
|
2013-01-03 13:58:17 -05:00 |
|
Andromeda Yelton
|
a4de9a0040
|
adding some tutorials
|
2013-01-03 13:46:32 -05:00 |
|
Andromeda Yelton
|
924300267b
|
more pointers to contextually appropriate actions for RHs
|
2013-01-03 13:18:26 -05:00 |
|
Andromeda Yelton
|
8867724ae9
|
make a work's rightsholders accessible from the templates
|
2013-01-03 13:18:00 -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 |