Commit Graph

127 Commits (8d3cacb821d9e95775f620826dabec48d159bdad)

Author SHA1 Message Date
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
eric 299e49506b updated requirements 2015-08-06 15:16:06 -04:00
Raymond Yee af0942d1f6 new version of rdflib 2015-08-06 12:06:22 -07:00
Raymond Yee 74ec17a398 add rdflib-jsonld==0.3 2015-08-06 11:49:28 -07:00
eric 499b0cd881 bump the commit 2015-08-04 12:39:34 -04:00
eric f79daf09db use gitenberg.metadata 2015-08-03 10:04:07 -04:00
eric 098eddc327 work in progress 2015-07-29 23:01:43 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
Raymond Yee 21e6cc2e54 updates to versions of selenium used to run tests 2015-07-09 13:47:50 -07:00
Raymond Yee 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
Raymond Yee 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
eric 28cebd0868 update PSA and dependencies
https://github.com/omab/python-social-auth/commit/74535c687c3373a9f58cd0
e310ed29980200ab91
2015-04-16 15:44:02 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
Raymond Yee 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
Raymond Yee 78ddf22c18 Merge branch 'master' into stub-marc 2014-10-22 02:04:00 +00:00
Raymond Yee b847771089 First pass at trying to fix problems in pip install -r requirements 2014-10-16 15:12:34 -07:00
Raymond Yee 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 fbe96bcfc7 basic stub records 2014-10-14 10:08:08 -04:00
Raymond Yee e0098baed9 I forgot to update the fabfile/requirements file to match current selenium library I use to run Se tests. 2014-10-06 11:48:30 -07:00
eric c6c5f9aac1 install/update packages to work with pdf 2014-08-21 17:46:33 -04:00
Raymond Yee 0cf6062d09 Need to point to github for pyzotero 2014-03-24 10:32:37 -07:00
Raymond Yee 00f0620346 Selenium 2.40 2014-03-10 12:34:28 -07:00
eric 4948a7961f Upload for T4U is fixed 2014-01-31 15:45:02 -05:00
Raymond Yee 155ff8789c change django-ckeditor reference to git+ssh://git@github.com/Gluejar/django-ckeditor.git@3.6.2.1.post20131230 2013-12-31 13:13:23 -05:00
Raymond Yee cdf93f6ff7 Merge branch 'update_Se' into bugfixes 2013-12-30 15:49:05 -05:00
Raymond Yee 5d4adb0fb1 Update to Selenium 2.39 2013-12-30 15:43:33 -05:00
eric a7856af22c fixed a bug in our version of ckeditor
Somehow I could not get this to install on my machine; the old code is
still there. committing because I don't understand what's going on.
2013-12-30 13:15:41 -05:00
eric 913030a112 update to registration 1.0 2013-12-16 15:12:46 -05:00
eric 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
Andromeda Yelton e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04:00
Raymond Yee 53178d80ce moving to stripe 1.9.1 2013-06-21 15:14:51 -07:00
eric 0a65a84157 update selectable to get it working again 2013-04-18 11:29:19 -04:00
eric 8366b08c69 get email_change working again 2013-03-27 17:57:08 -04:00
eric c93762b8ee update social auth and django
before this can be installed on an existing database, the following
south command must be applied:
django-admin.py convert_to_south social_auth
2013-03-14 23:46:01 -04:00
eric ac49c90767 Revert "update django-social-auth to 0.7.20 and django to 1.4.5"
This reverts commit 0d08d681cb.
2013-03-14 22:42:48 -04:00
eric 0d08d681cb update django-social-auth to 0.7.20 and django to 1.4.5 2013-03-14 22:36:40 -04:00
eric 7ff1ee07af Merge branch 'master' into update_endless 2013-03-06 11:17:19 -05:00
eric c8796a385c just change endless pagination version
seems to work, but need to migrate to take advantage
2013-03-05 19:14:20 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
Raymond Yee c25b13f4c9 specifying specific commit for django-ckeditor 2013-02-08 15:18:58 -08:00
Raymond Yee 68a44d5891 update to boto 2.8.0 to allow django-storages to run (https://bitbucket.org/david/django-storages/issue/144/_save-uses-unexpected-kwarg-rewind-257) 2013-02-08 13:58:48 -08:00
Raymond Yee a6eee0b854 1) use our custom django-ckeditor which tries to integrate django-storages: git+ssh://git@github.com/Gluejar/django-ckeditor.git@centralniak_merge
2) set in common.py placeholders for parameters needed by django-storages for S3
2013-02-08 09:57:23 -08:00
Raymond Yee 1461abca6b Added django-storages==1.1.6 2013-02-04 17:49:25 +00:00
Raymond Yee 7ea5ac7ca6 1) Now fire the transaction_charged signal in the Stripe webhook handling
2) add WebTest to requirements
3) have a check on possible Stripe events
2012-11-05 10:44:24 -08:00
Raymond Yee 542ffd8f34 Update reference to Django in requirements_versioned.pip to 1.4.2
removed requiresments.pip and requirements_relaunch.pip and updated README.md
2012-10-18 07:34:39 -07:00
Raymond Yee 9b42c0ccd9 Merge branch 'master' into relaunch_ry
Conflicts:
	requirements_versioned.pip
2012-10-02 10:18:24 -07:00
Raymond Yee 750c86c16e changing to lxml 2.3.5 since 3.0alpha2 was problematic -- could not find package now. 2012-09-28 09:15:40 -07:00
Raymond Yee 62e89f469f Adjusting library versions
seems like lxml 3.0alpha2 gone -> back to 2.3.5
2012-09-27 20:12:40 -07:00
Raymond Yee 30f1cad6f1 A revised requirements_versioned.pip for relaunch 2012-09-24 12:46:52 -07:00
Raymond Yee f9b3a5ddb5 updating version for stripe 2012-09-07 07:37:17 -07:00
Raymond Yee 7bf94b3925 Adding a specific version number for django-ckeditor==3.6.2.1 2012-07-27 12:10:47 -07:00
Raymond Yee 3401f138d0 Updating selenium because the latest Firefox won't work with previous version 2012-07-05 10:25:47 -07:00
Raymond Yee 0f6b581655 Setting up to use Amazon SES for SMTP
NOTE new library: django-smtp-ssl
putting parameters in for just.py first to try out on just before moving to production
2012-06-22 16:38:29 -07:00
Raymond Yee 04ec596dc1 pieces of django-maintenance 2012-05-17 13:28:48 -07:00
Raymond Yee a71d50458c Added a few more modules to help with RSA/ssh munging 2012-05-02 16:59:33 -07:00
Raymond Yee 737065cf2d Added functionality to lay foundation for creating EC2 instances on the fly 2012-04-30 17:38:09 -07:00
Raymond Yee 02e8bf268c First pass at fabfile -- added dependencies: fabric, boto 2012-04-09 12:49:16 -07:00
Raymond Yee f0009efaea Adding versioned version of django-notification 2012-03-27 09:06:07 -07:00
Raymond Yee c6108bd0b0 [#26102593] First steps towards controlling our library dependencies by specifying versions of libraries in requirements_versioned.pip 2012-03-07 13:57:13 -08:00