Commit Graph

4889 Commits (6c1630905b2e93c8b848ca331ff7e77461abe34d)

Author SHA1 Message Date
Raymond Yee 6c1630905b Merge branch 'master' into mobigen_integrate 2015-01-23 10:43:33 -08:00
Raymond Yee 1d534aca86 Merge pull request #448 from Gluejar/ansible
introducing ansible playbooks into sysadmin
2015-01-23 09:59:55 -08:00
Raymond Yee b65740a9a5 add some documentation 2015-01-23 09:32:06 -08:00
Raymond Yee db085d5f61 fix pointer to unattended-upgrade.yml 2015-01-23 09:19:10 -08:00
Raymond Yee 0c70f8cf9d first pass at ansible playbooks for sysadmin 2015-01-23 09:17:17 -08:00
Raymond Yee 4543c84385 Merge pull request #447 from Gluejar/another_opds
defend opds against control chars in subject name
2015-01-22 15:59:50 -08:00
Raymond Yee 61c0de3fbc add a command to delete subjects with non-xml characters 2015-01-22 15:48:04 -08:00
eric 2455007994 flip the logic 2015-01-22 15:27:41 -05:00
eric 75fe8d9542 defend opds against control chars in subject name
Also, don't add keyword feed if there are no other books in it
2015-01-21 15:19:32 -05:00
Raymond Yee 7fa97fbf83 The code for converting a book w/o mobi and writing it to S3 works....
The main problem is we need to make the process of doing the conversion asynchronous.
2015-01-20 15:41:40 -08:00
Raymond Yee b4776f36e2 Merge branch 'master' into mobigen_integrate 2015-01-20 13:13:58 -08:00
Raymond Yee df011718ac Merge pull request #445 from Gluejar/github_provider
fix github matcher
2015-01-20 11:08:31 -08:00
Raymond Yee d4a9972916 Merge pull request #446 from Gluejar/work_rights_statement
Work rights statement
2015-01-19 15:13:41 -08:00
eric 42d85d0ef8 make sure campaign success doesn't wipe description 2015-01-19 17:30:49 -05:00
eric 5634e37b33 about rights
The message we were send was unclear
2015-01-19 17:21:16 -05:00
eric aa14bcb5c9 fix github matcher 2015-01-19 12:10:07 -05:00
Raymond Yee 1be246586c Merge pull request #443 from Gluejar/edit_kw
Edit kw
2015-01-16 09:17:11 -08:00
Raymond Yee 45bccaec21 Merge pull request #444 from Gluejar/opds_encoding
fix encoding bug
2015-01-16 08:18:20 -08:00
eric 76e37ecd90 fix encoding bug 2015-01-16 11:16:25 -05:00
eric 551ea0e423 show add-keywords even if there are no keywords 2015-01-16 08:57:08 -05:00
eric 154701bea5 show most common keywords first 2015-01-16 08:56:36 -05:00
eric 073040d7ca add keywords! 2015-01-15 14:34:43 -05:00
eshellman d1a43c5522 Merge pull request #442 from Gluejar/opds_nits
reviewed.
2015-01-15 08:32:48 -05:00
Raymond Yee 50fae7d544 Running into validation problems with OPDS because "image/image" mime-type for
urls like https://github.com/Gluejar/open_access_ebooks_ebook/blob/master/open_access_ebooks/EPUB/cover.120.jpg?raw=true

Fix by looking at the ending of the path of a url, not the fragement, parameter, or query string
2015-01-14 18:29:17 -08:00
eric 927d644ffc noticed potential problem in payment when username is unicode 2015-01-14 18:05:03 -05:00
eric b5ae6f0d51 based on comments from Hadrien 2015-01-14 18:04:17 -05:00
eric 4f0cc87b48 temp add kw 2015-01-14 15:07:54 -05:00
eric a5c38d9354 subject deletion 2015-01-12 20:24:32 -05:00
eric bbcad0a7e2 add delete button style 2015-01-12 20:20:52 -05:00
Raymond Yee 4321bd5f51 Merge pull request #441 from Gluejar/kw_opds
fix the odds implementation of kw facet
2015-01-12 11:17:32 -08:00
eric ea4e489213 fix the odds implementation of kw facet
mostly, fixing missing url encoding
2015-01-12 12:03:47 -05:00
Raymond Yee 65c2ebb158 Merge pull request #440 from Gluejar/expose_kw
coming together! (needs migration)
2015-01-11 12:50:22 -08:00
Raymond Yee 134988f082 modify migration to handle situation in which a subject does not exist (e.g., Selenium tests) 2015-01-11 12:44:31 -08:00
Raymond Yee 684c518324 add comments to clarify intention of parts of facets.py, based on Eric's answers to Raymond's questions 2015-01-11 12:18:30 -08:00
eric 62daa67880 coming together! (needs migration) 2015-01-09 17:05:34 -05:00
eshellman 1d3eb7bbe4 Merge pull request #439 from Gluejar/ssl_redirect_prod
redirect all for prod
2015-01-08 18:01:26 -05:00
Raymond Yee c911a0f945 redirect all for prod 2015-01-08 14:08:18 -08:00
Raymond Yee afee7482f6 Merge pull request #438 from Gluejar/ssl_redirect_just
Ssl redirect just
2015-01-08 11:15:44 -08:00
Raymond Yee a77bae1cd6 restore prod to current state 2015-01-08 11:14:12 -08:00
eric b6e17b6fcf Merge branch 'master' into ssl_redirect 2015-01-08 13:11:18 -05:00
Raymond Yee b768afb076 Merge pull request #437 from Gluejar/update_press
update press page
2015-01-02 10:54:53 -05:00
eric ad2017e054 update press page 2015-01-02 00:33:32 -05:00
Raymond Yee 8a1caf6477 Merge pull request #436 from Gluejar/gift_news
update news item
2014-12-30 16:30:07 -05:00
eric 56d0020839 update news item 2014-12-30 11:23:35 -05:00
Raymond Yee aed91bca7a Merge pull request #435 from Gluejar/give_btu
Give btu: improve gift admin/prevent self-redemption
2014-12-22 18:30:07 -05:00
eric f77ef95a64 prevent self-redemption 2014-12-22 18:08:13 -05:00
eric 8224b9e24c improve gift admin 2014-12-22 17:49:05 -05:00
Raymond Yee f08c721d2e Merge pull request #434 from Gluejar/give_btu
Give btu updates: gift table revamp, add gift admin
2014-12-22 15:31:50 -05:00
eric 2db4516505 rip out useless code 2014-12-22 14:24:49 -05:00
eric fb878094d1 new test for established user 2014-12-22 14:21:40 -05:00