Commit Graph

5688 Commits (e623f6d31f0a2a5657f3a1b80aded8e40ab82c01)

Author SHA1 Message Date
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
eric 1dbe68408e use text from Rupert 2016-03-24 14:46:46 -04:00
eric cf93e975f3 allows us to create nonces 2016-03-24 14:43:05 -04:00
Raymond Yee f15cfdcc7f Merge pull request #551 from Gluejar/multi_formats_in_load_from_yaml
updating load_from_yaml to handle formats other than epub
2016-03-07 13:35:46 -08:00
Raymond Yee bf914a53de make use of settings.CONTENT_TYPES to compute EBOOK_FORMATS 2016-03-07 13:30:40 -08:00
Raymond Yee c5b7c20593 mock_ebook -> test_mode (much clearer) 2016-03-07 13:17:33 -08:00
eric 0d4930a238 fix too-strict url filter 2016-03-07 15:47:53 -05:00
Raymond Yee abe04a02c7 * Modified core.bookloader.load_from_yaml to go from assuming that there is an epub to enumerating
ebooks from corresponding release specified in yaml_url

* add GitHubTests.test_ebooks_in_github_release

* modified bookloader.load_from_yaml to allow for mock loading of epub in core.tests.BookLoaderTests.test_add_by_local_yaml
2016-03-04 12:09:30 -08:00
Raymond Yee 1ab3711bbf placeholder for updating load_from_yaml to handle formats other than epub -- e.g., mobi, pdf 2016-03-03 09:49:48 -08:00
eshellman 2256940bc7 Merge pull request #550 from Gluejar/travis_webhook
Travis webhook
2016-02-24 09:09:27 -05:00
eric 370147f6cd add url for travis webhook documentation 2016-02-24 09:08:57 -05:00
Raymond Yee b4a15304e9 ready for a review of this webhook (or push to just.unglue.it to test) 2016-02-23 10:32:51 -08:00
Raymond Yee b72f91862c in process of cleaning up webhook code 2016-02-22 15:03:07 -08:00
Raymond Yee e89af403c3 Merge branch 'master' into travis_webhook 2016-02-22 14:24:10 -08:00
Raymond Yee f4105faccd in progress: working on extracting repository owner and name from the data instead of from headers. (not working yet) 2016-02-22 14:15:24 -08:00
eshellman 5889c66c05 Merge pull request #549 from Gluejar/load_from_yaml_ebook
[#113378215] prevent a duplicate ebooks with exact same metadata by  /api/loader/yaml
2016-02-22 16:36:31 -05:00
Raymond Yee ca43d47397 current progress on webhook 2016-02-22 07:24:59 -08:00
Raymond Yee fb9a2bcd04 skeleton for /api/travisci/webhook 2016-02-18 11:37:35 -08:00
Raymond Yee f9320c6279 recognize that get_or_create returns (ebook, created) in load_from_yaml 2016-02-10 16:23:58 -08:00
Raymond Yee 45cb7d4eac [#113378215] prevent a duplicate ebooks with exact same metadata from being created by /api/loader/yaml
add dedupe_ebooks_with_same_urls.py command for deleting duplicate ebooks
2016-02-10 11:04:06 -08:00