Merge branch 'alpha' of github.com:sealcode/sealious into alpha

Allow empty strings as emails in field type email

Adjust deleting a session for app.run_action

Add format method to datetime - formatting to human-readable format

HOTFIX: params missing from field specification

Add conditional for field type html

Fix or strategy

Support custom configs

Support default config in Sealious plugins

Merge branch 'file_by_url' into alpha

Merge branch 'support_arbitrary_indexes' into alpha

Merge branch 'support_arbitrary_indexes' of ssh://github.com/Sealious/sealious…

Merge branch 'alpha' into support_arbitrary_indexes

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

Add a test for FieldType

Synchronise default methods: format, encode, decode

Merge branch 'change_resouceType_to_collection' into alpha

Merge branch 'alpha' into change_resouceType_to_collection

Merge branch 'separate_db_collections' into alpha

Merge branch 'no_accept_reject_interface' into alpha

Fix conflicts after merging alpha into no_accept_reject_interface

Merge branch 'change_resouceType_to_collection' into alpha

Merge branch 'travis_integration_tests' into references

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

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

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

Remove sha1 from dependencies in package.json(unused)

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

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

Merge branch 'travis_cache' into references

Merge branch 'locreq' into references

Fix merging conflicts with references

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

Rewrite deconstructors

Merge branch 'eslint-temp' into references

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

Rewrite Context

Rewrite Action prototype

Rewrite PluginManager

Rewrite FileManager totally

Rewrite Single

Rewrite ResourceType prototype

Rewrite AccessStrategy prototype

Rewrite Chip prototype

rewrite SubjectPath prototype

Rewrite Subject prototype

Rewrite ChipManager

Rewrite File prototype

Rewrite AccessStrategyType prototype

Replace vars with const/let in ConfigManager

Modify ConfigManager to export an object literal

Add tests to Single

Add tests for FieldTypeDefaultMethods

Adjust tests for Field-Type

fix things mentioned in PR

Add a test to Error tests

Add tests to FieldTypeDescrption

Add tests to Text

(I guess I'm tired...) Fix the test file name

Add tests and modify VirtualFile

Fix a test in AccessStrategy.Owner

Add tests to AccessStrategy.Public

Add tests for AccessStrategy.Noone

Add tests to AccessStrategy.Logged_in

fix merge conflicts