8f73485f5b
fixes bug in admin
2016-06-03 17:07:36 -04:00
160e45aeec
patch email-change
2016-05-10 17:14:24 -04:00
b03eb0328a
Merge branch 'dj16' into dj16ry
2016-05-09 17:45:59 -07:00
34b9df63ff
Merge branch 'master' into dj16
2016-05-09 17:45:41 -07:00
8211e5d3af
first pass at getting vagrant/ansible working for prod
2016-05-09 14:11:49 -07:00
d1a5b45ad6
Merge branch 'dj16' into dj16ry
2016-05-04 14:04:16 -07:00
ba516cd08d
Merge branch 'master' into dj16
2016-05-04 13:52:25 -07:00
a7ac628af1
Merge branch 'master' into dj16ry
2016-05-02 08:13:13 -07:00
a29a3a21c9
mistaken about the ed-questionnaire dependency
2016-04-28 08:39:41 -07:00
28749645fd
add ed-questionnaire dependency
2016-04-27 13:15:19 -07:00
132b7deb79
add requirements
2016-04-26 15:00:23 -04:00
f806071366
need a newer version of paramiko for fab get_dump to work
...
try upgrading pip before running pip install -r requirements for please.yml
2016-04-20 10:24:44 -07:00
00d3649b57
need to update redis because of https://github.com/celery/celery/issues/2903
2016-04-19 10:52:44 -07:00
d4f8e486cc
update selenium dependency
2016-04-18 10:17:21 -07:00
b35e09a263
upgrades in celery related modules to deal with upgrade to Python 2.7.11, etc
...
ALLOWED_HOSTS settign needed now
upgrade wsgi file (just in case)
2016-04-11 15:38:49 -07:00
561347d7eb
try to jump to newest version of kombu to work with Python 2.7.11
2016-04-11 13:44:07 -07:00
762036e10e
Tasypie update
2016-04-09 13:22:31 -04:00
a4e9855b35
revert to older, patched Notification
2016-04-08 18:45:50 -04:00
14829c327a
misc fixes for 1.6
2016-04-08 18:12:10 -04:00
562be5f12d
patch django-notification
2016-04-07 20:37:54 -04:00
6aa11efdd2
patch email_change
2016-04-07 20:35:59 -04:00
2f4bfcf440
first version bump
2016-04-07 14:52:12 -04:00
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
abe04a02c7
* Modified core.bookloader.load_from_yaml to go from assuming that there is an epub to enumerating
...
ebooks from corresponding release specified in yaml_url
* add GitHubTests.test_ebooks_in_github_release
* modified bookloader.load_from_yaml to allow for mock loading of epub in core.tests.BookLoaderTests.test_add_by_local_yaml
2016-03-04 12:09:30 -08:00
72fc7d2981
update to the latest version of selenium and add some delays to help Selenium script run
2016-01-28 20:24:53 -08:00
310ab01b84
update version of selenium
2016-01-19 16:09:13 -08:00
5bda0c99fd
upgrade and config ckedit
2015-10-08 16:24:55 -04:00
2a07aa32dc
Merge pull request #526 from Gluejar/edition_loader
...
Edition loader
2015-10-07 14:36:14 -07:00
a74a2c47b2
now handles loading multiple editions
2015-09-24 17:58:34 -04:00
85284f7fca
load bisac headings into mptt tree table
...
Requires django-mptt
table migration
2015-09-09 22:23:51 -04:00
7a75f9776e
update to latest Django 1.4.22
2015-08-26 14:28:28 -04:00
c34ffdd883
implement sorel-thumbnail
...
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
4ca705b766
update version of gitenberg.metadata in light of [added TypedSubject class and representer by eshellman · Pull Request #20 · gitenberg-dev/metadata]( https://github.com/gitenberg-dev/metadata/pull/20 )
2015-08-10 07:51:35 -07:00
46fb89450c
Merge branch 'master' into load_from_yaml
...
Conflicts:
api/urls.py
2015-08-06 15:19:12 -04:00
299e49506b
updated requirements
2015-08-06 15:16:06 -04:00
af0942d1f6
new version of rdflib
2015-08-06 12:06:22 -07:00
74ec17a398
add rdflib-jsonld==0.3
2015-08-06 11:49:28 -07:00
499b0cd881
bump the commit
2015-08-04 12:39:34 -04:00
f79daf09db
use gitenberg.metadata
2015-08-03 10:04:07 -04:00
098eddc327
work in progress
2015-07-29 23:01:43 -04:00
7b3360b235
Merge pull request #497 from Gluejar/catch_stk_timeouts
...
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
21e6cc2e54
updates to versions of selenium used to run tests
2015-07-09 13:47:50 -07:00
8ba4e9446e
upgrading to Django 1.4.21 should be simply a matter of changing the requirements file. *fingers crossed*
...
https://docs.djangoproject.com/en/1.8/releases/1.4.20/
https://www.djangoproject.com/weblog/2015/jul/08/security-releases/
2015-07-09 12:15:18 -07:00
e48175b079
buid_ec2_instances_for_django.ipynb now has a Fabric script that can build an Ubuntu instance w/ local mysql server installed and all the regluit code downloaded from github
2015-05-04 10:51:09 -07:00
28cebd0868
update PSA and dependencies
...
https://github.com/omab/python-social-auth/commit/74535c687c3373a9f58cd0
e310ed29980200ab91
2015-04-16 15:44:02 -04:00
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
5f252dc83a
let's first upgrade to the latest version Django 1.4.x to see what happens
2015-02-09 10:11:47 -08:00
78ddf22c18
Merge branch 'master' into stub-marc
2014-10-22 02:04:00 +00:00
b847771089
First pass at trying to fix problems in pip install -r requirements
2014-10-16 15:12:34 -07:00
f8be7677d5
need to update version of requests because we started getting error in accessing settings.BOOXTREAM_TEST_EPUB_URL
2014-10-15 14:14:18 -07:00
eric
Raymond Yee
Raymond Yee