b0550999e1
incorporate changes from kindle safe title changes.
...
Merge branch 'master' into kindle_file_size
Conflicts:
frontend/views.py
2015-03-09 10:56:20 -07:00
71c8a95b90
add comment about what fix_kindle_bugs does
2015-03-06 15:16:04 -08:00
0c4550fe4a
save ebook file size on send_to_kindle
...
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
2015-03-05 22:30:03 -05:00
f05b276118
provide a title that's kindle-safe
2015-03-03 17:39:23 -05:00
9c4d609579
Merge pull request #459 from Gluejar/download-nits
...
add inactive download counts in rh tools [fix #88928040 ]
2015-02-25 11:21:08 -08:00
84227748db
add inactive download counts in rh tools
2015-02-23 16:52:55 -05:00
53ecbfcb5f
DRY for safe_get_work
2015-02-18 12:47:19 -05:00
a9d4a71912
fixed an incorrect reference, uncovered by the tests!
2015-02-03 15:41:38 -08:00
edd65c08c3
make sure the campaigns for the editions returned by editions_to_convert are not b2u.
2015-02-02 15:05:36 -08:00
53b62642cd
more idiomatic increment
2015-02-02 13:31:10 -05:00
c714de0d67
also for doab records
2015-01-30 11:39:48 -05:00
7cb0f473de
remove many-commas subjects, prevent their addition
2015-01-30 11:33:22 -05:00
32ec6b0a03
Merge pull request #449 from Gluejar/improve_gifts
...
Improve gifts
2015-01-28 11:59:27 -08:00
0b7f522232
first pass at a command to convert all the convertible campaign ebooks to mobi
2015-01-26 12:19:26 -08:00
dfbdf9bbd7
add a test for mobigen
2015-01-26 09:48:16 -08:00
e9d8080c3b
First cut of celery tasks for converting to mobi
2015-01-23 15:52:35 -08:00
6c1630905b
Merge branch 'master' into mobigen_integrate
2015-01-23 10:43:33 -08:00
ea5adba871
add notifications for unredeemed gifts
2015-01-23 13:11:19 -05:00
61c0de3fbc
add a command to delete subjects with non-xml characters
2015-01-22 15:48:04 -08:00
b4776f36e2
Merge branch 'master' into mobigen_integrate
2015-01-20 13:13:58 -08:00
aa14bcb5c9
fix github matcher
2015-01-19 12:10:07 -05:00
1be246586c
Merge pull request #443 from Gluejar/edit_kw
...
Edit kw
2015-01-16 09:17:11 -08:00
154701bea5
show most common keywords first
2015-01-16 08:56:36 -05:00
50fae7d544
Running into validation problems with OPDS because "image/image" mime-type for
...
urls like https://github.com/Gluejar/open_access_ebooks_ebook/blob/master/open_access_ebooks/EPUB/cover.120.jpg?raw=true
Fix by looking at the ending of the path of a url, not the fragement, parameter, or query string
2015-01-14 18:29:17 -08:00
4f0cc87b48
temp add kw
2015-01-14 15:07:54 -05:00
ea4e489213
fix the odds implementation of kw facet
...
mostly, fixing missing url encoding
2015-01-12 12:03:47 -05:00
134988f082
modify migration to handle situation in which a subject does not exist (e.g., Selenium tests)
2015-01-11 12:44:31 -08:00
684c518324
add comments to clarify intention of parts of facets.py, based on Eric's answers to Raymond's questions
2015-01-11 12:18:30 -08:00
62daa67880
coming together! (needs migration)
2015-01-09 17:05:34 -05:00
f08c721d2e
Merge pull request #434 from Gluejar/give_btu
...
Give btu updates: gift table revamp, add gift admin
2014-12-22 15:31:50 -05:00
5e4b7a7b89
fix wrong field type in model
2014-12-22 13:49:39 -05:00
6fc3eb8703
turns out we can't send notifications to inactive accounts
...
I had intended that gift redemption would activate the account, but
that doesn't work. Need to figure out the downside to having unverified
active accounts.
2014-12-22 13:24:22 -05:00
642653c4f8
Merge pull request #433 from Gluejar/give_btu
...
bug fix in give_btu
2014-12-22 11:50:18 -05:00
c85fd340d8
how did that sneak through?
2014-12-22 11:47:34 -05:00
05686ffaec
Merge pull request #432 from Gluejar/give_btu
...
Give btu updates
2014-12-22 09:04:08 -05:00
ae208286f0
handle case of double gifts
...
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
20c3ffe12e
Merge pull request #430 from Gluejar/give_btu
...
As requested by Eric, I'm now going to do the merge to get this PR on just. Then I'll test downloads. Noting the current commit on master in case we need to revert: 25dcb06f46
2014-12-20 15:42:00 -05:00
5719f7f90c
forgot to actually test the code
2014-12-20 13:14:05 -05:00
b01562b630
Properly handle gifts to existing users
2014-12-20 12:47:15 -05:00
f18acfc091
notify the giver when the gift is redeemed
...
migration needed
2014-12-19 15:13:54 -05:00
2c44a29aa7
regifting
2014-12-18 13:37:28 -05:00
1c651f2458
everything more or less works except resifting
2014-12-18 01:07:59 -05:00
41163d81a2
purchase and provisioning the gift
2014-12-16 14:18:51 -05:00
b9aee9095b
Merge branch 'master' into mobigen_integrate
2014-12-16 08:55:51 -08:00
ac39075ccd
a comment to explain logic of reset_free_flag
2014-12-15 11:46:59 -08:00
7b5174aca6
ui and model for buy as a gift
2014-12-15 00:56:08 -05:00
be0ab46872
use is_free in query sets
2014-12-14 10:00:10 -05:00
b54b21fdfe
keep is_free up to date
2014-12-13 12:37:35 -05:00
c9270b154a
Merge branch 'master' into free_flag
2014-12-13 11:55:02 -05:00
19dd7eadcb
Merge pull request #425 from Gluejar/opds_facets
...
Opds facets [deliver #82001456 ]
2014-12-12 11:42:04 -08:00
7ceaffd124
add is_free flag
2014-12-11 23:01:13 -05:00
6c824e38af
Added another clarifying comment
2014-12-11 14:34:04 -08:00
f24478d641
Add a comment to explain logic KeywordFacetGroup.has_facet in response to explanation in https://github.com/Gluejar/regluit/pull/427#discussion_r21712785
2014-12-11 14:08:19 -08:00
8c9bccc1f0
keyword facets!
...
for example, /free/kw.Fiction/
2014-12-10 17:14:28 -05:00
5995ae610a
Moved code to call the mobigen service from .ipynb to regluit.core.mobigen (may eventually want to move core/mobigen.py to external package)
2014-12-09 11:56:27 -08:00
e76b1feccc
Merge branch 'master' into opds_facets
2014-12-08 16:06:44 -08:00
f7b796c6a6
Merge pull request #421 from Gluejar/facets
...
Facets [deliver #70680500 ]
2014-12-08 15:21:49 -08:00
95958847ed
Since http://jenkins.unglueit.com/job/regluit/2912/console , the cover images from Google Books api are now starting with http and not https, which is strange.
...
This fix allows the test to pass for http or https book covers
2014-12-08 10:09:05 -08:00
badf8e4b0e
bring back descriptions, use them
2014-12-05 20:38:08 -05:00
ab6eb0eed5
revise the top level feeds
2014-12-05 20:37:51 -05:00
5246bd1a1c
add new facet machinery to olds
2014-12-05 18:38:04 -05:00
70d4506365
move path parsing to facets
2014-12-05 18:36:45 -05:00
f689bcf6bd
I learned something
2014-12-05 09:39:48 -05:00
0e3b0468c3
rewrite some classes in facets.py to use instance variables instead of class variables...will matter if we have more than one Facet/FacetGroup at a time
2014-12-04 14:40:30 -08:00
08408dae79
adjust display for ebook rights form
2014-12-03 13:25:01 -05:00
75fab489f1
fix display of license url, title and labels
2014-12-03 13:18:29 -05:00
a285b94ddd
make spelling consistent
2014-12-03 13:17:43 -05:00
af83e6a8c0
Rip out CCList, replace with facets
2014-12-03 10:15:38 -05:00
8e23f937f8
auto generate refine box
2014-12-02 16:09:30 -05:00
533922de9f
buggy image
2014-12-01 16:14:38 -05:00
eefcee6f32
Merge branch 'master' into facets
2014-12-01 16:08:12 -05:00
7913b7e38c
wired license facet block
2014-12-01 16:07:41 -05:00
a7c9c5a6d7
add license art libre
...
Also fixed a mistake that left gfdl off of the ebook choices list.
correct spelling is "license art libre"
2014-11-23 16:44:59 -05:00
2264926301
Merge branch 'master' into facets
2014-11-20 22:12:18 -05:00
c87004122d
add GDFL to campaign choices
...
needed for framasoft translation of a Stallman book
2014-11-20 21:34:19 -05:00
20cf22da8f
add facet descriptions.
2014-11-20 21:11:15 -05:00
5dd1d836fb
add sorting
2014-11-18 16:54:19 -05:00
9aa6d0c78c
Merge branch 'master' into facets
2014-11-18 13:33:51 -05:00
591f06a267
first pass at faceted search
2014-11-18 13:33:17 -05:00
b7aaa155a0
sloppy error
2014-11-17 13:30:02 -05:00
7e1c5eeec9
add github and wikibooks to allowed ebook sources
2014-11-17 11:51:36 -05:00
db969f859d
Merge pull request #412 from Gluejar/privacy
...
I will do the merge to test the dropbox functionality on just.
2014-11-14 14:43:27 -08:00
3d71917d70
self-host license badges
2014-11-10 13:14:59 -05:00
547adfea56
Change default avatar to one with more privacy
...
using a user's email in the gravatar hash can connect their account to
other sites. Stop doing this as default for new users.
2014-11-07 14:47:12 -05:00
b08cdbf2bc
Merge pull request #410 from Gluejar/load_marc
...
Load marc
2014-11-06 17:52:14 -08:00
bad86da003
Merge pull request #409 from Gluejar/opds_paging
...
[finish #78017168 ] Opds paging
2014-11-06 16:54:52 -08:00
4b250ec9d8
this allows admin to edit a work without featuring it
2014-11-06 14:23:34 -05:00
4e4d1debd0
fix bug in isbn module
2014-11-05 18:33:30 -05:00
df913fab09
some feed consumers want images for both sizes
2014-11-03 19:57:58 -05:00
e41dd676c8
add stub record indicator
2014-11-03 16:29:36 -05:00
aeb07049da
delete core.marcrecord table
2014-11-03 14:52:43 -05:00
fafd37a973
Merge branch 'master' into marc_package
...
Conflicts:
core/marc.py
static/css/campaign2.css
2014-10-30 12:38:53 -04:00
c5bb7220f2
don't link cover to google books if own cover
2014-10-29 15:18:32 -04:00
d0e305cfec
rip out code
2014-10-27 19:11:44 -04:00
3b4b836e6c
add marc download tools
2014-10-27 11:55:46 -04:00
98b5af63cc
a proposed fix for when edition.publisher_name is None
2014-10-25 17:43:15 -07:00
96a94378a2
on-line fix
2014-10-25 12:02:27 -04:00
78ddf22c18
Merge branch 'master' into stub-marc
2014-10-22 02:04:00 +00:00
73003ba1c2
stub loader
2014-10-20 16:57:20 -04:00
a5d3dfdf4f
add_author method
2014-10-20 16:54:19 -04:00
9de0474386
start moving marc code to its own package
2014-10-17 17:14:02 -04:00
be294aa8f0
Merge branch 'master' into stub-marc
2014-10-17 11:36:35 -04:00
3e21430e13
# in MARC spec means blank space
2014-10-17 11:30:55 -04:00
a085a5fcca
add more metadata from db
...
008, authors, publishers, isbn, pub date from db
2014-10-16 17:14:54 -04:00
1dd114bc74
add to migration the change in default collation for core_identifier. One possible problem is that this code is mysql specific. In practice, not a problem for now since we're using mysql.
2014-10-15 07:46:50 -07:00
d8d97faee2
change size of value column
...
This migration will throw an error unless the entire table has
collation utf8_bin because of the unique together constraint. Also, 250
is the largest size we can have with mySQL as back end (together with
the unique together index)
2014-10-14 15:42:57 -04:00
fbe96bcfc7
basic stub records
2014-10-14 10:08:08 -04:00
93c9b696b2
Allow staff to enter books with an http id
...
I'm finding LOTS of books that don't have ISBN or OCLCnum
2014-10-08 16:23:24 -04:00
ef6c4a659e
ebook files activate and deactivate
...
when manager unselects 'add_ask', the system didn't revert to the files
without added ask. This fixes that. To test, toggle the add_ask
checkbox and save campaign.
2014-10-04 16:51:16 -04:00
2223446f36
Merge pull request #386 from Gluejar/pdf_ask
...
Insert Pdf/epub ask into served files [Take 2]
2014-09-17 04:48:46 -04:00
6c9f4459b3
only set LC as source if LC is source
2014-09-12 17:44:41 -04:00
2651e79a3c
syntax error
2014-09-12 14:37:22 -07:00
8423e5442b
fixed error when record is not from LC
2014-09-12 11:49:07 -04:00
28434b06a1
now do the same for epubs
2014-09-05 16:35:57 -04:00
6bccb4b3f8
bugfix
2014-09-05 13:30:09 -04:00
30e50260a3
make ebooks when new files are uploaded, clean up old
...
the download bits are suppressed when the ask comes from the pdf
seems we weren't making new ebooks when new files were uploaded
old ebooks now deactivated so we don't loase download counts and history
add ask to pdf is triggered by file upload or THANKS campaign save
2014-09-04 18:33:20 -04:00
7c88bf107f
typo
2014-08-30 13:31:12 -04:00
40831b6161
incorporate add_ask into campaign management
2014-08-30 12:04:50 -04:00
73c616092d
campaign.add_ask_to_ebfs for pdfs
2014-08-28 15:29:41 -04:00
7b7c050fb2
Merge pull request #379 from Gluejar/edition_errata
...
Edition editing errata
2014-08-13 22:30:49 -07:00
edb769317d
Merge pull request #375 from Gluejar/new_campaign_options
...
no contrib form if the ask is all zero
2014-08-07 15:58:22 -07:00
5a2a3e60b6
add PD and GDFL to license choices; add pd-us
...
also all make list display facets for PD-US and GDFL; don't expose them
until we have content we like in them
2014-08-06 17:14:09 -04:00
a08fc4441c
eliminate spurious ids for un-saved editions
2014-08-06 16:18:00 -04:00
af3ea58b7b
examined order_by queries, added indices as required
2014-07-31 12:17:42 -04:00
833654d89f
update launch able to reflect no-ask campaigns
2014-07-29 22:43:37 -04:00
440b352fff
Set publisher name for edition
2014-07-25 15:16:06 -07:00
307db5a995
Merge branch 'master' into doab_load
2014-07-25 14:45:22 -07:00
aa84366418
no contrib form if the ask is all zero
2014-07-25 14:43:54 -04:00
967bd2dcae
code can now load description, subjects and covers for the pdf files
2014-07-24 16:29:28 -07:00
45a89ee055
Merge branch 'master' into doab_load
2014-07-22 15:36:40 -07:00
6aa3e458ea
move opds to api
...
and simplify code.
view no longer passing site and protocol to opds methods
facets now in a list
url adds /api/ in front
2014-07-16 16:47:32 -07:00
7f02fcd126
The doab_load_books django command is working again -- I had to fix the signatures of some methods
2014-07-16 15:26:19 -07:00
806e24dc80
Merge pull request #367 from Gluejar/OPDS
...
Opds
2014-07-11 14:13:13 -07:00
7df31ee53d
Merge branch 'master' into doab_load
2014-07-10 13:12:08 -07:00
84a102c640
Merge pull request #368 from Gluejar/featured_ebook
...
Featured ebook
2014-07-09 10:19:01 -07:00
f40350c868
Merge branch 'master' into doab_load
2014-07-08 14:14:51 -07:00
d14a0dc497
Fixed bug in load_doab_edition: new Work needs to be saved before attaching IDs to it.
...
code in doab_load.ipynb to load books and test the integrity of the load. Big surprise (to me): to find invalid ISBNs in the DOAB data
2014-07-08 09:29:31 -07:00
5b3a8d7b13
I've moved the new version of load_doab_edition into core/doab.py from notebook.
...
Code in doab_loading.ipynb for testing the loading
2014-07-07 11:00:52 -07:00
77a4ef1c09
address "opening a campaign" comments
...
"hastens" isn't quite right; adding a tooltip to the delete function
would require mucking with django-selectable, and that will take more
time than its worth.
2014-07-03 20:26:36 -04:00
833f077de1
With the new arguments in doab.json, I needed to add a catch-all **kwargs to load_doab_edition
...
functions in regluit.core.doab and regluit.core.tasks.
2014-07-03 10:45:57 -07:00
bc7850a2a9
add featured column, use it
2014-07-01 10:07:07 -07:00
b356699c9b
First pass at /opds/{facet} --> now with active_campaigns too
2014-06-25 18:05:57 -07:00
8830919318
Add feed=opds to download URLs for ebooks in OPDS feed
2014-06-25 16:54:01 -07:00
49133935a0
First draft of opds/creativecommons.xml
2014-06-24 15:27:40 -07:00
f38dd948f9
this is all I need to do to skip the claim approval step.
...
We can always revoke the claim
2014-06-20 14:26:28 -04:00
b675052736
Merge pull request #362 from Gluejar/edit_language
...
Edit language [finish #69779438 ]
2014-06-11 15:13:10 -04:00
d17836fb58
put in fix to LT scraper -- need now to hit front page to pick up session-like cookies
2014-06-11 08:46:24 -04:00
f43d40b9f4
[ #70942940 ] Making load_doab_edition more rigorous:
...
* assuming that 1 DOAB ID associated at most with 1 Work or 1 Edition
* explicitly throw exception if Google Books doesn't recognize the ISBN in question
2014-06-06 16:40:13 -07:00
13f4bfc28d
stop filtering language=en in work lookups
2014-06-06 15:42:51 -04:00
7e72a8fff6
remove code that was truncating language codes
2014-06-06 14:47:36 -04:00
54c3742ce7
adding a command to load doab books
2014-06-06 11:37:10 -07:00
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
efdbdf6643
[ #70942940 ] Making the DOAB record loading asynchronous (ie., use Celery)
2014-06-05 16:31:14 -07:00
265420dd74
some code to load DOAB records...no code here yet for how I processed the DOAB records into json format yet.
2014-06-04 15:23:47 -07:00
a55c31d3ff
fix test
2014-05-22 13:19:05 -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
199f862c5f
typo
2014-05-08 12:59:39 -04:00
052f5adbc0
add license descriptions and badges to the pages
2014-05-08 11:54:09 -04:00
a3ae7e3177
fix test errors. yay tests.
2014-05-08 10:49:59 -04: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
6bf70c4f79
Skipping Goodreads test
2014-05-02 14:20:37 -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
0ef460b09e
book loader was stomping on selected edition selections
2014-04-14 17:43:06 -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
878970df4b
notification cleanup
2014-03-14 14:28:21 -04:00
5e916e945d
[ fix #62816484 ] don't put it on reserve if it's the library buying
2014-03-14 12:39:49 -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
8a5d92adaf
remove public_domain
...
never used, not accurate
2014-03-10 15:48:53 -04:00
f27b111117
fix twitter avatars [ #66896902 ]
2014-03-06 17:53:37 -05:00
256c60fbfc
Merge branch 'master' into t4u_download
...
Conflicts:
core/models.py
2014-03-03 11:08:50 -08:00
4d2054af07
less fake test
2014-03-01 22:42:26 -05: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
62737954cb
Merge branch 'master' into useability_tweaks
2014-02-24 10:07:09 -08:00
a87065f70e
Merge branch 'master' into unglued_b2u_mobi
2014-02-21 13:24:20 -08:00
1c9c953e30
fix email notice
2014-02-21 15:23:56 -05:00
92e870d2b7
Merge branch 'master' into t4u_download
2014-02-21 13:18:04 -05: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
678eb02847
Thanks works with anonymous user
2014-02-20 15:56:10 -05:00
737cf91c66
complete switch to "Faves/Favorites" language
2014-02-19 23:16:28 -05:00
b5fd630bfc
Thanks mostly works.
2014-02-19 22:18:23 -05:00
9ef421a696
A pragmatic fix -- given we're essentially not running this test anyhow.
2014-02-14 11:18:35 -08: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
7d7cbfc7f8
Merge pull request #275 from Gluejar/bugfixes
...
Bugfixes
2013-12-31 11:21:11 -08:00
b8c7b8afa7
add a page that lets rhs see the premiums earned by ungluers
2013-12-30 21:51:32 -05:00
af8fe05c54
fix same email bug
...
This bug [#63071834 ] was caused by a bug in Registration 1.0, which
fires the account_activated signal twice. There's already a pull
request fixing this bug.
In reviewing this handler, I realized that all the other reg code is in
library_auth, so I moved the same_email code there. I also decided that
the utility of attaching to the old email address was insufficient to
over come the risk of people stealing accounts by messing with social
auth.
2013-12-30 11:49:04 -05:00
c3c3d5b9c4
don't want "ending soon" notifications on B2U
2013-12-20 17:33:55 -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
2892a22824
change terminology from "donation" to "gift"
2013-12-13 15:15:35 -05:00
be080223bd
Make core.BookLoaderTests.test_ebook check the ebooks only if they show up...the public domain status of book fluctuates.
2013-12-10 16:17:12 -08:00
a3a1853a3b
fix test
2013-11-29 16:04:22 -05:00
e014114a52
preclude possible inter-instance data leakage
2013-11-18 18:22:09 -05:00
0a9e3b8c79
I officially hate working with zipfiles
2013-11-17 23:24:03 -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
2959b68549
Merge pull request #246 from Gluejar/b2u_ungluify
...
B2u ungluify
2013-11-15 15:59:05 -08:00
a98b43ede3
replace example book with one recognized now by Google Books
2013-11-15 15:47:02 -08:00
188d34ea51
added test for b2u ungluify
...
(also tests now invoke booxtream in test mode)
2013-11-15 11:25:41 -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
c6edd83884
Merge branch 'master' into b2u_ungluify
2013-11-14 14:58:22 -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
a64c9470e2
StringIO should be fed a unicode string if possible
2013-11-12 18:48:43 -05:00
e4b3d387fe
correct documentation notes
2013-11-12 14:58:29 -05:00
e9de656bfc
make sure current_total gets updated
2013-11-12 14:58:11 -05:00
2786b871d3
update status now works for b2u
2013-11-12 14:48:04 -05:00
f016bbb4c1
Merge pull request #240 from Gluejar/reserves
...
fix silly method of turning off notifications
2013-11-12 06:01:53 -08:00
ffd6796bfd
fix silly method of turning off notifications
2013-11-10 10:28:22 -05:00
073b618fd8
must preface timedelta with datetime
2013-11-08 21:30:18 -08: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
520fef9f18
set emails in fixtures to avoid test failures on notification
2013-11-06 19:19:18 -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
d740d98e51
turned off requests logging from bookloader
...
the messages from requests were more than useful
2013-10-30 12:42:59 -04:00
53d9f2c8be
library ungluer list is library members
2013-10-19 21:01:10 -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
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -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
18d1d69ccb
wrong object
2013-09-24 16:22:41 -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
405913c746
fix oclcnum buggy code
2013-09-22 23:41:24 -04:00
3b34c43581
Merge branch 'insert_dated_copyright'
2013-09-20 18:00:30 -07:00
8543a9ac2f
change pyepub to regluit.pyepub
2013-09-20 17:59:40 -07:00
ed1f17169d
Merge pull request #210 from Gluejar/insert_dated_copyright
...
Insert dated copyright -> Se tests and main tests passed on my laptop.
2013-09-20 17:44:35 -07: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
aedf080965
add license to opf file metadata
2013-09-20 17:44:37 -04:00
de2e56a25a
add campaign to test to exercise the inserted file
2013-09-18 17:36:42 -04:00
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
e075fd0081
not using unglueit.com any more
2013-09-11 13:43:49 -04:00
6294c15aad
TGFT
2013-09-06 00:14:06 -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
715bf049bc
Merge branch 'b2u_fulfillment' of https://github.com/Gluejar/regluit into b2u_fulfillment
...
Conflicts:
core/signals.py
2013-08-29 22:16:42 -04:00
f8df110163
only watermark on purchase
2013-08-29 11:57:41 -04:00
646c8f09e3
I think it's right to move the logic into the else: https://github.com/Gluejar/regluit/pull/202#discussion_r6059064
2013-08-29 06:29:45 -07: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
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -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
Raymond Yee
eric
Raymond Yee
