sync to master (ignore this)#1

Merged

binary1230 merged 195 commits intobinary1230:masterfrom

Dec 6, 2017

Commits on Oct 18, 2015

Defer dependency installation to the Dockerfile inheriting from this one. Makes having more than one plugin work.
gillianwebb
committed
Fix Dockerfile for deferred dependency installation
gillianwebb
committed
Use proper virtualenv path for CMD
gillianwebb
committed

Commits on May 25, 2016

Commits on May 28, 2016

sort glob() output for consistent results
binary1230
committed

Commits on Jun 15, 2016

Merge pull request #16 from magfest/sort_glob
binary1230
authored

Commits on Jul 1, 2016

Commits on Jul 12, 2016

Merge pull request #17 from magfest/centralized_logging
binary1230
authored

Commits on Aug 13, 2016

turn up all logging thresholds to the highest levels
binary1230
committed

Commits on Aug 14, 2016

Commits on Aug 20, 2016

Commits on Aug 21, 2016

Commits on Aug 27, 2016

enable system diagnostics package 1 for threading info
binary1230
committed

Commits on Aug 31, 2016

Commits on Sep 2, 2016

Merge pull request #24 from magfest/upgrade_pytest
binary1230
authored

Commits on Sep 12, 2016

Commits on Sep 13, 2016

Commits on Sep 20, 2016

@declarative_base now fills in a __init__ which applies default column values
EliAndrewC
committed

Commits on Sep 21, 2016

Merge branch 'defaults_applied_at_init' into 'master'
EliAndrewC
committed

Commits on Sep 26, 2016

Commits on Oct 3, 2016

fixes #31: pluggable authentication
EliAndrewC
committed

Commits on Oct 4, 2016

Commits on Oct 5, 2016

added ability for plugins to define a preprocessing step for API calls
EliAndrewC
committed

Commits on Oct 6, 2016

Merge branch 'pluggable_auth' into 'master'
EliAndrewC
committed

Commits on Oct 27, 2016

Commits on Oct 28, 2016

Commits on Nov 1, 2016

bumped version after tagging
EliAndrewC
committed

Commits on Nov 2, 2016

Commits on Nov 8, 2016

use new format for setup.cfg so pytest stops complaining
binary1230
committed

Commits on Nov 22, 2016

Commits on Nov 29, 2016

Merge pull request #48 from magfest/approval_workflow_improvements
EliAndrewC
authored

Commits on Dec 1, 2016

three edge case fixes for websocket subscriptions, plus a lot more docstrings
EliAndrewC
committed

Commits on Dec 2, 2016

added extra logging for unexpected websocket errors
EliAndrewC
committed

Commits on Dec 6, 2016

Merge remote-tracking branch 'origin/resyncing_with_public' into feature/resyncing_with_public
EliAndrewC
committed

Commits on Dec 7, 2016

Merge branch 'feature/resyncing_with_public' into 'master'
EliAndrewC
committed

Commits on Dec 21, 2016

added additional websocket closing checks and bumped the cherrypy tool priority
EliAndrewC
committed

Commits on Jan 6, 2017

Commits on Jan 18, 2017

implemented configurable list of session fields to be copied into threadlocal globals on every RPC request
EliAndrewC
committed

Commits on Jan 19, 2017

Merge branch 'feature/configurable_websocket_session_fields' into 'master'
EliAndrewC
committed

Commits on Jan 30, 2017

Commits on Feb 1, 2017

Commits on Feb 7, 2017

Commits on Feb 13, 2017

Commits on Mar 6, 2017

fixed forwarded websocket subscriptions to update the existing subscription rather than create a new one
EliAndrewC
committed

Commits on Mar 7, 2017

Commits on Mar 13, 2017

Merge branch 'configurable_config' into 'master'
EliAndrewC
committed

Commits on Mar 15, 2017

Commits on Mar 16, 2017

Merge branch 'notify_delay_refactor' into 'master'
EliAndrewC
committed

Commits on Mar 22, 2017

bumped version
EliAndrewC
committed

Commits on Mar 24, 2017

Bumps required Jinja2 version to 2.7 to ensure urlencode() filter is supported
RobRuana
committed

Commits on Mar 31, 2017

Only run coveralls once for each major python version (2.7 & 3.5)
RobRuana
committed

Commits on Apr 2, 2017

Speeds up tox tasks
RobRuana
committed

Commits on Apr 4, 2017

forwarded subscriptions can now have their methods updated
EliAndrewC
committed

Commits on Apr 5, 2017

Commits on Apr 6, 2017

Merge branch 'fixed_connection_checker' into 'master'
EliAndrewC
committed

Commits on Apr 11, 2017

Commits on Apr 12, 2017

Merge branch 'SIDEB-146' into 'master'
EliAndrewC
committed

Commits on Apr 20, 2017

Fixes #72: Adds support for declarative_base parameters (#73)
RobRuana
authored

Commits on Apr 23, 2017

Commits on Apr 24, 2017

Commits on Apr 25, 2017

Commits on Apr 27, 2017

Commits on May 2, 2017

passthru subscriptions now get cleaned up properly
EliAndrewC
committed

Commits on May 3, 2017

Commits on May 4, 2017

Commits on May 6, 2017

Update NodeJS Docker instructions
kitsuta
authored

Commits on May 8, 2017

Commits on May 10, 2017

Merge pull request #83 from magfest/public-resync-2017-05-09-2
RobRuana
authored

Commits on Jun 12, 2017

Fixes #56: Removes upper bounds on cherrypy version requirement (#84)

RobRuana
authored and
EliAndrewC
committed

Commits on Jul 29, 2017

Changes name used for cached property to avoid collisions with common naming pattern
RobRuana
committed

Commits on Jul 30, 2017

Commits on Sep 6, 2017

Merge pull request #9 from magfest/master
thaeli
authored

Commits on Nov 18, 2017

Makes jsonrpc_handler more flexible (#92)
RobRuana
authored

Commits on Nov 25, 2017

add psutil and prctl

binary1230
authored and
RobRuana
committed

Commits on Dec 6, 2017

Merge pull request #96 from RAMSProject/master
RobRuana
authored