Andromeda Yelton
|
a322baa195
|
addressing pull request feedback
|
2013-01-17 15:46:31 -05:00 |
eshellman
|
b3ef759221
|
Merge pull request #112 from Gluejar/pledge_links_to_work
Pledge links to work
|
2013-01-17 12:46:29 -08:00 |
|
eshellman
|
c073529b58
|
Merge pull request #111 from Gluejar/proper_cc_text
Proper cc text
|
2013-01-17 12:44:57 -08:00 |
|
Andromeda Yelton
|
b7aabf1ca4
|
now the pledge page links back to the work
|
2013-01-17 15:37:03 -05:00 |
|
Andromeda Yelton
|
e00b43870c
|
it would be great if the embed thing actually worked
|
2013-01-16 13:08:21 -05:00 |
|
Andromeda Yelton
|
5fb880c9da
|
sharing options on download page
|
2013-01-16 12:50:20 -05:00 |
|
Andromeda Yelton
|
68b1fd9bf7
|
add sharing options to front matter
|
2013-01-16 12:10:36 -05:00 |
|
Andromeda Yelton
|
1887599595
|
more status-sensitive email share text
|
2013-01-16 11:23:28 -05:00 |
|
Andromeda Yelton
|
a27e319e5a
|
more status-sensitive twitter share text
|
2013-01-16 11:13:23 -05:00 |
|
thatandromeda
|
db8977ca16
|
Merge pull request #107 from Gluejar/book_panel_nits
Book panel nits
|
2013-01-10 06:36:56 -08:00 |
|
Andromeda Yelton
|
a3c0848b79
|
making text more consistent with that suggested by official license chooser
|
2013-01-09 15:02:48 -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 |
|
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
|
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 |
|
eric
|
aeabfa1fde
|
img measurements are already px
|
2013-01-04 13:34:50 -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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
thatandromeda
|
7fd78d9349
|
Update frontend/templates/base.html
|
2012-12-31 13:07:18 -05: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 |
|
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
|
7501c3fdae
|
prettifying
|
2012-12-11 13:17:33 -05:00 |
|
Andromeda Yelton
|
bfbb74c0a2
|
providing next steps
|
2012-12-11 10:37:38 -05:00 |
|
Andromeda Yelton
|
1304a73790
|
Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
frontend/templates/metrics.html
frontend/views.py
|
2012-12-11 10:31:58 -05:00 |
|
Raymond Yee
|
33665abd37
|
Merge branch 'master' into pledges_on_info_page
|
2012-12-10 12:26:30 -08:00 |
|
Raymond Yee
|
61bb121a51
|
[#37736995] the old error message for a CC error was potentially confusing -- I think this should be better -- see images in
https://www.evernote.com/shard/s1/sh/b59d4cfa-81a2-42bc-a315-24996fb01e83/2cfa234f2a15042ff0bb198514771dcb
|
2012-12-10 11:18:46 -08:00 |
|
eric
|
c1c3b3d1ad
|
[#40818125] minimum target to $500
|
2012-12-06 21:05:15 -05:00 |
|
Andromeda Yelton
|
23708e15ba
|
exclude uncollectable pledges
|
2012-12-06 15:31:32 -05:00 |
|
Andromeda Yelton
|
7decd15333
|
Revert "wanted to be able to track prospective revenue from info page"
This reverts commit 150ed860c9.
|
2012-12-06 12:37:48 -05:00 |
|
Andromeda Yelton
|
150ed860c9
|
wanted to be able to track prospective revenue from info page
|
2012-12-06 11:42:02 -05:00 |
|
eshellman
|
fd7c10863e
|
Merge pull request #91 from Gluejar/fix_lightbox
Fix lightbox. works for me.
|
2012-12-04 13:37:40 -08:00 |
|
thatandromeda
|
f22312d735
|
Update frontend/templates/base.html
network of killers now live
|
2012-12-04 13:47:19 -05:00 |
|
Andromeda Yelton
|
88b4446bf0
|
force reload of hijax.js
|
2012-11-30 12:28:29 -05:00 |
|
eshellman
|
0993d393d2
|
Merge pull request #88 from Gluejar/smashwords
Smashwords. Looks good for the first pass.
|
2012-11-29 10:58:15 -08:00 |
|
Andromeda Yelton
|
202c10b0fb
|
latest coverage
|
2012-11-29 12:04:05 -05:00 |
|
Andromeda Yelton
|
4fe73e110c
|
make sure to include new file location
|
2012-11-29 12:00:34 -05:00 |
|
Andromeda Yelton
|
0aef30015b
|
addressing comments
|
2012-11-29 11:20:13 -05:00 |
|
Andromeda Yelton
|
c4ac00e8ef
|
first pass at smashwords page
|
2012-11-29 10:54:07 -05:00 |
|
Raymond Yee
|
4d923aba5b
|
Merge branch 'master' into charge_failed
|
2012-11-27 12:19:21 -08:00 |
|
Andromeda Yelton
|
1cd50d716f
|
display submit buttons as loading gifs for transactions that might take a while
|
2012-11-27 13:32:25 -05:00 |
|
Raymond Yee
|
41f3da3d31
|
Merge branch 'master' of github.com:Gluejar/regluit into charge_failed
|
2012-11-26 14:36:40 -08:00 |
|
Andromeda Yelton
|
8692d26540
|
friendlifying
|
2012-11-26 14:23:04 -05:00 |
|
thatandromeda
|
1976bb14d3
|
Update frontend/templates/notification/pledge_charged/short.txt
|
2012-11-26 13:45:12 -05:00 |
|
thatandromeda
|
0b9827424f
|
Merge pull request #84 from Gluejar/pledge_sidebar
Pledge sidebar
|
2012-11-26 08:21:02 -08:00 |
|
Raymond Yee
|
6ab521faa1
|
Merge branch 'master' into charge_failed
|
2012-11-23 09:20:58 -08:00 |
|
eshellman
|
db1fdc321e
|
Merge pull request #79 from Gluejar/ending_soon_notification
Ending soon notification
|
2012-11-21 14:05:26 -08:00 |
|
eric
|
54a8a31c8c
|
Merge branch 'master' into pledge_sidebar
|
2012-11-21 17:00:33 -05:00 |
|
Raymond Yee
|
ecea475419
|
a few modifications to pledge_failed notice
|
2012-11-21 11:40:19 -08:00 |
|
Raymond Yee
|
cbac6f1e3c
|
First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing
|
2012-11-21 09:21:01 -08:00 |
|
Andromeda Yelton
|
0a0b74e449
|
Revert "Revert "make the html validate""
This reverts commit a215471abb.
Conflicts:
frontend/templates/base.html
|
2012-11-20 15:53:24 -05:00 |
|
Andromeda Yelton
|
3ccb10a9aa
|
Merge branch 'pledge_sidebar' of github.com:Gluejar/regluit into pledge_sidebar
Conflicts:
frontend/templates/base.html
|
2012-11-20 15:51:37 -05:00 |
|
eric
|
466f7b9689
|
ok, so this results in the same dom tree, though the css matching is off
|
2012-11-20 15:48:41 -05:00 |
|
Andromeda Yelton
|
a215471abb
|
Revert "make the html validate"
This reverts commit f5e3cc1670.
|
2012-11-20 15:40:32 -05:00 |
|
eric
|
f5e3cc1670
|
make the html validate
|
2012-11-20 15:28:45 -05:00 |
|
Raymond Yee
|
02b17ea81f
|
Merge branch 'master' into charge_failed
|
2012-11-20 12:08:36 -08:00 |
|
Andromeda Yelton
|
7fcd0ba3af
|
change css filenames so that we can force user refresh
|
2012-11-20 14:26:06 -05:00 |
|
Andromeda Yelton
|
9f43c9a43c
|
this one too
|
2012-11-20 13:41:00 -05:00 |
|
Andromeda Yelton
|
ba3c0d3871
|
& not &
|
2012-11-20 13:40:25 -05:00 |
|
Andromeda Yelton
|
029cd9740d
|
that line looks better outside the form
|
2012-11-20 10:10:30 -05:00 |
|
Andromeda Yelton
|
810580779e
|
fixing nits
|
2012-11-20 10:06:40 -05:00 |
|
Andromeda Yelton
|
a2abb92038
|
makes pledge action clearer by describing in more contexts and using Pledge rather than Support
|
2012-11-20 09:56:04 -05:00 |
|
Andromeda Yelton
|
81e27e234e
|
decided that phrasing was confusing
|
2012-11-20 09:09:03 -05:00 |
|
Raymond Yee
|
8b3287d85d
|
Merge branch 'master' into charge_failed
|
2012-11-19 10:28:18 -08:00 |
|
Raymond Yee
|
af8a661eb7
|
Merge branch 'master' into webhooks
|
2012-11-19 09:21:38 -08:00 |
|
Andromeda Yelton
|
0b657cf1c1
|
clarify that acks are in the unglued ebook itself
|
2012-11-19 11:23:32 -05:00 |
|
eshellman
|
2fd4743e4c
|
Merge pull request #77 from Gluejar/hijaxify_signin
Hijaxify signin and make forms more good
|
2012-11-16 13:25:28 -08:00 |
|
Andromeda Yelton
|
3253bcca6f
|
also suppress sign up box on /accounts/register
|
2012-11-16 15:47:03 -05:00 |
|
Raymond Yee
|
645c7d41da
|
Merge branch 'master' into webhooks
|
2012-11-16 10:48:17 -08:00 |
|
thatandromeda
|
fce06ca854
|
Update frontend/templates/press.html
|
2012-11-16 13:22:36 -05:00 |
|
Andromeda Yelton
|
2858ed194c
|
bugfixing
|
2012-11-16 11:43:00 -05:00 |
|
eric
|
e613fe9365
|
added version to js url to force reload
|
2012-11-16 11:32:27 -05:00 |
|
Andromeda Yelton
|
87da5ae50e
|
tweaking phrasing following user feedback
|
2012-11-16 10:07:45 -05:00 |
|
Andromeda Yelton
|
1433be3856
|
customizing this on a per-user basis is going to be a pain, hence no amount
|
2012-11-16 10:07:19 -05:00 |
|
thatandromeda
|
acfdbfdf9c
|
Stephen's campaign closed :/
|
2012-11-16 08:00:22 -05:00 |
|
Raymond Yee
|
b02a289e01
|
Add templates for pledge_failed notification
|
2012-11-15 09:06:55 -08:00 |
|
Andromeda Yelton
|
2dc20d18ec
|
Merge branch 'master' into hijaxify_signin
|
2012-11-12 10:10:59 -05:00 |
|
Andromeda Yelton
|
097241493c
|
separating out rest of hijax vs non-hijax styling
|
2012-11-07 15:56:37 -05:00 |
|
Andromeda Yelton
|
c5ed14b6dc
|
further rectifying css
|
2012-11-07 15:34:10 -05:00 |
|
Andromeda Yelton
|
d9905df303
|
first pass at hijaxifying signin link
|
2012-11-07 14:58:40 -05:00 |
|
Andromeda Yelton
|
d7e4384236
|
add badge link to notifications page and suppress menu drop-down when clicking on it
|
2012-11-07 13:45:10 -05:00 |
|
Andromeda Yelton
|
304ddb6bdc
|
add badge to avatar when there are unseen notifications
|
2012-11-06 10:06:10 -05:00 |
|
Andromeda Yelton
|
50c51bd058
|
supporter not always in context, so use something that is
|
2012-11-06 09:54:42 -05:00 |
|
Andromeda Yelton
|
271741ead4
|
more consistent capitalization
|
2012-11-06 09:36:54 -05:00 |
|
Andromeda Yelton
|
0bcf845058
|
suppress top signup button on landing page
|
2012-11-06 09:34:31 -05:00 |
|
Andromeda Yelton
|
b3f21ecce3
|
consistent sign in/sign up capitalization
|
2012-11-06 09:31:53 -05:00 |
|
Andromeda Yelton
|
78c62ef553
|
Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
frontend/templates/work.html
|
2012-10-25 09:43:29 -04:00 |
|
thatandromeda
|
ec20417039
|
Update frontend/templates/press.html
|
2012-10-25 10:14:40 -03:00 |
|
thatandromeda
|
1a83b6cfc4
|
Merge pull request #73 from Gluejar/clarify_acknowledgements
Clarify acknowledgements
|
2012-10-24 09:14:12 -07:00 |
|
thatandromeda
|
08e49036d1
|
Merge pull request #74 from Gluejar/fix_nav_menu
Fix nav menu
|
2012-10-24 09:13:43 -07:00 |
|
Andromeda Yelton
|
4a87253ca7
|
only show the premiums section if there actually are premiums
|
2012-10-24 11:34:22 -04:00 |
|
Andromeda Yelton
|
9eb0323768
|
add case where ungluer has not yet pledged
|
2012-10-24 11:30:37 -04:00 |
|
Andromeda Yelton
|
d4549dfdb6
|
explain about acknowledgements in campaign management page
|
2012-10-24 11:25:37 -04:00 |
|
Andromeda Yelton
|
89b92b4dba
|
add acknowledgements to support menu
|
2012-10-24 11:25:17 -04:00 |
|
Andromeda Yelton
|
cc18eb20d3
|
add acknowledgements to support menu
|
2012-10-24 11:24:46 -04:00 |
|
Andromeda Yelton
|
e6ed4c3074
|
explain about acknowledgements in campaign management page
|
2012-10-24 11:00:35 -04:00 |
|
Raymond Yee
|
b4c1d09e88
|
Merge pull request #64 from Gluejar/prepopulate_ack_name
Prepopulate ack name
|
2012-10-23 10:35:40 -07:00 |
|
Andromeda Yelton
|
673b890e42
|
add production setting and only use google analytics in production
|
2012-10-23 10:24:16 -04:00 |
|
Andromeda Yelton
|
aa338e9811
|
amazon situation now resolved
|
2012-10-23 09:08:09 -04:00 |
|
Andromeda Yelton
|
6b348f2b76
|
don't need that conditional any more
|
2012-10-22 15:45:11 -04:00 |
|
Andromeda Yelton
|
4effa6faf9
|
communicate current outage, provide CTAs for current and future ones
|
2012-10-22 15:44:56 -04:00 |
|
Andromeda Yelton
|
02f803291a
|
communicate current outage, provide CTAs for current and future ones
|
2012-10-22 15:43:45 -04:00 |
|
Andromeda Yelton
|
002298d51a
|
don't need that conditional any more
|
2012-10-22 15:43:25 -04:00 |
|
Andromeda Yelton
|
104992612b
|
first pass at making things visually distinct if there are notifications
|
2012-10-19 15:01:06 -04:00 |
|
Andromeda Yelton
|
836a957d97
|
add profile settings link to dropdown
|
2012-10-19 12:31:23 -04:00 |
|
Andromeda Yelton
|
09d5b00e50
|
highlight editing area if #edit is in url
|
2012-10-19 12:26:11 -04:00 |
|
Andromeda Yelton
|
1bf4743667
|
making notifications prettier
|
2012-10-19 12:19:56 -04:00 |
|
Andromeda Yelton
|
11aac359e6
|
adding drop-down menu
|
2012-10-19 12:01:28 -04:00 |
|
Andromeda Yelton
|
21ef0c1bf2
|
now passing data through initial form values, not hidden divs
|
2012-10-18 14:16:05 -04:00 |
|
Andromeda Yelton
|
e3cdf397d3
|
Merge branch 'master' of github.com:Gluejar/regluit into prepopulate_ack_name
|
2012-10-18 10:12:13 -04:00 |
|
eric
|
6b78ff7685
|
message for no pledges, html nits
|
2012-10-18 09:04:22 -04:00 |
|
Andromeda Yelton
|
96918d60a5
|
if not modifying pledge use ack data from previous transaction to prefill ack boxes [#37939351]
|
2012-10-17 11:54:29 -04:00 |
|
thatandromeda
|
79fca69cf9
|
Update frontend/templates/press.html
|
2012-10-16 16:41:37 -03:00 |
|
Andromeda Yelton
|
102937567b
|
better syntax
|
2012-10-16 10:20:41 -04:00 |
|
thatandromeda
|
80fae98b88
|
Merge pull request #60 from Gluejar/manage_user_cc
tweak error page, other nits
|
2012-10-15 07:50:45 -07:00 |
|
eric
|
5ddbcd8d67
|
Improve error message to encourage user to try again
|
2012-10-15 10:47:18 -04:00 |
|
eric
|
48be5a1191
|
xhtml nits
|
2012-10-15 10:28:31 -04:00 |