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

5607 Commits (fe36cf83b547fdb51b6564a2dcbe5770330b0b9c)

Author SHA1 Message Date
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
eric af7d0e867c add isbn querey 
if query is a valid isbn, then search on the identifier table
 2016-05-09 21:48:23 -04:00
Raymond Yee b03eb0328a Merge branch 'dj16' into dj16ry 2016-05-09 17:45:59 -07:00
Raymond Yee 34b9df63ff Merge branch 'master' into dj16 2016-05-09 17:45:41 -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 4422e5b609 Merge pull request #570 from Gluejar/sysadmin 
vagrant/ansible for prod
 2016-05-09 14:55:35 -07:00
Raymond Yee c0afa2cc95 fix output log for prod.conf: switch from logrotate to cronolog 2016-05-09 14:52:46 -07:00
Raymond Yee 7d6c57dfa8 prod2 added to Vagrantfile 2016-05-09 14:48:50 -07:00
Raymond Yee de7aee305b Merge branch 'master' into sysadmin 2016-05-09 14:46:57 -07:00
Raymond Yee 1699c8af7d add dump_db_prod.sh 2016-05-09 14:32:58 -07:00
Raymond Yee 3f9a7b15e5 define migrate 2016-05-09 14:26:24 -07:00
Raymond Yee 8211e5d3af first pass at getting vagrant/ansible working for prod 2016-05-09 14:11:49 -07:00
Raymond Yee 87b4a68d70 Merge branch 'master' into dj16ry 2016-05-07 16:06:57 -07:00
Raymond Yee a1c1b3a80e Merge branch 'master' into dj16 2016-05-07 16:06:31 -07:00
Raymond Yee ff8e7b6c9b Merge pull request #569 from Gluejar/sysadmin 
update vagrant+ansible playbooks to dev.yml, a unification of various playbooks
 2016-05-07 15:35:27 -07:00
Raymond Yee 1222d677dc switch to master 2016-05-07 15:20:48 -07:00
Raymond Yee 761cafa110 need host_var for just2 and prod2 also -- eventually should use group_vars but this works for now. 2016-05-07 14:50:10 -07:00
Raymond Yee 83a36414d5 need to load campaign_starter.sql (not 2) for pre-Django 1.6 2016-05-07 13:56:19 -07:00
Raymond Yee d67c1f1d3e load data for please but deal with jenkins for just 2016-05-07 13:41:47 -07:00
Raymond Yee a4e2a87b4c Merge branch 'sysadmin' into dj16ry 2016-05-07 09:45:06 -07:00