Commit Graph

6809 Commits (879103104645583389d1046476889ef0b25f4c42)

Author SHA1 Message Date
eric 8791031046 fix test build 2018-11-04 16:52:20 -05:00
eric ee73c60aaa fix build 2018-11-04 10:32:53 -05:00
eshellman 6a7eac84e3
Merge pull request #95 from Gluejar/master
update fro gluejar/regluit
2018-11-04 10:31:00 -05:00
eric 6535505e4d Revert "Merge branch 'master' into master"
This reverts commit bd52df020d, reversing
changes made to e455d9a766.
2018-11-03 17:23:07 -04:00
eshellman bd52df020d Merge branch 'master' into master 2018-11-03 17:06:09 -04:00
eshellman e455d9a766
Merge pull request #814 from Gluejar/ku
Implement Knowledge Unlatched Harvest
2018-11-03 16:39:56 -04:00
eric f4d7e6f888 working ku code 2018-11-03 14:47:41 -04:00
eric f98de7114e add oapn id 2018-11-03 14:33:23 -04:00
eric add0375ac3 working scraper 2018-11-02 14:03:30 -04:00
eshellman b727aaf9a9
Merge pull request #813 from Gluejar/kuscrape
Kuscrape
2018-11-02 13:58:24 -04:00
eric 57769f65a1 Update core/loaders/multiscrape.py
update to facilitate merg
2018-11-02 13:24:23 -04:00
eric 6c2b07b053 Merge branch 'master' into ku 2018-11-01 14:29:52 -04:00
eric 460cc871b6 Merge branch 'master' into kuscrape 2018-11-01 14:29:30 -04:00
eshellman d2f3ae5c2b
Merge pull request #811 from Gluejar/CVE-2018-18074
Upgrade requests
2018-11-01 13:48:05 -04:00
eric 8dab8dfba0 Upgrade requests
per CVE-2018-18074
2018-11-01 13:30:20 -04:00
eshellman 24aaaa93ae
Merge pull request #810 from Gluejar/gitberg-milestone
change news to announce gitenberg milestone
2018-10-29 22:56:49 -04:00
eric 53995ffb4a allow scrapers to set parser
needed to support xml harvests
2018-10-29 22:42:49 -04:00
eric fc475017fb change news 2018-10-29 22:41:03 -04:00
eshellman 2a0d204cec
Merge pull request #809 from Gluejar/update
Update
2018-10-09 09:52:01 -04:00
eric ff4e2c261d pyasn1 2018-10-09 09:26:18 -04:00
eric 4e399a848c current gitberg 2018-10-09 09:18:58 -04:00
eric 76047d74bb stale documentation 2018-10-09 09:17:30 -04:00
eric 3697789274 wip 2018-10-09 09:05:31 -04:00
eshellman b844d66268
Merge pull request #808 from Gluejar/more-pressbooks
More pressbooks, reject garbage in CC urls, force login for password change
2018-09-10 13:37:26 -04:00
eric 272616895d fix github3 issue 2018-09-10 12:04:12 -04:00
eric 22ce4bf6a8 update requirements 2018-09-09 22:57:03 -04:00
eric 2639cc66d1 enforce login for password change 2018-09-09 22:34:06 -04:00
eric a87cdfc8ef make sure cc url is not garbage 2018-09-09 22:12:42 -04:00
eric 04aed3bf16 add opentextbc to pressbooks list 2018-09-09 21:55:38 -04:00
eshellman fb6f9ec9e5
Merge pull request #807 from Gluejar/fix-ml-subscribe
corrected test for social_auth
2018-08-15 15:38:17 -04:00
eric 265d63cf75 corrected test for social_auth 2018-08-14 15:17:32 -04:00
eshellman 0f1889306d
Merge pull request #806 from Gluejar/fix-springer
new markup for title
2018-08-08 23:34:11 -04:00
eric d6d6841515 new markup for title 2018-08-08 23:09:39 -04:00
eshellman a74f9d20fc
Merge pull request #805 from Gluejar/improve-pressbooks
adapt to newer pressbooks version
2018-08-02 21:29:08 -04:00
eric 7efb048a5c adapt to newer pressbooks version 2018-08-02 17:27:04 -04:00
eshellman a355a873f7
Merge pull request #804 from Gluejar/fix-log-rotation
group writable logs
2018-08-01 22:54:42 -04:00
eric ebc1e2e8f9 group writable logs
log needs to be writable by both www-data (running from apache) and ubuntu (running during settup or celery) users
2018-08-01 20:07:55 -04:00
eshellman eaf4754ecc
Merge pull request #803 from Gluejar/fix-sitemap
Fix sitemap
2018-08-01 12:16:45 -04:00
eric 20fb2c5855 delint 2018-08-01 09:38:49 -04:00
eric 534753db84 not sure how this broke 2018-08-01 09:32:29 -04:00
eshellman 912e5a28f1
Merge pull request #802 from Gluejar/clean_management
update management commands
2018-07-31 13:41:26 -04:00
eric f01ccd168a update management commands
updated argument declaration
use stdout.write() in stead of print
2018-07-31 13:12:22 -04:00
eshellman 9723b59a24
Merge pull request #801 from Gluejar/mc-on-activate
Mc on activate
2018-07-30 20:41:46 -04:00
eric ce62ce7199 ensure no duplicate emails 2018-07-30 19:00:58 -04:00
eric c2ed76b57f don't send mailchimp invite until activation 2018-07-30 18:37:38 -04:00
eshellman 6b7b25e0b1
Merge pull request #800 from Gluejar/dj111-errata
fix scripts
2018-07-30 17:09:42 -04:00
eric 3d93fe2017 fix add subject script 2018-07-30 16:49:36 -04:00
eric d7826e535c don't need watermark scripts 2018-07-30 16:49:10 -04:00
eric b5bcdea744 wrong jquery ui 2018-07-30 14:26:51 -04:00
eshellman 9f81dd7c1e
Merge pull request #799 from Gluejar/dj111-errata
add better error message in ebook upload
2018-07-30 13:50:06 -04:00