eric
|
88a50073de
|
Merge remote-tracking branch 'Gluejar/master'
|
2018-06-09 15:54:14 -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 |
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
|
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 |
|
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 |
|
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 |
|
eric
|
088f08831c
|
move db params to vault
|
2016-12-21 14:36:06 -05:00 |
|
eric
|
7d749f068a
|
revive settings files
|
2016-12-20 14:55:53 -05:00 |
Raymond Yee
|
4033b6f123
|
first steps to encrypting variables in settngs/common.py
|
2016-12-08 14:26:59 -08:00 |
|
eric
|
33a1482cc7
|
refactor libraryauth
try to keep all the user reg stuff in libraryauth, in prep for
splitting it off
|
2016-07-28 15:28:05 -04:00 |
|
eric
|
4ff63359b3
|
migration to repair db
The migrations needed to migrate our db to django 1.8 are as follows:
django-admin.py migrate default 0001_initial --fake
django-admin.py migrate --fake-initial auth
django-admin.py migrate default 0002_add_related_name --fake
django-admin.py migrate core --fake
django-admin.py migrate libraryauth
django-admin.py migrate --fake-initial
|
2016-07-28 10:10:05 -04: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 |
|
eric
|
cafd163f77
|
deprecate profile
|
2016-07-23 12:09:18 -04:00 |
|
eric
|
9da195dcc8
|
remove south, fix migration problems
|
2016-07-21 16:09:42 -04:00 |
|
eric
|
f3cb6c9edf
|
switch to contrib_comments
removed in 1.8
|
2016-07-21 16:05:57 -04:00 |
|
eric
|
dbcf4dba6b
|
remove payment.templatetags
duplicate app name not allowed in 1.7
|
2016-07-21 15:57:42 -04:00 |
|
eric
|
a6c1371ba5
|
remove the "nonprofit" campaign functionality
|
2016-07-08 10:57:01 -04:00 |
|
Raymond Yee
|
c95ba9f1f2
|
update campaigntest.py to use GeckoDriver to drive Firefox
|
2016-06-15 11:16:33 -07:00 |
|
Raymond Yee
|
9c59b701ed
|
Merge pull request #587 from Gluejar/fix-survey-runinfo
Improve survey app
|
2016-05-31 16:13:34 -07:00 |
|
eric
|
4e2e2b1683
|
fix lost values on prev link
Maybe this app was converted from a non-django app, because the code to
get the runid was not django-ish
|
2016-05-24 18:52:18 -04:00 |
|
eric
|
bf220c5c6f
|
Merge branch 'master' into push
# Conflicts:
# settings/common.py
|
2016-05-20 16:44:13 -04:00 |
|
eric
|
3e61822111
|
management command to push books
|
2016-05-20 16:34:25 -04:00 |
|
eric
|
a466a251a0
|
add distro app
|
2016-05-16 16:50:09 -04:00 |
|
eric
|
897e038e5e
|
blow away survey app
...and alter the migration history
|
2016-05-11 10:01:03 -04:00 |
|
Raymond Yee
|
ba516cd08d
|
Merge branch 'master' into dj16
|
2016-05-04 13:52:25 -07:00 |
|
Raymond Yee
|
ddb53fc5e9
|
try removing DefaultStorageFinder -- will this break the questionnaire?
|
2016-04-29 12:37:26 -07:00 |
|
eric
|
cf64d43811
|
add the questionnaire module
|
2016-04-26 14:38:32 -04:00 |
|
eshellman
|
c07f279be8
|
Merge pull request #559 from Gluejar/dj16ry
some changes I'm considering for dj16
|
2016-04-12 14:44:31 -04:00 |
|
Raymond Yee
|
2c8d7fd287
|
add SOUTH_MIGRATION_MODULES = {
'djcelery': 'djcelery.south_migrations',
}
|
2016-04-12 09:35:39 -07:00 |
|
eric
|
e4a2ce084e
|
add ALLOWED_HOSTS
|
2016-04-11 22:08:03 -04:00 |
|
eric
|
3140b05b62
|
postpose TZ cleanup
|
2016-04-09 13:27:04 -04:00 |
|
eric
|
14829c327a
|
misc fixes for 1.6
|
2016-04-08 18:12:10 -04: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 |
|
Raymond Yee
|
26520d92e6
|
Merge pull request #555 from Gluejar/fix-mobi-making
Fix mobi making
|
2016-03-30 17:26:06 -07:00 |
|
Raymond Yee
|
bf1ba2890c
|
Merge pull request #553 from Gluejar/mime-types
init mimetypes
|
2016-03-30 11:14:11 -07:00 |
|
eric
|
7180661fe3
|
generate mobi on ask
|
2016-03-28 14:30:05 -04:00 |
|
eric
|
60bc236ab4
|
init mimetypes
|
2016-03-25 14:13:39 -04:00 |