d951cca966
Merge branch 'master' into django15
...
# Conflicts:
# api/models.py
# api/onix.py
# api/opds.py
# api/tests.py
# api/urls.py
# api/views.py
# bisac/__init__.py
# core/bookloader.py
# core/facets.py
#
core/migrations/0072_auto__add_relator__add_relation__add_field_subject_
authority.py
# core/models.py
# core/tests.py
# fabfile.py
# frontend/forms.py
# frontend/templates/new_edition.html
# frontend/templates/notification/rights_holder_claim/notice.html
# frontend/templates/privacy.html
# frontend/views.py
# requirements_versioned.pip
# settings/common.py
# test/raw/master/metadata.yaml
2016-04-07 14:26:45 -04:00
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
abfbc4101c
Merge branch 'master' into ban_disposable_emails
...
Conflicts:
libraryauth/urls.py
2013-12-16 16:44:13 -05:00
9a47f953cf
wire in custom registration and reorganize urls, add tests
2013-12-16 15:16:34 -05:00
8c974ca343
moved library list generation into a template tag
...
previously, if you created or updated a library, the list
(/libraryauth/list/ )would not get updated
2013-12-13 14:25:18 -05:00
92aee28538
users can't join unapproved libraries
2013-12-01 19:20:42 -05:00
ccb1f0dd86
create and edit Library objects, which now have names and owners
2013-11-27 22:14:52 -05:00
7254dcd55e
list of library users
...
visible to other library users and unglue.it staff
2013-10-27 13:15:18 -04:00
b1d8b2338a
list of unlguit libraries at libraryauth/list/
2013-10-12 22:39:47 -04:00
c73ed19080
fix superlogin urlconfig
2013-10-11 17:24:06 -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
eric