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
Raymond Yee fe36cf83b5 Merge branch 'master' into update_proddb 2016-09-03 14:56:51 -07:00
Raymond Yee f68377a5ec put production into maintenance mode 2016-09-03 14:55:51 -07:00
Raymond Yee d077a18488 Merge pull request #620 from Gluejar/update_proddb 
put just in maintenance mode (to remind myself how to do so)
 2016-09-03 14:52:51 -07:00
Raymond Yee 708634b99a put just in maintenance mode (to remind myself how to do so) before doing so for production 2016-09-03 14:51:07 -07:00
Raymond Yee 60d3ae7ce9 Merge pull request #619 from Gluejar/justdb1 
change just to connect to the justdb1 MySQL 5.6.27 RDS instance
 2016-09-02 16:48:28 -07:00
Raymond Yee 766543d8ab change just to connect to the justdb1 MySQL 5.6.27 RDS instance 2016-09-02 16:45:27 -07:00
Raymond Yee e8198faad2 Merge pull request #618 from Gluejar/fix_dump 
modify script used to dump sql to include table definition for core_key
 2016-08-30 15:19:15 -07:00
Raymond Yee 5dbcee7213 modify script used to dump sql to include table definition for core_key 2016-08-30 13:26:11 -07:00
Raymond Yee c1f553f113 syntax error fix 2016-08-25 17:17:18 -04:00
Raymond Yee 07025dc6d0 Merge pull request #616 from Gluejar/fix-unglueitar 
unicode unglueitars were broken
 2016-08-25 16:58:08 -04:00
eric ccc8cd4fa8 unicode unglueitars were broken 2016-08-25 16:06:40 -04:00
Raymond Yee d7a9bdb76e Merge pull request #614 from Gluejar/updatepdf 
update PyPDF2
 2016-08-09 13:21:00 -07:00
eric 7bf32de3f5 update PyPDF2 
We have one ebook that fails adding an ask page. This update includes a
fix (submitted by me, I think.)
 2016-07-26 16:58:44 -04:00
Raymond Yee 81840fa561 Merge pull request #612 from Gluejar/revert-registration 
use correct version of django-registration
 2016-07-20 09:04:19 -07:00
eric 53bcac8a84 resolve conflict 
# Conflicts:
#	requirements_versioned.pip
 2016-07-20 10:58:18 -04:00
eric b9286cb817 use correct version of django-registration 2016-07-20 10:53:34 -04:00
Raymond Yee bedebc40e7 Merge pull request #611 from Gluejar/old_dj_registration 
Revert "1.6 compatible dj-registration"
 2016-07-20 07:24:47 -07:00
Raymond Yee 36e2cf29b5 Revert "1.6 compatible dj-registration" 
This reverts commit d7324cd1db.
 2016-07-20 07:18:44 -07:00
Raymond Yee cf706a1203 Merge pull request #610 from Gluejar/bugfixes 
3 Bugfixes
 2016-07-19 10:18:20 -07:00
Raymond Yee 9e514c48e9 Merge pull request #609 from Gluejar/opds-indirect 
implement indirectAcquisition element
 2016-07-18 14:21:15 -07:00
Raymond Yee 4c395bbec4 Merge pull request #601 from Gluejar/fix-headings 
fix headings like "!lcsh: whatever"
 2016-07-18 13:16:14 -07:00
eric f110e02297 match licenses 
noted that rights for gitenberg ebooks was not getting set properly
 2016-07-14 19:02:22 -04:00
eric d7324cd1db 1.6 compatible dj-registration 
password reset broke with switch to django 1.6 due to
http://stackoverflow.com/questions/6323852/django-nonrel-django-registra
tion-problem-unexpected-keyword-argument-uidb36 ; current
dj-registration requires 1.7
 2016-07-14 18:27:23 -04:00
eric c01459c059 fixed kw editing for non-staff, added tests 2016-07-14 12:25:18 -04:00
eric 3001aed8c8 implement indirectAcquisition element 2016-07-12 14:50:13 -04:00
Raymond Yee 5eaf6f5c73 Merge pull request #608 from Gluejar/remove-nonprofit 
Remove nonprofit
 2016-07-12 09:42:18 -07:00
eric 0c3c9fa818 fix bug in buy as a gift 
A bugfix broke "buy as a gift"
https://github.com/Gluejar/regluit/commit/f7bfdfbbc4cec73e0608f3fef5c335
ce0113078c
 2016-07-12 09:00:32 -04:00
eric a6c1371ba5 remove the "nonprofit" campaign functionality 2016-07-08 10:57:01 -04:00
Raymond Yee dd5bd866a0 Merge pull request #606 from Gluejar/tighten-robots 
add googlebooks virtual urls to disallow
 2016-07-01 09:30:23 -07:00
Raymond Yee 1e39df05a8 Merge pull request #607 from Gluejar/log_warnings 
forgot to fix update-* scripts for new celery configuration
 2016-06-28 12:06:35 -07:00
Raymond Yee 7c1a179fc4 forgot to fix update-* scripts for new celery configuration 2016-06-28 12:05:38 -07:00
eric ca08c5caef add googlebooks virtual urls to disallow 
after we added author links, robots started creating db entries by
following links in search page
 2016-06-28 14:56:59 -04:00
Raymond Yee a9152bdbe3 Merge pull request #605 from Gluejar/fix_3708 
hopefully, this will fix http://jenkins.unglueit.com/job/regluit/3708…
 2016-06-28 08:48:58 -07:00
Raymond Yee 4edd9127a8 hopefully, this will fix http://jenkins.unglueit.com/job/regluit/3708/console 2016-06-28 08:48:06 -07:00
Raymond Yee 35b2aba98b Merge pull request #604 from Gluejar/log_warnings 
Log warnings
 2016-06-27 09:30:07 -07:00
Raymond Yee 289d5cc834 now use master branch 2016-06-27 09:28:44 -07:00
Raymond Yee aaf9bf39f0 I think this is right now: set the ownership of /var/log/regluit to {{user}} 
working for now...
 2016-06-25 10:07:31 -07:00
Raymond Yee 6be6449780 set gid to www-data for /var/log/regluit 2016-06-25 09:16:10 -07:00
Raymond Yee aeb42c3142 for some reason, the previous commit makes for zombie apache...let's set /var/log/regluit to belong to www-data 2016-06-25 08:55:02 -07:00
Raymond Yee cd6be7a137 adjust relationship between {{user}} and www-data to hopefully fix permission issue for /var/log/regluit 2016-06-25 08:08:30 -07:00
Raymond Yee bb5d90c983 make use of www-data user, group for /var/log/regluit 2016-06-24 16:21:14 -07:00
Raymond Yee d7575455cd fix owner on /var/log/regluit 2016-06-24 15:32:11 -07:00
Raymond Yee 19e022e0b0 set logs in prod.py 2016-06-24 14:39:37 -07:00
Raymond Yee 2042e939ee Merge branch 'nosudo_celery' into log_warnings 2016-06-24 14:25:11 -07:00
Raymond Yee 59d9ed4a17 change the various crontabs 
add notebooks/fix_build_3550.ipynb, which is not directly related to celery
 2016-06-24 14:23:03 -07:00
Raymond Yee 44468581b6 Merge branch 'master' into nosudo_celery 2016-06-24 13:58:56 -07:00
Raymond Yee 73d107afa4 now let's see whether we can get the logging working now 
Merge branch 'nosudo_celery' into log_warnings
 2016-06-23 13:54:50 -07:00
Raymond Yee f3647da90e fix syntax for celeryd_multi 2016-06-23 13:52:29 -07:00
Raymond Yee af20692b91 need return on crontab_please.txt 2016-06-23 12:32:21 -07:00
Raymond Yee 661c1b6b02 need to fix path in crontab 2016-06-23 11:55:44 -07:00