Commit Graph

464 Commits (c142533898b3f8e2763d2ec5d4d7a3ceee91b4fa)

Author SHA1 Message Date
eric 699ef09728 remove old static folder 2017-06-20 14:47:29 -04:00
eric 4cc0e0fe4f delete regluit.questionnaire 2017-06-20 11:08:14 -04:00
Raymond Yee 2beb02c3d0 * deleted settings/localvm.py
* add comment about a key in prod
* deleted comment in settings/just.py
2017-01-13 22:37:21 -08:00
Raymond Yee 03de890a71 no need for djkombu -- superceded by kombu
https://pypi.python.org/pypi/django-kombu
2017-01-06 16:23:23 -08:00
eric 93b9501a1c remove secrets from jenkins 2016-12-30 23:06:18 -05:00
eric b9053183ba passes all tests without secret keys 2016-12-30 22:26:16 -05:00
eric cf57c78686 bookloader is mocked 2016-12-30 17:24:20 -05:00
Raymond Yee 6f2cad604a cleanup of Vagrantfile and prod.py 2016-12-27 23:37:11 -05:00
Raymond Yee d3391b7515 a few comments about existing keys in jenkins.py 2016-12-27 14:27:28 -05:00
eric 088f08831c move db params to vault 2016-12-21 14:36:06 -05:00
Raymond Yee f8f05312a5 fix please.py
need to create directory settings/keys
2016-12-20 22:37:17 -06:00
eric 7d749f068a revive settings files 2016-12-20 14:55:53 -05:00
Raymond Yee 7ebbc26aef remove comments about old keys in common.py.j2
hack to keep jenkins setup to keep working while the old keys have yet to be invalidated
2016-12-17 12:31:39 -08:00
Raymond Yee 4033b6f123 first steps to encrypting variables in settngs/common.py 2016-12-08 14:26:59 -08:00
Raymond Yee c692b6dd0b basic structure for just and please -- though I've not modified templates yet
please GOODREADS keys in place
2016-12-05 15:09:31 -08:00
Raymond Yee fa9aa1801a mostly replace please twitter and facebook settings 2016-11-30 14:48:22 -08:00
Raymond Yee 7fe95e02b3 nuking AIzaSyDsrHCUsUFNAf65cFPSF8MZTKj8C9oMuj8 for GOOGLE_BOOKS_API_KEY 2016-11-29 18:20:28 -08:00
Raymond Yee cd1f2cc244 attempt to create settings/please.py via template 2016-11-29 15:46:11 -08:00
Raymond Yee 31ddc6a0a9 forgot import os 2016-11-16 17:55:37 -08:00
Raymond Yee 16c78485ea try to build just and please with a setting coming from secrets.yml 2016-11-16 17:21:22 -08:00
Raymond Yee 2b82c6c786 testing templating 2016-11-15 21:02:36 -08:00
Raymond Yee aed8549156 turn maintenance for prod off 2016-09-08 18:55:39 -07:00
Raymond Yee 40971359a7 put production into maintenance 2016-09-08 18:28:33 -07:00
Raymond Yee f9b1129fee take just out of maintenance mode 2016-09-08 11:42:27 -07:00
Raymond Yee d191279033 DEBUGG->DEBUG 2016-09-07 15:15:23 -07:00
Raymond Yee 24dc3c578d Merge branch 'master' into dj18 2016-09-07 09:59:19 -07:00
Raymond Yee 6a86ffae07 put just into MAINTENANCE_MODE 2016-09-07 09:37:54 -07:00
Raymond Yee 62f44bee19 Merge branch 'master' into dj18 2016-09-06 17:18:28 -07:00
Raymond Yee 4b8cd2228f turn off maintenance mode on just and prod 2016-09-03 15:28:35 -07:00
Raymond Yee f68377a5ec put production into maintenance mode 2016-09-03 14:55:51 -07:00
Raymond Yee 708634b99a put just in maintenance mode (to remind myself how to do so) before doing so for production 2016-09-03 14:51:07 -07:00
Raymond Yee 766543d8ab change just to connect to the justdb1 MySQL 5.6.27 RDS instance 2016-09-02 16:45:27 -07:00
eric 33a1482cc7 refactor libraryauth
try to keep all the user reg stuff in libraryauth, in prep for
splitting it off
2016-07-28 15:28:05 -04:00
eric 4ff63359b3 migration to repair db
The migrations needed to migrate our db to django 1.8 are as follows:
django-admin.py migrate default 0001_initial --fake
django-admin.py migrate --fake-initial auth
django-admin.py migrate default 0002_add_related_name --fake
django-admin.py migrate core --fake
django-admin.py migrate libraryauth
django-admin.py migrate --fake-initial
2016-07-28 10:10:05 -04:00
eric 827c33e7a0 Deprecated template settings
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-template-related-s
ettings
2016-07-27 13:48:12 -04:00
eric cafd163f77 deprecate profile 2016-07-23 12:09:18 -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 dbcf4dba6b remove payment.templatetags
duplicate app name not allowed in 1.7
2016-07-21 15:57:42 -04:00
eric a6c1371ba5 remove the "nonprofit" campaign functionality 2016-07-08 10:57:01 -04:00
Raymond Yee 19e022e0b0 set logs in prod.py 2016-06-24 14:39:37 -07:00
Raymond Yee 7b73cc366d adjust Vagrant configuration for please to log warnings 2016-06-21 09:20:46 -07:00
Raymond Yee d6cd6f75c3 move regluit log to /var/logs/regluit 2016-06-20 13:50:47 -07:00
Raymond Yee 29bbbfd4de try to rename logger to '' and add propagate: True 2016-06-20 13:07:09 -07:00
Raymond Yee 387a4607e7 add missing brief formatter 2016-06-20 12:58:10 -07:00
Raymond Yee a240123c31 add logging to just (test) 2016-06-20 12:50:57 -07:00
Raymond Yee c95ba9f1f2 update campaigntest.py to use GeckoDriver to drive Firefox 2016-06-15 11:16:33 -07:00
Raymond Yee 9c59b701ed Merge pull request #587 from Gluejar/fix-survey-runinfo
Improve survey app
2016-05-31 16:13:34 -07:00
eric 4e2e2b1683 fix lost values on prev link
Maybe this app was converted from a non-django app, because the code to
get the runid was not django-ish
2016-05-24 18:52:18 -04:00
eric bf220c5c6f Merge branch 'master' into push
# Conflicts:
#	settings/common.py
2016-05-20 16:44:13 -04:00
eric 3e61822111 management command to push books 2016-05-20 16:34:25 -04:00
eric a466a251a0 add distro app 2016-05-16 16:50:09 -04:00
Raymond Yee 753c6301aa Merge pull request #577 from Gluejar/questionnaire-for-16
Questionnaire for 16
2016-05-11 09:57:44 -07:00
eric 897e038e5e blow away survey app
...and alter the migration history
2016-05-11 10:01:03 -04:00
eric 4151a6e2b3 also for test installs 2016-05-11 09:12:42 -04:00
eric 4c3b3f2760 send disallowed host errors to null 2016-05-11 09:08:04 -04:00
Raymond Yee d3b27af491 now I have code for adding SECRET_KEY to servers as well as encrypted SECRET_KEY for various servers 2016-05-06 16:06:50 -07:00
Raymond Yee 8b04769ebd move to unified ansible in dev.yml and open up naming in settings/please.py 2016-05-06 09:59:32 -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 ddb53fc5e9 try removing DefaultStorageFinder -- will this break the questionnaire? 2016-04-29 12:37:26 -07:00
eric cf64d43811 add the questionnaire module 2016-04-26 14:38:32 -04:00
Raymond Yee d4f8e486cc update selenium dependency 2016-04-18 10:17:21 -07:00
eshellman c07f279be8 Merge pull request #559 from Gluejar/dj16ry
some changes I'm considering for dj16
2016-04-12 14:44:31 -04:00
Raymond Yee 2c8d7fd287 add SOUTH_MIGRATION_MODULES = {
'djcelery': 'djcelery.south_migrations',
}
2016-04-12 09:35:39 -07:00
eric e4a2ce084e add ALLOWED_HOSTS 2016-04-11 22:08:03 -04: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
eric 3140b05b62 postpose TZ cleanup 2016-04-09 13:27:04 -04:00
eric 14829c327a misc fixes for 1.6 2016-04-08 18:12:10 -04:00
eric 6aa11efdd2 patch email_change 2016-04-07 20:35:59 -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 26520d92e6 Merge pull request #555 from Gluejar/fix-mobi-making
Fix mobi making
2016-03-30 17:26:06 -07:00
Raymond Yee bf1ba2890c Merge pull request #553 from Gluejar/mime-types
init mimetypes
2016-03-30 11:14:11 -07:00
eric 7180661fe3 generate mobi on ask 2016-03-28 14:30:05 -04:00
eric 60bc236ab4 init mimetypes 2016-03-25 14:13:39 -04:00
eric cf93e975f3 allows us to create nonces 2016-03-24 14:43:05 -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
eric 5bda0c99fd upgrade and config ckedit 2015-10-08 16:24:55 -04:00
eric 85284f7fca load bisac headings into mptt tree table
Requires django-mptt
table migration
2015-09-09 22:23:51 -04:00
eric f1b29bcf46 There are no references to settings.BASE_URL 2015-08-25 11:07:11 -04:00
eric c34ffdd883 implement sorel-thumbnail
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
Raymond Yee 61fe8125e9 turn debugging on for localvm
needed a new key/secrete for facebook login
2015-07-03 11:06:54 -07:00
Raymond Yee cb55b83090 using xip.io to map a test server URL.
specifically 192.168.33.10.xip.io
2015-07-03 11:06:54 -07:00
Raymond Yee c759ee8a73 pass 2 on localvm 2015-07-03 11:06:54 -07:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
Raymond Yee 08cfd613c2 reconciled the mysql parameters in just with production/please and add first draft of ansible playbook for just 2015-05-18 12:38:09 -07:00
Raymond Yee cb0c647d1a * making progress on building please.unglue.it
* updating requirements_versioned.pip to handle Pyzotero
2015-05-04 10:51:12 -07:00
Raymond Yee bc0e753d44 facebook credentials for just 2015-04-16 15:59:19 -07:00
eric 7715551671 fix auth pipeline classes 2015-04-15 10:50:36 -04:00
Raymond Yee 66b6a73acd facebook keys for just 2015-04-10 17:36:31 -07:00
Raymond Yee b61a4a0e0c 1) updated settings/dev.py to reflect new parameters needed for python-social-auth
2) added an IPython notebook to run Selenium test
2015-04-10 16:05:12 -07:00
eric 6ef8e7699d update credentials 2015-04-09 13:28:03 -04:00
eric 97579bda71 re-establish un length limit 2015-04-09 12:41:00 -04:00
eric e87294d442 twitter and facebook settings 2015-04-09 11:44:48 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
eric ea5adba871 add notifications for unredeemed gifts 2015-01-23 13:11:19 -05:00
eric ad2017e054 update press page 2015-01-02 00:33:32 -05:00
eric fafd37a973 Merge branch 'master' into marc_package
Conflicts:
	core/marc.py
	static/css/campaign2.css
2014-10-30 12:38:53 -04:00