Commit Graph

58 Commits (80b46f36c75c4122c83c18211c6b5c452366e5d9)

Author SHA1 Message Date
eric 968c7e384d TEST_ settings deprecated 2018-04-19 21:19:40 -04:00
eric ef49e65e30 switch to css in git 2017-12-15 14:16:09 -05:00
eric bb29fc3d1f remove gluejar.com 2017-11-18 16:34:56 -05:00
John Kelly 4a617363fe Change defaults in dev.py to use mysql and redis, and add more detail to README 2017-10-29 18:40:35 -04: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 7d749f068a revive settings files 2016-12-20 14:55:53 -05: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
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 d4f8e486cc update selenium dependency 2016-04-18 10:17:21 -07: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
eric f1b29bcf46 There are no references to settings.BASE_URL 2015-08-25 11:07:11 -04: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 84c18ee65d Make sure current staff is described accurately on ungluue.it site 2013-08-01 19:28:20 -04:00
eric 9ccfb4be48 Ed's tired of getting unglue.it bug reports 2012-09-05 11:17:36 -04:00
Raymond Yee b532a13bd0 Putting in MAINTENANCE_MODE for various local configurations 2012-05-17 13:56:44 -07:00
Jason 65a7df298d Adding secure IPN url for amazon payments 2012-05-15 16:52:05 -04:00
Raymond Yee 090d36de66 [#29272807] implemented storage of FPS_* keys in the db 2012-05-09 17:16:49 -07:00
Raymond Yee 70210dca95 add looking for settings.local to the settings files
fabfile.list_backups
first cut at aws.create_dbinstance and aws.db_info
2012-05-05 13:45:50 -07:00
Raymond Yee b9bbecb351 Merge branch 'master' of github.com:Gluejar/regluit into fps
Conflicts:
	settings/common.py
	settings/dev.py
	settings/prod.py
2012-05-02 18:01:20 -07:00
eric 61a4878b54 [finish #24030945] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems. 2012-04-28 13:02:38 -04:00
Raymond Yee 85797b11a7 incorporating host settings for FPSConnection 2012-04-23 17:12:36 -07:00
icellama21 03e9947189 Adding basic amazon FPS Pay function 2012-04-18 11:53:13 -04:00
Raymond Yee 11be270cfd Added AWS parameters to various settings files 2012-04-11 09:53:20 -07:00
Raymond Yee 600f2e7075 Put definition of CELERYBEAT variables in common.py and definition of some common tasks but don't turn them on in common -- do that in the respective local setups 2012-04-05 13:54:46 -07:00
eric 51cf67dca7 moved transaction settings to common.py 2012-03-26 16:18:31 -04:00
Raymond Yee 9199f78606 test/campaigntests.py has a BasicGuiTest.testFrontPage, which tests whether the Learn More link will toggle the description panel.
paypal/tests.py:  made loginSandbox drop the test parameter and callable from outside of paypal/tests.py -- now, for example, from test/campaigntests.py
settings/dev.py:  added LIVE_SERVER_TEST_URL, UNGLUEIT_TEST_USER, UNGLUEIT_TEST_PASSWORD -- parameters useful for selenium-based live server testing
the beginnings of test/campaigntests.support_campaign() -- a selenium script to drive automated pledging to campaign for testing purposes
2012-03-14 15:06:29 -07:00
Raymond Yee feef3935d0 Adding a settings.LOCALDATETIME_NOW to allow for the computed current time to be changed for unglue.it -- useful for testing only! [#22561067] 2012-03-09 10:34:14 -08:00
Andromeda Yelton 35d4fa4fd1 jquery back to local version for security reasons, only needed in common.py 2012-02-06 15:02:57 -05:00
Andromeda Yelton a35bb7cbba there is now a setting for our versions of jquery ad jquery_ui. defaults to google hosted, use static to do offline dev. SO much less annoying. 2012-02-06 13:53:25 -05:00
Raymond Yee dcf477c34a Adding a site for ry-dev to initial_data.json
Creating a separate celeryd_please.conf to handle please
Added SITE_ID to dev.py
More instructions for README.md
2012-01-26 07:29:46 -08:00
Raymond Yee f7e8e41c71 First round of having debug URLs available only if not in preview mode 2012-01-18 09:08:34 -08:00
Ed Summers 61f9ff9980 forked please and prod configurations 2012-01-15 20:37:08 +00:00
Andromeda Yelton c6f2e0b531 one more thing to display for preview only 2012-01-15 14:56:26 -05:00
Raymond Yee c055767173 set the expiry date based on the campaign deadline. There is a setting PREAPPROVAL_PERIOD_AFTER_CAMPAIGN for specifying how many days after the campaign deadline should we ask for a preapproval deadline. I've put in 90 days. 2011-12-20 14:56:01 -05:00
Raymond Yee bad343e3d2 views.py: wiring in the email address of partnering non-profit
payment/manager.py: wire in the email address of the campaign recipient and the Gluejar commission rate
move the Gluejar commission rate to dev.py/prod.py
2011-12-19 18:34:30 -05:00
eric 34dd5237af merged with raymond's commit 2011-12-02 19:37:27 -05:00
Ed Summers 8008a5df51 added /googlebooks/{googlebooks_id}/ route which will add the book to gluejar and redirect to the new work url, for use on the search results page 2011-11-21 20:12:13 -05:00
Ed Summers 3b777f87aa allow empty publication date, also make sure test database uses charset utf8 or else tests will fail 2011-11-21 14:13:29 -05:00
Raymond Yee 64829259fc Added a setting for debug_toolbar 2011-11-16 13:00:51 -08:00
Raymond Yee 3be4e6fab4 First pass at integrating LT into the UI 2011-11-16 10:20:10 -08:00
Raymond Yee 96939b59b7 Merge branch 'master' of github.com:Gluejar/regluit into goodreads
Conflicts:
	settings/dev.py
2011-11-08 09:51:27 -08:00
Raymond Yee a40cab0184 First take on integrating pledge 2011-11-07 16:01:08 -05:00
Raymond Yee 83b7bed56e introduce a setting to allow Celery messages to go to regular Python log 2011-11-06 18:32:43 -05:00
Raymond Yee 68b4da17d1 Some code for OpenLibrary, Freebase, HathiTrust to explore the nature of the data available in those sources 2011-11-06 07:55:07 -05:00
Jason 9a6a3d260a Adding unique tracking ID to paypal payments 2011-10-27 02:35:46 -04:00
Raymond Yee 809517e99a Ooops...forgot other files I had actually changed. 2011-10-24 18:29:01 -07:00
Raymond Yee b1526ea284 Merge branch 'master' into tastypie2
Conflicts:
	core/models.py
2011-10-20 10:00:45 -07:00
Ed Summers 0c1411f2e8 added celery async task for add_related that gets exercised when a book is added to a wishlist. includes new settings for the djkombu celery backend 2011-10-19 23:31:16 -04:00
Raymond Yee 0ed1d229f5 Updating campaign widget to show status and progress. Don't have a way to calculate a graphic representation of progress yet. 2011-10-19 09:45:25 -07:00