Commit Graph

108 Commits (5756f171dc7e02b3a3c035c23ad51652e7410b08)

Author SHA1 Message Date
Raymond Yee b1ec19eb85 Merge branch 'master' into add-doab-authlist 2017-01-12 14:27:56 -08:00
eric 58f1452988 see if django-nose-selenium was the problem 2017-01-06 16:59:55 -05:00
eric cf57c78686 bookloader is mocked 2016-12-30 17:24:20 -05:00
Raymond Yee 10e6156162 add dependencies for pandas (and numpy) 2016-12-15 16:53:45 -08:00
eric 1b8a3b03a5 fix truncated image file problems
update Pillow while we're at it.
2016-12-12 21:42:29 -05:00
eric 0a37ac2bba fix cleanupregistration
we're lucky we didn't lose any user data!
2016-10-03 13:27:25 -04:00
Raymond Yee b8364e6278 hopefully, updating django-maintenancemode will fix problem related to https://github.com/shanx/django-maintenancemode/issues/8 2016-09-08 08:00:51 -07:00
Raymond Yee 006dc54c7b remove extra pyasn dependency 2016-08-08 17:28:27 -07:00
eric 09fe1a5d32 switch from deprecated get_model a app registry 2016-07-24 18:39:36 -04:00
eric 9e3fef8e9e fix models so django migrate can build an empty db 2016-07-22 18:49:19 -04:00
eric ff38f063d0 update noftifications
needed a new way to populate the noticetype table because of signal
deprecation
2016-07-22 18:44:54 -04:00
eric 5b4badb7e6 update registration 2016-07-22 18:42:19 -04:00
eric 9da195dcc8 remove south, fix migration problems 2016-07-21 16:09:42 -04:00
eric f3cb6c9edf switch to contrib_comments
removed in 1.8
2016-07-21 16:05:57 -04:00
eric b9286cb817 use correct version of django-registration 2016-07-20 10:53:34 -04:00
eric d7324cd1db 1.6 compatible dj-registration
password reset broke with switch to django 1.6 due to
http://stackoverflow.com/questions/6323852/django-nonrel-django-registra
tion-problem-unexpected-keyword-argument-uidb36 ; current
dj-registration requires 1.7
2016-07-14 18:27:23 -04:00
eric 8f73485f5b fixes bug in admin 2016-06-03 17:07:36 -04:00
eric 160e45aeec patch email-change 2016-05-10 17:14:24 -04:00
Raymond Yee b03eb0328a Merge branch 'dj16' into dj16ry 2016-05-09 17:45:59 -07:00
Raymond Yee 34b9df63ff Merge branch 'master' into dj16 2016-05-09 17:45:41 -07:00
Raymond Yee 8211e5d3af first pass at getting vagrant/ansible working for prod 2016-05-09 14:11:49 -07:00
Raymond Yee d1a5b45ad6 Merge branch 'dj16' into dj16ry 2016-05-04 14:04:16 -07:00
Raymond Yee ba516cd08d Merge branch 'master' into dj16 2016-05-04 13:52:25 -07:00
Raymond Yee a7ac628af1 Merge branch 'master' into dj16ry 2016-05-02 08:13:13 -07:00
Raymond Yee a29a3a21c9 mistaken about the ed-questionnaire dependency 2016-04-28 08:39:41 -07:00
Raymond Yee 28749645fd add ed-questionnaire dependency 2016-04-27 13:15:19 -07:00
eric 132b7deb79 add requirements 2016-04-26 15:00:23 -04:00
Raymond Yee 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
Raymond Yee 00d3649b57 need to update redis because of https://github.com/celery/celery/issues/2903 2016-04-19 10:52:44 -07:00
Raymond Yee d4f8e486cc update selenium dependency 2016-04-18 10:17:21 -07:00
Raymond Yee 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
Raymond Yee 561347d7eb try to jump to newest version of kombu to work with Python 2.7.11 2016-04-11 13:44:07 -07:00
eric 762036e10e Tasypie update 2016-04-09 13:22:31 -04:00
eric a4e9855b35 revert to older, patched Notification 2016-04-08 18:45:50 -04:00
eric 14829c327a misc fixes for 1.6 2016-04-08 18:12:10 -04:00
eric 562be5f12d patch django-notification 2016-04-07 20:37:54 -04:00
eric 6aa11efdd2 patch email_change 2016-04-07 20:35:59 -04:00
eric 2f4bfcf440 first version bump 2016-04-07 14:52:12 -04:00
eric 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
Raymond Yee 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
Raymond Yee 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
Raymond Yee 310ab01b84 update version of selenium 2016-01-19 16:09:13 -08:00
eric 5bda0c99fd upgrade and config ckedit 2015-10-08 16:24:55 -04:00
Raymond Yee 2a07aa32dc Merge pull request #526 from Gluejar/edition_loader
Edition loader
2015-10-07 14:36:14 -07:00
eric a74a2c47b2 now handles loading multiple editions 2015-09-24 17:58:34 -04:00
eric 85284f7fca load bisac headings into mptt tree table
Requires django-mptt
table migration
2015-09-09 22:23:51 -04:00
Raymond Yee 7a75f9776e update to latest Django 1.4.22 2015-08-26 14:28:28 -04:00
eric c34ffdd883 implement sorel-thumbnail
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
Raymond Yee 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
eric 46fb89450c Merge branch 'master' into load_from_yaml
Conflicts:
	api/urls.py
2015-08-06 15:19:12 -04:00