03f3dd1287
can now edit language via edition edit
...
Also, the language field is widened to support language ids such as
"zh-tw".
Migration required.
2014-06-06 14:32:34 -04:00
314847459b
remove readmill, add dropbox
2014-05-20 12:19:34 -04:00
4d359b53c1
Merge pull request #348 from Gluejar/list_by_license
...
List by license [#70951010 ]
2014-05-14 09:14:03 -07:00
de6b8555d1
move CC constants into a module
2014-05-08 10:21:50 -04:00
c92219f673
Revert "Reverting changes made to fix double click problem -- and moving changes to fix_double_click"
...
This reverts commit 643d8d358d
2014-05-07 15:37:19 -07:00
643d8d358d
Reverting changes made to fix double click problem -- and moving changes to fix_double_click
...
Revert "move post monkey subscribe into a task"
This reverts commit 9556c4a792
2014-05-02 13:59:04 -07:00
9556c4a792
move post monkey subscribe into a task
...
I'm not able to verify that this works better
2014-05-02 14:07:59 -04:00
183dea1511
patch the personalizer
2014-04-30 15:17:10 -04:00
1c923e63b6
handle exception when no edition
...
Occurred for 100 years of solitude probably during regrouping
2014-04-28 14:23:43 -04:00
9287825d6e
pdf and mobi not displayed in campaign management
2014-04-28 10:59:03 -04:00
5661377207
if library supports t4u book, members of library don't see the ask
...
instead they see “your library has supported this free ebook!
2014-03-18 22:30:21 -04:00
cce7c43d8f
revamp edition display and editing
...
1. created editions display view (work(action=editions))
2. moved split function to new editions page (staff only)
3. added edition selector (staff only)
4. moved ebook link addition to edit edition page
5. standard work display shows only 10 newest editions (much faster!)
6. campaign managers should be able to edit editions
7. ebook links can’t be added when there’s a campaign.
8. more room for edition description editing
2014-03-11 17:34:27 -04:00
ebc3a1a02a
add selected_edition, earliest_publication
2014-03-10 22:22:14 -04:00
256c60fbfc
Merge branch 'master' into t4u_download
...
Conflicts:
core/models.py
2014-03-03 11:08:50 -08:00
3986124464
fix two bugs
2014-03-01 17:13:57 -05:00
ae531e0d7d
Merge branch 'master' into t4u_download
2014-02-25 19:10:01 -08:00
482d9be31d
add b2u test links to campaign management page
2014-02-25 13:58:33 -05:00
bd829aff25
On reflection, files_reviewed was a bad idea
2014-02-25 12:54:14 -05:00
7fda4abd1c
Merge branch 'master' into unglued_b2u_mobi
2014-02-24 14:44:13 -08:00
e66c54e3dc
fix test failures
2014-02-21 13:16:55 -05:00
c7abcb357b
report anonymous contributions
2014-02-20 16:31:13 -05:00
b5fd630bfc
Thanks mostly works.
2014-02-19 22:18:23 -05:00
36ebc83a5b
adapt work and book panel to t4u
...
also: start migration to “Fave”
also: start showing faves on ready to read books
also: on panel view, fixed the num-wishes link was unclickable
but: the fave count looks ugly
2014-02-11 11:37:39 -05:00
bb676f9500
missing step in THANKS campaign launch
2014-02-10 20:16:56 -05:00
a4488c45ce
make campaign creation really work the way it should
...
Problem was that rh_tools forms were not being updated correctly after
creating a campaign.
2014-02-08 15:29:27 -05:00
2d7330b447
Not sure why a test of this decided to fail now!
2014-02-05 20:56:30 -05:00
87387baa32
add file review requirement for b2u and t4u campaigns
...
migration needed!
2014-02-05 19:33:55 -05:00
fe931c7835
uploader now generates mobi for unglued b2u files
2014-02-05 17:02:21 -05:00
25d9923337
THANKS has null target
2014-01-30 11:59:17 -05:00
3bfbbd7653
Merge branch 'master' into t4u_file_upload
2014-01-30 11:53:20 -05:00
4c9aba2b47
authors should always return a query set
2014-01-23 23:04:52 -05:00
e540bb7a56
all authors now display
...
had to harden the work model against works without editions to pass
tests
Lagos 2060 will need 1st author to change back
added work.authors_short to work model and to search work mock model
used work #415 as an example of a work with 3 authors
2014-01-17 21:37:19 -05:00
f101f0dc20
Merge branch 'master' into multi_author_display
2014-01-15 21:22:49 -05:00
b3465ea084
search code for dependence on deadline being not null
2014-01-15 17:59:45 -05:00
df7dd775bf
add authors method to work
2014-01-15 15:16:24 -05:00
1b656ad76a
fix missing launch button
...
t4u work removed the deadline in b2u campaigns, resulting in a failed
criterion for shooing the launch button. Have moved all the
launchability logic to the campaign model
2014-01-15 10:19:57 -05:00
66ca501327
temp commit
2014-01-15 08:32:55 -05:00
66e241441b
make cc_date less crash
2014-01-13 14:32:03 -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
b8c7b8afa7
add a page that lets rhs see the premiums earned by ungluers
2013-12-30 21:51:32 -05:00
eb416e75dd
Merge branch 'master' into switch_watermarking
2013-12-19 18:02:43 -05:00
a05c3d27f1
Merge branch 'switch_watermarking' into thanks4u
2013-12-18 16:06:30 -05:00
973d2c3bc0
made watermarking optional [ #62120182 ]
...
apply migrations
2013-12-18 12:34:53 -05:00
0d28fbab7e
Merge branch 'master' into ban_disposable_emails
2013-12-18 08:54:11 -08:00
098b185a5a
turn off mailchimp checking for tests
2013-12-16 15:11:25 -05:00
40e611bac5
revive the gift/donation credit funtionality, at least for b2u campaigns
...
The reason for doing this is so a library can put in money with one
check, then use it up gradually. (we get to pocket the fees that would
go to stripe) One change here- in b2u there is an extra click to get to
download page, even if no gift credit is involved - this way the user
knows what and how he's bee charged
2013-12-15 00:31:06 -05:00
e014114a52
preclude possible inter-instance data leakage
2013-11-18 18:22:09 -05:00
a1cea30cba
fix percent for campaign preview
...
somehow googlebot found a link to the "preview" of Stephen Black's
campaign.
Not an urgent fix, but thanks, googlebot.
2013-11-15 23:06:08 -05:00
a701edf3b2
make ebook entries yay
2013-11-15 02:10:14 -05:00
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
5d4539b305
enable ebookfile download and secure ebookfile storage
2013-11-14 14:48:16 -05:00
9cf7385324
move campaign completion logic to campaign
2013-11-14 12:40:01 -05:00
0dad79a3d4
fix bug comparing dates with times
2013-11-14 12:38:58 -05:00
e4b3d387fe
correct documentation notes
2013-11-12 14:58:29 -05:00
2786b871d3
update status now works for b2u
2013-11-12 14:48:04 -05:00
ffd6796bfd
fix silly method of turning off notifications
2013-11-10 10:28:22 -05:00
00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
2d86584129
add Acq to admin system
2013-11-06 23:25:52 -05:00
50134907cd
also want tests to pass
2013-11-06 17:20:13 -05:00
f5f58dfba6
don't want tests to generate email
2013-11-06 15:43:54 -05:00
ca540c4cb4
wired up claim notifications [ #37257639 ]
2013-11-06 14:58:50 -05:00
f6f3c4fc04
booxtream default ex libraris page boasts about "Social DRM". yuck.
2013-11-03 17:19:23 -05:00
757927220e
this is what caused "Open Access" to fail for Raymond last week.
2013-11-03 17:14:13 -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
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
76562f83ad
fix test errors
2013-10-19 17:27:53 -04:00
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -04:00
6e7344d8a4
and now, you can borrow a library book! yay!
2013-10-18 15:35:48 -04:00
60cd2f626b
borrowability reflected on work page
2013-10-18 13:33:47 -04:00
93d128102e
display of borrowability and library holdings
...
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -04:00
d99aaa97c9
card number authentication!
...
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
b091612605
Merge branch 'master' into b2u_errata
...
Conflicts:
frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
58755d76e1
fix dollar per day computation to use launch date when present
...
also, activated had never been activated!
2013-09-26 09:26:50 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
be711e142d
cleaned up marc file storage issues before implementing b2u
...
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
99fe9f9011
rewrite license page
2013-09-20 17:46:06 -04:00
c83f1f657d
remove more debugging stuff
2013-09-20 17:45:28 -04:00
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
aad6d72207
Merge branch 'master' into b2u_download
...
Conflicts:
core/signals.py
2013-09-05 22:56:46 -04:00
b801eb4927
add acq handling to download
...
needs migration. should migrate core back to 0052 to refresh acq table
download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
4e161bebe6
explicit import of regluit.core.parameters
...
move to using the openly available github hosted version of Eric's Open Access Ebooks for core.EbookFileTests.test_ebookfile test
Should we delete the static/test epub?
2013-08-28 17:13:35 -07:00
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
567f20d5a2
move more constants
2013-08-25 23:52:09 -04:00
f93fe51e29
days_per_copy properties
2013-08-22 14:23:47 -04:00
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
159ad0db05
fix tests, fix bugs found by tests
2013-08-20 01:01:36 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
26c4d522b4
made the cc_date and test consistent whether its a date or a datetime
2013-08-19 16:01:32 -04:00
94eb6aeab0
Demphasize "wishes" on the website in preparation for B2U
2013-08-18 18:10:25 -04:00
d5b9f88380
move "extra data" into a json field dict to improve payment code tidieness
...
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
bf5dcd688a
fix some date comparison code to get tests to pass
2013-08-18 15:18:01 -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
75c32569e2
B2U campaign percentages
2013-08-08 22:32:58 -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
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
5e0ee9f5f9
need a bit more flexibility and validation if we're creating CC/PD MARCrecord instances directly from admin
2013-07-25 10:36:03 -04:00
3a9e588fc7
replacing confusing field names
2013-07-25 10:18:36 -04:00
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
bb5c1079b6
user can now change marc preferences
2013-07-23 12:23:04 -04:00
1414ae5fa4
add user preference for MARC record link target
2013-07-23 09:53:07 -04:00
6ba623a2c8
database support for MARC records that link to download page
2013-07-23 08:49:15 -04:00
1bebec42af
what about public domain ebooks?
2013-07-19 13:13:53 -04:00
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -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
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
bbeb086cbc
bugfixing
2013-07-08 15:54:36 -04:00
2ea00389b3
minimal MARC support in database
2013-07-08 10:03:22 -04:00
b0f4eda221
show offers on work page
2013-06-27 13:10:33 -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
3ea697c768
create offers
...
must migrate core schema!
2013-06-17 18:53:28 -04:00
f4ffd5da6f
Merge branch 'master' into simpler_download
2013-06-04 10:48:49 -04:00
92b4a36a41
archive now presenting both http and https
2013-06-03 16:29:52 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
2338240540
add kindle email to profile. requires migration
2013-05-31 11:35:17 -04:00
ffc813d8ee
blank descriptions now legit
2013-05-28 10:19:01 -04:00
d65704d675
RightsHolder, Subject, UserProfile admin useable
2013-05-03 19:21:10 -04:00
356cc67785
claim admin useable
2013-05-03 18:05:43 -04:00
6b7fb7fd00
fix ebook url in reverse method
2013-04-26 17:49:57 -04:00
a2606b2e08
move download count display to work infobox and rh_tools
2013-04-20 10:08:10 -04:00
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
c60986f87c
Merge pull request #159 from Gluejar/press_updater
...
Press updater
2013-04-05 08:21:51 -07:00
00ab8f4d18
better name
2013-04-04 10:15:15 -04:00
63dd344c5a
adds db support for press items
2013-04-04 09:44:41 -04:00
31644ffb5a
revert to simpler faster query
...
output from speed test: old way 10% faster
2 values 0:00:18.294094
orig 0:00:16.574740
1 value 0:00:18.118002
2 values 0:00:18.266426
2013-04-03 20:21:04 -04:00
044c5ba806
fix self.identifiers.values('type', 'value').filter(type='goog')[0].value -> ['value']
2013-04-02 23:14:39 -07:00
d26e97f883
need ['value'] to access value not .value
2013-04-02 23:01:24 -07:00
d861aafdc3
Merge branch 'master' into landing_page
2013-04-02 07:55:42 -07:00
2aabf09161
merge from master
2013-03-29 19:41:28 -04:00
e4259bf468
changed all_names to alternate_names, added counter to monitor progress
...
Be sure your mysql server is set to utf8:
http://stackoverflow.com/questions/3513773/change-mysql-default-characte
r-set-to-utf8-in-my-cnf
2nd answer
2013-03-29 14:58:54 -04:00
63c6b35a30
Merge branch 'master' into add_publisher_model
2013-03-29 08:43:15 -07:00
552602f20a
https gravatar
2013-03-28 12:27:37 -04:00
520beedfc7
made it faster
2013-03-28 11:38:40 -04:00
a0af1761f1
forgot to set gravatar as default for new users
2013-03-28 10:39:48 -04:00
24a08d2979
Implement Andromeda suggestions
2013-03-27 21:46:52 -04:00
56691cd3e0
make sure alias pubname is used for new, add tests
2013-03-27 12:51:10 -04:00
3a81db3804
Implement publisher and feedback email in campaign management
...
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
782f2bd712
can now admin the publishernames.
...
Setting a publisher moves the editions to that publisher's name
2013-03-26 14:12:58 -04:00
eric
Raymond Yee
Andromeda Yelton