Commit Graph

192 Commits (62c1538a765df1f25c73cc09837d3c6565dfb836)

Author SHA1 Message Date
Andromeda Yelton e7cea6c8f4 clarifying 2013-04-24 14:30:39 -04:00
eric 3c61e292d9 Fix edition editing, add other identifiers 2013-04-13 10:59:11 -04:00
Raymond Yee 2bb69d9e82 Merge pull request #149 from Gluejar/verify_email_change
Verify email change
2013-04-08 07:28:32 -07:00
eric fabc7e6802 merge from master again except views 2013-04-05 13:07:13 -04:00
Andromeda Yelton a7adca844e submitterator needs to allow us to submit past press coverage 2013-04-04 11:40:03 -04:00
Andromeda Yelton 57f7c81ec0 adds press item submission functionality 2013-04-04 11:09:18 -04:00
eric 097127ab7c resolve conficts in merge from master 2013-03-29 12:03:15 -04:00
eric 3a81db3804 Implement publisher and feedback email in campaign management
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
eric c26f9e1505 merge from master 2013-03-22 16:39:23 -04:00
eric a22e5e95e5 fix bad welcome page and login 2013-03-19 10:33:57 -04:00
eric 014f15d8ee start on the profile editor mods... 2013-03-14 21:42:00 -04:00
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
eric 7bf62d665e rip out old password change code 2013-03-12 21:58:15 -04:00
eric cc2623e196 login form now remembers the username you picked [#23965785] 2013-03-12 14:26:40 -04:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
eric fec7f33d9e staff only UI for merging works [finish #39297681]
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
eric bda3211a76 user can manage their account credit card [#37674369] 2012-10-14 23:41:17 -04:00
eric ed6e72ec0d preset no-premium, add validation message that should no longer arise [fix #37720723]
so essentially this fixes the bug in two ways
2012-10-14 11:33:13 -04:00
eric ef4b5bdb84 limit max pledge to $2000 [finish #37674713] 2012-10-13 10:13:46 -04:00
Raymond Yee 4ab64c2a68 Merge branch 'master' into pledge_pretty_stick_merge
Conflicts:
	frontend/templates/faq_pledge.html
	static/css/sitewide.css
	static/less/sitewide.less

I took frontend/templates/faq_pledge.html from master.
I combined less/css to have def'n of both .central and li.checked
2012-10-10 16:46:11 -07:00
Andromeda Yelton 2bea7e89f4 Merge branch 'master' into pledge_pretty_stick
Conflicts:
	frontend/templates/pledge.html
	static/css/pledge.css
	static/less/pledge.less
2012-10-05 15:06:37 -04:00
Andromeda Yelton 17e110696d titles can be a lot longer than 30 characters 2012-10-05 12:08:06 -04:00
Raymond Yee 410f1cb9ec Merge branch 'relaunch_ry' 2012-10-04 14:09:51 -07:00
Raymond Yee 5df3ab23ab Merge branch 'master' into relaunch_ry 2012-10-04 09:35:54 -07:00
Andromeda Yelton 5ca4d5c4c8 improving layout of premium addition 2012-10-04 12:08:40 -04:00
Andromeda Yelton 4ea8dbdfac anonymity needs to adhere to whole pledge and be communicated clearly regardless of amount if we're doing badges 2012-10-03 16:02:51 -04:00
Andromeda Yelton 0ec9789e56 merging in relaunch_ry in hopes that stripe wil work 2012-10-02 10:25:43 -04:00
Andromeda Yelton 4cf4787a95 don't display username 2012-10-02 09:32:33 -04:00
eshellman 8cb4586f78 Merge pull request #20 from Gluejar/relaunch
Relaunch
2012-09-28 07:55:07 -07:00
Raymond Yee d72df702aa Merge branch 'master' into relaunch_ry 2012-09-27 15:01:20 -07:00
Raymond Yee 3b04ddb4a9 Merge branch 'relaunch' into relaunch_ry 2012-09-27 14:07:47 -07:00
Raymond Yee 800dc128ab Merge branch 'campaign_relaunch' into relaunch
Conflicts:
	frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
Andromeda Yelton 57df9c116e removing references to paypal and amazon 2012-09-27 12:35:23 -04:00
eric 050bf58da5 add ability to set oclcnumbers for editions. [#finish 32289887]
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
Raymond Yee 2ea3059682 [#36469239] get rid of retain_cc_info since we will retain CC info for all pledges 2012-09-21 12:51:21 -07:00
eric 5d7e6a39bd managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [#36192903][#30068227] 2012-09-21 12:10:13 -04:00
Raymond Yee 77ceed03ad Now -- a checkbox for whether to retain CC info and functionality for creating Customer / charge vs charge directly 2012-09-11 15:53:39 -07:00
Raymond Yee 35e399553f restore CCForm 2012-09-10 16:47:36 -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
eric 0c9d71e4d6 introduce PledgeExtra data object to simplify method calls 2012-09-07 09:46:38 -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
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
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 9e8a0f16b7 ebook adding form should also exclude unglued field now that it exists 2012-08-15 09:40:20 -04:00
eric 10560fb36b merge credit into relaunch 2012-08-14 21:15:31 -04:00
eric 403420a283 Add user-to-user credit transfers [#21784207] 2012-08-13 21:00:28 -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 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
Andromeda Yelton 5855593c5b adding support for acknowledgement fields throughout data pipeline 2012-07-23 08:31:57 -04:00
eric a7af78cc9a [start #31995801] manage campaign form now handles the 11:59PM closing time 2012-07-06 22:10:55 -04:00
eric 17cbab1fc4 temporarily stop checking for end date changes 2012-06-28 16:23:29 -04:00
eric 365976933e [#29809805] made username change form more pythonic 2012-05-26 17:30:12 -04:00
eric 61f45a5716 [#29809805] fixed changed email doesn't check for duplicate email 2012-05-26 17:28:57 -04:00
Raymond Yee a0bc6deefc Closing in on pledge_cancel 2012-05-23 07:22:48 -07:00
Raymond Yee 2f232c29fd Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge 2012-05-21 08:54:05 -07:00
Raymond Yee b8336c4ed6 En route to implementing pledge cancellation 2012-05-21 07:56:18 -07:00
eric 04d8c80cff correct license test with correction from AY [#29884981] 2012-05-21 09:25:38 -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 36a5e92d25 [finish #29677811] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting 2012-05-15 23:42:31 -04:00
eric 08290c0128 [#28736373] fixed problem with not being able to select no edition 2012-05-14 01:05:14 -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 81d158f505 [#28851641] Edition creation and editing !!! Needs a schema migration. 2012-05-11 14:13:09 -04:00
eric 0212136a43 Revert "unrequiring paypal address"
This reverts commit 32a4b29e33.
2012-05-09 09:37:57 -04:00
Andromeda Yelton beff46fd8c standardizing on Unglue.it rather than Unglue.It 2012-05-08 16:15:23 -04:00
Andromeda Yelton 32a4b29e33 unrequiring paypal address 2012-05-08 13:48:32 -04:00
eric 32a39635b4 [finish #29037717] added sentences explaining form limits 2012-05-07 18:00:52 -04:00
Andromeda Yelton a3ce812467 small formatting changes 2012-05-02 14:10:58 -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 bc9f1d3cd3 [fix #28759049] prefixing ebook contribution form not handled properly in view or form 2012-04-27 17:14:57 -04:00
eric d0148cf6dc [finish #28524505] add change email form 2012-04-24 22:20:10 -04:00
Andromeda Yelton be510587ff clarified error messages 2012-04-16 15:28:06 -04:00
eric 75da0a95d5 improved error message for missing campaign manager [#27468285] 2012-04-09 11:14:31 -04:00
eric 224bebfb80 [finish #27591051] check for license change before compaining about license change 2012-04-05 17:23:33 -04:00
eric 5d5c60993e added form to edit campaign managers [start #27468285] 2012-04-03 15:54:41 -04:00
Andromeda Yelton cd22bd9720 managers should be a required field because a campaign cannot be managed without a manager. against managerless frankencampaigns. 2012-04-03 08:20:46 -04:00
eric 8892a935dd Implemented limited edition premiums, front and back end [finish #27011359] 2012-03-26 18:47:02 -04:00
eric 7264b9846f Added management of custom premiums. (migration needed) [finish #26921893] 2012-03-26 15:32:23 -04:00
eric 0f61bd8d66 added license selection to campaigns. Simple migration to apply. 2012-03-23 12:30:49 -04:00
eric e4fc2621df fixed form broken by change to TZ aware times 2012-03-23 12:29:38 -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 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 62d47fee26 [#22561067] Ooops I had missed a couple of datetime.datetime.today() in frontend/forms.py 2012-03-16 13:24:55 -07:00
Raymond Yee 571e565b5e [Fixes #26515771] Now if you hit submit on default blank campaign pledge page, we won't get an error. 2012-03-15 14:54:38 -07:00
eric 5fd73ba93d [fixes #23965971] checks that url is unique (case insenstive), hides url adding if a campaign is active 2012-03-05 16:03:57 -05:00
eric eebeb2476f finish committing all changes 2012-02-28 17:28:58 -05:00
Andromeda Yelton 5d115275e0 hey, sweet, you can set textarea width with css rather than cols and it's more robust 2012-02-02 13:55:21 -05:00
Andromeda Yelton ab7a3df2f7 now both work and supporter pages provide notification of character limits in text entry fields 2012-02-02 13:40:08 -05:00
Andromeda Yelton 815a1f2e87 tagline textarea now communicates and enforces a character limit 2012-02-02 11:06:54 -05:00
Andromeda Yelton 4929e90108 css tweaks per stefan, updated press coverage 2012-01-30 10:09:45 -05:00
Raymond Yee d255fa0335 Made change so that Goodreads API is hit only when supporter wants to load books: https://www.pivotaltracker.com/story/show/23590565
Also allow supporter to clear association with Goodreads account
2012-01-24 09:36:45 -08:00
Andromeda Yelton 556ecf8a06 now users can give us feedback on alpha 2012-01-09 15:53:09 -05:00
thatandromeda 79e7d9d7df grammar! 2012-01-04 11:34:31 -05:00
Andromeda Yelton 03d94bfbc5 tweaking email sharing 2012-01-02 09:39:11 -05:00
Andromeda Yelton 0550f9ac43 added some default field prepopulation to email share form 2011-12-29 10:40:35 -05:00
Andromeda Yelton 79bc9ac15a now email share has marginal styling and returns users to their original page after form submission 2011-12-28 23:17:39 -05:00