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
e42ecfbec5
html cleanup on pledge page
2012-05-14 15:56:19 -04:00
98aca7b474
Attorney review done [finish #29281959 ]
2012-05-14 15:43:22 -04:00
3fe2800dfa
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-14 13:51:06 -04:00
1c5d517d93
setting clearer expectations about communication in response to user feedback
2012-05-14 13:50:55 -04:00
2b9b4a7331
share links in pledge_complete need to include url base
2012-05-14 13:42:34 -04:00
cd9bdf70b5
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-14 10:16:26 -07:00
b07d6c267d
Customize paymentReason for amazon -- in Paypal, we don't have it wired up anywhere yet
2012-05-14 10:15:40 -07:00
32250157e3
Merge branch 'real_money' of github.com:Gluejar/regluit
2012-05-14 15:41:55 +00:00
443c4b5d42
[finish #27015121 ] give focus to pledge amount box, select premium doesn't reduce pledge
2012-05-14 09:01:03 -04:00
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
08290c0128
[ #28736373 ] fixed problem with not being able to select no edition
2012-05-14 01:05:14 -04:00
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
3c98e65217
whoops. So used to django knowing what I meant...
2012-05-13 23:11:06 -04:00
ea9ac7508e
repaired the invocation ot I_just_pledged emailshare [ #27785469 ]
2012-05-13 22:59:07 -04:00
296b5b5b20
countdown broke preview
2012-05-13 22:13:45 -04:00
66f08eab10
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-13 13:55:08 -07:00
1270907295
merge these changes to master when the real money bit is flipped
2012-05-13 16:50:33 -04:00
f1a7d68f8a
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-13 16:47:10 -04:00
d9a96c2ada
putting from email in reply-to: header [ #29498563 ]
2012-05-13 16:38:58 -04:00
cc097b0aa3
more fixing extends directive
2012-05-13 16:38:06 -04:00
9badabb53b
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-13 13:33:53 -07:00
89c4fa451f
extends directive needs to be the first line in Django template
2012-05-13 13:32:34 -07:00
100dc9d9b6
spurious <br>s
2012-05-13 16:06:48 -04:00
9ed4186124
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-05-13 15:37:28 -04:00
aad5593c1d
resolve conflicts
2012-05-13 15:37:20 -04:00
193e4ef324
methods are not properties, whoops
2012-05-13 15:33:54 -04:00
4a9b9b1f31
Merge branch 'master' of github.com:Gluejar/regluit into ry
2012-05-13 12:33:20 -07:00
c38a3a320f
fixing some URLs
2012-05-13 15:33:19 -04:00
0cdac29c22
apply intcomma to currency display everywhere and add humanize
2012-05-13 15:32:32 -04:00
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
ea5664b08c
that ampersand should not be URLencoded since it's actually a parameter
2012-05-13 15:22:38 -04:00
a54aa1a342
First pass -- pledge view will redirect to pledge modify view if there is already an active transaction
2012-05-13 12:18:48 -07:00
d2cf8a773b
improvifying pledge front end around modify and cancel
2012-05-13 10:49:23 -04:00
ae76f89034
fixing problems with context for you_have_pledged notification
2012-05-12 22:42:09 -04:00
e6467e4e85
even moar wordsmithing of notifications
2012-05-12 21:49:31 -04:00
6fe7aeeabb
even more notification wordsmithing
2012-05-12 21:28:27 -04:00
54e1e3e98b
merge all the things
2012-05-12 12:25:17 -04:00
83730badbb
more wordsmithing
2012-05-12 11:58:33 -04:00
77a66e5420
[ #29498563 ] fixed urls by moving email share messages to django templates; eliminated sender from form
2012-05-12 11:12:43 -04:00
76b8b9f33d
[ #29488053 ] no use linking to google books if no google books id
2012-05-11 22:46:41 -04:00
8e3baba673
wordsmithing
2012-05-11 21:36:20 -04:00
feb8650c10
[ #29488053 ] add to wishlist now works for works without googlebooks_id
2012-05-11 21:29:03 -04:00
5bd3f06903
[ #28851641 ] removed some debug code
2012-05-11 21:29:03 -04:00
ca2bfedafd
[ #28851641 ] fillied in you_have_pledged templates
2012-05-11 21:29:03 -04:00
2590c5d58d
Trying to get production to line up with master
2012-05-11 15:05:40 -07:00
1b16603056
Merge branch 'production' of github.com:Gluejar/regluit into production
2012-05-11 15:05:18 -07:00
fbd58d5e4e
Add import of notification
2012-05-11 14:14:49 -07:00
ba36838dfa
must import notification
2012-05-11 14:03:28 -07:00
7c49427e2c
Revert "wired pledge_you_have_pledged [ #27785469 ]"
...
This reverts commit 17d641cf65
2012-05-11 14:00:17 -07:00
17d641cf65
wired pledge_you_have_pledged [ #27785469 ]
2012-05-11 15:53:46 -04:00
36edf0a261
[ #28851641 ] // was getting rewritten by apache, I think
2012-05-11 15:39:26 -04:00
328cea6cf3
Update frontend/templates/notification/wishlist_active/full.txt
2012-05-11 16:05:47 -03:00
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
bc3045161c
clarified wording
2012-05-10 15:40:37 -04:00
71c174d012
need to expose paypal address field after all
2012-05-10 13:23:42 -04:00
4ba688dbad
minor fixes
2012-05-10 13:23:19 -04:00
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
fe84c09651
polishing for launch
2012-05-09 16:32:06 -04:00
41f662c048
updating pledging contextual FAQs
2012-05-09 13:40:01 -04:00
d0bac11ec4
clarifing CC noncommercial
2012-05-09 13:26:12 -04:00
e1835a7cc7
updating, including amazon and paypal language
2012-05-09 13:01:17 -04:00
665fb99af3
updating with paypal and amazon info
2012-05-09 12:49:49 -04:00
e4e66b2118
adding some more recent coverage
2012-05-09 12:45:00 -04:00
42d33794e3
sign up element in learn more section was misaligned
2012-05-09 12:20:41 -04:00
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
2012-05-09 09:37:57 -04:00
4c20082d70
[ #29281959 ] add feedback from lawyer
2012-05-09 09:37:33 -04:00
8fa1f89eca
re-require Paypal address
2012-05-09 09:36:27 -04:00
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
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
f232bc1048
we're not using this any more
2012-05-08 14:41:04 -04:00
6e1aa4dfd0
changed work_list page to clearly communicate that it's staff picks when facet = recommended
2012-05-08 14:28:06 -04:00
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
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
5004256f78
better wording
2012-05-08 13:47:58 -04:00
9fc2444f37
need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly
2012-05-08 10:51:04 -04:00
7dbb2e2276
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-08 09:50:32 -04:00
73157c8720
clarified manage campaign workflow
2012-05-08 09:27:03 -04:00
dd3eb97a65
updating for launch
2012-05-08 08:34:52 -04:00
b06a1e218a
Merge branch 'fps' of github.com:Gluejar/regluit into ry
2012-05-07 16:50:00 -07:00
32a39635b4
[finish #29037717 ] added sentences explaining form limits
2012-05-07 18:00:52 -04:00
1ab9304475
[finish #28949611 ] rights holders are now the default campaign manager; they can remove themselves after they add another manager
2012-05-07 17:32:58 -04:00
2159cb32d5
added section on license terms, updated verb tense, Unglue.It to Unglue.it
2012-05-07 13:39:24 -04:00
181cf1a28b
rearchitecting for launch
2012-05-07 13:10:42 -04:00
2cf23aeac0
commented the scripts
2012-05-07 13:10:18 -04:00
5b617370a8
moved boilerplate paragraph
2012-05-07 13:09:41 -04:00
dbadaf8241
removed alpha announcement
2012-05-07 13:07:54 -04:00
57cebd126d
[accept #28451269 ] added 2 headings and a preview link. Nice job.
2012-05-07 12:19:19 -04:00
1d005fae95
[finish #29170153 ] Improved display of no-google works
2012-05-07 11:36:34 -04:00
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
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
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
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
Raymond Yee
Andromeda Yelton
Raymond Yee