EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,626 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

5626 Commits (24d98ee47dd90f85e86221a8008364fa3a43dff6)

Author SHA1 Message Date
Raymond Yee c190ac678e Merge branch 'master' of github.com:Gluejar/regluit into broken_gitenberg_ebooks 2016-05-16 15:14:26 -07:00
Raymond Yee 15888b8a76 fix regluit.core.tests.BookLoaderTests.test_add_by_local_yaml by adjust how ebook_name mocked 2016-05-16 15:11:03 -07:00
Raymond Yee fd35306a50 Merge pull request #582 from Gluejar/broken_gitenberg_ebooks 
fix GITenberg ebooks with invalid URLs
 2016-05-16 14:34:52 -07:00
Raymond Yee 0e54ac57a1 Merge branch 'broken_gitenberg_ebooks' of github.com:Gluejar/regluit into broken_gitenberg_ebooks 2016-05-16 14:09:29 -07:00
eric 30874ad832 handle toggling of active 2016-05-16 14:08:47 -07:00
eric 312ad30329 Merge branch 'master' into broken_gitenberg_ebooks 2016-05-16 17:06:47 -04:00
eric 7c6388c175 handle toggling of active 2016-05-16 17:03:58 -04:00
eric a466a251a0 add distro app 2016-05-16 16:50:09 -04:00
eric 66ce157f97 large covers, archive 2016-05-16 16:47:58 -04:00
eric 66c0d84029 add work.formats() 2016-05-16 16:43:03 -04:00
Raymond Yee bf41bfccc6 change bookloader to load books by names of book in release and a command to deactivate currently broken ebooks 2016-05-16 12:43:11 -07:00
eshellman 391f573900 Merge pull request #581 from Gluejar/fix_test_b2u 
date for regluit.core.tests.CampaignTests.test_b2u needs to be kept close to current
 2016-05-16 11:32:43 -04:00
Raymond Yee 1b329f1b82 date for regluit.core.tests.CampaignTests.test_b2u needs to be kept within about 3 years of current date to pass 2016-05-16 08:18:42 -07:00
Raymond Yee b7c44190be don't chmod +x on dump.sh if class not in production 2016-05-13 15:17:16 -07:00
Raymond Yee be232224ab sudo: no for many commands -- especially in collectstatic -- and chmod +x to dump.sh 2016-05-12 11:54:02 -07:00
Raymond Yee b54b64b6ae Merge pull request #580 from Gluejar/add-licenses-roles 
fix test arising from https://github.com/Gluejar/regluit/pull/579
 2016-05-12 11:33:12 -07:00
eric 4e8a834d02 fix test 2016-05-12 12:56:25 -04:00
Raymond Yee a5653ed471 Merge pull request #579 from Gluejar/add-licenses-roles 
Add OSI licenses, marc relators, update Aldiko logo
 2016-05-12 09:06:14 -07:00
eric 8f3efc95ad update aldiko logo and add to iOS views 2016-05-12 11:02:57 -04:00
eric 1a2da6c523 Add dsr and aui marc relators 
"designer" and "author of introduction" are the additional roles we
could have used
 2016-05-12 11:02:22 -04:00
eric 5eb7ec366a add OSI license catch-all 
for BSD, MIT, and other OSI approved licenses
 2016-05-12 11:00:52 -04:00
Raymond Yee d452a12df2 Merge pull request #578 from Gluejar/remove-tempate-workaround 
Remove tempate workaround
 2016-05-11 14:20:58 -07:00
eric 9236556b75 Merge branch 'master' into remove-tempate-workaround 2016-05-11 14:39:15 -04:00
eric ee8fcc04e8 Merge branch 'master' into remove-tempate-workaround 
# Conflicts:
#	survey/templates/survey/generic.html
 2016-05-11 14:39:08 -04:00
Raymond Yee 753c6301aa Merge pull request #577 from Gluejar/questionnaire-for-16 
Questionnaire for 16
 2016-05-11 09:57:44 -07:00
Raymond Yee 1a08685cd9 Merge pull request #576 from Gluejar/disallowedhost-logging 
Disallowedhost logging
 2016-05-11 08:23:51 -07:00
eric c5ee01df57 its the future! 2016-05-11 10:41:50 -04:00
eric 240564e75b remove template workaround for testing 2016-05-11 10:36:20 -04:00
eric 897e038e5e blow away survey app 
...and alter the migration history
 2016-05-11 10:01:03 -04:00
eric 28f35648ae add indexes 2016-05-11 09:46:39 -04:00
eric 4151a6e2b3 also for test installs 2016-05-11 09:12:42 -04:00
eric 4c3b3f2760 send disallowed host errors to null 2016-05-11 09:08:04 -04:00
Raymond Yee 4f9a23cbc0 Merge pull request #575 from Gluejar/sysadmin 
grab auth tokens from local deploy_keys directory
 2016-05-10 18:14:16 -07:00
Raymond Yee a6f7418f19 grab auth tokens from local deploy_keys directory 2016-05-10 17:52:49 -07:00
Raymond Yee cc9b4ed7c0 Merge pull request #568 from Gluejar/really-delete-ebook-files 
delete files when deleting ebookfiles
 2016-05-10 17:46:31 -07:00
Raymond Yee 623f638b21 Merge pull request #571 from Gluejar/isbn-in-search 
add isbn querey
 2016-05-10 17:34:27 -07:00
eric f662920c2a Merge branch 'master' into push 2016-05-10 17:33:54 -04:00
eric c92a823a89 add distro 2016-05-10 17:33:51 -04:00
eric 28291d436e Merge branch 'master' into isbn-in-search 2016-05-10 17:32:45 -04:00
eric 3f833c569d patch for django-registration 2016-05-10 17:15:01 -04:00
eric 160e45aeec patch email-change 2016-05-10 17:14:24 -04:00
Raymond Yee f4663c1c58 Merge pull request #574 from Gluejar/sysadmin 
fixes in Vagrantfile while creating prod2
 2016-05-10 11:57:55 -07:00
Raymond Yee 6ad84101de Merge pull request #573 from Gluejar/fix_payment_import 
Decimal is imported as D
 2016-05-10 11:28:23 -07:00
Raymond Yee 795364a86e Decimal is imported as D 2016-05-10 11:27:24 -07:00
Raymond Yee c77c5b1b16 fix Vagrantfile error 2016-05-10 11:23:42 -07:00
Raymond Yee a7223e0e55 change setdns for just 2016-05-10 10:22:03 -07:00
Raymond Yee bff6092565 Merge pull request #557 from Gluejar/dj16 
Django 1.6+ compatibility
 2016-05-10 09:22:19 -07:00
Raymond Yee d76c8d0d42 Merge pull request #572 from Gluejar/dj16ry 
Merge changes I've made in dj16ry into dj16
 2016-05-10 09:20:46 -07:00
Raymond Yee 60389ff7e0 get rid of placeholder for jenkins 2016-05-10 09:18:03 -07:00
Raymond Yee 17178f9840 update to Python 2.7.11 and apply security upgrades 2016-05-09 22:40:29 -07:00