eric
66c0d84029
add work.formats()
2016-05-16 16:43:03 -04:00
eric
f662920c2a
Merge branch 'master' into push
2016-05-10 17:33:54 -04:00
Raymond Yee
795364a86e
Decimal is imported as D
2016-05-10 11:27:24 -07:00
eric
50930ce2b1
send kindle from s3
...
add file archiving code, because we needed it for push distribution.
Also use archive for kindle. tweak send-to-kindle docs.
2016-05-09 18:32:38 -04:00
Raymond Yee
ba516cd08d
Merge branch 'master' into dj16
2016-05-04 13:52:25 -07:00
Raymond Yee
574854ec5a
Merge pull request #565 from Gluejar/add-questionnaire
...
add the questionnaire module
2016-04-29 09:57:00 -07:00
eric
730c46c02a
Merge branch 'master' into dj16
2016-04-27 12:03:41 -04:00
eric
cf64d43811
add the questionnaire module
2016-04-26 14:38:32 -04:00
Raymond Yee
3c795dfb58
add a clarifying comment and restore raise Http404 for the case for ebfs.count() is 0
2016-04-26 11:24:46 -07:00
Raymond Yee
c67f676a24
try to make looking for the at most one SUCCESSFUL buy-to-unglue campaign for the work a bit clearer
2016-04-26 10:54:55 -07:00
eric
20102ffc12
remove assumption that successful campaign is last
2016-04-25 14:56:17 -04:00
eric
c5886e5584
allow thanks campaign after success
2016-04-23 17:55:01 -04:00
eric
616e8b3c9d
Wordpress is magically HTTPS
2016-04-12 14:32:22 -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
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
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
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
eric
a72ac07dcf
add function to generate mobi from the active epub
2016-03-29 13:06:23 -04: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
dfb7422857
some SEO
2016-03-28 09:54:57 -04:00
eric
a8ab510c61
set edition in initial
2016-03-25 23:37:32 -04:00
eric
60bc236ab4
init mimetypes
2016-03-25 14:13:39 -04:00
Raymond Yee
bac02db88a
Merge pull request #540 from Gluejar/missing-work-title
...
fixed work title in templates
2015-12-19 15:32:17 -05:00
Raymond Yee
c662da6a32
Merge pull request #538 from Gluejar/fix-merge-ui
...
Fix merge ui
2015-12-19 15:04:09 -05:00
eric
91d783d6e4
one more
2015-12-18 12:56:14 -05:00
eric
a52f7a9ec5
fixed work title in templates
...
at some point we changed work.__unicode__ causing this issue
2015-12-18 12:53:12 -05:00
eric
5f07c4d87f
fix edit permissions
...
we were letting rightsholders create editions but not edit them, and
the display of the link didn't match the edit permission. now
rightsholders can edit any edition for any work not in a campaign
2015-12-17 10:29:35 -05:00
eric
deb6fcc322
use local version of ui-lightness css uniformly
...
this is not fixing a bug, just making the invocation uniform accross
the site.
2015-12-14 11:52:41 -05:00
eric
9086cd77ec
I little bug I recently noticed
2015-12-08 11:02:26 -05:00
eric
a9d7608128
update last changed
2015-11-25 15:46:42 -05:00
eric
1a21da11c1
update news link
2015-11-18 15:32:58 -05:00
eric
67b6b6e954
errata for new edition editing
2015-11-18 10:04:01 -05:00
Raymond Yee
57f0d57c12
Merge pull request #530 from Gluejar/fix-new-subject
...
set the default
2015-11-17 14:23:49 -08:00
Raymond Yee
5544aeb70c
Merge pull request #531 from Gluejar/pubdate-range
...
Pubdate range
2015-11-17 13:56:59 -08:00
Raymond Yee
5eb74149c1
Update faq.html
...
'a a' -> 'a'
2015-11-17 08:16:05 -08:00
eric
3387dfa118
change gluejar to Free Ebook Foundation
2015-11-16 15:07:21 -05:00
eric
7b7d7cf174
Merge branch 'master' into pubdate-range
2015-11-16 11:06:21 -05:00
eric
462ce137f0
set the default
2015-11-13 16:49:01 -05:00
eric
457fc67045
use https for eric's blog
2015-10-27 17:08:19 -04:00
eric
a13e04a5b7
forgot this
2015-10-05 19:29:07 -04:00
eric
1ccdc144ba
display publication range
...
needs a migration
2015-10-05 19:17:16 -04:00
eric
e7c2cf1b3a
add rich text editor
2015-09-21 16:54:53 -04:00
eric
cf9e6f9104
fix add-edition
2015-09-21 16:42:46 -04:00
eric
6f4a27d409
fix for non staff user
2015-09-21 16:19:31 -04:00
eric
893d0c3c62
split edition edition from ebook submission
2015-09-21 16:07:41 -04:00