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
8b04769ebd
move to unified ansible in dev.yml and open up naming in settings/please.py
2016-05-06 09:59:32 -07:00
d1a5b45ad6
Merge branch 'dj16' into dj16ry
2016-05-04 14:04:16 -07:00
ba516cd08d
Merge branch 'master' into dj16
2016-05-04 13:52:25 -07:00
a7ac628af1
Merge branch 'master' into dj16ry
2016-05-02 08:13:13 -07:00
ddb53fc5e9
try removing DefaultStorageFinder -- will this break the questionnaire?
2016-04-29 12:37:26 -07:00
cf64d43811
add the questionnaire module
2016-04-26 14:38:32 -04:00
d4f8e486cc
update selenium dependency
2016-04-18 10:17:21 -07:00
c07f279be8
Merge pull request #559 from Gluejar/dj16ry
...
some changes I'm considering for dj16
2016-04-12 14:44:31 -04:00
2c8d7fd287
add SOUTH_MIGRATION_MODULES = {
...
'djcelery': 'djcelery.south_migrations',
}
2016-04-12 09:35:39 -07:00
e4a2ce084e
add ALLOWED_HOSTS
2016-04-11 22:08:03 -04:00
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
3140b05b62
postpose TZ cleanup
2016-04-09 13:27:04 -04:00
14829c327a
misc fixes for 1.6
2016-04-08 18:12:10 -04:00
6aa11efdd2
patch email_change
2016-04-07 20:35:59 -04:00
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
26520d92e6
Merge pull request #555 from Gluejar/fix-mobi-making
...
Fix mobi making
2016-03-30 17:26:06 -07:00
bf1ba2890c
Merge pull request #553 from Gluejar/mime-types
...
init mimetypes
2016-03-30 11:14:11 -07:00
7180661fe3
generate mobi on ask
2016-03-28 14:30:05 -04:00
60bc236ab4
init mimetypes
2016-03-25 14:13:39 -04:00
cf93e975f3
allows us to create nonces
2016-03-24 14:43:05 -04:00
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
5bda0c99fd
upgrade and config ckedit
2015-10-08 16:24:55 -04:00
85284f7fca
load bisac headings into mptt tree table
...
Requires django-mptt
table migration
2015-09-09 22:23:51 -04:00
f1b29bcf46
There are no references to settings.BASE_URL
2015-08-25 11:07:11 -04:00
c34ffdd883
implement sorel-thumbnail
...
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
61fe8125e9
turn debugging on for localvm
...
needed a new key/secrete for facebook login
2015-07-03 11:06:54 -07:00
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
c759ee8a73
pass 2 on localvm
2015-07-03 11:06:54 -07:00
153a582cf0
Merge pull request #484 from Gluejar/add_yahoo
...
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
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
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
cb0c647d1a
* making progress on building please.unglue.it
...
* updating requirements_versioned.pip to handle Pyzotero
2015-05-04 10:51:12 -07:00
bc0e753d44
facebook credentials for just
2015-04-16 15:59:19 -07:00
7715551671
fix auth pipeline classes
2015-04-15 10:50:36 -04:00
66b6a73acd
facebook keys for just
2015-04-10 17:36:31 -07:00
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
6ef8e7699d
update credentials
2015-04-09 13:28:03 -04:00
97579bda71
re-establish un length limit
2015-04-09 12:41:00 -04:00
e87294d442
twitter and facebook settings
2015-04-09 11:44:48 -04:00
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
ea5adba871
add notifications for unredeemed gifts
2015-01-23 13:11:19 -05:00
ad2017e054
update press page
2015-01-02 00:33:32 -05:00
fafd37a973
Merge branch 'master' into marc_package
...
Conflicts:
core/marc.py
static/css/campaign2.css
2014-10-30 12:38:53 -04:00
78ddf22c18
Merge branch 'master' into stub-marc
2014-10-22 02:04:00 +00:00
a391826e5c
increase recharge_window from 7 to 14 days to allow people more time
2014-10-19 16:30:59 -07:00
29baf69d3c
record spitting now works
2014-10-17 22:48:51 -04:00
be294aa8f0
Merge branch 'master' into stub-marc
2014-10-17 11:36:35 -04:00
b847771089
First pass at trying to fix problems in pip install -r requirements
2014-10-16 15:12:34 -07:00
fbe96bcfc7
basic stub records
2014-10-14 10:08:08 -04:00
Raymond Yee
eric
Raymond Yee