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
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
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
cc097b0aa3
more fixing extends directive
2012-05-13 16:38:06 -04: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
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
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
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
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
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
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
32a39635b4
[finish #29037717 ] added sentences explaining form limits
2012-05-07 18:00:52 -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
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
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
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
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
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
8902ec84b3
made manage_campaign workflow suck less
2012-05-04 09:56:41 -04:00
122454b949
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-01 13:56:12 -04:00
3deb660ce3
more css tweaks per stefan
2012-05-01 13:49:23 -04:00
1c2e48bc87
added edition to campaign model to allow selection of a preferred edition [finish #28736373 ]
2012-05-01 10:56:19 -04:00
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
fb5333be2e
only use role account email addresses in documentation pages
2012-05-01 10:02:07 -04:00
ce36f6771d
css changes per Stefan, part 1
2012-05-01 09:56:19 -04:00
8999afb7f1
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-30 11:28:52 -04:00
5421793f02
minor styling tweaks
2012-04-30 11:03:15 -04:00
4f524a792f
[ #24088823 ] ebook downloads now drop down if more than 1
2012-04-28 21:05:41 -04:00
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
6cd6064387
[start #24030945 ] notification that ebooks have been added to database
2012-04-27 17:29:57 -04:00
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
274762d7de
[deliver #24088823 ] rights and filetype images for pd, cc books
2012-04-26 17:26:27 -04:00
c6b05bd577
footer now points to wordpress blog
2012-04-26 15:37:41 -04:00
2ab1df92c2
addressing user feedback, highlighting field validation errors better
2012-04-26 15:30:28 -04:00
6246b231b1
[finish #27115511 ] remove html from wishlist_active notice
2012-04-25 10:20:04 -04:00
3709fa3ba8
polish up notice settings [finish #27014673 ]
2012-04-25 10:06:22 -04:00
ae1983be3d
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-24 22:45:19 -04:00
028aa8f10d
reorganize notifications [ #27014673 ]
2012-04-24 22:44:19 -04:00
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
15a08bdfeb
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-24 12:54:11 -04:00
a40e694faf
some phrasing help, plus made the offer details field not required
2012-04-24 12:54:05 -04:00
d652767a79
change supporters to ungluers on work page tab, see if that helps overflow problem
2012-04-23 12:08:11 -04:00
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
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
e85ae79c35
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-17 16:28:27 -04:00
d78fbf963c
notifications div ids replaced with snarkier, more-likely-to-be-unique text
2012-04-17 16:28:10 -04:00
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
8a24f860ee
[ #27470543 ] html fixes
2012-04-17 14:30:38 -04:00
7791de3c29
fixed html error [ #27310245 ]
2012-04-17 14:10:14 -04:00
8dda3369b5
minor language tweak per AM
2012-04-17 10:10:40 -04:00
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
ecf1a7e604
selecting a premium now autofills pledge box with that number [ #26659097 ]
2012-04-17 09:26:45 -04:00
be510587ff
clarified error messages
2012-04-16 15:28:06 -04:00
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
941fb78bf0
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-13 15:40:33 -04:00
8434bb981f
header now contains an alert badge for notifications [ #27777943 ]
2012-04-13 15:29:46 -04:00
bf68f2f587
corrected bad reference to rightsholder name
2012-04-11 13:39:32 -04:00
8cb1375ffe
friendlification of comment notifications
2012-04-11 13:39:03 -04:00
80c3a0090f
fix spelling before it leads to bugs. will need to syncdb
2012-04-11 13:37:36 -04:00
d88a908082
[finish #27470423 ] provide preview of unlaunched campaigns
2012-04-10 16:13:28 -04:00
6ccdd8a798
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-10 15:05:29 -04:00
edf3617f5a
partial de-suckification of pledge_complete page
2012-04-10 15:00:28 -04:00
89d385d51f
less and more text should toggle when editions info toggles
2012-04-10 14:33:34 -04:00
e38e0dcb37
Forgot to commit templates for successful_campaign notice type
2012-04-10 10:09:51 -07:00
acd4d7048c
making sure it isn't barfing on context variables
2012-04-09 11:26:12 -04:00
39129877ae
more edits to notification display, trying to get column widths right
2012-04-09 11:15:48 -04:00
0f24099400
add instructions for RHs needing html help
2012-04-09 10:11:06 -04:00
f71366cb13
non-link title should be italicized
2012-04-09 10:10:19 -04:00
3888dc5a21
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-09 08:39:19 -04:00
773b0fb568
more consistency on terms labeling [finish #27646209 ]
2012-04-07 15:19:23 -04:00
4be26a6d89
[finish #27646209 ] improve consistency of what we call the website terms
2012-04-07 15:12:25 -04:00
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
44c6e29ff9
replaced "electronic rights" with "commercial rights" in faq
2012-04-07 14:55:47 -04:00
a700275b88
[finish #27524965 ] removed ids from submit. added paragraph on interfering claims.
2012-04-07 14:49:31 -04:00
74f749128b
damn you late night coding. It's "campaign" not "campign" [ fix #27591051 ]
2012-04-06 13:05:31 -04:00
e26282422b
add computers in libraries talk and merge
2012-04-06 09:34:26 -04:00
147808bd88
[finish #27470199 ] inactivate checked premium button no longer shows if there are no checked premiums
2012-04-05 22:44:45 -04:00
d2a0a6f49a
[finish #27524335 ] Use claim display label in claim data display
2012-04-05 21:50:34 -04:00
72bbdf7157
repaired html broken by AY on rh_tools [ fix #27310123 ]
2012-04-05 17:54:33 -04:00
5eb5b093a3
[finish #27470379 ] don't show launch campaign button for campaign ineligible for launching
2012-04-05 17:23:33 -04:00
db736818fc
[finish #27524965 ] fixed issue where released claim prevents new claim
2012-04-05 16:55:10 -04:00
6d8bc9d199
tried smaller cover image in notice [ #27115511 ]
2012-04-05 13:11:42 -04:00
5c7fb1ac8f
reinserted status pending improvement [ #27470969 ]
2012-04-05 13:10:42 -04:00
be909bba69
change language on claim status [accept #27384493 ]
2012-04-05 11:58:26 -04:00
6adf21c380
put spaces in front of /> per xhtml recommendation
2012-04-05 11:53:58 -04:00
c47233ef70
minor updates
2012-04-04 14:22:31 -04:00
8a6de4ef1d
A proxy for the mailchimp js
2012-04-04 09:15:18 -07:00
7c77c748ef
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-04 06:52:47 -07:00
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
903356cbd6
merge
2012-04-04 08:52:50 -04:00
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
23d7ae9c86
Getting rid of http://platform.twitter.com -> //platform.twitter.com
2012-04-03 15:43:27 -07:00
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
40722074d1
Added work# and campaign# to distinguish works/campaigns with the same name
2012-04-03 15:54:41 -04:00
5d5c60993e
added form to edit campaign managers [start #27468285 ]
2012-04-03 15:54:41 -04:00
e3573c3157
Merge github.com:Gluejar/regluit
2012-04-03 14:58:43 -04:00
49677c3a45
manage campaign links replaced with big green buttons
2012-04-03 14:58:32 -04:00
5e25f2f90a
Merge branch 'master' of github.com:Gluejar/regluit
2012-04-03 13:56:25 -04:00
1187a346ee
use https urls for google books cover images
2012-04-03 13:55:45 -04:00
24674d8a2d
improving display of active campaign notice
2012-04-03 12:30:34 -04:00
7769bbd8b3
really change the notice
2012-04-03 12:07:29 -03:00
0319185251
resolve conflicts
2012-04-03 10:54:31 -04:00
6f1ccde928
moved notify_active_campaign into model, removed redundant context
2012-04-03 10:45:12 -04:00
24b7a77228
modifying display of claim status
2012-04-03 09:56:41 -04:00
7cf46d7f24
now with actual information content
2012-04-03 08:21:05 -04:00
e197cd6acc
now notifications actually get sent. cleanup to follow.
2012-04-02 15:04:51 -04:00
679f797b74
Merge github.com:Gluejar/regluit
2012-04-02 14:17:28 -04:00
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
69dde055b5
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-30 09:44:12 -07:00
7a590637a4
prettifying
2012-03-29 16:26:06 -04:00
2874be9693
now only displays unseen notices and only provides mark-as-seen option when relevant
2012-03-29 15:34:28 -04:00
320c66c494
styling see your notifications option in parallel with change-settings option on companion notification page
2012-03-29 14:48:20 -04:00
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
887ca1e696
revert to Andromeda's de-uglification; left base notification template
2012-03-29 10:59:24 -04:00
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
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
729bc6e78d
put back in some stuff Andromeda axed without telling anyone
2012-03-28 23:25:41 -04:00
495610badf
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-28 14:37:02 -07:00
c7f9996444
added status display on work page
2012-03-28 14:12:00 -04:00
6d50897508
Clarify the pledge modification process for the supporter.
2012-03-28 10:12:09 -07:00
a884997364
making slideshow work on pledge_complete
2012-03-28 12:50:42 -04:00
142ec1a904
de-uglifying
2012-03-28 11:31:50 -04:00
2ab92b6a2f
Merge github.com:Gluejar/regluit
2012-03-28 09:00:31 -04:00
4c4697740b
small changes to tabs to communicate better
2012-03-28 08:59:45 -04:00
2932758077
got notification settings to work [ #27116165 ]
2012-03-27 17:47:54 -04:00
32ca831897
Comments are now notifying and notices are listing [ #25980231 ]
2012-03-27 15:45:41 -04:00
290aecab19
wired up notifications
2012-03-27 13:24:16 -04:00
3925e96ad1
wishlist_comment templates
2012-03-27 12:37:07 -04:00
8f700024cf
eek! non-nested with tags
2012-03-27 12:36:47 -04:00
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
1a53a79752
merge all the things
2012-03-26 16:16:57 -04:00
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
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
0f61bd8d66
added license selection to campaigns. Simple migration to apply.
2012-03-23 12:30:49 -04:00
2c0fb79da5
minor touchups for rh admin
2012-03-23 11:13:11 -04:00
0aba595e05
campaign admin broken by missing jquery
2012-03-23 11:11:43 -04:00
137c48a70d
setup campaign, I mean
2012-03-23 11:10:34 -04:00
84411ca6e0
filled in legal stuff placeholder
2012-03-22 21:25:04 -04:00
c08bd9b54b
I had left a debugging message in pledge_modify.html -- now removed.
...
I figured out the problem of why regluit.test.campaigntest.support_campaign could not see the new Transaction -- it was locked in a database transaction that had an older snapshot of the db. fix came from http://stackoverflow.com/a/4739960/7782
2012-03-22 14:51:43 -07:00
eeaae9131a
[ fix #26883175 ] a35bb7cbba broke this by omitting jquery
2012-03-22 16:57:12 -04:00
29789da14d
learn more was broken on these pages
2012-03-22 16:19:15 -04:00
6d0e5c6a3e
[ #23019867 ] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now.
2012-03-22 12:12:46 -07:00
9f72351c67
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-22 10:18:07 -07:00
6e9f0ee669
tidy lists in metric page
2012-03-22 09:04:28 -04:00
ffb7c8cd33
[ #23019867 ] I believe this commit implements the rest of the pledge changing functionality and works as far as I can tell so far.
...
The one part I don't get yet is why the regluit.test.campaigntest.support_campaign script can successfully drive the browser to create a transction and then
change that pledge to create 2 transactions in total -- and yet until regluit.payment.manager.PaymentManager.check_status is run twice, there seems to be only
one transaction visible to the script.
Does this have to do with Django transactions? I don't know yet.
2012-03-21 15:06:56 -07:00
508a87a6dc
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-20 13:24:26 -07:00
530e07f383
moved atom feed (it's not rss) to autodiscovery link element [ #26402939 ]
2012-03-20 13:01:29 -04:00
Raymond Yee
eric
Andromeda Yelton
Raymond Yee
Ed Summers