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 |
|
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 |
Raymond Yee
|
b8aaab0d4c
|
Setting up jenkins-unglueit S3 bucket for jenkins
|
2014-02-19 15:24:23 -08:00 |
|
Raymond Yee
|
854bc28612
|
registered a new Google Books API for jenkins under rdhyee@gluejar.com account
|
2013-12-10 14:48:04 -08:00 |
|
Raymond Yee
|
6b4898c700
|
for now add s3 keys to jenkins -- ideally, we should set up separate keys
|
2013-08-30 12:13:44 -07:00 |
|
eric
|
84c18ee65d
|
Make sure current staff is described accurately on ungluue.it site
|
2013-08-01 19:28:20 -04:00 |
|
Raymond Yee
|
bf23675f5c
|
get rid of PAYMENT_PROCESSOR setting in jenkins.py
|
2012-11-27 13:09:45 -08:00 |
|
Raymond Yee
|
603b2dacf9
|
set IS_PREVIEW on jenkins
|
2012-10-15 08:55:44 -07:00 |
|
eric
|
9ccfb4be48
|
Ed's tired of getting unglue.it bug reports
|
2012-09-05 11:17:36 -04:00 |
|
Raymond Yee
|
bd66c62842
|
tell Jenkins about setting.PAYMENT_PROCESSOR (while we transition to having code look up transaction.host)
add missing comma
|
2012-05-16 07:47:16 -07:00 |
Ed Summers
|
d3d059b1b7
|
trying local mysql
|
2011-11-21 15:08:44 -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 |
|
Ed Summers
|
b9b99b4b34
|
lets try putting the mysql hostname in there
|
2011-11-21 12:45:58 -05:00 |
|
Ed Summers
|
20d7751c96
|
going to switch jenkins to use mysql
|
2011-11-21 12:38:24 -05:00 |
|
Raymond Yee
|
5c8f2c5586
|
Putting in a key in jenkins.py for Goodreads
|
2011-11-16 13:33:10 -08:00 |
|
Ed Summers
|
11e75cb0a9
|
added celery config for jenkins
|
2011-10-20 05:19:19 +00:00 |
|
Ed Summers
|
f701cda168
|
need a jenkins settings file with a googlebooks api key for the tests to pass
|
2011-10-10 13:26:00 -04:00 |