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.

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

Friendly amendments to pull #15 #17

Merged
merged 13 commits into from
Mar 20, 2016
Merged

Friendly amendments to pull #15 #17

merged 13 commits into from
Mar 20, 2016

Commits on Jan 24, 2015

  1. Configuration menu
    Copy the full SHA
    1e15e72 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. Configuration menu
    Copy the full SHA
    3d06d2f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    04a11c0 View commit details
    Browse the repository at this point in the history
  3. Fix FileReader bug when running tests when node sniff-test fails

    Not all current NodeJS installs return "node" when checking
    `process.argv[0]`.
    
    On my system it returns:
    
    $ node -p -e 'process.argv[0]'
    /Users/glenn/.nvm/versions/node/v4.2.2/bin/node
    
    Do the sniff-test of whether we are running tests in a browser or
    in node a different way.
    
    An example of previous fail was:
    
    ```
    /Users/glenn/src/miniLockLib/library.compiled/readSliceOfData.js:17
            this.fileReader = new FileReader;
                                  ^
    
    ReferenceError: FileReader is not defined
        at EncryptOperation.module.exports [as readSliceOfData] (/Users/glenn/src/miniLockLib/library.compiled/readSliceOfData.js:17:31)
        at EncryptOperation.module.exports.EncryptOperation.encryptData (/Users/glenn/src/miniLockLib/library.compiled/EncryptOperation.js:161:19)
        at EncryptOperation.module.exports.EncryptOperation.run (/Users/glenn/src/miniLockLib/library.compiled/EncryptOperation.js:85:19)
        at EncryptOperation.module.exports.EncryptOperation.start (/Users/glenn/src/miniLockLib/library.compiled/EncryptOperation.js:78:16)
        at EncryptOperation.start (/Users/glenn/src/miniLockLib/library.compiled/EncryptOperation.js:4:59)
        at Object.miniLockLib.encrypt (/Users/glenn/src/miniLockLib/library.compiled/index.js:19:22)
        at /Users/glenn/src/miniLockLib/tests.compiled/A Few Demo Tests.js:15:26
        at /Users/glenn/src/miniLockLib/tests.compiled/fixtures.js:50:14
        at Object.read.files.basic.txt (/Users/glenn/src/miniLockLib/tests.compiled/fixtures.js:56:14)
        at exports.read (/Users/glenn/src/miniLockLib/tests.compiled/fixtures.js:46:28)
    ```
    grempe committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    aace259 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5dc2038 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d1670d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2016

  1. Prefer pointer to Node.js installer over "brew install ..." in the RE…

    …ADME.
    
    Revised the introduction of the Digging In section to explain that GNU
    Make and Node.js are the basic software requirements for fiddling with
    the miniLockLib code.
    
    Removed pointer to “brew install …” because i don’t like alcohol or the
    command line.
    45678 committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    b888d5b View commit details
    Browse the repository at this point in the history
  2. Pow is still working ok for me, and i am not sure about Caddy, so tha…

    …t’s why i am removing it.
    
    Reverts commit 3d06d2f
    45678 committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    0d6b651 View commit details
    Browse the repository at this point in the history
  3. Prefer to let browserify be a local dependency.

    Running `make` works on my computer when the browserify package is
    installed locally with `npm`. i am willing to consider other options if
    this doesn’t work predictably on other computers.
    45678 committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    b374cd8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f3ed33b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9f91bec View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' into grempe-patch-1

    45678 committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    147f4c8 View commit details
    Browse the repository at this point in the history
  7. Added missing scripts for previous commit.

    45678 committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    4896142 View commit details
    Browse the repository at this point in the history