362a4d2b85
Merge branch 'master' of github.com:Gluejar/regluit
2012-07-16 14:52:38 -04:00
d5056441e8
oops...forgot to commit pledge_recharge.html
2012-07-16 11:48:10 -07:00
abdb4ddfc7
adding separator between headline and notification text
2012-07-16 14:46:45 -04:00
c9d57bb08b
making the sharing block work
2012-07-16 13:47:18 -04:00
f000c01267
fixing more syntax after testing
2012-07-16 13:29:20 -04:00
f56b342b00
fixing syntax errors found while testing
2012-07-16 12:44:27 -04:00
a226669109
bleah, django-notification fails around the with tags. removed.
2012-07-16 11:50:31 -04:00
1e49732693
almost ready to send this out to supporters with failed pledges
2012-07-13 15:55:41 -07:00
de415480ae
first pass at calculating transactions that need to be recharged
...
modification to fabfile to download a file of emails
2012-07-13 10:17:51 -07:00
da1386d7ab
Merge branch 'master' into ola_fulfill
2012-07-12 06:16:40 -07:00
7353731db5
4 campaigns now
2012-07-11 21:39:21 -07:00
94384fcb59
Work in progress
2012-07-11 19:51:36 -07:00
df147937aa
phrasing was unclear, scary. we're not space-limited here like we used to be.
2012-07-11 12:37:23 -03:00
4540263a6d
Merge branch 'master' into ola_fulfill
2012-07-11 07:39:19 -07:00
99057859e9
Setting up the URLs in progress.
2012-07-11 06:54:15 -07:00
e3be202189
"benefactors", not patrons [ #30516251 ]
2012-07-11 09:18:14 -04:00
7a76a2cbaf
Merge branch 'master' into ola_fulfill
2012-07-10 14:15:28 -07:00
94bd6fff2d
First pass at having a pledge recharge view (DON'T KNOW WHETHER THIS EVEN BUILDS PROPERLY)
2012-07-10 13:36:32 -07:00
94787951ad
allowed staff to manage campaigns
2012-07-10 15:58:19 -04:00
95c95dfcc8
added comment to explain about url dispatcher situation
2012-07-09 15:49:36 -04:00
69502b75ee
need to convert urls to template variables or django-notification can't find them
2012-07-09 15:47:38 -04:00
59b3657808
we were using this verbatim in five different templates. DRY
2012-07-09 15:47:09 -04:00
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
d53ea242b6
changing 'staff picks' to 'noteworthy'
2012-07-09 10:53:58 -04:00
01cb96e65d
reported email as notices, not accounts
2012-07-09 09:25:31 -04:00
e2962e1075
[finish #30516251 ] supporter acknowledgement page basic version
2012-07-07 18:13:05 -04:00
1764cd62d6
small optimization of supporter count
2012-07-07 16:38:23 -04:00
a7af78cc9a
[start #31995801 ] manage campaign form now handles the 11:59PM closing time
2012-07-06 22:10:55 -04:00
b6d77a7645
usernames were not being URLescaped. [#finish #32365703 ]
2012-07-06 12:25:20 -04:00
011dc4ffde
[ #32289649 ] validation nit
2012-07-06 11:19:51 -04:00
9152655587
list ungluers in two-column format by reverse of date wished [ #32289815 ]
2012-07-05 11:33:57 -04:00
b9aaff2968
david brin hooray
2012-07-05 11:33:18 -04:00
3ce4db8e9a
change support to premiums and make it clickable [ #32289833 ]
2012-07-05 10:39:19 -04:00
1bf0fe8d26
moving notification alert inline [ #32289941 ]
2012-07-05 10:30:26 -04:00
85247c306e
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
core/models.py
2012-07-05 10:21:08 -04:00
325765e453
loose ends from anaheim [ #32290011 ] [ #32289649 ] [ #32289951 ]
2012-07-05 10:05:04 -04:00
6ccaf81f06
updated to reflect Amazon email so supporters won't be surprised by it
2012-07-02 11:07:10 -04:00
bfe02fc39d
4->3 active campaigns
2012-06-29 18:38:19 -07:00
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
17cbab1fc4
temporarily stop checking for end date changes
2012-06-28 16:23:29 -04:00
8be8883e63
draft of front matter template (not used yet)
2012-06-28 16:23:29 -04:00
cbef02e3fc
moar boingboing
2012-06-28 12:45:21 -07:00
5f16b07174
alert header now trumpets our success
2012-06-22 00:41:20 -04:00
8977734bd7
[ fix #31636971 ] update campaign.left when campaign changes
2012-06-21 23:20:57 -04:00
d37792c813
[ #31605173 ] This plugs .../pledge/work_id where work_id tied to no campaign or a campaign that is not ACTIVE
2012-06-21 10:16:51 -07:00
4bb48c64e6
changing future to present continuous tense for when credit card charged
2012-06-21 09:07:05 -07:00
bc2e5ac3be
better handling of successful campaigns on work page
2012-06-21 10:49:55 -04:00
0c88c77733
forgot the easy-to-forget endswith
2012-06-21 06:14:37 -07:00
013ddb5a3c
Another template problem in the pledge_charged notices
2012-06-21 06:09:37 -07:00
20e5baa6ba
work -> transaction.campaign.work
2012-06-21 05:09:51 -07:00
7482a19cd1
work.id -> campaign.work.id
2012-06-20 21:29:23 -07:00
31cf653e63
Five -> four active campaigns
2012-06-20 20:47:42 -07:00
f7282d4e11
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-06-19 07:34:52 -04:00
001f654880
trivial cleanup in unglued ebook notification
2012-06-19 07:34:37 -04:00
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
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
2b7da6e91e
First attempt to place the notices properly coming from a pledge modify -- inside payment.manager.cancel_related_transaction -- but current problem is now that we get too many notices
2012-06-15 11:38:38 -04:00
eda96f716b
ending time should round up, not down. also times less than days were not going to display right due to type errors. now they will.
2012-06-15 12:06:38 -03:00
12dca9c36d
reducing redundancy in comment notification lead-in
2012-06-15 11:32:12 -03:00
2beb4e5dbb
commenting
2012-06-14 17:15:11 -03:00
2c14edd8ad
updating press coverage
2012-06-14 11:35:57 -03:00
ad23fc3c4c
refactoring to work with new expand_about.js
2012-06-13 16:50:57 -03:00
df7ea263a0
adding a wishlist-tabs explanation section [ #22431977 ]
2012-06-13 16:50:03 -03:00
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
d652db5c03
removing is_preview since it's no longer needed
2012-06-13 09:41:23 -03:00
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
d0a7f9ea63
added conversion tracking code for adwords campaigns so that we can assess their performance
2012-06-12 11:29:47 -03:00
656899105e
should make correct decisions about displaying sign-up-today option [ #30249919 ]
2012-06-04 15:50:30 -04:00
d55d3cb54a
fixes [ #30249919 ]
2012-06-04 15:20:23 -04:00
17b222d69f
adding prominent invitation for RHs to email us to FAQ
2012-06-04 10:29:42 -04:00
ce5ee124d9
removing pagination from work_list -- likely unnecessary and this should be faster
2012-06-01 13:15:50 -04:00
153e7eaff9
Merge branch 'master' of github.com:Gluejar/regluit
2012-06-01 11:02:35 -04:00
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
882ba635da
making capitalization consistent
2012-06-01 10:10:42 -04:00
acf6f18a1c
fixed broken link
2012-06-01 09:06:26 -04:00
56074903e7
more cleanup
2012-06-01 09:06:20 -04:00
a6d03af40d
caching repeatedly-used title
2012-05-31 13:33:16 -04:00
9e8be5695b
comments
2012-05-31 13:29:41 -04:00
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
cfa12dd228
was missing fastcoexist article
2012-05-31 13:24:53 -04:00
4eab46f1d5
clarify what 'official comment' means
2012-05-30 12:36:35 -04:00
63567d8eaa
mad->made (typo fix)
2012-05-30 09:32:04 -07:00
6e9e87f402
more blog coverage
2012-05-29 21:29:22 -04:00
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
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
4ce0731095
[ #28011527 ] implemented comment preview form to address missing-user error
2012-05-29 19:20:00 -04:00
e27ad644b5
Merge branch 'campaignformviewnixed'
2012-05-29 11:48:41 -07:00
a8762dca73
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-29 08:55:36 -04:00
5d37a969bd
phrasing needs to be sensitive to increase vs decrease
2012-05-29 08:55:16 -04:00
2563dda3e5
creating signal for pledge_modified and moving you_have_pledged to signals framework so they interact properly -- at most one sent
2012-05-29 08:54:57 -04:00
63bc11026e
two other reg templates to change when user already logged in [ #29858801 ]
2012-05-26 20:57:59 -04:00
a4e15bcda3
stop showing logged-in users the login form [ #29858801 ]
2012-05-26 18:36:10 -04:00
365976933e
[ #29809805 ] made username change form more pythonic
2012-05-26 17:30:12 -04:00
61f45a5716
[ #29809805 ] fixed changed email doesn't check for duplicate email
2012-05-26 17:28:57 -04:00
acaa931445
I think that the CampaignFormView should be deleted -- but before I merge this into master, I want to let others confirm
2012-05-25 19:39:02 -07:00
f0dde230f3
[ #27015121 ] forgot to add context to Pledgeview
...
Seems to me there's refactoring that can be done with these two views!
2012-05-25 18:44:28 -04:00
d784715407
Round dollar amount to nearest dollar [ #30073593 ]
2012-05-25 18:34:16 -04:00
7de9616e23
[finish #27015121 ] add going to amazon text, premium amount now inline.
2012-05-25 18:18:29 -04:00
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
9203127da1
comments by campaign managers get a blue box around them [ #28494261 ]
2012-05-25 14:51:46 -04:00
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
60b84b0358
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 14:10:10 -07:00
f3e5477d33
home link should also go to landing page
2012-05-24 15:33:34 -04:00
733893ecdb
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-24 15:30:01 -04:00
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
d2129a2e83
Merge branch 'master' into cancel_pledge
2012-05-24 09:37:13 -07:00
ad2405243a
Added missing deadline to book_panel
2012-05-24 09:35:58 -07:00
2f9d899030
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-24 08:43:33 -07:00
6eb29f2a78
adding SLJ coverage
2012-05-23 15:38:26 -04:00
b55af7977d
[ #29500707 ] The core of the cancel pledge is in place, though refinements, particularly in the UI still needs to be made.
...
Outstanding issues:
* Will the IPNs on a cancel come quickly enough so that the user will no longer see "Modify Pledge" when redirected to the Work page
* How to provide better feedback on the fact that a transaction has indeed been canceled? Do we need to use notifications here?
* This code is working on RY's laptop -- but now needs to be tested where there IPNs available.
2012-05-23 09:12:21 -07:00
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
a0bc6deefc
Closing in on pledge_cancel
2012-05-23 07:22:48 -07:00
4829c8679e
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-23 09:44:31 -04:00
cd9ff5af63
make whole pledge/read now area on back of panel clickable, maintain styling
2012-05-23 08:47:41 -04:00
2f285d7300
added name attributes to submit buttons
2012-05-23 08:12:35 -04:00
42665150ec
restored link to latest comments
2012-05-22 11:48:53 -04:00
7791f9a1ae
added a comment
2012-05-22 11:48:23 -04:00
0fcdbee50a
minor copy-editing type stuff
2012-05-22 11:07:40 -04:00
5ce95c342b
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-22 07:43:10 -07:00
165d08663b
html validation cleanup for pledge page and about lightbox [ #29777801 ]
2012-05-22 09:16:12 -04:00
54368ffbca
adding pledged checkmark next to relevant premium on work page when supporter has pledged
2012-05-22 07:34:42 -04:00
5f2ed14ff3
[ fix #29962925 ] Turns out you can't pledge without an amazon account
2012-05-21 18:42:56 -04:00
dd8b892a42
Merge branch 'master' of github.com:Gluejar/regluit into master_cancel
2012-05-21 13:57:59 -07:00
f01c83f1b8
adding call to action for logged-in users [ #29777801 ]
2012-05-21 16:01:20 -04:00
1cf9f4058d
fixing [ #29941831 ]
2012-05-21 14:06:48 -04:00
32a7699eb5
addressing some actual questions seen around the interwebs
2012-05-21 13:39:19 -04:00
c75148dc74
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 09:55:56 -07:00
1a53d8b86d
that div was ugly and contentless
2012-05-21 12:19:50 -04:00
efe7e41be4
got some feedbackfrom target audience types
2012-05-21 12:09:12 -04:00
2f232c29fd
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 08:54:05 -07:00
66616f9f90
well that had been precisely the opposite if condition than I intended
2012-05-21 11:18:30 -04:00
7f730e53ef
restoring a bit of language with license choice flexibility
2012-05-21 11:17:44 -04:00
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
b8336c4ed6
En route to implementing pledge cancellation
2012-05-21 07:56:18 -07:00
1b677087e2
add HuffPo article
2012-05-21 10:50:03 -04:00
690bd76357
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/press.html
2012-05-21 10:38:08 -04:00
b85d034030
we need an About link
2012-05-21 10:03:56 -04:00
42aaa90245
moar launch coverage
2012-05-21 10:03:45 -04:00
f32de7e935
added named url for sub-FAQs to improve linkability
2012-05-21 10:03:29 -04:00
61dd4124af
suppres percent-of-goal display when no campaign
2012-05-21 10:02:57 -04:00
04d8c80cff
correct license test with correction from AY [ #29884981 ]
2012-05-21 09:25:38 -04:00
e61a818ad3
[finish #29885177 ] redirect user after login instead of just displaying link
2012-05-20 00:55:41 -04:00
3de07e973f
[finish #29780503 ] add link to CC licence to rights tab of campaign page
2012-05-20 00:22:12 -04:00
bd5b062d24
change manage_campaign to allow active campaigns to remove license restrictions [ #29884981 ]
2012-05-20 00:13:12 -04:00
62c1d80547
changed wording to be more open to non NC licenses [ #29884981 ]
2012-05-20 00:08:04 -04:00
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
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
a5df3b608a
fixing broken link
2012-05-18 11:35:08 -04:00
9cac73f036
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-18 11:29:51 -04:00
bfc958fd06
updating with launch coverage
2012-05-18 11:29:37 -04:00
333de6ce6b
mildly humiliating grammar mistake
2012-05-18 11:28:58 -04:00
0d5392aeae
Merge branch 'ry'
2012-05-17 14:05:33 -07:00
cbb7045ad9
Another set of URLs for DEBUG only
2012-05-17 13:55:02 -07:00
04ec596dc1
pieces of django-maintenance
2012-05-17 13:28:48 -07:00
b233c5f03a
Undo the work I started with to finish pledge_cancel.
2012-05-17 10:52:12 -07:00
ac44911fa7
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-17 10:48:04 -07:00
00802f700f
digital shift article
2012-05-17 13:08:20 -04:00
e38be413c4
adding LJ article
2012-05-17 12:58:50 -04:00
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
37c54f0ef7
adding japanese coverage to blog section
2012-05-17 11:08:12 -04:00
7bd9f28770
making percent unglued display better in book panels
2012-05-17 10:19:20 -04:00
d234c45c42
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-17 09:55:34 -04:00
41323e443d
one more $ added to premium amount field
2012-05-17 09:43:29 -04:00
a47f48e777
showing percent campaign has proceeded toward goal more clearly
2012-05-17 09:24:57 -04:00
4ec0ed0638
adding $ before target price field to reduce chance people will type one into the field
2012-05-17 09:15:33 -04:00
aa5fb08850
[ #29500707 ] For the moment, ask users to contact us to cancel transactions.
2012-05-16 20:35:43 -07:00
c2b7cebfcd
Work underway for pledgecancel
2012-05-16 20:14:13 -07:00
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
45720197c6
ensuring that cancel message is not too wide
2012-05-16 14:29:15 -04:00
e60be456cc
whoops ungrammatical
2012-05-16 14:28:51 -04:00
c4053a4b59
communicating stuff more clearly
2012-05-16 14:03:14 -04:00
2a9ef4030f
rewording notification box to reflect current state
2012-05-16 12:18:35 -04:00
f5602b5756
we weren't using this
2012-05-16 11:38:53 -04:00
104b916171
changing http unglue.it links to https
2012-05-16 11:38:42 -04:00
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
775d1d4af2
fixing rendering of successful campaign notifications
2012-05-16 10:06:26 -04:00
0f9d292e16
more andromeda's nits [ #29281959 ]
2012-05-16 02:05:32 -04:00
4a98076b63
fix andromeda's nits [ #29281959 ]
2012-05-16 01:49:36 -04:00
979bb8b037
missing humaize in pledged_charge [ #28493739 ]
2012-05-16 01:48:41 -04:00
36a5e92d25
[finish #29677811 ] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
2012-05-15 23:42:31 -04:00
06b002c276
[ #28493739 ] fix heading of pleadge_charged notice
2012-05-15 23:07:18 -04:00
a6e685618c
resolve conflicts
2012-05-15 22:54:23 -04:00
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
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
6c3c1a8cd5
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-15 15:44:54 -04:00
03f98844fd
removing pledge_prefill script, moving tiny little focus script to here
2012-05-15 15:44:18 -04:00
9d33a95147
[ fixed #29647161 ] fixed login redirect which was failing when next included a query string
2012-05-15 14:18:17 -04:00
28a4eb5f57
[ #29632523 ] pledge modify form now preselects the correct premium
2012-05-15 13:47:00 -04:00
8cba752057
more notices need html templates for display at /notifications
2012-05-15 10:27:57 -04:00
9e2050c000
adding answer to an actual question from an actual user
2012-05-15 09:33:12 -04:00
d3bff4efb5
[ #29481707 ] added explanation of how to "edit" a premium
2012-05-14 23:27:44 -04:00
95d4786c4b
notice templates should actually say stuff
2012-05-14 21:42:46 -04:00
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
fe9ee13ae1
adding eric's ccc podcast
2012-05-14 20:53:05 -04:00
4fec8438a6
communicating a little more clearly
2012-05-14 20:44:27 -04:00
0e59ee746b
Update frontend/views.py
2012-05-14 18:23:13 -03:00
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
33bfb73a25
the sharing options in the you_have_pledged notice.html should be real live links
2012-05-14 16:53:53 -04:00
Andromeda Yelton
Raymond Yee
eric