Commit Graph

697 Commits (1ab9304475398f290b6d988bfa60c40b3e5ef35d)

Author SHA1 Message Date
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
eric 2c0fb79da5 minor touchups for rh admin 2012-03-23 11:13:11 -04:00
eric 0aba595e05 campaign admin broken by missing jquery 2012-03-23 11:11:43 -04:00
eric 137c48a70d setup campaign, I mean 2012-03-23 11:10:34 -04:00
eric 84411ca6e0 filled in legal stuff placeholder 2012-03-22 21:25:04 -04:00
Raymond Yee 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
eric eeaae9131a [fix #26883175] a35bb7cbba broke this by omitting jquery 2012-03-22 16:57:12 -04:00
eric 29789da14d learn more was broken on these pages 2012-03-22 16:19:15 -04:00
Raymond Yee 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
Raymond Yee 9f72351c67 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-22 10:18:07 -07:00
eric 6e9f0ee669 tidy lists in metric page 2012-03-22 09:04:28 -04:00
Raymond Yee 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
Raymond Yee 508a87a6dc Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-20 13:24:26 -07:00
eric 530e07f383 moved atom feed (it's not rss) to autodiscovery link element [#26402939] 2012-03-20 13:01:29 -04:00
Raymond Yee 0e9dc0e798 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-20 09:41:49 -07:00
eric 38bca40bdd landing page was missing the wishlist javascript! [addresses comment on #26590795] 2012-03-20 12:29:29 -04:00
eric 163445d4f5 bulletized the premium list in faq using [accept #26309601] 2012-03-20 11:45:34 -04:00
Andromeda Yelton 52fcbf8d4f font embiggening, moved badge on campaign list to match other list pages 2012-03-20 10:44:56 -04:00
Andromeda Yelton 53d99ae72f addressing https://www.pivotaltracker.com/story/show/26590795 2012-03-20 09:52:57 -04:00
Raymond Yee 46ca784030 [#23019867] First pass at allow for pledges to be modified 2012-03-19 16:32:37 -07:00
Andromeda Yelton 7568aa3f14 more informative text than ACTIVE now in status field 2012-03-19 16:36:05 -04:00
Andromeda Yelton 76b261ff3e making terms look more like legalese per https://www.pivotaltracker.com/story/show/26309601 2012-03-19 16:08:05 -04:00
Andromeda Yelton 6d3d032f9b addresses https://www.pivotaltracker.com/story/show/25969011 2012-03-19 15:52:09 -04:00
Andromeda Yelton 5e5e966651 if showing in slideshow on empty supporter wishlist, now offers add-to-wishlist rather than remove-this 2012-03-19 15:32:33 -04:00