eric
|
88a50073de
|
Merge remote-tracking branch 'Gluejar/master'
|
2018-06-09 15:54:14 -04:00 |
|
eric
|
5846470b9a
|
delete the directory already!
|
2018-06-08 20:52:37 -04:00 |
|
eric
|
35569dd88b
|
Merge branch 'master' into add-travis
|
2018-06-08 20:40:30 -04:00 |
|
eric
|
9abb666ce8
|
updates from gluejar travis work
|
2018-06-08 20:20:11 -04:00 |
|
eric
|
f174fc4317
|
make sure the keys directory exists
|
2018-05-24 21:47:40 -04:00 |
|
eric
|
2860e0351f
|
touch
|
2018-05-23 16:09:05 -04:00 |
|
eric
|
beb152a755
|
see if we can easily get travis to do tests
|
2018-05-23 15:46:26 -04:00 |
|
eric
|
3661faec0a
|
Merge remote-tracking branch 'Gluejar/master' into catchup
# Conflicts:
# core/models/__init__.py
# core/models/bibmodels.py
# vagrant/host_vars/prod/secrets.yml
|
2018-05-23 13:56:27 -04:00 |
nicholas antonov
|
568183d3e4
|
Make download page work on mobile
|
2018-04-24 19:42:52 -04:00 |
|
eric
|
d710f8e25f
|
new endless
|
2018-04-19 21:25:12 -04:00 |
|
eric
|
968c7e384d
|
TEST_ settings deprecated
|
2018-04-19 21:19:40 -04:00 |
jonahmania
|
97708c41d6
|
Merge in master
|
2018-02-13 17:42:09 -05:00 |
|
eric
|
bec9d46dc4
|
fix campaign execution
|
2018-02-01 21:48:00 -05:00 |
|
Nicholas Antonov
|
5d51759a92
|
add files (imports fail)
|
2018-01-30 12:40:50 -05:00 |
|
eric
|
a1c96ebd1a
|
only allow image uploads
|
2018-01-26 12:54:25 -05:00 |
|
eric
|
ef49e65e30
|
switch to css in git
|
2017-12-15 14:16:09 -05:00 |
|
eric
|
877affd8bf
|
implement sass for only pledge.css
|
2017-12-12 13:26:01 -05:00 |
|
eshellman
|
76dc6d010c
|
Merge pull request #731 from EbookFoundation/newfoundation
try scss off production
|
2017-12-11 16:23:46 -05:00 |
|
eric
|
5e5a7c699a
|
determines error logging email
|
2017-12-09 13:55:41 -05:00 |
|
Nicholas Antonov
|
893d8abc4a
|
Make django scss preprocessor work
|
2017-12-07 16:33:10 -05:00 |
|
Nicholas Antonov
|
9513514beb
|
Start adding sass preprocessor
|
2017-12-05 18:46:18 -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 |
|
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 |