c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
a22e5e95e5
fix bad welcome page and login
2013-03-19 10:33:57 -04:00
014f15d8ee
start on the profile editor mods...
2013-03-14 21:42:00 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
7bf62d665e
rip out old password change code
2013-03-12 21:58:15 -04:00
cc2623e196
login form now remembers the username you picked [ #23965785 ]
2013-03-12 14:26:40 -04:00
282f877890
wire up msg view to wishlist_message notification [ #36991391 ]
2013-02-26 12:43:54 -05:00
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
bda3211a76
user can manage their account credit card [ #37674369 ]
2012-10-14 23:41:17 -04:00
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
ef4b5bdb84
limit max pledge to $2000 [finish #37674713 ]
2012-10-13 10:13:46 -04:00
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
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
17e110696d
titles can be a lot longer than 30 characters
2012-10-05 12:08:06 -04:00
410f1cb9ec
Merge branch 'relaunch_ry'
2012-10-04 14:09:51 -07:00
5df3ab23ab
Merge branch 'master' into relaunch_ry
2012-10-04 09:35:54 -07:00
5ca4d5c4c8
improving layout of premium addition
2012-10-04 12:08:40 -04:00
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
0ec9789e56
merging in relaunch_ry in hopes that stripe wil work
2012-10-02 10:25:43 -04:00
4cf4787a95
don't display username
2012-10-02 09:32:33 -04:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
d72df702aa
Merge branch 'master' into relaunch_ry
2012-09-27 15:01:20 -07:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
57df9c116e
removing references to paypal and amazon
2012-09-27 12:35:23 -04:00
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
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
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
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
35e399553f
restore CCForm
2012-09-10 16:47:36 -07:00
0e1839d531
Merge branch 'master' into relaunch_ry
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:18:30 -07:00
bcceaa719b
integrating stripe into fund_the_pledge
2012-09-10 13:17:30 -07:00
7398fdf161
unglued property should adhere to editions, not ebooks
2012-09-10 15:18:40 -04:00
0c9d71e4d6
introduce PledgeExtra data object to simplify method calls
2012-09-07 09:46:38 -04:00
9395cd058b
now donating cents works, too
2012-09-06 11:36:13 -04:00
8eeadc99d3
woo hoo, credit and donation scaffolding works end to end [ #21784207 ]
2012-09-06 01:01:17 -04:00
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
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
9e8a0f16b7
ebook adding form should also exclude unglued field now that it exists
2012-08-15 09:40:20 -04:00
10560fb36b
merge credit into relaunch
2012-08-14 21:15:31 -04:00
403420a283
Add user-to-user credit transfers [ #21784207 ]
2012-08-13 21:00:28 -04:00
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
b041430731
front end for new pledge page, plus just enough back end that it displays
2012-08-01 08:52:39 -04:00
e8bd5ab2dc
added ckeditor to manage campaign forms to provide rich text editing and image uploads [ #32447975 ]
2012-07-27 14:23:44 -04:00
5855593c5b
adding support for acknowledgement fields throughout data pipeline
2012-07-23 08:31:57 -04:00
a7af78cc9a
[start #31995801 ] manage campaign form now handles the 11:59PM closing time
2012-07-06 22:10:55 -04:00
17cbab1fc4
temporarily stop checking for end date changes
2012-06-28 16:23:29 -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
a0bc6deefc
Closing in on pledge_cancel
2012-05-23 07:22:48 -07:00
2f232c29fd
Merge branch 'master' of github.com:Gluejar/regluit into cancel_pledge
2012-05-21 08:54:05 -07:00
b8336c4ed6
En route to implementing pledge cancellation
2012-05-21 07:56:18 -07:00
04d8c80cff
correct license test with correction from AY [ #29884981 ]
2012-05-21 09:25:38 -04:00
bd5b062d24
change manage_campaign to allow active campaigns to remove license restrictions [ #29884981 ]
2012-05-20 00:13:12 -04:00
36a5e92d25
[finish #29677811 ] removed completely useless UNGLUEIT_SHORTEST_DEADLINE setting
2012-05-15 23:42:31 -04:00
08290c0128
[ #28736373 ] fixed problem with not being able to select no edition
2012-05-14 01:05:14 -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
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
2012-05-09 09:37:57 -04:00
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
32a39635b4
[finish #29037717 ] added sentences explaining form limits
2012-05-07 18:00:52 -04:00
a3ce812467
small formatting changes
2012-05-02 14:10:58 -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
bc9f1d3cd3
[ fix #28759049 ] prefixing ebook contribution form not handled properly in view or form
2012-04-27 17:14:57 -04:00
d0148cf6dc
[finish #28524505 ] add change email form
2012-04-24 22:20:10 -04:00
be510587ff
clarified error messages
2012-04-16 15:28:06 -04:00
75da0a95d5
improved error message for missing campaign manager [ #27468285 ]
2012-04-09 11:14:31 -04:00
224bebfb80
[finish #27591051 ] check for license change before compaining about license change
2012-04-05 17:23:33 -04:00
5d5c60993e
added form to edit campaign managers [start #27468285 ]
2012-04-03 15:54:41 -04:00
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
8892a935dd
Implemented limited edition premiums, front and back end [finish #27011359 ]
2012-03-26 18:47:02 -04:00
7264b9846f
Added management of custom premiums. (migration needed) [finish #26921893 ]
2012-03-26 15:32:23 -04:00
0f61bd8d66
added license selection to campaigns. Simple migration to apply.
2012-03-23 12:30:49 -04:00
e4fc2621df
fixed form broken by change to TZ aware times
2012-03-23 12:29:38 -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
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
62d47fee26
[ #22561067 ] Ooops I had missed a couple of datetime.datetime.today() in frontend/forms.py
2012-03-16 13:24:55 -07:00
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
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
eebeb2476f
finish committing all changes
2012-02-28 17:28:58 -05:00
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
ab7a3df2f7
now both work and supporter pages provide notification of character limits in text entry fields
2012-02-02 13:40:08 -05:00
815a1f2e87
tagline textarea now communicates and enforces a character limit
2012-02-02 11:06:54 -05:00
4929e90108
css tweaks per stefan, updated press coverage
2012-01-30 10:09:45 -05:00
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
556ecf8a06
now users can give us feedback on alpha
2012-01-09 15:53:09 -05:00
79e7d9d7df
grammar!
2012-01-04 11:34:31 -05:00
03d94bfbc5
tweaking email sharing
2012-01-02 09:39:11 -05:00
0550f9ac43
added some default field prepopulation to email share form
2011-12-29 10:40:35 -05:00
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
0717479238
lo-fi email sharing now works
2011-12-28 20:43:52 -05:00
4e36892910
Putting in stub for campaign_admin.
...
Let admin do a PaymentManger.checkStatus() to get the latest information about Transactions (using the PayPal PaymentDetails and PreapprovalDetails API methods)
2011-12-20 17:42:06 -05:00
cd53080ac6
eleventy billion css tweaks part quattuor
2011-12-16 12:17:08 -05:00
34dd5237af
merged with raymond's commit
2011-12-02 19:37:27 -05:00
b8cebfa0dd
Refining the interaction of Premium choice and pledge amount
2011-11-30 08:58:26 -08:00
b44379e6cd
First pass at tying the premium selected and the pledge amount
2011-11-29 18:02:51 -08:00
1fc644aacd
implemented a minimum campaign term; other campaign management tweaks
2011-11-29 10:48:37 -05:00
9cbcea0f72
the open campaign form now automatically sets the end date and target to allowed values
2011-11-28 23:37:31 -05:00
57640ec7b2
First pass at unwiring campaign_detail from the real pledge view.
2011-11-28 15:39:06 -08:00
b398a948dc
refactored campaign management savable constraints out of view and into form
2011-11-25 21:23:37 -05:00
d5bae40c00
refactored launchable into campaign model. fixed date camparison bug. moved target and deadline limits to settings file
2011-11-23 21:41:06 -05:00
20cc607193
claim form now uses ModelChoiceField; tests for previous claims
2011-11-23 12:23:53 -05:00
0bad939bfb
Though the form is ugly, a campaign manager can now launch a campaign and set info
...
I also learned what it means when a form is bound to a model object
2011-11-22 00:28:16 -05:00
a6c84aea89
should now be back where I was
2011-11-21 15:49:29 -05:00
43d3f3f553
halfway through implementation of campaign management. can't launch campaigns yet. migrate schemas!
2011-11-20 22:23:51 -05:00
1189ab02c4
switched to using is_staff set by django admin to determine website "staff" (also fixed a bug from last commit)
2011-11-20 14:22:51 -05:00
fa68e52260
switched campaign manager field to AutoCompleteSelectMultipleField
2011-11-20 14:02:09 -05:00
a6bf130b24
Andromeda von Rightsholder can now open campaigns from her rightsholder tools page; apply migrations!
2011-11-19 21:22:54 -05:00
6cc05817a8
woo hoo! autocomplete input on rightsholder creation form. uses app django-selectable
2011-11-18 09:24:31 -05:00
a720089525
unglue it admin users can now approve rightsholder claims!
2011-11-17 14:35:41 -05:00
5df81cc52e
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
...
Conflicts:
frontend/urls.py
2011-11-16 11:58:39 -08:00
d5a2b88768
Awesome Unglue.it Administration page added; will require a migration to add claim status
2011-11-16 14:45:37 -05:00
3be4e6fab4
First pass at integrating LT into the UI
2011-11-16 10:20:10 -08:00
6a2e690f18
claim form now creates a claim
2011-11-16 00:22:29 -05:00
354b46085f
Approved rights holders get a claim form on work pages; still need to make a view that does the actual claiming
2011-11-15 18:20:29 -05:00
daef075f5b
Fixing the incorrect passing of a Goodreads shelf name -- and also incorrect display of number of books on wishlist.
2011-11-15 12:51:38 -08:00
0328430169
first cut at UI for unglue.it admins to create rights holders and delegate ownership
2011-11-14 23:28:55 -05:00
4c65a11696
de-association from twitter and facebook are now supported
2011-11-14 13:23:26 -05:00
db3163b01b
added twitter account association and profile image acquisiton
...
also added goodreads association url to UI for good measure
2011-11-12 16:36:31 -05:00
bc3b8333b6
added librarything_id and facebook_id to profile model, wired to supporter template; started faq
2011-11-11 22:51:22 -05:00
49aca6428c
The /pledge page now has the correct radio button to correpond to the premium clicked on.
...
HOWEVER, there's no enforcement currently of the pledge amount to be the same as the premium clicked on.
Also, no form validation on pledge page yet too.
2011-11-09 10:05:03 -08:00
a40cab0184
First take on integrating pledge
2011-11-07 16:01:08 -05:00
fa1806759b
Merge branch 'master' of github.com:Gluejar/regluit into goodreads
2011-11-01 14:24:18 -07:00
c139e4dcfc
adding option for supporters to pledge anonymously
2011-11-01 17:08:09 -04:00
f7ea58a602
Integrated Goodreads shelf loading to wishlist into UI
2011-10-31 17:26:05 -07:00
559ff63aa3
added homepage url and twitter id to user profile model and form; reverted signalling
...
relying on signals to ensure that there's always a profile record
turned out to be a bad idea; django social auth signals are poorly
architected for this; and so it doesn't work. Catching exceptions
worked just fine, so I went back to that. Homepage and twitter buttons
now show only if they've been entered in settings. Twitter handle works
with or without '@' entered.
2011-10-24 23:32:32 -04:00
74e6f7a374
wired user profile edit form to supporter page
...
you can now edit tagline from supporter page
2011-10-19 03:13:29 -04:00
8cab4dc425
First pass integration of preapproval into campaign pledge form
2011-10-18 16:27:20 -07:00
f01d0c4df3
First cut at doing payment integration and understanding how to use class-based generic views
2011-10-12 10:47:48 -07:00
7e4f0a222b
Ooops....forgot some files in previous commit
2011-10-11 10:03:40 -07:00
4e65134ab1
no need for commented out imports, eh
2011-10-09 15:17:43 -04:00
73c4ebde29
allow username setting and tagline in profile
...
started work on user profiles, with "tagline" field
the first a user signs in this google, they are redirected to a page
where they can set their username
2011-10-03 12:36:22 -04:00
eric
Raymond Yee
Andromeda Yelton
Andromeda Yelton
Ed Summers