Commit Graph

4016 Commits (a4321ff6fc530d95443318bd06c05835e04ddf51)

Author SHA1 Message Date
eric a4321ff6fc fix various bugs 2013-10-10 22:31:07 -04:00
eric 9929452ebc LibraryUser replaces LibraryCard, used for all backends, has datestamp 2013-10-10 15:56:40 -04:00
eric 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
eric 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
eric 2f703a7815 Merge branch 'master' into add_libraries 2013-10-07 12:35:55 -04:00
eric 56a4856080 wording tweak 2013-10-07 12:35:26 -04:00
Raymond Yee 3799606cc5 Merge pull request #217 from Gluejar/fix_epub_noguide
fix pyepub addpart when epub has no guide [#58277304]
2013-10-07 06:14:06 -07:00
eric 30e5d6fc6e fix pyepub addpart when epub has no guide [#58277304] 2013-10-06 15:12:33 -04:00
Raymond Yee 4069c4e4a5 Merge pull request #216 from Gluejar/fix_event_display
exclude incomplete transactions from event display on landing page
2013-10-05 08:54:21 -07:00
eric ec7a3155b2 exclude incomplete transactions from event display on landing page 2013-10-05 11:41:12 -04:00
Raymond Yee a860b7860a Merge pull request #215 from Gluejar/more_b2u_info
More b2u info
2013-10-04 08:47:58 -07:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric 076ce51efd draft of revised TOU 2013-10-02 17:21:22 -04:00
eric b7393e7825 change copyright notice per lawyer 2013-10-02 12:09:26 -04:00
eric ab473f5411 libraries, phase 1.
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
Raymond Yee 11ea43d058 Merge pull request #214 from Gluejar/short_stripe_form
Short stripe form
2013-10-01 14:24:50 -07:00
eric 6b5dbc16c0 we haven't used some info and will have better conversion as we ask for less info 2013-09-27 14:03:01 -04:00
eric 0d14b9ac3e mis-spellings, we're not selling pdf yet 2013-09-27 14:01:10 -04:00
eric 11908e25fc we never documented our CSS dev practice properly. 2013-09-27 12:20:16 -04:00
Raymond Yee 4ee69bf0e5 Merge pull request #213 from Gluejar/b2u_errata
errata- kindle config, b2u campaign mechanics, display text
2013-09-27 07:33:59 -07:00
eric c74723cf02 less/css cleanup
now using Less v 2.8
Don't see any visible changes
2013-09-26 12:19:10 -04:00
eric 1f8014294c lists.css not minified 2013-09-26 11:59:41 -04:00
eric b091612605 Merge branch 'master' into b2u_errata
Conflicts:
	frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
eric 93b7ffc951 Improve language on campaign pages, make text bigger 2013-09-26 09:49:39 -04:00
eric 5976803cb4 fix bug in kindle config, improve doumentation 2013-09-26 09:36:03 -04:00
eric 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
Raymond Yee 48ab7cb7e8 Merge pull request #212 from Gluejar/fix_b2u_marc
wrong object
2013-09-24 13:30:49 -07:00
eric 18d1d69ccb wrong object 2013-09-24 16:22:41 -04:00
Raymond Yee b46ebbdd4a Merge pull request #211 from Gluejar/b2u_marc
B2u marc
2013-09-24 06:20:39 -07:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
eric 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
eric 405913c746 fix oclcnum buggy code 2013-09-22 23:41:24 -04:00
Raymond Yee 3b34c43581 Merge branch 'insert_dated_copyright' 2013-09-20 18:00:30 -07:00
Raymond Yee 8543a9ac2f change pyepub to regluit.pyepub 2013-09-20 17:59:40 -07:00
Raymond Yee 2143d5854f Merge branch 'master' of github.com:Gluejar/regluit 2013-09-20 17:52:48 -07:00
Raymond Yee 78a7d69513 Add pyepub to installed modules 2013-09-20 17:51:58 -07:00
Raymond Yee 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
eric 99fe9f9011 rewrite license page 2013-09-20 17:46:06 -04:00
eric c83f1f657d remove more debugging stuff 2013-09-20 17:45:28 -04:00
eric aedf080965 add license to opf file metadata 2013-09-20 17:44:37 -04:00
eric 5a256ef16b remove debugging stuff 2013-09-20 12:44:35 -04:00
eric de2e56a25a add campaign to test to exercise the inserted file 2013-09-18 17:36:42 -04:00
eric ed341884ea add license page to epub before sending it for watermarking 2013-09-15 21:43:58 -04:00
eric 3f63ef336f introduce pyepub 2013-09-15 21:43:01 -04:00
eric 5611aa9843 update booxtream 2013-09-15 21:41:53 -04:00
Raymond Yee 6fe4a2dc6e Merge pull request #209 from Gluejar/just_settings
not using unglueit.com any more
2013-09-11 15:13:46 -07:00
eric e075fd0081 not using unglueit.com any more 2013-09-11 13:43:49 -04:00
Raymond Yee b78fb2fad4 Merge pull request #208 from Gluejar/unmix_readmill
readmill downloads can't have mixed redirects -- looks ok to try out
2013-09-11 08:33:30 -07:00
eric 2e58255e6c readmill downloads can't have mixed redirects 2013-09-11 11:31:20 -04:00
Raymond Yee 424ecf3034 Merge pull request #207 from Gluejar/fix_kindle_send
only 2 o's in ebook
2013-09-09 13:57:17 -07:00