Attempt to fix errors with File Manager

Merge 'references' into 'alpha'

Merge branch 'alpha' into references

Update README.md

Correct badges in README.md

Merge branch 'references' into 'remove_unnecessary_dependencies'

Change integration tests command to be more explicit

Merge branch 'remove_unnecessary_dependencies' into references

Add comments to travis scripts

Revert "Add comments to travis scripts"

Add some entries to .npmignore

Merge branch 'travis_integration_tests' into references

Remove ambiguous 'this' from FileManager

Fix file manager

Merge branch 'travis_integration_tests' into remove_unnecessary_dependencies

Fix bugs in FileManager initialization

Merge integration tests into remove_unnecessary_dependencies

Return to the proper directory after integration tests

Merge branch 'references' into travis_integration_tests

Adjust paths in travis script

Make the travis script go back to the 'sealious' dir after the 'install' step

Correct typo in .travis file

Fix some more bad bindings in Subjects

Add integration tests to Travis

Fix wrong bindings in ResourceTypeCollection

Make PluginManager skip plugins that had already been loaded

Fix 'action.run is undefined'

Fix bad bindings in get_chips_by_type

Rewrite _base-chips.js to call generator functions

Fix 'ChipManager is undefined'

Remove useless ConfigManager tests; Add new tests to ConfigManager that check…

Add test to ConfigManager that won't pass if Object.assign() is used

Merge branch 'remove_require_sealious' into remove_unnecessary_dependencies

Remove remaining 'require(sealious)' instances

Merge branch 'remove_unnecessary_dependencies' into remove_require_sealious

Merge branch 'references' into remove_unnecessary_dependencies

Add shortid to package.json and replace uid with it

Add .npmignore (not strictly what this branch is about, but I think it's okay)

Merge branch 'remove_unnecessary_dependencies' into remove_require_sealious

Revert the Object.assign changes in ConfigManager

Remove jsdoc config file and sublime project file

Bring back the sealious-datastore-tingo dep. Remove the prepublish script

Remove require-self from devDependencies from package.json(unused)

Remove sha1 from dependencies in package.json(unused)

Remove trailing comma from package.json

Remove sealious-datastore-tingo from dependencies in package.json(unused)

Remove Set from dependencies in package.json (unused)

Remove require-dir from dependencies in package.json(unused)

Rewrite merge dep to Object.assign in ConfigManager

Remove require('sealious') from file-manager.js

Remove Sealious for required dependencies from file-manager.js

Remove require('sealious') from run-action.js, restore require('sealious') to…

Remove require('sealious') from file-manager.js

Remove require('sealious') from context.js

Remove require('sealious') from plugin-manager.js

Remove require('sealious') resource_type.user.js

Remove require('sealious') from username.js

Remove require('sealious') from themselves.js

Remove require('sealious') from file.js, single_reference.js

Remove require('sealious') from not.js, or.js, super.js

Remove require('sealious') from and.js

Merge branch 'rewrite_new_function_to_object' into references

Remove require('sealious') from action.js

Add tests for Logger

Fix merging conflicts

Rewrite default argument (ES6 feature)

Rewrite deconstruction and add 'use strict' to test files

Resolve strict mode incompatibilities

Update locreq dependency

Merge branch 'travis_cache' into references

Add 'use strict' directive to all files in lib/

Fix strict mode errors

Experiments successful. Remove the silly dependency.

Experimental: Add a new dependency to see if it will be installed over the…

Experimental: Add another commit to see if the build speed has increased

Change node version on Travis to LTS

Experimental: add node_modules cache for faster builds

Merge branch 'locreq' into references

Fix merging conflicts with references

Merge branch 'references' of ssh://github.com/Sealious/sealious into references

Add dangling-comma to eslint rules. Apply the style changes to the codebase.

Rewrite deconstructors

Add locreq where needed. Remove some redundant 'require(sealious)' calls

Merge branch 'eslint-temp' into references

Change 'require.main.require' to locreq

Remove JSCS and JSHint config files

Remove unnecessary scripts from package.json and add eslint scripts

Remove unnecessary dependencies

Fix merge conflicts with references

merged

working eslint

eslint changes...

as

alol

config lol

a

Rewrite Context

test

sd