Raymond Yee
|
c01de2bae3
|
Merge pull request #560 from Gluejar/blog2https
Wordpress is magically HTTPS
|
2016-04-13 07:42:27 -07: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 |
|
eric
|
616e8b3c9d
|
Wordpress is magically HTTPS
|
2016-04-12 14:32:22 -04:00 |
|
Raymond Yee
|
877b296128
|
commenting out payment.tests.BasicGuiTest because for some reason
the suite() is not being honored and BasicGuiTest is being run when
I run django-admin.py test payment
have to explore further: http://stackoverflow.com/questions/21572921/django-celery-test-runner-doing-very-strange-things
|
2016-04-12 10:48:04 -07: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 |
|
Raymond Yee
|
6df2db650a
|
use dj16ry branch
|
2016-04-11 16:03:27 -07:00 |
|
Raymond Yee
|
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 |
|
Raymond Yee
|
0f3e183fbb
|
use dj16ry branch for now
|
2016-04-11 14:13:54 -07:00 |
|
Raymond Yee
|
561347d7eb
|
try to jump to newest version of kombu to work with Python 2.7.11
|
2016-04-11 13:44:07 -07:00 |
|
Raymond Yee
|
f37b04320c
|
try to use Python 2.7.11 again
|
2016-04-11 13:40:12 -07:00 |
|
Raymond Yee
|
aec5bdb564
|
update manage.py for Django 1.6
|
2016-04-11 13:17:16 -07:00 |
|
Raymond Yee
|
a3a39ec8f5
|
dj16
|
2016-04-11 13:13:52 -07:00 |
|
Raymond Yee
|
521c85564d
|
Merge branch 'master' into sysadmin
|
2016-04-11 10:15:30 -07:00 |
|
Raymond Yee
|
560b348b9f
|
Merge pull request #558 from Gluejar/fix-vertical-text
fix doubly rotated "feedback" text in chrome
|
2016-04-11 09:17:02 -07:00 |
|
eric
|
e7c1eea932
|
fix doubly rotated "feedback" text in chrome
|
2016-04-09 19:59:05 -04:00 |
|
eric
|
3140b05b62
|
postpose TZ cleanup
|
2016-04-09 13:27:04 -04:00 |
|
eric
|
7e3e1655e1
|
one more null boolean
|
2016-04-09 13:26:42 -04:00 |
|
eric
|
ef62d59dd0
|
bugfix unrelated to 1.6
|
2016-04-09 13:26:05 -04:00 |
|
eric
|
3949947277
|
unsafe value in session
|
2016-04-09 13:25:31 -04:00 |
|
eric
|
b47d166eda
|
1.6 transaction sideeffect
|
2016-04-09 13:24:44 -04:00 |
|
eric
|
2b9fd4e021
|
undo deletion of "edition.unglued"
|
2016-04-09 13:23:36 -04:00 |
|
eric
|
762036e10e
|
Tasypie update
|
2016-04-09 13:22:31 -04:00 |
|
eric
|
bca17837a0
|
add fixtures in testcases
|
2016-04-09 13:21:12 -04:00 |
|
eric
|
a4e9855b35
|
revert to older, patched Notification
|
2016-04-08 18:45:50 -04:00 |
|
eric
|
14829c327a
|
misc fixes for 1.6
|
2016-04-08 18:12:10 -04:00 |
|
eric
|
7a952f09cf
|
patch form exclude syntax
|
2016-04-07 20:39:23 -04:00 |
|
eric
|
356207bc5d
|
patch django.conf.urls.defaults
|
2016-04-07 20:38:53 -04:00 |
|
eric
|
562be5f12d
|
patch django-notification
|
2016-04-07 20:37:54 -04:00 |
|
eric
|
6aa11efdd2
|
patch email_change
|
2016-04-07 20:35:59 -04:00 |
|
eric
|
2f4bfcf440
|
first version bump
|
2016-04-07 14:52:12 -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
|
77db40b8a8
|
Merge pull request #556 from Gluejar/embed-for-daily-feature
add featured mode to the widget
|
2016-03-31 10:32:01 -07: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
|
182e784144
|
add a comment to clarify distinction betwen Ebookfile and Ebook
|
2016-03-30 14:59:04 -07:00 |
|
Raymond Yee
|
bf1ba2890c
|
Merge pull request #553 from Gluejar/mime-types
init mimetypes
|
2016-03-30 11:14:11 -07:00 |
|
eric
|
f7411d9525
|
add featured mode to the widget
Been wanting this for a while!
|
2016-03-29 13:47:23 -04:00 |
|
eric
|
a72ac07dcf
|
add function to generate mobi from the active epub
|
2016-03-29 13:06:23 -04:00 |
|
Raymond Yee
|
9ddd8de2d6
|
Merge pull request #552 from Gluejar/feedback-module
Feedback module
|
2016-03-28 18:19:19 -07:00 |
|
eric
|
c902d6503c
|
can add asks to non-ebf ebooks
(and can start a thanks campaign with non-ebf ebooks
|
2016-03-28 17:53:33 -04:00 |
|
eric
|
7180661fe3
|
generate mobi on ask
|
2016-03-28 14:30:05 -04:00 |
|
eric
|
dfb7422857
|
some SEO
|
2016-03-28 09:54:57 -04:00 |
|
Raymond Yee
|
46454f13a4
|
Merge branch 'master' into sysadmin
|
2016-03-25 22:48:55 -07:00 |
|
eric
|
ab0c8814b4
|
add management command
|
2016-03-25 23:44:18 -04:00 |
|
eric
|
a8ab510c61
|
set edition in initial
|
2016-03-25 23:37:32 -04:00 |
|
eric
|
ca498a2ed6
|
simpler hash
|
2016-03-25 22:44:43 -04:00 |
|
Raymond Yee
|
f4fd70a1ff
|
Merge pull request #554 from Gluejar/fix_build_3550
Fix build 3550
|
2016-03-25 15:15:32 -07:00 |
|
Raymond Yee
|
3cb6553933
|
add notebook I used to find a good substitute
|
2016-03-25 15:13:09 -07:00 |
|
Raymond Yee
|
7bd29807f6
|
fix problem with Obama book in Chinese
|
2016-03-25 15:07:31 -07:00 |
|
eric
|
60bc236ab4
|
init mimetypes
|
2016-03-25 14:13:39 -04:00 |