eshellman
|
0a59165099
|
Merge pull request #93 from EbookFoundation/upstream-staging
merge from upstream
|
2018-06-27 12:59:42 -04:00 |
|
eshellman
|
3e7fefb0a5
|
Merge pull request #92 from Gluejar/master
make mirror in EbookFoundation
|
2018-06-26 14:48:10 -05:00 |
|
eshellman
|
6f2391b0b9
|
Merge branch 'update' into master
|
2018-06-26 14:29:02 -05:00 |
|
eric
|
82e2495380
|
Merge remote-tracking branch 'Gluejar/master' into update
|
2018-06-26 14:19:28 -05:00 |
|
eshellman
|
1389f87616
|
Merge pull request #790 from Gluejar/queue-notifications
make sure to queue the notification emisions
|
2018-06-20 16:18:03 -04:00 |
|
eric
|
e82c389236
|
make sure to queue the notification emmisions
so that we don't need the emit_notices cron job
|
2018-06-20 15:57:34 -04:00 |
|
eshellman
|
cc74d7d414
|
Merge pull request #789 from Gluejar/fix-claim
fix regression in 5598b154c5
|
2018-06-20 12:21:22 -04:00 |
|
eric
|
68ddec61c8
|
fix regression in 5598b154c5
|
2018-06-20 11:36:15 -04:00 |
|
eshellman
|
4dbf3ab725
|
Merge pull request #788 from Gluejar/fix-mailchimp
Fix mailchimp
|
2018-06-20 10:56:13 -04:00 |
|
eric
|
1d83e7af78
|
update to mailchimp 3.0 api
|
2018-06-20 10:03:48 -04:00 |
|
eshellman
|
2b2df9d3b5
|
Merge pull request #787 from Gluejar/fix-regression
Fix regression
|
2018-06-19 14:30:33 -04:00 |
|
eric
|
fadba3ce1b
|
syntax
|
2018-06-19 14:15:53 -04:00 |
|
eric
|
042613b0ae
|
wip
|
2018-06-19 14:14:10 -04:00 |
|
eric
|
59b49e2c2e
|
fix exception when there's no google result
|
2018-06-19 13:34:29 -04:00 |
|
eshellman
|
80b46f36c7
|
Merge pull request #786 from Gluejar/handle-series
Handle sets
|
2018-06-19 10:55:47 -04:00 |
|
eric
|
e49fbd1826
|
correct handling of google books returning multiple items
|
2018-06-19 10:44:15 -04:00 |
|
eric
|
b709ad93f8
|
fix handling of cascade argument
|
2018-06-19 10:43:42 -04:00 |
|
eric
|
d8171088a6
|
support lists of doabids
|
2018-06-19 10:42:02 -04:00 |
|
eric
|
604260363f
|
deleting works should delete attached objects
I think the only place this should get invoked is via admin
|
2018-06-18 22:07:29 -04:00 |
|
eric
|
2f9dda8432
|
less agressive merging in doab
|
2018-06-18 17:04:40 -04:00 |
|
eric
|
53a0791da0
|
handle series properly
|
2018-06-18 17:04:19 -04:00 |
|
eric
|
3bc7d5c003
|
fix loader tests
|
2018-06-18 17:03:41 -04:00 |
|
eshellman
|
3f99ea1104
|
Merge pull request #785 from Gluejar/doab-errata
Doab errata
|
2018-06-15 16:09:53 -04:00 |
|
eric
|
7593944dc0
|
reset default to 15 days
|
2018-06-15 15:30:04 -04:00 |
|
eric
|
bade8e7f4d
|
handle records without downloads
|
2018-06-15 10:34:23 -04:00 |
|
eshellman
|
6094de0e44
|
Merge pull request #784 from Gluejar/better_make_mobis
add reset option
|
2018-06-11 16:02:35 -04:00 |
|
eshellman
|
7cf26e8a24
|
Merge pull request #783 from Gluejar/remove-vagrant
remove stale files
|
2018-06-11 14:46:24 -04:00 |
|
eric
|
ea278c3f41
|
add reset option
|
2018-06-11 14:43:56 -04:00 |
|
eric
|
655991b892
|
remove stale files
these functions have moved into EbookFoundation/regluit-provisioning
|
2018-06-11 12:42:49 -04:00 |
|
eshellman
|
dad5b4b3cc
|
Merge pull request #88 from EbookFoundation/remove-provisioning
remove ansible
|
2018-06-11 12:36:34 -04:00 |
|
eric
|
b240d015d6
|
remove ansible
all ansible stuff has been moved to a separate repo
|
2018-06-11 11:57:44 -04:00 |
|
eshellman
|
75168b92d9
|
Merge pull request #87 from EbookFoundation/catch-up
Merge remote-tracking branch 'Gluejar/master'
|
2018-06-09 17:02:45 -04:00 |
|
eric
|
88a50073de
|
Merge remote-tracking branch 'Gluejar/master'
|
2018-06-09 15:54:14 -04:00 |
|
eshellman
|
d7751af8f9
|
Merge pull request #86 from EbookFoundation/add-travis
WIP: see if we can easily get travis to do tests
|
2018-06-09 15:46:47 -04:00 |
|
eric
|
6408c878c4
|
pull test fixes from Gluejar/master
|
2018-06-09 15:00:45 -04:00 |
|
eric
|
d3b9cfaf3c
|
re-encrypt
|
2018-06-09 14:42:25 -04:00 |
|
eric
|
6fb024517f
|
fix cp
|
2018-06-09 14:22:41 -04:00 |
|
eric
|
b8d8cdedb6
|
newline
|
2018-06-08 20:58:44 -04:00 |
|
eric
|
5846470b9a
|
delete the directory already!
|
2018-06-08 20:52:37 -04:00 |
|
eric
|
6a5cc4fe0d
|
try removing it more
|
2018-06-08 20:49:18 -04:00 |
|
eric
|
8812b6b663
|
remove the keys again
|
2018-06-08 20:46:55 -04:00 |
|
eric
|
35569dd88b
|
Merge branch 'master' into add-travis
|
2018-06-08 20:40:30 -04:00 |
|
eric
|
9abb666ce8
|
updates from gluejar travis work
|
2018-06-08 20:20:11 -04:00 |
|
eshellman
|
20b8a29299
|
Merge pull request #782 from Gluejar/add-travis
re-add travis
|
2018-06-08 20:05:57 -04:00 |
|
eric
|
ee954b7f47
|
retire jenkins
|
2018-06-08 19:38:43 -04:00 |
|
eric
|
15fc49d828
|
maybe no sudo
|
2018-06-08 19:12:27 -04:00 |
|
eric
|
039e2e1a05
|
add keys directory
|
2018-06-08 19:01:42 -04:00 |
|
eshellman
|
f2edf98780
|
Merge branch 'master' into add-travis
|
2018-06-08 18:48:16 -04:00 |
|
eric
|
8b709d955b
|
remove settings/keys
|
2018-06-08 18:47:09 -04:00 |
|
eric
|
5a4241839c
|
Merge remote-tracking branch 'Gluejar/master' into add-travis
|
2018-06-08 18:29:36 -04:00 |