66ca501327
temp commit
2014-01-15 08:32:55 -05:00
9949a53da3
Use named campaign types
2014-01-10 14:51:59 -05:00
f3a04aff99
Merge branch 'master' into thanks4u_
2014-01-03 18:47:51 -05:00
70004a0f0f
can create a THANKS campaign
2014-01-03 14:15:26 -05:00
073e9664c0
fix test for ISBN
2013-12-27 16:35:23 -05:00
4927801a77
fix bug in OpenCampaign
...
I had added a prefix to this form, neglected thorough testing, did
better testing this time.
2013-12-18 13:02:57 -05:00
973d2c3bc0
made watermarking optional [ #62120182 ]
...
apply migrations
2013-12-18 12:34:53 -05:00
6bdbe1d046
user can buy multiple library licenses [ #59827932 ]
...
also, some logic needed cleaning for setting expires on reserves
2013-11-01 16:15:01 -04:00
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
439169a1ab
Implemented IP authentication
...
libraries get associated with a library_block table (IP ranges)
moved superlogin here
IP stuff mostly copied from
https://github.com/benliles/django-ipauth/blob/master/ipauth/models.py
The model is that you need to be in an allowed IP range to "join" a
library. Once you've joined, you can use your login from anywhere. to
use that library.
Asign IP ranges in admin
2013-10-08 15:37:22 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
4b3c899088
[ #55666760 ] make fund-complete page sensetive to action
2013-09-06 13:58:23 -04:00
e5a162061d
only epub files to be uploaded for now
2013-08-26 23:54:19 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
2c06139a6f
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
2013-08-10 16:29:58 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
e64c128f7e
Merge branch 'master' into ebook_selling
...
Conflicts:
frontend/forms.py
2013-08-08 19:59:29 -04:00
613c3770e0
Bake in CC Date concept according to blog post, up to campaign creation
...
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
2013-08-08 19:56:26 -04:00
69f9e1838f
harmonization with master for merge
2013-08-08 18:21:33 -04:00
eff880ce0b
get license from database, not from the record submitter
2013-07-26 19:52:15 -04:00
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
3a9e588fc7
replacing confusing field names
2013-07-25 10:18:36 -04:00
bb5c1079b6
user can now change marc preferences
2013-07-23 12:23:04 -04:00
287f017551
documentation for CC/PD MARC records
2013-07-22 14:23:59 -04:00
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
516c8c768a
I can harvest files from the db instead of tempting error by entering them twice
2013-07-18 16:36:01 -04:00
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
87c27cecee
wiring ungluify_record to front end and s3
2013-07-17 10:34:01 -04:00
fe2e3b72c5
argh
2013-07-16 11:42:17 -04:00
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
835ff4be8e
Rightsholder can upload ebook files and set buy-to unglue prices [ #51733385 ][ #51745045 ]
...
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
1ea77acf09
move latest ending logic from form to model/settings
2013-06-17 18:53:28 -04:00
f4ffd5da6f
Merge branch 'master' into simpler_download
2013-06-04 10:48:49 -04:00
dd72b0d997
add the downoad_count to form exclude
2013-06-03 16:23:21 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
236302342e
users can add and change kindle email
2013-05-31 15:19:58 -04:00
f2e6d10469
allow new edition id oclc but no isbn; allow new publishernames
2013-05-13 17:32:30 -04:00
e7cea6c8f4
clarifying
2013-04-24 14:30:39 -04:00
3c61e292d9
Fix edition editing, add other identifiers
2013-04-13 10:59:11 -04:00
2bb69d9e82
Merge pull request #149 from Gluejar/verify_email_change
...
Verify email change
2013-04-08 07:28:32 -07:00
fabc7e6802
merge from master again except views
2013-04-05 13:07:13 -04:00
a7adca844e
submitterator needs to allow us to submit past press coverage
2013-04-04 11:40:03 -04:00
57f7c81ec0
adds press item submission functionality
2013-04-04 11:09:18 -04:00
097127ab7c
resolve conficts in merge from master
2013-03-29 12:03:15 -04:00
3a81db3804
Implement publisher and feedback email in campaign management
...
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
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
eric
Andromeda Yelton
Raymond Yee