Andromeda Yelton
7bd44fb93e
link to work page not download page
2012-09-13 11:17:05 -04:00
Andromeda Yelton
fdf27c4029
make work title on download page a link
2012-09-13 11:14:32 -04:00
Andromeda Yelton
d4309dd46c
digital shift coverage of OLA unglued ebook launch
2012-09-12 11:55:27 -04:00
Andromeda Yelton
de78548a32
list press releases on press page
2012-09-12 11:31:22 -04:00
Andromeda Yelton
fb648bbb5c
Merge branch 'fix_lockss'
2012-09-12 10:37:29 -04:00
Andromeda Yelton
18a598f628
need to change lockss page since unglued adheres to editions
2012-09-12 10:11:49 -04:00
Andromeda Yelton
3733780ef3
Merge branch 'master' of github.com:Gluejar/regluit
2012-09-12 10:00:31 -04:00
Andromeda Yelton
d8316c76ec
user isn't in the context so we shouldn't reference it
2012-09-12 08:41:22 -04:00
eric
c457dec497
helpful ebook format notations
2012-09-12 00:20:09 -04:00
eric
64461cc49e
one letter typo was messing up unglued ebooks display
2012-09-12 00:09:29 -04:00
Raymond Yee
e6f94223f4
Merge branch 'master' into relaunch_ry
2012-09-11 15:55:58 -07:00
Andromeda Yelton
b383c9717d
hijax script should be in base so it works sitewide, and hijax class must be applied to download link to trigger
2012-09-11 14:14:57 -04:00
Andromeda Yelton
ba6c7165b3
OLA launch announcement
2012-09-11 14:03:33 -04:00
eric
5ddc050ff9
[finished #35857177 ] fixed missing user wishlist context for bookpanel on supporter page
...
bug introduced in
https://github.com/Gluejar/regluit/commit/fd44471aaecc08c30dd1688b060cd1
18174d910e
2012-09-11 13:41:53 -04:00
Raymond Yee
a161b1f28b
integrating Credit card form in
2012-09-10 17:02:34 -07:00
Raymond Yee
0e1839d531
Merge branch 'master' into relaunch_ry
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:18:30 -07:00
Raymond Yee
bcceaa719b
integrating stripe into fund_the_pledge
2012-09-10 13:17:30 -07:00
Andromeda Yelton
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
Andromeda Yelton
3a0d09db33
edition-adding on rights tab was hard to read with multiple editions
2012-09-10 14:37:37 -04:00
Raymond Yee
e0bc5ee996
Merge branch 'master' into relaunch
2012-09-10 08:52:23 -07:00
Raymond Yee
add83c9d9e
fixed case of LOCKSSpreserved.png
2012-09-10 08:49:12 -07:00
Andromeda Yelton
d9147fd088
clarifying instructions
2012-09-10 10:51:52 -04:00
Andromeda Yelton
3a1a523acb
typo
2012-09-10 10:51:43 -04:00
eric
92a2ccc7ce
cleaned up the response when a pledge is modified rather than created
2012-09-07 17:48:48 -04:00
eric
4700e63b06
resolve conflict
2012-09-07 16:26:09 -04:00
eric
18608d3e7d
preapproval amount is now amount for requested premium, not previously pledged amount
2012-09-07 16:13:53 -04:00
eric
a361d7b53d
so we didn't really need to put premium description directly into context
2012-09-07 16:12:32 -04:00
Raymond Yee
1742572d95
Merge branch 'master' into relaunch
...
Conflicts:
frontend/views.py
2012-09-07 13:08:03 -07:00
eric
6f63c047ce
DRY pub year code moved to work model
2012-09-07 16:07:47 -04:00
eric
c2636f5bba
removed legacy DonateView
2012-09-07 01:11:28 -04:00
eric
4d4e61d338
donation modification now works [ #21784207 ]
2012-09-06 16:55:32 -04:00
eric
bd794a2ac5
clean up the donation endpoint pages so they work (if a bit ugly!)
2012-09-06 14:04:47 -04:00
eric
9395cd058b
now donating cents works, too
2012-09-06 11:36:13 -04:00
eric
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
Andromeda Yelton
f2e9559a3a
beginning of a notification to RHs when someone wishlists their work
2012-08-31 13:47:01 -04:00
eric
94270f33c6
add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager
...
also removed unused target, lists, ack-link,
2012-08-31 03:16:04 -04:00
eric
f299d9ecf7
rip out paypal and amazon code
2012-08-31 03:12:15 -04:00
Andromeda Yelton
863bfe5856
/about/ pages need appropriate styling and should not conflict if user clicks on About in header
2012-08-28 13:47:29 -04:00
Andromeda Yelton
13171f6472
making sure the styling works no matter where download link is clicked from
2012-08-28 10:22:47 -04:00
Andromeda Yelton
07c529a715
read it now should link to download page
2012-08-28 10:22:30 -04:00
Andromeda Yelton
24abca09b7
revising download instructions per feedback from testers
2012-08-28 10:08:06 -04:00
Andromeda Yelton
eb5eb17d83
was driving me crazy that that went to preview rather than campaign itself for active campaigns
2012-08-27 16:40:40 -04:00
Andromeda Yelton
48e20a7cdd
bringing all the lightboxes under the hijax.js system
2012-08-27 15:35:29 -04:00
Andromeda Yelton
307e0d41c7
completed first draft of download instructions
2012-08-27 14:13:50 -04:00
Andromeda Yelton
cc70ff1765
adding download instructions
2012-08-24 18:48:28 -04:00
Andromeda Yelton
a6e034a36a
rudimentary download page plus logic to serve it
2012-08-24 15:14:32 -04:00
eric
9c602cf530
typo
2012-08-23 18:24:52 -04:00
Andromeda Yelton
4fe0c3ff05
Merge branch 'master' of github.com:Gluejar/regluit
2012-08-23 14:10:11 -04:00
Andromeda Yelton
aa3667d260
working on download page
2012-08-23 13:38:48 -04:00
eric
599d333e34
typo
2012-08-22 14:38:49 -04:00
Andromeda Yelton
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
Andromeda Yelton
368a3ca8ec
making license display more standards-compliant
2012-08-15 10:05:10 -04:00
Andromeda Yelton
28670ed01a
building LOCKSS manifest page
2012-08-15 09:40:37 -04:00
eric
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
Andromeda Yelton
6d6c324a82
tweaking
2012-08-14 15:03:33 -04:00
Andromeda Yelton
e2957abf25
tweaking
2012-08-14 14:53:48 -04:00
Andromeda Yelton
07f1177c08
we kinda got a lot of press coverage following the amazon shutdown
2012-08-14 10:11:31 -04:00
eric
403420a283
Add user-to-user credit transfers [ #21784207 ]
2012-08-13 21:00:28 -04:00
eric
e928a2dfa1
edit alert, make the box red again
2012-08-09 06:28:42 -04:00
thatandromeda
e902c3c704
announcement at top of site edited to reflect Amazon situation
2012-08-08 16:11:52 -03:00
Andromeda Yelton
8ef30302d4
notice templates for campaign shutoffs due to amazon payment suspension
2012-08-08 14:19:04 -04:00
eric
0d13fe9ba4
2 more minus_amount s [ #21784207 ]
2012-08-07 16:18:03 -04:00
eric
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
Andromeda Yelton
da0f4970c2
improving data flow of acks throughout system
2012-08-06 15:44:43 -04:00
Andromeda Yelton
8db1e5b59a
set up acks page to deal with ack_name, _link, _dedication and anonymity bit
2012-08-06 13:35:29 -04:00
Andromeda Yelton
270a686049
Merge branch 'master' of github.com:Gluejar/regluit into mandatory_premiums
...
Conflicts:
static/css/lists.css
2012-08-06 09:37:09 -04:00
Andromeda Yelton
2b16fc06a8
clarifying where the acks will happen
2012-08-01 12:08:52 -04:00
Andromeda Yelton
f6f624fe87
addressing some questions we actually get about Amazon and Paypal and making sure answers on page are correct
2012-08-01 09:19:09 -04:00
Andromeda Yelton
b041430731
front end for new pledge page, plus just enough back end that it displays
2012-08-01 08:52:39 -04:00
eric
e8bd5ab2dc
added ckeditor to manage campaign forms to provide rich text editing and image uploads [ #32447975 ]
2012-07-27 14:23:44 -04:00
eric
d478836e0e
use profile.home_url in acks page where it's been set [ #32366341 ]
2012-07-26 12:07:16 -04:00
thatandromeda
29fd89011c
removing reference to "donate"
2012-07-25 11:51:05 -03:00
Raymond Yee
7f6b1fd684
refining script to produce data for OLA
...
add user profile tagline to acks
2012-07-25 07:15:51 -07:00
thatandromeda
b691c8f896
Update frontend/templates/notification/notice_template.html
2012-07-24 14:52:39 -03:00
eric
0d8604e1bd
to be safe, removed the word "donation" from website
2012-07-24 10:45:49 -04:00
Andromeda Yelton
6d4044bcde
intermediate state
2012-07-24 08:08:34 -04:00
Andromeda Yelton
fd5e73ea9b
don't need adwords code for oral lit any more
2012-07-23 07:41:56 -04:00
eric
ed12a0d460
[ #32290103 ] fixed html error- <hr /> not allowed in span
2012-07-22 14:53:53 -04:00
eric
3044507e2b
{#22431977] tweaked wording on unglued header
2012-07-22 14:18:29 -04:00
eric
fdce89d17b
Added language filtering [finish #24232285 ]
2012-07-21 16:26:16 -04:00
eric
d7638463b1
reporting facility for languages
2012-07-20 14:29:04 -04:00
Andromeda Yelton
6a6ee190e4
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-18 15:15:31 -04:00
Andromeda Yelton
c47f9326f6
erroneously referred to learn_more.css rather than learnmore.css
2012-07-18 15:14:48 -04:00
Andromeda Yelton
ce8a36580a
whoops, mixed up some attributions
2012-07-18 07:51:30 -04:00
Raymond Yee
b8f9155789
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-17 09:24:27 -07:00
Andromeda Yelton
97c2d0b63d
need to make sure base.html About link in header works with new expand_about.js
2012-07-17 12:17:43 -04:00
Andromeda Yelton
f57ac97e81
die zeit, german NPR coverage
2012-07-17 09:04:10 -04:00
Andromeda Yelton
c9871b29a2
Merge branch 'wishlist_tabs'
...
Conflicts:
frontend/templates/base.html
2012-07-17 08:53:28 -04:00
Andromeda Yelton
f32cb39d9a
added conditionals to make sure phrasing made sense for empty wishlists, and clarified who chooses the ungluing fee
2012-07-17 08:47:53 -04:00
Raymond Yee
ba6762e781
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 11:56:13 -07:00
Andromeda Yelton
362a4d2b85
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 14:52:38 -04:00
Raymond Yee
d5056441e8
oops...forgot to commit pledge_recharge.html
2012-07-16 11:48:10 -07:00
Andromeda Yelton
abdb4ddfc7
adding separator between headline and notification text
2012-07-16 14:46:45 -04:00
Andromeda Yelton
c9d57bb08b
making the sharing block work
2012-07-16 13:47:18 -04:00
Andromeda Yelton
f000c01267
fixing more syntax after testing
2012-07-16 13:29:20 -04:00
Andromeda Yelton
f56b342b00
fixing syntax errors found while testing
2012-07-16 12:44:27 -04:00
Andromeda Yelton
a226669109
bleah, django-notification fails around the with tags. removed.
2012-07-16 11:50:31 -04:00
Raymond Yee
7353731db5
4 campaigns now
2012-07-11 21:39:21 -07:00
thatandromeda
df147937aa
phrasing was unclear, scary. we're not space-limited here like we used to be.
2012-07-11 12:37:23 -03:00
eric
e3be202189
"benefactors", not patrons [ #30516251 ]
2012-07-11 09:18:14 -04:00
Andromeda Yelton
95c95dfcc8
added comment to explain about url dispatcher situation
2012-07-09 15:49:36 -04:00
Andromeda Yelton
69502b75ee
need to convert urls to template variables or django-notification can't find them
2012-07-09 15:47:38 -04:00
Andromeda Yelton
59b3657808
we were using this verbatim in five different templates. DRY
2012-07-09 15:47:09 -04:00
Andromeda Yelton
ac682c2c47
whoa hey. if we're using a TEMPLATING SYSTEM the notification content should probably be blocks inserted into a TEMPLATE, huh.
2012-07-09 11:33:21 -04:00
Andromeda Yelton
d53ea242b6
changing 'staff picks' to 'noteworthy'
2012-07-09 10:53:58 -04:00
eric
01cb96e65d
reported email as notices, not accounts
2012-07-09 09:25:31 -04:00
eric
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
eric
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
eric
b6d77a7645
usernames were not being URLescaped. [#finish #32365703 ]
2012-07-06 12:25:20 -04:00
eric
011dc4ffde
[ #32289649 ] validation nit
2012-07-06 11:19:51 -04:00
Andromeda Yelton
9152655587
list ungluers in two-column format by reverse of date wished [ #32289815 ]
2012-07-05 11:33:57 -04:00
Andromeda Yelton
b9aaff2968
david brin hooray
2012-07-05 11:33:18 -04:00
Andromeda Yelton
3ce4db8e9a
change support to premiums and make it clickable [ #32289833 ]
2012-07-05 10:39:19 -04:00
Andromeda Yelton
1bf0fe8d26
moving notification alert inline [ #32289941 ]
2012-07-05 10:30:26 -04:00
Andromeda Yelton
85247c306e
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
core/models.py
2012-07-05 10:21:08 -04:00
Andromeda Yelton
325765e453
loose ends from anaheim [ #32290011 ] [ #32289649 ] [ #32289951 ]
2012-07-05 10:05:04 -04:00
Andromeda Yelton
6ccaf81f06
updated to reflect Amazon email so supporters won't be surprised by it
2012-07-02 11:07:10 -04:00
Raymond Yee
bfe02fc39d
4->3 active campaigns
2012-06-29 18:38:19 -07:00
Andromeda Yelton
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
Andromeda Yelton
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
eric
8be8883e63
draft of front matter template (not used yet)
2012-06-28 16:23:29 -04:00
thatandromeda
cbef02e3fc
moar boingboing
2012-06-28 12:45:21 -07:00
eric
5f16b07174
alert header now trumpets our success
2012-06-22 00:41:20 -04:00
Raymond Yee
4bb48c64e6
changing future to present continuous tense for when credit card charged
2012-06-21 09:07:05 -07:00
eric
bc2e5ac3be
better handling of successful campaigns on work page
2012-06-21 10:49:55 -04:00
Raymond Yee
0c88c77733
forgot the easy-to-forget endswith
2012-06-21 06:14:37 -07:00
Raymond Yee
013ddb5a3c
Another template problem in the pledge_charged notices
2012-06-21 06:09:37 -07:00
Raymond Yee
20e5baa6ba
work -> transaction.campaign.work
2012-06-21 05:09:51 -07:00
Raymond Yee
7482a19cd1
work.id -> campaign.work.id
2012-06-20 21:29:23 -07:00
Raymond Yee
31cf653e63
Five -> four active campaigns
2012-06-20 20:47:42 -07:00
eric
f7282d4e11
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-06-19 07:34:52 -04:00
eric
001f654880
trivial cleanup in unglued ebook notification
2012-06-19 07:34:37 -04:00
Raymond Yee
1f77371b7b
1) the title of ISBN:9780226032030 changed from 'Forbidden journeys' to 'Forbidden Journeys'
...
2) using humanize tag naturalday on the book panel
2012-06-18 13:55:45 -07:00
Raymond Yee
30bf30177c
Added a case for pledge_modified to have a up_or_down to be 'canceled' -- and change in template text to handle the canceling of a pledge
2012-06-15 16:14:26 -04:00
Andromeda Yelton
12dca9c36d
reducing redundancy in comment notification lead-in
2012-06-15 11:32:12 -03:00
Andromeda Yelton
2beb4e5dbb
commenting
2012-06-14 17:15:11 -03:00
Andromeda Yelton
2c14edd8ad
updating press coverage
2012-06-14 11:35:57 -03:00
Andromeda Yelton
ad23fc3c4c
refactoring to work with new expand_about.js
2012-06-13 16:50:57 -03:00
Andromeda Yelton
df7ea263a0
adding a wishlist-tabs explanation section [ #22431977 ]
2012-06-13 16:50:03 -03:00
Andromeda Yelton
3d5cf5107f
embiggening font sitewide (almost nothing below 13px), making font size a less variable so it's easier to change in future and we don't have so many different font sizes
2012-06-13 13:31:21 -03:00
Andromeda Yelton
d652db5c03
removing is_preview since it's no longer needed
2012-06-13 09:41:23 -03:00
Andromeda Yelton
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
Andromeda Yelton
d0a7f9ea63
added conversion tracking code for adwords campaigns so that we can assess their performance
2012-06-12 11:29:47 -03:00
Andromeda Yelton
656899105e
should make correct decisions about displaying sign-up-today option [ #30249919 ]
2012-06-04 15:50:30 -04:00
Andromeda Yelton
d55d3cb54a
fixes [ #30249919 ]
2012-06-04 15:20:23 -04:00
Andromeda Yelton
17b222d69f
adding prominent invitation for RHs to email us to FAQ
2012-06-04 10:29:42 -04:00
Andromeda Yelton
ce5ee124d9
removing pagination from work_list -- likely unnecessary and this should be faster
2012-06-01 13:15:50 -04:00
Andromeda Yelton
153e7eaff9
Merge branch 'master' of github.com:Gluejar/regluit
2012-06-01 11:02:35 -04:00
Andromeda Yelton
fd44471aae
caching the wishlist rather than calculating it for every single book_panel = potentially huge performance improvement
2012-06-01 10:22:39 -04:00
Andromeda Yelton
882ba635da
making capitalization consistent
2012-06-01 10:10:42 -04:00
Andromeda Yelton
acf6f18a1c
fixed broken link
2012-06-01 09:06:26 -04:00
Andromeda Yelton
56074903e7
more cleanup
2012-06-01 09:06:20 -04:00
Andromeda Yelton
a6d03af40d
caching repeatedly-used title
2012-05-31 13:33:16 -04:00
Andromeda Yelton
9e8be5695b
comments
2012-05-31 13:29:41 -04:00
Andromeda Yelton
90ece3a2b0
made logic less awful, cached work.id to speed things up as it's used many times
2012-05-31 13:25:19 -04:00
Andromeda Yelton
cfa12dd228
was missing fastcoexist article
2012-05-31 13:24:53 -04:00
Andromeda Yelton
4eab46f1d5
clarify what 'official comment' means
2012-05-30 12:36:35 -04:00
Raymond Yee
63567d8eaa
mad->made (typo fix)
2012-05-30 09:32:04 -07:00
Andromeda Yelton
6e9e87f402
more blog coverage
2012-05-29 21:29:22 -04:00
Andromeda Yelton
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
Andromeda Yelton
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
Raymond Yee
d077a81a1b
[ #29919391 ] 742d5bcd70/frontend/templates/book_panel.html (L163)
was not succeeding because work.last_campaign is None. So I rearrange the logic
...
to look first for whether there are any ebooks to link to, then added a check for last_campaign == None.
I think this fixes the immediate issue of Wished by N not appearing-- but the set of if statements could take a bit more thinking through
2012-05-29 16:57:38 -07:00
eric
4ce0731095
[ #28011527 ] implemented comment preview form to address missing-user error
2012-05-29 19:20:00 -04:00
Andromeda Yelton
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
Andromeda Yelton
5d37a969bd
phrasing needs to be sensitive to increase vs decrease
2012-05-29 08:55:16 -04:00
eric
63bc11026e
two other reg templates to change when user already logged in [ #29858801 ]
2012-05-26 20:57:59 -04:00
eric
a4e15bcda3
stop showing logged-in users the login form [ #29858801 ]
2012-05-26 18:36:10 -04:00
eric
d784715407
Round dollar amount to nearest dollar [ #30073593 ]
2012-05-25 18:34:16 -04:00
eric
7de9616e23
[finish #27015121 ] add going to amazon text, premium amount now inline.
2012-05-25 18:18:29 -04:00
eric
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
eric
9203127da1
comments by campaign managers get a blue box around them [ #28494261 ]
2012-05-25 14:51:46 -04:00
Raymond Yee
1335b3cb72
[ #29500707 ]
...
Fleshing out exception handling for pledge_cancel
selenium tests work for both amazon and paypal on RY laptop -- now going to test them on ry-dev
2012-05-24 18:47:50 -07:00
Raymond Yee
60b84b0358
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 14:10:10 -07:00
Andromeda Yelton
f3e5477d33
home link should also go to landing page
2012-05-24 15:33:34 -04:00
Andromeda Yelton
733893ecdb
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-24 15:30:01 -04:00
Andromeda Yelton
86313666ee
making [ #29858801 ] happen -- now you can get back to the home page by clicking on the logo even if logged in
2012-05-24 15:29:45 -04:00
Raymond Yee
d2129a2e83
Merge branch 'master' into cancel_pledge
2012-05-24 09:37:13 -07:00
Raymond Yee
ad2405243a
Added missing deadline to book_panel
2012-05-24 09:35:58 -07:00
Raymond Yee
2f9d899030
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 08:43:33 -07:00
Andromeda Yelton
6eb29f2a78
adding SLJ coverage
2012-05-23 15:38:26 -04:00
Andromeda Yelton
30adccdd37
put ungluer count on second line and changed text placement accordingly to prevent overflow with high ungluer count numbers
2012-05-23 10:40:13 -04:00
Raymond Yee
a0bc6deefc
Closing in on pledge_cancel
2012-05-23 07:22:48 -07:00
Andromeda Yelton
4829c8679e
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-23 09:44:31 -04:00
Andromeda Yelton
cd9ff5af63
make whole pledge/read now area on back of panel clickable, maintain styling
2012-05-23 08:47:41 -04:00
Andromeda Yelton
2f285d7300
added name attributes to submit buttons
2012-05-23 08:12:35 -04:00
Andromeda Yelton
42665150ec
restored link to latest comments
2012-05-22 11:48:53 -04:00
Andromeda Yelton
7791f9a1ae
added a comment
2012-05-22 11:48:23 -04:00
Andromeda Yelton
0fcdbee50a
minor copy-editing type stuff
2012-05-22 11:07:40 -04:00
Raymond Yee
5ce95c342b
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-22 07:43:10 -07:00
eric
165d08663b
html validation cleanup for pledge page and about lightbox [ #29777801 ]
2012-05-22 09:16:12 -04:00
Andromeda Yelton
54368ffbca
adding pledged checkmark next to relevant premium on work page when supporter has pledged
2012-05-22 07:34:42 -04:00
eric
5f2ed14ff3
[ fix #29962925 ] Turns out you can't pledge without an amazon account
2012-05-21 18:42:56 -04:00
Raymond Yee
dd8b892a42
Merge branch 'master' of github.com:Gluejar/regluit into master_cancel
2012-05-21 13:57:59 -07:00
Andromeda Yelton
f01c83f1b8
adding call to action for logged-in users [ #29777801 ]
2012-05-21 16:01:20 -04:00
Andromeda Yelton
1cf9f4058d
fixing [ #29941831 ]
2012-05-21 14:06:48 -04:00
Andromeda Yelton
32a7699eb5
addressing some actual questions seen around the interwebs
2012-05-21 13:39:19 -04:00
Raymond Yee
c75148dc74
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 09:55:56 -07:00
Andromeda Yelton
1a53d8b86d
that div was ugly and contentless
2012-05-21 12:19:50 -04:00
Andromeda Yelton
efe7e41be4
got some feedbackfrom target audience types
2012-05-21 12:09:12 -04:00
Raymond Yee
2f232c29fd
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 08:54:05 -07:00
Andromeda Yelton
66616f9f90
well that had been precisely the opposite if condition than I intended
2012-05-21 11:18:30 -04:00
Andromeda Yelton
7f730e53ef
restoring a bit of language with license choice flexibility
2012-05-21 11:17:44 -04:00
Andromeda Yelton
decdbef3a4
Merge branch 'launch' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/faq.html
frontend/templates/press.html
2012-05-21 11:10:25 -04:00
Raymond Yee
b8336c4ed6
En route to implementing pledge cancellation
2012-05-21 07:56:18 -07:00
Andromeda Yelton
1b677087e2
add HuffPo article
2012-05-21 10:50:03 -04:00
Andromeda Yelton
690bd76357
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/press.html
2012-05-21 10:38:08 -04:00
Andromeda Yelton
b85d034030
we need an About link
2012-05-21 10:03:56 -04:00
Andromeda Yelton
42aaa90245
moar launch coverage
2012-05-21 10:03:45 -04:00
Andromeda Yelton
61dd4124af
suppres percent-of-goal display when no campaign
2012-05-21 10:02:57 -04:00
eric
e61a818ad3
[finish #29885177 ] redirect user after login instead of just displaying link
2012-05-20 00:55:41 -04:00
eric
3de07e973f
[finish #29780503 ] add link to CC licence to rights tab of campaign page
2012-05-20 00:22:12 -04:00
eric
bd5b062d24
change manage_campaign to allow active campaigns to remove license restrictions [ #29884981 ]
2012-05-20 00:13:12 -04:00
eric
62c1d80547
changed wording to be more open to non NC licenses [ #29884981 ]
2012-05-20 00:08:04 -04:00
Raymond Yee
272d795ded
Renaming the current functionality that has been named "cancel" to be "nevermind" because that functionality arose to support users changing their mind
...
The new PledgeCancel is a placeholder for the functionality I will build next to let users actually cancel existing transactions
Finally, I use the setting.PAYMENT_PROCESSOR to set the default value of Transaction.host ('paypal' or 'amazon')
2012-05-18 16:59:48 -07:00
Andromeda Yelton
e64e3722ea
added guidance to deal with the username/email prefill bug, let's see if it helps
2012-05-18 13:47:12 -04:00
Andromeda Yelton
a5df3b608a
fixing broken link
2012-05-18 11:35:08 -04:00
Andromeda Yelton
9cac73f036
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-18 11:29:51 -04:00
Andromeda Yelton
bfc958fd06
updating with launch coverage
2012-05-18 11:29:37 -04:00
Andromeda Yelton
333de6ce6b
mildly humiliating grammar mistake
2012-05-18 11:28:58 -04:00
Raymond Yee
0d5392aeae
Merge branch 'ry'
2012-05-17 14:05:33 -07:00
Raymond Yee
04ec596dc1
pieces of django-maintenance
2012-05-17 13:28:48 -07:00
Andromeda Yelton
00802f700f
digital shift article
2012-05-17 13:08:20 -04:00
Andromeda Yelton
e38be413c4
adding LJ article
2012-05-17 12:58:50 -04:00
Andromeda Yelton
1eb7847b76
need to make sure book_panel knows about campaign status no matter where it's being included from
2012-05-17 12:06:29 -04:00
Andromeda Yelton
37c54f0ef7
adding japanese coverage to blog section
2012-05-17 11:08:12 -04:00
Andromeda Yelton
7bd9f28770
making percent unglued display better in book panels
2012-05-17 10:19:20 -04:00
Andromeda Yelton
d234c45c42
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-17 09:55:34 -04:00
Andromeda Yelton
41323e443d
one more $ added to premium amount field
2012-05-17 09:43:29 -04:00
Andromeda Yelton
a47f48e777
showing percent campaign has proceeded toward goal more clearly
2012-05-17 09:24:57 -04:00
Andromeda Yelton
4ec0ed0638
adding $ before target price field to reduce chance people will type one into the field
2012-05-17 09:15:33 -04:00
Raymond Yee
aa5fb08850
[ #29500707 ] For the moment, ask users to contact us to cancel transactions.
2012-05-16 20:35:43 -07:00
Andromeda Yelton
cc8c9ebbb9
added a message that will display when is_preview is off directing people toward active campaigns
2012-05-16 21:43:45 -04:00
Andromeda Yelton
45720197c6
ensuring that cancel message is not too wide
2012-05-16 14:29:15 -04:00
Andromeda Yelton
e60be456cc
whoops ungrammatical
2012-05-16 14:28:51 -04:00
Andromeda Yelton
c4053a4b59
communicating stuff more clearly
2012-05-16 14:03:14 -04:00
Andromeda Yelton
2a9ef4030f
rewording notification box to reflect current state
2012-05-16 12:18:35 -04:00
Andromeda Yelton
f5602b5756
we weren't using this
2012-05-16 11:38:53 -04:00
Andromeda Yelton
104b916171
changing http unglue.it links to https
2012-05-16 11:38:42 -04:00
Andromeda Yelton
b9de19bb09
modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom
2012-05-16 10:35:58 -04:00
Andromeda Yelton
775d1d4af2
fixing rendering of successful campaign notifications
2012-05-16 10:06:26 -04:00
eric
0f9d292e16
more andromeda's nits [ #29281959 ]
2012-05-16 02:05:32 -04:00
eric
4a98076b63
fix andromeda's nits [ #29281959 ]
2012-05-16 01:49:36 -04:00
eric
979bb8b037
missing humaize in pledged_charge [ #28493739 ]
2012-05-16 01:48:41 -04:00
eric
06b002c276
[ #28493739 ] fix heading of pleadge_charged notice
2012-05-15 23:07:18 -04:00
eric
a6e685618c
resolve conflicts
2012-05-15 22:54:23 -04:00
eric
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
Andromeda Yelton
b6a6b6df7d
first pass at making pledge amount and premium level boxes reconcile. needs to be made DRYer but works.
2012-05-15 19:31:49 -04:00
Andromeda Yelton
6c3c1a8cd5
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-15 15:44:54 -04:00
Andromeda Yelton
03f98844fd
removing pledge_prefill script, moving tiny little focus script to here
2012-05-15 15:44:18 -04:00
eric
28a4eb5f57
[ #29632523 ] pledge modify form now preselects the correct premium
2012-05-15 13:47:00 -04:00
Andromeda Yelton
8cba752057
more notices need html templates for display at /notifications
2012-05-15 10:27:57 -04:00
Andromeda Yelton
9e2050c000
adding answer to an actual question from an actual user
2012-05-15 09:33:12 -04:00
eric
d3bff4efb5
[ #29481707 ] added explanation of how to "edit" a premium
2012-05-14 23:27:44 -04:00
Andromeda Yelton
95d4786c4b
notice templates should actually say stuff
2012-05-14 21:42:46 -04:00
Andromeda Yelton
26061cd240
hey the reason I wasn't getting the layout I expected was that I'm an idiot. sweet\!
2012-05-14 21:09:29 -04:00
Andromeda Yelton
fe9ee13ae1
adding eric's ccc podcast
2012-05-14 20:53:05 -04:00
Andromeda Yelton
4fec8438a6
communicating a little more clearly
2012-05-14 20:44:27 -04:00
Andromeda Yelton
6d14ba1c30
only really need to set context for site once, not separately for view and triggered notification
2012-05-14 16:56:36 -04:00
Andromeda Yelton
33bfb73a25
the sharing options in the you_have_pledged notice.html should be real live links
2012-05-14 16:53:53 -04:00
eric
e42ecfbec5
html cleanup on pledge page
2012-05-14 15:56:19 -04:00
eric
98aca7b474
Attorney review done [finish #29281959 ]
2012-05-14 15:43:22 -04:00
Andromeda Yelton
1c5d517d93
setting clearer expectations about communication in response to user feedback
2012-05-14 13:50:55 -04:00
Andromeda Yelton
2b9b4a7331
share links in pledge_complete need to include url base
2012-05-14 13:42:34 -04:00
Raymond Yee
32250157e3
Merge branch 'real_money' of github.com:Gluejar/regluit
2012-05-14 15:41:55 +00:00
eric
443c4b5d42
[finish #27015121 ] give focus to pledge amount box, select premium doesn't reduce pledge
2012-05-14 09:01:03 -04:00
eric
6bb564aca6
[finish #28851641 ]campaign managers now have access to edition creation and editing for works they manage
2012-05-14 01:07:02 -04:00
eric
4d1a1aba35
fixed missing inputs for manage campaign form [ fix #29179771 ] which prevented active campaigns from saving edits
2012-05-14 00:56:32 -04:00
eric
3c98e65217
whoops. So used to django knowing what I meant...
2012-05-13 23:11:06 -04:00
eric
ea9ac7508e
repaired the invocation ot I_just_pledged emailshare [ #27785469 ]
2012-05-13 22:59:07 -04:00
Andromeda Yelton
1270907295
merge these changes to master when the real money bit is flipped
2012-05-13 16:50:33 -04:00
Andromeda Yelton
f1a7d68f8a
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-13 16:47:10 -04:00
eric
cc097b0aa3
more fixing extends directive
2012-05-13 16:38:06 -04:00
Raymond Yee
89c4fa451f
extends directive needs to be the first line in Django template
2012-05-13 13:32:34 -07:00
Andromeda Yelton
100dc9d9b6
spurious <br>s
2012-05-13 16:06:48 -04:00
eric
9ed4186124
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-05-13 15:37:28 -04:00
eric
aad5593c1d
resolve conflicts
2012-05-13 15:37:20 -04:00
Andromeda Yelton
c38a3a320f
fixing some URLs
2012-05-13 15:33:19 -04:00
eric
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04:00
Andromeda Yelton
9a6ea26266
check to see if people have pledged and if so direct them to pledge_modify from sidebar rather than spawning new pledge
2012-05-13 15:23:04 -04:00
Andromeda Yelton
ea5664b08c
that ampersand should not be URLencoded since it's actually a parameter
2012-05-13 15:22:38 -04:00
Andromeda Yelton
d2cf8a773b
improvifying pledge front end around modify and cancel
2012-05-13 10:49:23 -04:00
Andromeda Yelton
ae76f89034
fixing problems with context for you_have_pledged notification
2012-05-12 22:42:09 -04:00
Andromeda Yelton
e6467e4e85
even moar wordsmithing of notifications
2012-05-12 21:49:31 -04:00
Andromeda Yelton
6fe7aeeabb
even more notification wordsmithing
2012-05-12 21:28:27 -04:00
Andromeda Yelton
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
Andromeda Yelton
83730badbb
more wordsmithing
2012-05-12 11:58:33 -04:00
eric
77a66e5420
[ #29498563 ] fixed urls by moving email share messages to django templates; eliminated sender from form
2012-05-12 11:12:43 -04:00
eric
76b8b9f33d
[ #29488053 ] no use linking to google books if no google books id
2012-05-11 22:46:41 -04:00
Andromeda Yelton
8e3baba673
wordsmithing
2012-05-11 21:36:20 -04:00
eric
feb8650c10
[ #29488053 ] add to wishlist now works for works without googlebooks_id
2012-05-11 21:29:03 -04:00
eric
5bd3f06903
[ #28851641 ] removed some debug code
2012-05-11 21:29:03 -04:00
eric
ca2bfedafd
[ #28851641 ] fillied in you_have_pledged templates
2012-05-11 21:29:03 -04:00
thatandromeda
328cea6cf3
Update frontend/templates/notification/wishlist_active/full.txt
2012-05-11 16:05:47 -03:00
eric
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
eric
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
Andromeda Yelton
bc3045161c
clarified wording
2012-05-10 15:40:37 -04:00
Andromeda Yelton
71c174d012
need to expose paypal address field after all
2012-05-10 13:23:42 -04:00
Andromeda Yelton
4ba688dbad
minor fixes
2012-05-10 13:23:19 -04:00
Andromeda Yelton
c6186c7808
need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want
2012-05-09 16:33:22 -04:00
Andromeda Yelton
fe84c09651
polishing for launch
2012-05-09 16:32:06 -04:00
Andromeda Yelton
41f662c048
updating pledging contextual FAQs
2012-05-09 13:40:01 -04:00
Andromeda Yelton
d0bac11ec4
clarifing CC noncommercial
2012-05-09 13:26:12 -04:00
Andromeda Yelton
e1835a7cc7
updating, including amazon and paypal language
2012-05-09 13:01:17 -04:00
Andromeda Yelton
665fb99af3
updating with paypal and amazon info
2012-05-09 12:49:49 -04:00
Andromeda Yelton
e4e66b2118
adding some more recent coverage
2012-05-09 12:45:00 -04:00
Andromeda Yelton
42d33794e3
sign up element in learn more section was misaligned
2012-05-09 12:20:41 -04:00
eric
4c20082d70
[ #29281959 ] add feedback from lawyer
2012-05-09 09:37:33 -04:00
eric
8fa1f89eca
re-require Paypal address
2012-05-09 09:36:27 -04:00
Andromeda Yelton
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
Andromeda Yelton
11c19b950d
preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns
2012-05-08 15:51:17 -04:00
Andromeda Yelton
f232bc1048
we're not using this any more
2012-05-08 14:41:04 -04:00
Andromeda Yelton
6e1aa4dfd0
changed work_list page to clearly communicate that it's staff picks when facet = recommended
2012-05-08 14:28:06 -04:00
Andromeda Yelton
9549b34d9e
parts of Description tab now conditional on campaign status, rather than offering RHs options they're not allowed to use
2012-05-08 13:48:24 -04:00
Andromeda Yelton
5004256f78
better wording
2012-05-08 13:47:58 -04:00
Andromeda Yelton
7dbb2e2276
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-08 09:50:32 -04:00
Andromeda Yelton
73157c8720
clarified manage campaign workflow
2012-05-08 09:27:03 -04:00
Andromeda Yelton
dd3eb97a65
updating for launch
2012-05-08 08:34:52 -04:00
eric
32a39635b4
[finish #29037717 ] added sentences explaining form limits
2012-05-07 18:00:52 -04:00
Andromeda Yelton
2159cb32d5
added section on license terms, updated verb tense, Unglue.It to Unglue.it
2012-05-07 13:39:24 -04:00
Andromeda Yelton
181cf1a28b
rearchitecting for launch
2012-05-07 13:10:42 -04:00
Andromeda Yelton
2cf23aeac0
commented the scripts
2012-05-07 13:10:18 -04:00
Andromeda Yelton
5b617370a8
moved boilerplate paragraph
2012-05-07 13:09:41 -04:00
Andromeda Yelton
dbadaf8241
removed alpha announcement
2012-05-07 13:07:54 -04:00
eric
57cebd126d
[accept #28451269 ] added 2 headings and a preview link. Nice job.
2012-05-07 12:19:19 -04:00
eric
1d005fae95
[finish #29170153 ] Improved display of no-google works
2012-05-07 11:36:34 -04:00
eric
a32b09a4cb
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
.
2012-05-07 01:18:11 -04:00
eric
c0cb99e040
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
.
2012-05-07 01:18:11 -04:00
eric
d334fa58b0
Revert "Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""""
...
This reverts commit b21787a590
.
2012-05-07 01:18:11 -04:00
eric
e10136f1b2
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit 1bbac102a2
.
2012-05-07 01:18:11 -04:00
eric
1bbac102a2
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
.
2012-05-07 01:14:47 -04:00
eric
b21787a590
Revert "Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"""
...
This reverts commit c8be251ffa
.
2012-05-07 01:14:47 -04:00
eric
c8be251ffa
Revert "Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration""
...
This reverts commit 2d344a09c6
.
2012-05-07 01:14:01 -04:00
eric
2d344a09c6
Revert "[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration"
...
This reverts commit 7043e71c39
.
2012-05-07 01:11:26 -04:00
eric
7043e71c39
[ #28945859 ] removed description from edition. Be sure to do data migration before applying this schema migration
...
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
Andromeda Yelton
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
Andromeda Yelton
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
Andromeda Yelton
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
eric
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
eric
c0625d78b8
banish isbn 10 display because it might not exist and prefer not to address the issue
2012-05-01 10:54:29 -04:00
eric
fb5333be2e
only use role account email addresses in documentation pages
2012-05-01 10:02:07 -04:00
Andromeda Yelton
ce36f6771d
css changes per Stefan, part 1
2012-05-01 09:56:19 -04:00
Andromeda Yelton
8999afb7f1
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-30 11:28:52 -04:00
Andromeda Yelton
5421793f02
minor styling tweaks
2012-04-30 11:03:15 -04:00
eric
4f524a792f
[ #24088823 ] ebook downloads now drop down if more than 1
2012-04-28 21:05:41 -04:00
eric
61a4878b54
[finish #24030945 ] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems.
2012-04-28 13:02:38 -04:00
eric
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
eric
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
eric
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
Andromeda Yelton
c6b05bd577
footer now points to wordpress blog
2012-04-26 15:37:41 -04:00
Andromeda Yelton
2ab1df92c2
addressing user feedback, highlighting field validation errors better
2012-04-26 15:30:28 -04:00
eric
6246b231b1
[finish #27115511 ] remove html from wishlist_active notice
2012-04-25 10:20:04 -04:00
eric
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
eric
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
eric
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
eric
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
Andromeda Yelton
15a08bdfeb
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-24 12:54:11 -04:00
Andromeda Yelton
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
Andromeda Yelton
d652767a79
change supporters to ungluers on work page tab, see if that helps overflow problem
2012-04-23 12:08:11 -04:00
Raymond Yee
ba9123ba39
Sets form action properly in pledge.html depending on whether new pledge or modified pledge.
...
campaigntest.support_campaign changed to handle new premium selection process, which now changes the preapproval amount
2012-04-19 15:43:21 -07:00
Andromeda Yelton
911f6f6212
pledge and pledge_modify don't need to use different templates, just an if statement or two. DRY
2012-04-19 10:50:40 -04:00
Andromeda Yelton
e85ae79c35
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-17 16:28:27 -04:00
Andromeda Yelton
d78fbf963c
notifications div ids replaced with snarkier, more-likely-to-be-unique text
2012-04-17 16:28:10 -04:00
eric
d32190e905
[ #27115511 ] removed user avatar from comment notices because it didn't look right next to book cover.
...
Can revisit with professional design help.
2012-04-17 15:16:07 -04:00
eric
8a24f860ee
[ #27470543 ] html fixes
2012-04-17 14:30:38 -04:00
eric
7791de3c29
fixed html error [ #27310245 ]
2012-04-17 14:10:14 -04:00
Andromeda Yelton
8dda3369b5
minor language tweak per AM
2012-04-17 10:10:40 -04:00
Andromeda Yelton
434c6d048b
synced label for and input id so that clicking anywhere on the label selects the radio button
2012-04-17 09:33:47 -04:00
Andromeda Yelton
ecf1a7e604
selecting a premium now autofills pledge box with that number [ #26659097 ]
2012-04-17 09:26:45 -04:00
Andromeda Yelton
be510587ff
clarified error messages
2012-04-16 15:28:06 -04:00
Andromeda Yelton
7ef482b1ac
ensuring that errors display before form fields everywhere and switching css to make that apparent. if you write a custom form display, put errors before fields [ #27310245 ]
2012-04-16 14:18:04 -04:00
Andromeda Yelton
941fb78bf0
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-13 15:40:33 -04:00
Andromeda Yelton
8434bb981f
header now contains an alert badge for notifications [ #27777943 ]
2012-04-13 15:29:46 -04:00
eric
bf68f2f587
corrected bad reference to rightsholder name
2012-04-11 13:39:32 -04:00
eric
8cb1375ffe
friendlification of comment notifications
2012-04-11 13:39:03 -04:00
eric
80c3a0090f
fix spelling before it leads to bugs. will need to syncdb
2012-04-11 13:37:36 -04:00
eric
d88a908082
[finish #27470423 ] provide preview of unlaunched campaigns
2012-04-10 16:13:28 -04:00
Andromeda Yelton
6ccdd8a798
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-10 15:05:29 -04:00
Andromeda Yelton
edf3617f5a
partial de-suckification of pledge_complete page
2012-04-10 15:00:28 -04:00
Andromeda Yelton
89d385d51f
less and more text should toggle when editions info toggles
2012-04-10 14:33:34 -04:00
Raymond Yee
e38e0dcb37
Forgot to commit templates for successful_campaign notice type
2012-04-10 10:09:51 -07:00
Andromeda Yelton
acd4d7048c
making sure it isn't barfing on context variables
2012-04-09 11:26:12 -04:00
Andromeda Yelton
39129877ae
more edits to notification display, trying to get column widths right
2012-04-09 11:15:48 -04:00
Andromeda Yelton
0f24099400
add instructions for RHs needing html help
2012-04-09 10:11:06 -04:00
Andromeda Yelton
f71366cb13
non-link title should be italicized
2012-04-09 10:10:19 -04:00
Andromeda Yelton
3888dc5a21
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-09 08:39:19 -04:00
eric
773b0fb568
more consistency on terms labeling [finish #27646209 ]
2012-04-07 15:19:23 -04:00
eric
4be26a6d89
[finish #27646209 ] improve consistency of what we call the website terms
2012-04-07 15:12:25 -04:00
eric
dae1c430d6
Per legal counsel, we may not use the noun "offering" on our site. the verb is ok, the noun "offer" is ok.
2012-04-07 14:59:25 -04:00
eric
44c6e29ff9
replaced "electronic rights" with "commercial rights" in faq
2012-04-07 14:55:47 -04:00
eric
a700275b88
[finish #27524965 ] removed ids from submit. added paragraph on interfering claims.
2012-04-07 14:49:31 -04:00
eric
74f749128b
damn you late night coding. It's "campaign" not "campign" [ fix #27591051 ]
2012-04-06 13:05:31 -04:00
Andromeda Yelton
e26282422b
add computers in libraries talk and merge
2012-04-06 09:34:26 -04:00
eric
147808bd88
[finish #27470199 ] inactivate checked premium button no longer shows if there are no checked premiums
2012-04-05 22:44:45 -04:00
eric
d2a0a6f49a
[finish #27524335 ] Use claim display label in claim data display
2012-04-05 21:50:34 -04:00
eric
72bbdf7157
repaired html broken by AY on rh_tools [ fix #27310123 ]
2012-04-05 17:54:33 -04:00
eric
5eb5b093a3
[finish #27470379 ] don't show launch campaign button for campaign ineligible for launching
2012-04-05 17:23:33 -04:00
eric
db736818fc
[finish #27524965 ] fixed issue where released claim prevents new claim
2012-04-05 16:55:10 -04:00
eric
6d8bc9d199
tried smaller cover image in notice [ #27115511 ]
2012-04-05 13:11:42 -04:00
eric
5c7fb1ac8f
reinserted status pending improvement [ #27470969 ]
2012-04-05 13:10:42 -04:00
eric
be909bba69
change language on claim status [accept #27384493 ]
2012-04-05 11:58:26 -04:00
eric
6adf21c380
put spaces in front of /> per xhtml recommendation
2012-04-05 11:53:58 -04:00
Andromeda Yelton
c47233ef70
minor updates
2012-04-04 14:22:31 -04:00
Raymond Yee
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
Raymond Yee
7c77c748ef
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-04 06:52:47 -07:00
Raymond Yee
43f4c85162
First pass at fixing ssl issues on press page --> fix youtube videos. Still leaves mailchimp js
2012-04-04 06:42:22 -07:00
Andromeda Yelton
903356cbd6
merge
2012-04-04 08:52:50 -04:00
Andromeda Yelton
e03309a88e
more user-friendly wording of campaign status. also seeing if i can get this to show up in pivotal [start #27470969 ]
2012-04-04 08:50:06 -04:00
Raymond Yee
23d7ae9c86
Getting rid of http://platform.twitter.com -> //platform.twitter.com
2012-04-03 15:43:27 -07:00
Raymond Yee
96b10a2776
Commenting out number of supporters in the tab right now on work.html until we figure out how to display without overflowing tab space
2012-04-03 15:14:52 -07:00
eric
40722074d1
Added work# and campaign# to distinguish works/campaigns with the same name
2012-04-03 15:54:41 -04:00
eric
5d5c60993e
added form to edit campaign managers [start #27468285 ]
2012-04-03 15:54:41 -04:00
Andromeda Yelton
e3573c3157
Merge github.com:Gluejar/regluit
2012-04-03 14:58:43 -04:00
Andromeda Yelton
49677c3a45
manage campaign links replaced with big green buttons
2012-04-03 14:58:32 -04:00
Ed Summers
5e25f2f90a
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-03 13:56:25 -04:00
Ed Summers
1187a346ee
use https urls for google books cover images
2012-04-03 13:55:45 -04:00
Andromeda Yelton
24674d8a2d
improving display of active campaign notice
2012-04-03 12:30:34 -04:00
eshellman
7769bbd8b3
really change the notice
2012-04-03 12:07:29 -03:00
eric
0319185251
resolve conflicts
2012-04-03 10:54:31 -04:00
eric
6f1ccde928
moved notify_active_campaign into model, removed redundant context
2012-04-03 10:45:12 -04:00
Andromeda Yelton
24b7a77228
modifying display of claim status
2012-04-03 09:56:41 -04:00
Andromeda Yelton
7cf46d7f24
now with actual information content
2012-04-03 08:21:05 -04:00
Andromeda Yelton
e197cd6acc
now notifications actually get sent. cleanup to follow.
2012-04-02 15:04:51 -04:00
Andromeda Yelton
679f797b74
Merge github.com:Gluejar/regluit
2012-04-02 14:17:28 -04:00
Andromeda Yelton
94aa31a950
campaign activation now sends signal which notify listens for. still need to fix actual sending of notification.
2012-04-02 14:17:18 -04:00
Raymond Yee
69dde055b5
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-30 09:44:12 -07:00
Andromeda Yelton
7a590637a4
prettifying
2012-03-29 16:26:06 -04:00
Andromeda Yelton
2874be9693
now only displays unseen notices and only provides mark-as-seen option when relevant
2012-03-29 15:34:28 -04:00
Andromeda Yelton
320c66c494
styling see your notifications option in parallel with change-settings option on companion notification page
2012-03-29 14:48:20 -04:00
Andromeda Yelton
449aae4662
notices page now has reasonably styled notices and there is a model for generating other notice types
2012-03-29 14:46:06 -04:00
eric
887ca1e696
revert to Andromeda's de-uglification; left base notification template
2012-03-29 10:59:24 -04:00
eric
57a1c60903
comments were being id's by name not username, we didn't mean to make name public
2012-03-29 01:22:38 -04:00
eric
4d9e279862
[finish #25980231 ] implemented a separate notification type for other commenters
...
person entering content doesn't get the notification duh
if you've commented on a wishlist item, you only get the also commented
notification, not the wishlist comment notification
2012-03-29 01:21:37 -04:00
eric
729bc6e78d
put back in some stuff Andromeda axed without telling anyone
2012-03-28 23:25:41 -04:00
Raymond Yee
495610badf
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-28 14:37:02 -07:00
eric
c7f9996444
added status display on work page
2012-03-28 14:12:00 -04:00
Raymond Yee
6d50897508
Clarify the pledge modification process for the supporter.
2012-03-28 10:12:09 -07:00
Andromeda Yelton
a884997364
making slideshow work on pledge_complete
2012-03-28 12:50:42 -04:00
Andromeda Yelton
142ec1a904
de-uglifying
2012-03-28 11:31:50 -04:00
Andromeda Yelton
2ab92b6a2f
Merge github.com:Gluejar/regluit
2012-03-28 09:00:31 -04:00
Andromeda Yelton
4c4697740b
small changes to tabs to communicate better
2012-03-28 08:59:45 -04:00
eric
2932758077
got notification settings to work [ #27116165 ]
2012-03-27 17:47:54 -04:00
eric
32ca831897
Comments are now notifying and notices are listing [ #25980231 ]
2012-03-27 15:45:41 -04:00
eric
290aecab19
wired up notifications
2012-03-27 13:24:16 -04:00
eric
3925e96ad1
wishlist_comment templates
2012-03-27 12:37:07 -04:00
eric
8f700024cf
eek! non-nested with tags
2012-03-27 12:36:47 -04:00
eric
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
Andromeda Yelton
1a53a79752
merge all the things
2012-03-26 16:16:57 -04:00
eric
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
Andromeda Yelton
66d62ef3aa
making pledge complete page prettier and more featureful: next actions, more speciic email sharing text, enforce login
2012-03-26 15:26:47 -04:00
eric
0f61bd8d66
added license selection to campaigns. Simple migration to apply.
2012-03-23 12:30:49 -04:00