eric
|
6535505e4d
|
Revert "Merge branch 'master' into master"
This reverts commit bd52df020d, reversing
changes made to e455d9a766.
|
2018-11-03 17:23:07 -04:00 |
|
eshellman
|
bd52df020d
|
Merge branch 'master' into master
|
2018-11-03 17:06:09 -04:00 |
|
eric
|
ebc1e2e8f9
|
group writable logs
log needs to be writable by both www-data (running from apache) and ubuntu (running during settup or celery) users
|
2018-08-01 20:07:55 -04:00 |
|
eric
|
b5bcdea744
|
wrong jquery ui
|
2018-07-30 14:26:51 -04:00 |
|
eric
|
f951137981
|
jquery ui 1.12 not compatible with selectable
|
2018-07-29 15:41:33 -04:00 |
|
eric
|
bf004702b8
|
use the all-fixed dj-notification
|
2018-07-26 17:32:56 -04:00 |
|
eric
|
961c8eebb2
|
remove debug context processor
raises exception when used without a request
|
2018-07-26 11:25:51 -04:00 |
|
eric
|
9b0dc3a20d
|
re-fix notifications
|
2018-07-24 15:50:58 -04:00 |
|
eric
|
26bab0af68
|
last 2.0 deprecations
|
2018-07-24 11:33:39 -04:00 |
|
eric
|
d86912a61d
|
remove maintenance mode
and switch to MIDDLEWARE
|
2018-07-24 09:04:43 -04:00 |
|
eric
|
b8e1072266
|
fix travis settings
|
2018-07-23 15:44:45 -04:00 |
|
eric
|
ad19be5523
|
update ckeditor
|
2018-07-23 14:42:23 -04:00 |
|
eric
|
2179021a4f
|
turn on runserver logging
|
2018-07-23 14:41:46 -04:00 |
|
eric
|
24f1321321
|
dj 1.11!
|
2018-07-23 14:41:05 -04:00 |
|
eric
|
147822b2a5
|
update dj selectable
Also put jquery-ui-theme in settings
|
2018-07-23 10:02:03 -04:00 |
|
eric
|
26d65e8793
|
facebook id not useful; get pic instead
|
2018-07-20 13:03:51 -04:00 |
|
eric
|
9f98ddddfe
|
update to factored social_auth
addresses facebook's limits on passing state in redirect; (also addresses dj111 compatibility)
updated httplib2 fixes goodreads issue
|
2018-07-19 17:38:36 -04:00 |
|
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
|
ee954b7f47
|
retire jenkins
|
2018-06-08 19:38:43 -04:00 |
|
eric
|
23944c41da
|
causes checkout errors
|
2018-06-08 17:51:27 -04:00 |
|
eric
|
ca5e5bed0c
|
update boto
|
2018-06-08 13:55:05 -04:00 |
|
eric
|
8aae6808d1
|
thought I already did this
|
2018-06-07 16:28:12 -04:00 |
|
eric
|
4afe792a73
|
set TEST_INTEGRATION
|
2018-06-07 15:08:23 -04:00 |
|
eric
|
f75fd07c76
|
use hosts not common
|
2018-06-07 14:39:36 -04:00 |
|
eric
|
f597da88aa
|
make sure common.keys overrides common
|
2018-06-07 13:05:25 -04:00 |
|
eric
|
0deb76b678
|
make keys a module
|
2018-06-07 09:59:35 -04:00 |
|
eric
|
3e782e636d
|
files for running tests with travis
|
2018-06-06 23:27:08 -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 |