Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge from upstream #93

Merged
merged 71 commits into from Jun 27, 2018
Merged

merge from upstream #93

merged 71 commits into from Jun 27, 2018

Commits on Feb 22, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    d7f8c26 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    e922363 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    21b20d9 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    89b4221 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    0e52849 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    bd3d228 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    fede427 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    d40896f View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    62819e0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    67f8895 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    8a92605 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed May 11, 2018
    Configuration menu
    Copy the full SHA
    33bf10c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed May 11, 2018
    Configuration menu
    Copy the full SHA
    16441fe View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2018

  1. switch to dockerized mobi

    @eshellman
    eshellman committed Jun 6, 2018
    Configuration menu
    Copy the full SHA
    e1553f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. add column to EbookFile to indicate a failed make_mobi 

    so we don't keep trying with a bad epub file
    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    c422965 View commit details
    Browse the repository at this point in the history

  2. Merge pull request Gluejar#780 from Gluejar/test-mobi 

    new mobigen
    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    92cdeed View commit details
    Browse the repository at this point in the history

  3. files for running tests with travis

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    3e782e6 View commit details
    Browse the repository at this point in the history

  4. user is specific to org

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    cdce5e5 View commit details
    Browse the repository at this point in the history

  5. make keys a module

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    0deb76b View commit details
    Browse the repository at this point in the history

  6. re-decrypt

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    3028c5f View commit details
    Browse the repository at this point in the history

  7. make sure common.keys overrides common

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    f597da8 View commit details
    Browse the repository at this point in the history

  8. use hosts not common

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    f75fd07 View commit details
    Browse the repository at this point in the history

  9. set TEST_INTEGRATION

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    4afe792 View commit details
    Browse the repository at this point in the history

  10. thought I already did this

    @eshellman
    eshellman committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    8aae680 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. update boto

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    ca5e5be View commit details
    Browse the repository at this point in the history

  2. fix pdf tester 

    boto3 storage returns unicode not str someplace
    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    ab3c193 View commit details
    Browse the repository at this point in the history

  3. fix Booxtreem LOCAL_TEST

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    8b385d0 View commit details
    Browse the repository at this point in the history

  4. delint

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    455032e View commit details
    Browse the repository at this point in the history

  5. Merge pull request Gluejar#781 from Gluejar/add-travis 

    files for running tests with travis
    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    8d3cacb View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'Gluejar/master' into production

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    3663009 View commit details
    Browse the repository at this point in the history

  7. emergency update

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    cac2866 View commit details
    Browse the repository at this point in the history

  8. more fixing

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    55186ec View commit details
    Browse the repository at this point in the history

  9. revert

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    8d6c23e View commit details
    Browse the repository at this point in the history

  10. causes checkout errors

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    23944c4 View commit details
    Browse the repository at this point in the history

  11. another permission issue

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    d593360 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'production'

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    8fac19d View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'Gluejar/master' into add-travis

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    5a42418 View commit details
    Browse the repository at this point in the history

  14. remove settings/keys

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    8b709d9 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into add-travis

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    f2edf98 View commit details
    Browse the repository at this point in the history

  16. add keys directory

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    039e2e1 View commit details
    Browse the repository at this point in the history

  17. maybe no sudo

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    15fc49d View commit details
    Browse the repository at this point in the history

  18. retire jenkins

    @eshellman
    eshellman committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    ee954b7 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2018

  1. Merge pull request Gluejar#782 from Gluejar/add-travis 

    re-add travis
    @eshellman
    eshellman committed Jun 9, 2018
    Configuration menu
    Copy the full SHA
    20b8a29 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. remove stale files 

    these functions have moved into EbookFoundation/regluit-provisioning
    @eshellman
    eshellman committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    655991b View commit details
    Browse the repository at this point in the history

  2. add reset option

    @eshellman
    eshellman committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    ea278c3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Gluejar#783 from Gluejar/remove-vagrant 

    remove stale files
    @eshellman
    eshellman committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    7cf26e8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request Gluejar#784 from Gluejar/better_make_mobis 

    add reset option
    @eshellman
    eshellman committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    6094de0 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. handle records without downloads

    @eshellman
    eshellman committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    bade8e7 View commit details
    Browse the repository at this point in the history

  2. reset default to 15 days

    @eshellman
    eshellman committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    7593944 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Gluejar#785 from Gluejar/doab-errata 

    Doab errata
    @eshellman
    eshellman committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    3f99ea1 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2018

  1. fix loader tests

    @eshellman
    eshellman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    3bc7d5c View commit details
    Browse the repository at this point in the history

  2. handle series properly

    @eshellman
    eshellman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    53a0791 View commit details
    Browse the repository at this point in the history

  3. less agressive merging in doab

    @eshellman
    eshellman committed Jun 18, 2018
    Configuration menu
    Copy the full SHA
    2f9dda8 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. deleting works should delete attached objects 

    I think the only place this should get invoked is via admin
    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    6042603 View commit details
    Browse the repository at this point in the history

  2. support lists of doabids

    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    d817108 View commit details
    Browse the repository at this point in the history

  3. fix handling of cascade argument

    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    b709ad9 View commit details
    Browse the repository at this point in the history

  4. correct handling of google books returning multiple items

    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    e49fbd1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request Gluejar#786 from Gluejar/handle-series 

    Handle sets
    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    80b46f3 View commit details
    Browse the repository at this point in the history

  6. fix exception when there's no google result

    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    59b49e2 View commit details
    Browse the repository at this point in the history

  7. wip

    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    042613b View commit details
    Browse the repository at this point in the history

  8. syntax

    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    fadba3c View commit details
    Browse the repository at this point in the history

  9. Merge pull request Gluejar#787 from Gluejar/fix-regression 

    Fix regression
    @eshellman
    eshellman committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    2b2df9d View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. update to mailchimp 3.0 api

    @eshellman
    eshellman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    1d83e7a View commit details
    Browse the repository at this point in the history

  2. Merge pull request Gluejar#788 from Gluejar/fix-mailchimp 

    Fix mailchimp
    @eshellman
    eshellman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    4dbf3ab View commit details
    Browse the repository at this point in the history

  3. fix regression in 5598b15

    @eshellman
    eshellman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    68ddec6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request Gluejar#789 from Gluejar/fix-claim 

    fix regression in 5598b15
    @eshellman
    eshellman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    cc74d7d View commit details
    Browse the repository at this point in the history

  5. make sure to queue the notification emmisions 

    so that we don't need the emit_notices cron job
    @eshellman
    eshellman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    e82c389 View commit details
    Browse the repository at this point in the history

  6. Merge pull request Gluejar#790 from Gluejar/queue-notifications 

    make sure to queue the notification emisions
    @eshellman
    eshellman committed Jun 20, 2018
    Configuration menu
    Copy the full SHA
    1389f87 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. Merge remote-tracking branch 'Gluejar/master' into update

    @eshellman
    eshellman committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    82e2495 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'update' into master

    @eshellman
    eshellman committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    6f2391b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #92 from Gluejar/master 

    make mirror in EbookFoundation
    @eshellman
    eshellman committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    3e7fefb View commit details
    Browse the repository at this point in the history