Update to commit 1d07874 from git@github.com:x-team/wp-stream.git

Includes the following commit(s):

commit 1d078742ec087886d741fd6e119ef62233900dbe
Merge: afe2a97 f393e75
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop'

commit f393e753d7a5b5ca0562ddf07c6bb2c1c139a3d3
Author: Frankie Jarrett <frankie@x-team.com>

    Release notes for 1.4.0

M	readme.md
M	readme.txt

commit d2ff7ca1b3f1e27293e615abd7335bc40fe16e67
Merge: 338f91e 9db81c5
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #439 from x-team/wp-cli

commit 338f91e079de90656ac5eb7ffb9b7227998c84b3
Merge: 1b1a4c1 e55019d
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #438 from x-team/issue-426

commit e55019de0b70785e019449881b974793ab59fa20
Author: Luke Carbis <luke.carbis@x-team.com>

    Retroactively update blog id on single site

M	includes/db-updates.php

commit 9db81c59bf2d4e79b22e8f1043aa9af547d0fd69
Author: Weston Ruter <weston@x-team.com>

    Fix more PHPCS issues

M	connectors/installer.php
M	includes/dashboard.php
M	includes/list-table.php

commit 0c7cdc11a0be2ad703819fccff9e469417db4344
Author: Luke Carbis <luke.carbis@x-team.com>

    Run update at init

M	includes/install.php
M	stream.php

commit a6781bf0cf9cd1f50d144b122d1b64a59c5061a9
Author: Luke Carbis <luke.carbis@x-team.com>

    Remove updated required check before loading Stream

M	includes/admin.php

commit 2dee9ef148b6700e8e6f752f43ca0a39c96d71be
Author: Weston Ruter <weston@x-team.com>

    Fix PHPCS issues

M	includes/dashboard.php

commit 22fafeb4ff25249eea3adfeafda2914b0f0ffeb1
Author: Weston Ruter <weston@x-team.com>

    Sort authors by display name

M	includes/admin.php
M	includes/list-table.php

commit 1ac00795992fd60428b3dc8db7766f6059ffdd53
Author: Luke Carbis <luke.carbis@x-team.com>

    Change array definition to one line

M	includes/db-updates.php

commit abd0dfa2bd3082ae9fbd6dfe6ea6de0b52910fae
Author: Weston Ruter <weston@x-team.com>

    Add WP-CLI support for logging theme deletion

M	connectors/installer.php

commit ac4c41945080531f4697bebd8aed5dc0ba42a1dd
Author: Weston Ruter <weston@x-team.com>

    Serialize non-scalar values when inserting meta

M	includes/db.php

commit 1246ef42f2cd060b4899408be698d2bf08b6013c
Author: Weston Ruter <weston@x-team.com>

    Fix logging of plugin/theme install/upgrade via WP-CLI

M	connectors/installer.php

commit 2f65e7c1c2a0634bd2a202878358653c2fdbf12a
Author: Luke Carbis <luke.carbis@x-team.com>

    Add auto updates and include 1.4.0 schema changes in auto

M	includes/db-updates.php
M	includes/install.php

commit e3ef53a0eafd7ae77261854d732b54f1c96aada4
Author: Weston Ruter <weston@x-team.com>

    Fix HiDPI avatars in author filter

M	includes/admin.php

commit 8ade955af24110f3de3730e477ecd24c37c8fab5
Author: Weston Ruter <weston@x-team.com>

    Use N/A for user=0 if not WP-CLI

M	includes/dashboard.php
M	includes/list-table.php
M	ui/admin.css

commit 48187ae2b69e5f6d6d8485c090cb9d96c9a1edcb
Merge: 4c652fb 1b1a4c1
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-426

commit 4c652fbd824d1f3cd20d191ed82f12dccf59a32d
Author: Luke Carbis <luke.carbis@x-team.com>

    Added auto parameter to update function

M	includes/install.php

commit 1b1a4c1e9105fbbd04ae530085c549ef5a02eafc
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing undefined index notice

M	includes/list-table.php

commit 26e29e2b09b6c74b289c331f42fe92c6c9d72a5f
Merge: eb19610 f6d3a40
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #435 from x-team/issue-433

commit eb196101e001d861b2488246a61da530a408880c
Merge: 1a6b886 93decc6
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #430 from x-team/issue-49-and-wp-cli

commit 1a6b886f6b3a2b15a579183637828d6f07e791d1
Merge: 1ea56d1 8d19351
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #429 from x-team/issue-380

commit 8d19351084b8bb1554cbc1dcb24080f458a97610
Author: Frankie Jarrett <frankie@x-team.com>

    Use search icon instead of eye

M	includes/list-table.php

commit f6d3a4058da835318f8653ce6d943f14530395c4
Author: Luke Carbis <luke.carbis@x-team.com>

    Hides the blogs connector unless in Network Admin

M	connectors/blogs.php
M	connectors/settings.php
M	includes/connectors.php
M	includes/network.php

commit 93decc6f0925337c1cec5424f01a7595f0b96726
Merge: 6e3fcb3 d7c6213
Author: Weston Ruter <weston@x-team.com>

    Merge branch 'wp-cli' into issue-49-and-wp-cli

commit d7c6213076c22fc06c7798b8798ea446097210b4
Author: Shady Sharaf <shady@sharaf.me>

    Use printf instead of sprintf+echo

M	includes/dashboard.php

commit 6e3fcb3b801aa8a24d2b195b243c7651c1f7b9b8
Merge: fc6f199 f3ac5d9
Author: Shady Sharaf <shady@sharaf.me>

    Merge remote-tracking branch 'origin/wp-cli' into issue-49-and-wp-cli

commit d177dfe8ed0b8c4ba79a07e9b0cc35bb3dccffa1
Author: Shady Sharaf <shady@sharaf.me>

    Remove the link on summary, add an icon to filter by object id

M	includes/list-table.php
M	ui/admin.css

commit f3ac5d9e9aea17bb7e0e6e305adeedba946c64a3
Author: Weston Ruter <weston@x-team.com>

    Fix: Equals sign not aligned with surrounding assignments (again)

M	includes/list-table.php

commit 0e16300b9d21a3ef4b23f2edfe6279e9618c74ef
Author: Weston Ruter <weston@x-team.com>

    Fix: Equals sign not aligned with surrounding assignments

M	includes/settings.php

commit fc6f199b570ccb5f2c3bf49c39aa89bda325497d
Author: Shady Sharaf <shady@sharaf.me>

    Get around WPCS/travis issue

M	includes/admin.php

commit 019ddbeb9f426ae4167e1326425d00b191ee39a0
Author: Weston Ruter <weston@x-team.com>

    Use WP-CLI logo for avatar; retinaize

M	includes/dashboard.php
M	includes/list-table.php
M	includes/settings.php
M	ui/admin.css
A	ui/stream-icons/wp-cli.png

commit c481675782130c14a402a4047a02a3b083c60497
Author: Weston Ruter <weston@x-team.com>

    Include WP-CLI user in list returned on Settings page

M	includes/settings.php

commit 492250abbd99ce18105166b8a88f5361afab86a0
Author: Shady Sharaf <shady@sharaf.me>

    Show proper author gravatars on ajaxified filters

M	includes/admin.php
M	includes/list-table.php
M	ui/admin.js

commit 61211261758edd603122e5daeb496da1bba383e3
Author: Shady Sharaf <shady@sharaf.me>

    Remove dummy ajax callback method

M	includes/list-table.php

commit 3627894cec2d2af395ec700bc64a1e23de2033ea
Author: Shady Sharaf <shady@sharaf.me>

    Generalize the ajax-filter pre-selection code

M	includes/admin.php
M	ui/admin.js

commit 9f987cda7b2cb08c05192fb8694f49de3fcdf03e
Author: Weston Ruter <weston@x-team.com>

    Unslash search query param

M	includes/list-table.php

commit f6593c7b677c3c6ea9dd979282dbf3b455bec1ec
Author: Weston Ruter <weston@x-team.com>

    Remove WP-CLI user if there are no records attributed to user=0

M	includes/list-table.php

commit 5439ae7609e30b6ecd214fea2157e963328da653
Author: Shady Sharaf <shady@sharaf.me>

    Fix pre-selection of ajaxified filters

M	includes/list-table.php

commit 4e94162145da9c31a8451146de471c325035f695
Author: Shady Sharaf <shady@sharaf.me>

    Fix Ajaxified filters in Stream list table
    Short-circuit author list generation if users are more than PRELOAD_AUTHORS_MAX

M	includes/admin.php
M	includes/list-table.php
M	ui/admin.js

commit 1ea56d1d67d9a26225c829e63b4f8e69e673b191
Merge: 7fe9eae 4d14916
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #425 from x-team/luke-self-admin-url

commit cb38be76d1b153d0fc1c2d8fcc378599cb2437ab
Author: Weston Ruter <weston@x-team.com>

    Apply style issues reported by review

M	includes/list-table.php
M	includes/query.php

commit 3ff0fce90fbb251610bb72de37852dcb0e565ee3
Author: Weston Ruter <weston@x-team.com>

    Fix inclusion of placeholder for authors filter when WP-CLI included

M	includes/list-table.php

commit 130722af9137de9676e11dbf0d2c7159d29a4175
Author: Weston Ruter <weston@x-team.com>

    Fix another assignment alignment problem

M	stream.php

commit ca7ca3ae668eee1229353c2dfa8acc7da26d70f0
Author: Weston Ruter <weston@x-team.com>

    Refactor for WPCS master rules

M	stream.php

commit 0e01d41fe4514786145697f1a28f3448510eef9d
Author: Weston Ruter <weston@x-team.com>

    Only show uninstall message when a database_message is supplied

M	stream.php

commit 7f1a744cc4159897cec38dae4160416ee8d5c927
Author: Weston Ruter <weston@x-team.com>

    Delete new DB version after uninstall

M	includes/admin.php

commit 14c0eb6c031f64322bb273fb854fd7571a33f054
Merge: 3d0d9f6 7fe9eae
Author: Weston Ruter <weston@x-team.com>

    Merge branch 'develop' into wp-cli

commit 3d0d9f682edb733f40ca3812f7f3d37633df8b22
Author: Weston Ruter <weston@x-team.com>

    Include WP-CLI (user=0) in filter selects

M	includes/list-table.php
M	includes/log.php

commit 4d14916471c1e4b0c55ce0d3f8f6df6deed66314
Author: Luke Carbis <luke.carbis@x-team.com>

    Use self_admin_url where possible

M	includes/admin.php
M	includes/dashboard.php
M	includes/list-table.php
M	includes/network.php

commit 7fe9eaeeaccebd8c1ab16bb6d9077653cc92efd4
Merge: 11b0f1e ecc1ee3
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #421 from x-team/issue-420

commit 11b0f1e7ff862965ad6bb36bac06683ab429d89f
Author: Frankie Jarrett <frankie@x-team.com>

    Add instructions to flush rewrite rules on Private Feeds setting

M	includes/settings.php

commit ecc1ee3923208bf6b5e23fae62b557358625f3d9
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix broken feeds

M	includes/feeds.php

commit 9af585adcb3351a6e9d9aeb945c78e10a49bffd5
Merge: e22098a e64ea11
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-420

commit e22098a150dcb80aae63cf1fc21ba94da67ea56d
Author: Luke Carbis <luke.carbis@x-team.com>

    Makes the Generate new key link ajaxified

M	includes/admin.php
M	includes/feeds.php
M	ui/admin.css
M	ui/admin.js

commit e64ea1162010a7acbb88e99e85a4830d85a4a581
Merge: ca2d245 2e5a56d
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #401 from x-team/issue-65

commit 2e5a56d419210d7f7593a057008e0f11df2982fc
Author: Frankie Jarrett <frankie@x-team.com>

    Set proper query default args for site_id

M	includes/query.php

commit b56b238f2adbeba009d8b9cfc378b52c445443ac
Merge: c07e3a9 ca2d245
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-65

commit ca2d245ee856906ce59fbcfcfdacf280b3a6f3eb
Merge: c6e95e3 6b6dc09
Author: Luke Carbis <luke@carbis.com.au>

    Merge pull request #418 from x-team/issue-412

commit c07e3a9253c862144d8c225301020b07c72cb238
Merge: 2b5d20b c6e95e3
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-65

commit 3a660fca19925895a4d3f0c24250c581173620c2
Author: Weston Ruter <weston@x-team.com>

    Attribute anonymous WP-CLI actions, and tag WP-CLI actions done by a user

M	includes/list-table.php
M	includes/log.php

commit f2a5332acf2c70a55ee8096bf37a743fd912f3eb
Author: Weston Ruter <weston@x-team.com>

    Allow for author=0 (WP-CLI) to be queried

M	includes/list-table.php
M	includes/query.php

commit c9517183ea37ab4d17100852960d88ff5bddff2b
Author: Weston Ruter <weston@x-team.com>

    Use WP_CLI::warning() for admin notices in WP_Stream

M	stream.php

commit 1e305d9804e1b0b00273624bc5122b88ff05d7ce
Author: Weston Ruter <weston@x-team.com>

    Eliminate WP_CLI short-circuit

M	stream.php

commit c6e95e3457c51dc3e90b3342715124bb286f793a
Merge: 3cfff8f b77259f
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #419 from x-team/issue-411

commit b77259f839f3d12a9f3e55995cf7b988cabaeacd
Author: Frankie Jarrett <frankie@x-team.com>

    A bit o' code formatting

M	includes/admin.php

commit c1f2562cdb9e62f77e89d0dd36176bcb3f915a89
Author: Jonathan Bardo <bardo.jonathan@gmail.com>

    Fix travis phpcs error [ci-skip]

M	includes/admin.php

commit 6699c44f809121a30f0b4a84595e3dbfec4e9429
Author: Jonathan Bardo <bardo.jonathan@gmail.com>

    Fix plugins not being enqueued in plugins.php

M	includes/admin.php

commit 6b6dc09f0bbc7178205d17a8851e95677764cb0d
Author: Frankie Jarrett <frankie@x-team.com>

    Updating tests

M	tests/tests/test-admin.php

commit 137ac2984d975f0ee2d7c278221e44134909379f
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing auto purge cron that was not being created properly

M	includes/admin.php
M	includes/db-updates.php

commit 2b5d20b5d817a735a722e1ef228134918867c61c
Author: Frankie Jarrett <frankie@x-team.com>

    Fix last commit, edited wrong statement

M	includes/db-updates.php

commit 4eb2fcde1aea4c137c96560f947f1d05f7a87013
Author: Frankie Jarrett <frankie@x-team.com>

    Make author_role column value NULL by default when updating the DB

M	includes/db-updates.php

commit be7360b34fd258592dcad070ceb878b6ea4cb6bb
Author: Frankie Jarrett <frankie@x-team.com>

    Don't get option from network-wide

M	includes/feeds.php
M	includes/query.php

commit 381857a60bb0f4f7f9c3a931969414d512e44732
Author: Frankie Jarrett <frankie@x-team.com>

    Escape blog_charset output, provide text domain in translatable strings

M	includes/feeds.php

commit 408b0b97512676172cb82ff113e45ccb4a9c75ec
Author: Frankie Jarrett <frankie@x-team.com>

    Use get_site_option in feeds for MS compat

M	includes/feeds.php

commit 26e943ff788c2f4bc821200f15b55a5936704088
Author: Frankie Jarrett <frankie@x-team.com>

    Use default site_id of 1 if not on multisite
    If Stream is running on a single site install that switches to multisite later, this will ensure records remain in the main site's Stream

M	includes/query.php

commit a3ebb08ef05633343b8325771a3ac9f88cb52cdf
Merge: 68f0648 3cfff8f
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-65

commit 68f0648a0722d345a9db82b3c9e1b94e35fe7cd7
Author: Frankie Jarrett <frankie@x-team.com>

    Ensure Network Admin can see DB update notices

M	includes/install.php

commit 4b6311344b50c129d977b31343b725e0d50ad98c
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting

M	includes/db-updates.php

commit 3cfff8f0c7933bfa4674373569c7e37ca3e53fd0
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing remove icons in custom date input fields

M	ui/admin.js

commit 1ce1466581cae370fef84ceed25f803f8d2cc132
Merge: bde79bb 8c39ecb
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-65

commit aa38c01cf390f9ce147d7db7f14b3e5a639eadf2
Author: Frankie Jarrett <frankie@x-team.com>

    Fix bug with predefined date queries not working

M	ui/admin.js

commit 8c39ecb9a710538061800b57bf0d6f019d7728ab
Author: Frankie Jarrett <frankie@x-team.com>

    Update routine for setting author_role column values retroactively

M	includes/db-updates.php

commit 63c4eec558ee79fbe906b520042658e3bfb9f2b2
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing errors in DB update routines

M	includes/db-updates.php
M	includes/install.php

commit f114ac6880408a46bbe95690addcb04ee40cc0c5
Author: Frankie Jarrett <frankie@x-team.com>

    Bump version in develop for testing

M	includes/db-updates.php
M	stream.php

commit 8dd8ef65cf8f058338df73f08825f3abea40288f
Author: Frankie Jarrett <frankie@x-team.com>

    Allow author_role and record__in args in feed queries

M	includes/feeds.php

commit 51c271ff42dec112b6d1db774fa37e04361ac2a9
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting

M	includes/query.php

commit 81c454b80a9ce0ec44f38a177819d1b36baa1555
Author: Frankie Jarrett <frankie@x-team.com>

    Add SQL statements for author_role queries, allow in list table

M	includes/list-table.php
M	includes/query.php

commit 944c2f40e9c28c6997e69ec0e78251633ec5b5cd
Author: Frankie Jarrett <frankie@x-team.com>

    Fix error in result that was causing column to never be created

M	includes/db-updates.php

commit bde79bb68dcde66dacfe29689163c1935aba6513
Author: Luke Carbis <luke.carbis@x-team.com>

    Add is_plugin_active_for_network function check

M	includes/network.php

commit 81fa5846e0477f8e463326a31e0c1f2b9995708d
Author: Frankie Jarrett <frankie@x-team.com>

    Escape string in buttons

M	includes/install.php

commit f96015754b0893abe9828e765c63e76d3af72638
Author: Frankie Jarrett <frankie@x-team.com>

    Use unique submit button name for DB update

M	includes/install.php

commit 34f2095861396bb61197ee4d7a69c3b935561db1
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix for blog_id = '0' argument

M	includes/query.php

commit 9856364f229f9af4fbeaff5222a55996ecf92fd1
Merge: d02c954 0e375ce
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-65

commit d02c954bd7e9547bf302fe688e0fd735e0be3b6d
Author: Luke Carbis <luke.carbis@x-team.com>

    Make some network functions static

M	includes/network.php

commit c682f8e6545c6993c8558cdf9c7453c2454ebb67
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting on array

M	includes/network.php

commit 3417e72df76ebc73693217bbbd88c1098374a8c0
Merge: 4be02d2 fc36bf1
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'issue-65' of github.com:x-team/wp-stream into issue-65

commit 4be02d2d51b0b6e9c714a1c724430ce2cf49a2e8
Author: Frankie Jarrett <frankie@x-team.com>

    Add Stream to the admin bar menu under My Sites > Network Admin

M	includes/network.php

commit 0e375ce724a9bd166f501b58f8d19dae518f3268
Merge: d2f6e9b d3a2089
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #415 from x-team/issue-414

commit afe2a9709eb4cef05e0e05836c6465a1551b4d72
Merge: bb5fd42 2a649b0
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #417 from x-team/nextgen-compability

commit 2a649b0dfb07d712dd2a563c1020da38069f3040
Author: Frankie Jarrett <frankie@x-team.com>

    Changing width to 350px for mobile compatibility

M	ui/admin.css

commit 890bab5175c279e4e8491f8e2e7c81c0cda899f2
Author: Shady Sharaf <shady@sharaf.me>

    Fix position of CSS line

M	ui/admin.css

commit c0796e2989b7e074acd1fcba12e0a27fbce28877
Author: Shady Sharaf <shady@sharaf.me>

    More specific CSS selector

M	ui/admin.css

commit 9237be9592bfb15ce3fba5b72e2ebc7ca2dbad3c
Author: Shady Sharaf <shady@sharaf.me>

    Fix the width of select2-container, to fix NextGen compatibility issue

M	ui/admin.css

commit d3a2089d7814ced4124e3be375084a2701dda893
Author: Shady Sharaf <shady@sharaf.me>

    Fix doc block to reference proper return description

M	includes/db-updates.php

commit 6102d9ee3aebd8d3ab15e328925b8fab86b149af
Author: Shady Sharaf <shady@sharaf.me>

    Fix incorrect variable usage

M	includes/db.php

commit fc36bf1ed990d96ff81c803df19151e0c7661885
Author: Luke Carbis <luke.carbis@x-team.com>

    Don't show Stream if there's a DB update that needs a-doin'

M	includes/admin.php
M	includes/install.php

commit 95dd2a197f3153897bb255d09adf0c408f3a9a5b
Author: Luke Carbis <luke.carbis@x-team.com>

    Check if exists before adding blog_id

M	includes/db-updates.php

commit fc4ab67a9828b1b1435d24e91dba996139e48897
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix bug preventing Stream access

M	includes/network.php

commit fea9e2fcf4b3235222905f1a360a8a94412e769c
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix network settings bug

M	includes/admin.php
M	includes/network.php

commit 84431b4c59f37d9052b706d7b55493a13d4d282f
Author: Luke Carbis <luke.carbis@x-team.com>

    Move deactivate after is_plugin_active check.

M	includes/admin.php

commit c46114ee0369c1381eb64a81f707ebf7ac428e5a
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix primary blog records disappearing in update

M	includes/db-updates.php

commit 91a43fc08da63acd1b7088393257945f602bfcbc
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix uninstall bug

M	includes/admin.php

commit c103eee266b136a97ac5c96cb6976b5f5a6cee95
Author: Luke Carbis <luke.carbis@x-team.com>

    Restore update routine.

M	includes/db-updates.php
M	includes/install.php

commit fa4aa3ee00ac1b8274f89019d50e1d8d88b10f46
Author: Luke Carbis <luke.carbis@x-team.com>

    Simplified the get_fields() function.

M	includes/network.php

commit 06e451b6f56892ea731f0cbcb6a2102345b00483
Merge: 33c2433 d2f6e9b
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-65

commit d2f6e9bc1a2267944e78c042c78bb6d80105ce10
Merge: 82d5fc2 4fef084
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #387 from x-team/issue-379

commit 4fef0843fe81800010705bd850846a0047598512
Author: Luke Carbis <luke.carbis@x-team.com>

    Store the database version in the network options

M	includes/install.php

commit ba8fcf0beb19707e1da670dbcf464febe9469fff
Author: Luke Carbis <luke.carbis@x-team.com>

    Remove version compare

M	includes/db-updates.php

commit 12af2a1dead054cde1f45f1ef4e37cb7980e6169
Merge: 775e481 82d5fc2
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-379

commit 82d5fc2a2f263462d40c166446c290b11dd8ab22
Merge: f4684ea 685ed1a
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #413 from x-team/issue-389

commit 33c243301f10ee4c6d5f5e158dfd28ca4820df95
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing sniff for misaligned equal sign

M	includes/settings.php

commit c68699ad0a41cfe098b262c12b3322bec9bd92c4
Author: Luke Carbis <luke.carbis@x-team.com>

    Cleaning up.

M	includes/admin.php
M	includes/network.php
M	includes/settings.php

commit 64d9dc08ca0b35bb909315ada63dcd2d1d65c833
Author: Frankie Jarrett <frankie@x-team.com>

    Version bump for testing

M	stream.php

commit 775e481844213be2e74cf247a9bc3fb504aebc66
Merge: 57ef26e f4684ea
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-379

commit 57ef26e530e4852365b96b3a13fb264fd7fdc447
Author: Frankie Jarrett <frankie@x-team.com>

    Tweak update prompt message

M	includes/install.php

commit 03630f873d34c301239442e7749d2aaa616cac51
Author: Frankie Jarrett <frankie@x-team.com>

    Change version compare operator back to lessthan only

M	includes/install.php

commit f72869de962c60aebf14079cabccdd8d7ac9fda3
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting

M	includes/admin.php

commit 712056a0fa82658737b2dd8621120123d8466145
Author: Frankie Jarrett <frankie@x-team.com>

    Updating deprecated functions

M	includes/db-updates.php

commit 73d40113aabb8832254bf0b82bb736f579f13608
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Reload WP_Stream_Connectors to run db update action if needed

M	includes/db-updates.php

commit 56b8f74c085189e35e6c0d3444b4f45d5b5ea85c
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Changed version compare to less than or equal to

M	includes/install.php

commit 7e7b298678adcda968e1ac4281af20c30973d0a2
Author: Luke Carbis <luke.carbis@x-team.com>

    Remove exclude Network Admin Settings

M	includes/admin.php
M	includes/feeds.php
M	includes/network.php
M	includes/query.php
M	ui/admin.js

commit 685ed1ae73d3eb647162a2f83c8484dc30699dfd
Author: Luke Carbis <luke.carbis@x-team.com>

    Comment for user role label fallback mechanism

M	includes/list-table.php

commit 76d5af3fc3b3c7f4e2a810e9a8799cf721f690c3
Author: Luke Carbis <luke.carbis@x-team.com>

    Remove update routine

M	includes/install.php

commit ceb715c8f1eaeb83d81f9101d5bf1aa7e68d00c1
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix deprecated function and more fallback

M	includes/list-table.php

commit ed643b36b8b4a12c11f924d96f8618c4c475c66e
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix wrong column name

M	includes/install.php

commit 923c022c531b84da4fa647d0c439883b2b9fe638
Merge: 5a9d80c 4ade702
Author: Luke Carbis <luke.carbis@x-team.com>

    Weird conflict.

commit 5a9d80c994d7a3f6d3a8b193c553326af0c1d2bb
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'issue-379' of https://github.com/x-team/wp-stream into issue-379

M	includes/db-updates.php
M	includes/install.php

commit bec915e1735966ad1e12aacbb354ee7c924380df
Author: Luke Carbis <luke.carbis@x-team.com>

    Empty default (just in case)

M	includes/install.php

commit 4ade7025725a5583ab1a89b802cedea0aa36d793
Author: Frankie Jarrett <frankie@x-team.com>

    Changing docblock descriptions that were misleading

M	includes/db-updates.php

commit 81e1632b9e84d37aa87028caf2da80b245164afa
Merge: f2c8456 f4684ea
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-389

commit f2c8456ca0c986323149c53eacc14e1a08177523
Author: Luke Carbis <luke.carbis@x-team.com>

    Additional role fallback and multisite fix

M	includes/list-table.php
M	includes/log.php

commit 57eac7c95ee9abb0f165fa630bb8aedb46c0dc86
Author: Luke Carbis <luke.carbis@x-team.com>

    Deleted user UI

M	includes/list-table.php
M	ui/admin.css

commit d5ea5def4fd066268e574cce5a63cd2e19574152
Author: Luke Carbis <luke.carbis@x-team.com>

    Store and use user_role_label meta

M	includes/list-table.php
M	includes/log.php

commit 0677f5304a84fc4f3cd18a8208ad701b0159df83
Author: Luke Carbis <luke.carbis@x-team.com>

    Oops - used a deprecated function.

M	includes/admin.php

commit cfa01ba5170dfee86b03079ea0be090477ef73c5
Author: Luke Carbis <luke.carbis@x-team.com>

    Better quotes for query.

M	includes/admin.php

commit b2bbe2c0c9a7b5b7d9849082afb71dfd60a8b69b
Author: Luke Carbis <luke.carbis@x-team.com>

    Network admin check for scheduled ttl purge

M	includes/admin.php

commit 7df518768b77938d817e0270380f5bc18b3c53ce
Author: Luke Carbis <luke.carbis@x-team.com>

    Rethinking settings for multisite

M	includes/admin.php
M	includes/network.php
M	includes/settings.php
M	ui/admin.js

commit c3756eae59e676c8d2704aad22babf2b6c06a49d
Author: Luke Carbis <luke.carbis@x-team.com>

    Tidy up

M	includes/settings.php

commit 7cc0bd0ecb9dab47b8f6ca4c258e0cb2c3808e7f
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix database reset

M	includes/admin.php
M	includes/db.php
M	includes/network.php

commit 3e9d64b62d2cf36c6e6554f49914c981cdd1fcf4
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix network feed not showing after #410 merge

M	includes/feeds.php

commit fbccdb50493d909d3a2d09f8b105263dc47b0f0d
Author: Luke Carbis <luke.carbis@x-team.com>

    Revert ttl fix (will open a separate issue)

M	includes/admin.php

commit f679d08440dcab5c5b79dfd4ff19b583dce4bbee
Author: Luke Carbis <luke.carbis@x-team.com>

    Better uninstall

M	includes/admin.php

commit d04e706e7529bfb492bbf5e0053d1e78de4a96f4
Author: Luke Carbis <luke.carbis@x-team.com>

    Better uninstall for multisite

M	includes/admin.php
M	includes/feeds.php

commit f88816db8d35ff8a5cfbec915693efa01159131a
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix ttl purge and enable for network

M	includes/admin.php
M	includes/network.php
M	stream.php

commit 68348379737b52c462acb5bd634e036c1dbce590
Merge: b2a30c3 f4684ea
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-65

commit f4684ea41a33c26300163bcec41ce44db0530464
Author: Frankie Jarrett <frankie@x-team.com>

    Disable Dashboard widget next/last pagination controls on last page

M	includes/dashboard.php

commit 8b402ecb05f396cecad5f74162fbc9ee5e2e0f34
Author: Frankie Jarrett <frankie@x-team.com>

    Format the current page number in Dashboard widget pagination controls

M	includes/dashboard.php

commit 038664ddfda30eafef966c8c71cbfe37b50700d5
Author: Frankie Jarrett <frankie@x-team.com>

    Fix pagination bug in Dashboard widget caused by total record count

M	includes/dashboard.php

commit 231b36e3f4cf72d58e66c7448c94cdbff79128d4
Author: Chris Olbekson <chris.olbekson@x-team.com>

    update method should only return false if error updating

M	includes/db-updates.php
M	includes/install.php

commit 07c121ca534c3ebac400e2c8ecb316d57e085751
Merge: 5fc4f8e 4c17114
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #408 from x-team/restrict-dashboard-js-enqueue

commit 5fc4f8e903dc63a9128504c0e7267fe88dd3e8d1
Merge: ecba3dd 904d70e
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #410 from x-team/issue-409

commit b2a30c379a89b4fb33fe81e79e21dd04232d8f99
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix live updates for all blogs in network admin

M	includes/live-update.php
M	includes/network.php

commit f22b84d2bd729db40e45419084cbf50faad4f218
Merge: d15672f 904d70e
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge remote-tracking branch 'origin/issue-409' into issue-65

commit d15672f1eef4c2a8cdf5548b3083322017007292
Author: Luke Carbis <luke.carbis@x-team.com>

    Replace deprecated filter

M	includes/network.php

commit d6955335e48c262b2c414b5b1d5ef2be824a9f39
Merge: 50366d0 ecba3dd
Author: Luke Carbis <luke.carbis@x-team.com>

    Merge branch 'develop' into issue-65

commit 50366d0e97ef7a76a70d421873a5983c81ee3e08
Author: Luke Carbis <luke.carbis@x-team.com>

    Workaround for phpcs check

M	includes/network.php

commit 2e8155a46e9d0f20234a4be8e91c00376d381d08
Author: Luke Carbis <luke.carbis@x-team.com>

    Moving the furniture around

M	includes/feeds.php

commit 8a65b20443f8b10d5c5a829d5e30d919d6e0015e
Author: Luke Carbis <luke.carbis@x-team.com>

    Patch vulnerability

M	includes/feeds.php

commit 8dc371a767f1edf4883eb48f954ffe72580a7390
Author: Luke Carbis <luke.carbis@x-team.com>

    Better name for "Network Admin in Feeds" setting

M	includes/feeds.php
M	includes/network.php

commit e29e7d85b4424fd43380e43677dadc66225ca864
Author: Luke Carbis <luke.carbis@x-team.com>

    Adds feed support on multisite

M	includes/feeds.php
M	includes/query.php

commit 904d70e32c7cf1bcfff829f3b58370ee9c516dd4
Author: johnregan3 <john.regan@x-team.com>

    Issue 409 Removing Unneeded Action Priorities

M	stream.php

commit 0e85746adfbe425982564141f171cd107229fcf4
Author: Luke Carbis <luke.carbis@x-team.com>

    Nicer way of editing the private feeds setting

M	includes/network.php

commit 221ad9e8b2fa2d57a09b7630aa55c8b09af03e4f
Author: johnregan3 <john.regan@x-team.com>

    Issue 409 Removing 'dashboard' prefix from methods

M	includes/dashboard.php
M	includes/live-update.php

commit 983971e29d29e52713bd4f313a9bde90e25b633b
Author: johnregan3 <john.regan@x-team.com>

    Issue 409 Separating Admin PHP Files

M	includes/admin.php
A	includes/dashboard.php
A	includes/live-update.php
M	stream.php

commit 7ef69cf2a4d6905c1e9fa595b50b00c4395f68a6
Author: Frankie Jarrett <frankie@x-team.com>

    Matching actual convention used by plugin_basename( WP_STREAM_DIR ) . '_db'

M	includes/install.php

commit a5e744e7c4994d83aeae17d180602f957774c7ab
Merge: 5470ec0 ecba3dd
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-379

commit ecba3dd571eeff828a3d9b103358de8ca9c25136
Merge: 787ea82 3c81726
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #344 from x-team/weston-review

commit 3c8172629aa9c2e64c9a9eba4200867411d1fa78
Merge: 5537a7e 787ea82
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into weston-review

commit 787ea82728f42bf7e76d0984f5f2ac1a5b6b51d7
Author: Frankie Jarrett <frankie@x-team.com>

    Version bump to 1.3.2, early for extension dependency

M	stream.php

commit ae86cc2397372d9aa2fdb053c5ed2784b2baff18
Merge: 3f83458 ae3b19b
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #269 from x-team/issue-267

commit ae3b19bcf2e6fe5302c83ff46d940d0095290397
Author: Frankie Jarrett <frankie@x-team.com>

    Use correct version number in docblocks

M	includes/deprecated.php

commit 1f3a0949e3383614644b40fed220152abfff16e5
Author: Shady Sharaf <shady@sharaf.me>

    Fix replaced function name

M	connectors/editor.php
M	connectors/settings.php
M	includes/install.php

commit 402916cea060acf85f6c8181509c6532f8c0fac8
Author: Shady Sharaf <shady@sharaf.me>

    Fix some more deprecated functions

M	includes/install.php

commit 639ea4b6941c2192d33fa3b928b1c2fab7b7d899
Author: Shady Sharaf <shady@sharaf.me>

    Further replace get_stream_meta in new commits

M	connectors/editor.php
M	connectors/settings.php
M	includes/install.php

commit c3c8497af669c5f7083bf8bac5091484c1749246
Merge: 625e8f2 d68202d
Author: Shady Sharaf <shady@sharaf.me>

    Merge branch 'issue-267' of github.com:x-team/wp-stream into issue-267

commit d68202d03c54762a94df9e51f96978158e82059f
Author: Luke Carbis <luke.carbis@x-team.com>

    Change structure of deprecated filter array

M	includes/deprecated.php

commit 768cc074e69e2bfdb6f3b305411cf140040cdf67
Author: Luke Carbis <luke.carbis@x-team.com>

    Fix broken deprecation

M	includes/deprecated.php

commit e734f037b8eeedf568dc7c4421790ee73a9da1a3
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Remove settings from New Site Settings screen

M	includes/network.php

commit 831abdb22ac7b1e1d6c22086be21c2f278527748
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Add a comma

M	includes/deprecated.php

commit be5ff80d17b5cf65a7e84ce637eb4f47a0544d41
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Deprecate stream_toggle_filters

M	includes/deprecated.php
M	includes/list-table.php

commit 288422296cedfa805d79825ee6599e832f436a18
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Updated version

M	includes/deprecated.php

commit 5f870e628e064c4fba0c88de55158b2fc27e6a4f
Merge: 172b879 3f83458
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Merge branch 'develop' into issue-267

commit 172b879ba04d92dc605b89d7436eec4b248c3532
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Switched arrangement of deprecated filters array.

M	includes/deprecated.php

commit 5537a7e2d87a8344ddc8e2793f46e1ad5959c3f5
Merge: 523f4d5 3f83458
Author: Weston Ruter <weston@x-team.com>

    Merge branch 'develop' into weston-review

commit 4c171145d92fdbe63fd025303fca2dfa0b6a0501
Author: Weston Ruter <weston@x-team.com>

    Restrict dashboard.js to only enqueue on Dashboard (index.php)

M	includes/admin.php

commit 625e8f2d7030b3286c1c1c21d704e496aa2c86ac
Merge: 4dc0ca9 3f83458
Author: Shady Sharaf <shady@sharaf.me>

    Merge remote-tracking branch 'origin/develop' into issue-267

commit 3f83458c70a33079f8875412672757e2443525ee
Merge: e48c42e 9897c74
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #403 from x-team/compact-search-filters-2

commit e48c42eea719c352f9d9640d764a267da89acdcf
Merge: e75a3cb 3c8a18e
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #407 from x-team/issue-406

commit e75a3cb64d10aac8fb60fa3e84fa634614239941
Merge: 5218d06 b444726
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #405 from x-team/issue-296

commit 5218d06ea410923d738331ea617a6cf83c1d5309
Merge: 489ad09 847324a
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #321 from x-team/issue-filter-input

commit 847324af3ec7ca75d673719daa3beee1aaf71278
Author: Frankie Jarrett <frankie@x-team.com>

    Missed a yoda format

M	includes/filters.php

commit 0b00b13da90f05bcec7e73f1e28fd6472ad0dd30
Author: Frankie Jarrett <frankie@x-team.com>

    Yoda format

M	includes/filters.php

commit 3c8a18ee780dc8402ca97e64c65dd0b1b023ff26
Author: Shady Sharaf <shady@sharaf.me>

    Fix error checking for menus the current_user_can't see.

M	connectors/settings.php

commit f4f3475e88f4da8885c7f7604ba205bc59163c7c
Author: Shady Sharaf <shady@sharaf.me>

    Fix WP_Stream_Query to skip meta query if no results were found

M	includes/query.php

commit f6f6a036d14c75191e268dc87b377d9fd335bbf4
Author: Shady Sharaf <shady@sharaf.me>

    Fix WP_Stream_Filter_Input to treat non-existing values properly with sanitizers

M	includes/filters.php

commit 646c4661d20d4ab6745e7eab34bdf99eecc6203f
Merge: 4a80757 489ad09
Author: Shady Sharaf <shady@sharaf.me>

    Merge remote-tracking branch 'origin/develop' into issue-filter-input

commit b44472632ef69a247c0a04d55dd7afefaf54f849
Author: Shady Sharaf <shady@sharaf.me>

    Refreshing Travis build

M	includes/admin.php

commit 489ad099bebcd3f79cbf313ae35f2a8f76310989
Merge: 23d59f0 2b1fceb
Author: Shady Sharaf <shady@sharaf.me>

    Merge pull request #404 from desaiuditd/issue-402

commit 041abff75d06b0a86214459893114832dd04a632
Author: Shady Sharaf <shady@sharaf.me>

    Fallback to user->caps to detect user roles if overridden by other plugins
    Fixes the compability issue with W3TC/NewRelic

M	includes/admin.php

commit 5470ec0fc7bf348f176b490db4966e124e037e70
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Change $wpdb query to find version from any previous directories

M	includes/install.php

commit 9897c74c97fa85bbce072c0d9b8d75b423df83be
Author: Frankie Jarrett <frankie@x-team.com>

    Hide datepickers if custom is closed

M	ui/admin.js

commit 824a1c14766eafd99ab5b1c2333a936746f9188c
Author: Frankie Jarrett <frankie@x-team.com>

    Hide datepicker fields unless custom is chosen

M	ui/admin.js

commit 2b1fceb651b7d8499122daf02be328f372449135
Author: Udit Desai <desaiuditd@gmail.com>

    Row Action Links in Stream List Table - Fixes #402

M	includes/list-table.php

commit 83e3c4324279124649a184227b275af8cfab4200
Author: Frankie Jarrett <frankie@x-team.com>

    Changes to dashboard widget when viewed in Network Admin

M	includes/admin.php

commit 82ea869ec915978bfbc1127f8a5cfd6db41570bc
Merge: 5dd02a9 23d59f0
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-65

commit 23d59f0fe53950498c5bb4e8b44f9a9774728157
Merge: 98b7cee 2cb14f0
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #399 from x-team/issue-386

commit 2cb14f017503061bdea0aec1823f53241d250318
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting

M	includes/admin.php

commit 5dd02a9dd00230c1df81b0600e39fe41aa8887e8
Author: Frankie Jarrett <frankie@x-team.com>

    Updating field description for network admin private feeds

M	includes/network.php

commit 86b0e34b9d43ad4e5a72034c060cdac9ec87a8d3
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Remove tabs when only one exists

M	includes/admin.php

commit ffd452950ae91c05c6ede6181e02d96e3b133733
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Change the Private Feeds desc in the Network Admin

M	includes/network.php

commit 2b3153490fcd82d3a995ac477f125f0da6e09c76
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting

M	includes/network.php

commit b9ab2fdf3a6b427af38688c73391d874e0a67160
Author: Frankie Jarrett <frankie@x-team.com>

    Don't show descriptions unless in the network admin

M	includes/network.php

commit 30682dde8fd636f5e523c84bab51095c5a0d1fd2
Author: Frankie Jarrett <frankie@x-team.com>

    Fix undefined key notice

M	includes/list-table.php

commit d089d8b3e6e3b3c14e48ba18a5a14e627f92429c
Author: Frankie Jarrett <frankie@x-team.com>

    Revert "Add 1 for network admin"

M	includes/admin.php

commit 30f76000fd3302b23d040e14b872e3b678e05d72
Merge: 5296812 78fe00a
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'issue-65' of github.com:x-team/wp-stream into issue-65

commit 52968128c0391bfd4a84948678e2b9b1668f6ea4
Author: Frankie Jarrett <frankie@x-team.com>

    Add 1 for network admin

M	includes/admin.php

commit 78fe00a213bc83762e6143fe76af85d0f44ed900
Author: Luke Carbis <luke.carbis@x-team.com.au>

    New settings layout in network admin.

M	connectors/settings.php
M	includes/admin.php
M	includes/network.php
M	includes/settings.php

commit 5a3e26f9fc5225d6c8cd4358be20674782bf592c
Author: Frankie Jarrett <frankie@x-team.com>

    Add blog count to records page title in network admin

M	includes/admin.php

commit 297f8775b323b11f4a39bf4e6b8e8fe9b14c0f6d
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Should have been in merge

M	includes/list-table.php

commit 88b36b3ba1cafcaacb1d448c6c2326dcc400ffc6
Merge: 1fbb93d 98b7cee
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Merge branch 'develop' into issue-65

commit 1f2b38fb289cc9c9973ea6099bf31a72ba76abe3
Author: Frankie Jarrett <frankie@x-team.com>

    Two spaces between PRIMARY KEY and value, as per dbdelta guidelines

M	includes/install.php

commit 39cfe07c84720d8d08e15f8d9dfef3b3f9c06ee9
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Fix many bugs in dashboard widget live updates

M	includes/admin.php
M	ui/admin.css
M	ui/admin.js
M	ui/dashboard.js

commit d852138edd11800733179c62767418a17db210e6
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Fix jslint errors

M	ui/admin.js

commit 96e0357dc853ae792469a9d40173f0796b94373a
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Add pagination refresh to live updates

M	includes/admin.php
M	ui/admin.js

commit 34fab25d694a71d344d230f1165c5a588dc4b5e4
Author: Luke Carbis <luke.carbis@x-team.com.au>

    Fix truncating short list when new items added

M	ui/admin.js

commit caa41acbe1226a337463545cdae365c85b345359
Author: Luke Carbis <luke@carbis.com.au>

    Store author email, display_name and login as meta

M	includes/list-table.php
M	includes/log.php

commit 1c1ce3d082ca19fcf3450239c0e722419fb17de5
Author: Luke Carbis <luke@carbis.com.au>

    Add author_role to stream table

M	includes/db-actions.php
M	includes/install.php
M	includes/log.php
M	includes/query.php

commit 854418eae93665d48cf7fee4fcf335396232f174
Author: Frankie Jarrett <frankie@x-team.com>

    Space police

M	stream.php

commit b6ee405e79934e596e35a9f9f4644c6b6791bedf
Merge: 9b36d03 74e50fb
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Merge remote-tracking branch 'origin/issue-379' into issue-379

commit 9b36d0394e7560fbb425ad160e68c9fceda10f3a
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Remove unused WP_STREAM_UPDATE_URL constant

M	stream.php

commit 74e50fb2fdd302a332df75fa2a4b78cc09dc7cc4
Author: Frankie Jarrett <frankie@x-team.com>

    Change order of update functions, code formatting

M	includes/admin.php
M	includes/db-updates.php
M	includes/install.php
M	includes/query.php
M	stream.php

commit 9d02f8cd28ab802886ec4a3bed90a77567f5436a
Merge: 8b57839 98b7cee
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-379

commit 98b7ceeeb8aafe87ca98455167b3a10a8437e7f6
Merge: 3f37f16 8a86405
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #398 from x-team/issue-397a

commit 8a86405c51b8490e40c9a0f459eb3de9cc1711b9
Author: Frankie Jarrett <frankie@x-team.com>

    Other code formatting

M	includes/admin.php

commit 4970e3d50288ef3fa8817d8bbaa1dc2414a51e6f
Merge: b987325 3f37f16
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-397a

commit 3f37f1680dd565ca6d406f8a4e7d92973adc229a
Merge: 53ef4f2 8b0dc3f
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #393 from x-team/issue-392

commit 53ef4f22b7341646338299ea96e61086f919b0db
Merge: f81560c 6eeb8e6
Author: Frankie Jarrett <fjarrett@gmail.com>

    Merge pull request #395 from x-team/issue-394

commit b987325e866d9e059e311c769444d10348b18064
Author: johnregan3 <john.regan@x-team.com>

    Issue 397 adding isset() checks

M	includes/admin.php

commit 1fbb93d6808a5d2fca1b62012f48162b60611f3c
Author: Luke Carbis <luke@carbis.com.au>

    Fix spacing errors

M	connectors/blogs.php
M	includes/install.php

commit cb6f50d924d8da96e67aa4c0165573ff07e75517
Author: Luke Carbis <luke@carbis.com.au>

    Update routine version change

M	includes/install.php

commit dbd66b41078803e9412ed7ebabb1187a64c27529
Author: Luke Carbis <luke@carbis.com.au>

    Upgrade routine for merging multisite tables

M	connectors/settings.php
M	includes/install.php

commit 0eed70c5ac4e2b58dab026db167fa4f1379d886b
Author: Luke Carbis <luke@carbis.com.au>

    Fix non-multisite error when using wp_get_sites()

M	connectors/blogs.php

commit 8de845fe2bd0757d0800161377f396e4f422ad43
Author: Luke Carbis <luke@carbis.com.au>

    Add blogs connector

A	connectors/blogs.php
D	tmp/blogs.php

commit 8b57839a3709cd49f4ea7a73ea6c4fe81d042b4a
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Don't rely on plugin_basename for db version option_name

M	includes/admin.php

commit 0f63f205b0c6061b353e98a985f244713515efa5
Author: Luke Carbis <luke@carbis.com.au>

    Clean up admin, list-table

M	includes/admin.php
M	includes/list-table.php
M	includes/network.php

commit 6eeb8e6f0c30c0abd0fca10c92a37a9a008afeb8
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-394] Accept zero

M	ui/admin.js

commit 78432aaf37c01148e305f469394b06cd05ce3a1d
Author: Luke Carbis <luke@carbis.com.au>

    Clean up admin, install and db-actions

M	includes/admin.php
M	includes/db-actions.php
M	includes/install.php
M	includes/network.php

commit 8b0dc3f68f6ad2495f00418d7c4dc60677a164dd
Author: johnregan3 <john.regan@x-team.com>

    Fixing Enable Live Update Checkbox

M	includes/list-table.php
M	ui/admin.js

commit f81560c327bbffbc359f01a5b846a5fdc88fd65a
Author: Frankie Jarrett <frankie@x-team.com>

    Trivial change, use lowercase f

M	includes/list-table.php

commit a5524453320bb7b6998168b670c2517b12a4acca
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Don't rely on plugin_basename for db version option_name

M	includes/admin.php
M	includes/install.php

commit c44fe90643026a47344ff2e08d180dffa8551a0f
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Don't rely on plugin_basename for db version option_name

M	includes/install.php

commit 4dcb5525c4dfe587686c1c712b7e698de0e47002
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Security and nonce checks

M	includes/install.php

commit 4a807573639c30b65eb58ff9c408d068950ec43a
Author: Frankie Jarrett <frankie@x-team.com>

    Add FILTER_VALIDATE_IP flag

M	includes/feeds.php

commit b36395c5a65fff768da7d88118e5e5d59952e9a3
Merge: 4fd7ebf ba9117f
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-filter-input

commit 10d8ffb2724198ae09b9872d4cc849dd16d1a65f
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Class method to fire the appropriate update functions

M	includes/install.php

commit 5d4fceaef7809f58b755371e2114210581b3d4a2
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Class method to fire the appropriate update functions

A	includes/db-updates.php
M	includes/install.php

commit 2416dcc11c52da2964f3c952e44e84d28db8dcf9
Author: Luke Carbis <luke@carbis.com.au>

    Fix screen option column toggles

M	includes/admin.php
M	includes/list-table.php

commit 0a24ca7c40c5eaf6e21d0669228f72aa09b7f472
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Revert "Convert each database change to a static method using update_xxx as naming convention"

M	includes/install.php

commit e6230bd5f3abd8c27c93a7ae75e4ddf2a80f9dc6
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Revert "Added method to return array of plugin versions that require db update"
    Reverting the screwy conflict merges
    This reverts commit 1fceb01dfeecff349f57cee922254de0bacb4ce8.

M	stream.php

commit 6b6d69d969dd55db627ff4cd15bc839cf2797807
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Convert each database change to a static method using update_xxx as naming convention

M	includes/install.php

commit c084cbf206bccebb5f624cef2b598fabd04a34f1
Merge: 1fceb01 bb0fd0b
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Merge remote-tracking branch 'origin/issue-379' into issue-379

commit 1fceb01dfeecff349f57cee922254de0bacb4ce8
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Added method to return array of plugin versions that require db update

M	stream.php

commit 3f84124b4bf8ca737c33fb6e2f4473ce66636a7f
Author: Luke Carbis <luke@carbis.com.au>

    Add Network Settings to settings connector.

M	connectors/settings.php

commit bb0fd0b675fcc55a54d6304860f427ff26135b4f
Author: Frankie Jarrett <frankie@x-team.com>

    More code formatting

M	includes/admin.php

commit 5d22a734262e729318b34b4f7af087642648d6c6
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting fixes

M	includes/install.php

commit 24ea6ad763a86b66f2c1ac95f8000f9a3fb51e93
Author: Frankie Jarrett <frankie@x-team.com>

    Include text domain in localized string, remove extra space

M	includes/install.php

commit c0ae219e7fe0f7aa40d4b0e34e94d7af3b959689
Author: Frankie Jarrett <frankie@x-team.com>

    Space police

M	includes/install.php

commit 7c6808a54ccfd20b35a20a039a013b23d15f235b
Author: Frankie Jarrett <frankie@x-team.com>

    Improving output of admin alerts

M	includes/install.php

commit ec614227b72462d100b007f5f69b8d12edad5399
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Added documentation to the new install / update methods

M	includes/install.php

commit 8b5ea3d045c042da56674853407b8122afc4c70b
Author: Luke Carbis <luke@carbis.com.au>

    Fix live update and columns

M	includes/list-table.php

commit 65a328a9d60817b37366a7eca0671aa213fd840c
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Formating and white space

M	stream.php

commit 83c5c653232dbd6043597d73c97e9db1afd3686e
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Final bug fixes from testing - ready to send pr

M	includes/install.php

commit 56c1fd67dcd972c2ed0daf3ad449140d9668250e
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Fixed bug with query_string matching

M	includes/install.php

commit 1cd31293a16651229a8326135d69a4d572edd7af
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Moved WP_Stream::instal() to fire on init.  Needs Stream_Admin to be loaded now

M	stream.php

commit ab1160484bbe50f5b1ef24d59cc0737a0d5eb0b1
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Added register_update_hook that can be used by connectors

M	includes/admin.php

commit 5179cd98a1b2d542dfb86be12674acf140944b1a
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Refinement of update and redirect routines when database updates are performed

M	includes/install.php

commit ba9117fe724bc19c6cebf58485117a63255b3f0f
Author: Frankie Jarrett <frankie@x-team.com>

    Make styles for icons within select2 common for all Stream screens

M	ui/admin.css

commit 32a89c8c6af4c2326ee5398f39628b5e642688ec
Author: Frankie Jarrett <frankie@x-team.com>

    Code formatting

M	includes/install.php

commit beede2f4befbd9fc0b9000f7d8111064a7dad4a0
Merge: dbadcb6 bb5fd42
Author: Chris Olbekson <chris.olbekson@x-team.com>

    merge conflicst

commit 4728dfda4ac1a1307425529402eb9cb705688801
Author: Luke Carbis <luke@carbis.com.au>

    Add Reset Site Settings option

M	includes/admin.php
M	includes/network.php
M	ui/admin.js

commit dbadcb670a5b5367d4c286cf922b51f719676269
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	includes/install.php
M	includes/query.php
M	stream.php

commit 739f6b23aa36d63ab6f4b3f765d0913d97f472b2
Author: Luke Carbis <luke@carbis.com.au>

    Fix fatal error on settings page.

M	includes/admin.php

commit 59fe5c6ffcb063ecdbf1aa53d60016c9363e41a4
Author: Luke Carbis <luke@carbis.com.au>

    Fix Travis CI Errors

M	includes/admin.php
M	includes/list-table.php

commit 486a6cd4a6383cea5973aed73e9f2014b3733ed6
Merge: 6295045 bb5fd42
Author: Luke Carbis <luke@carbis.com.au>

    Merge remote-tracking branch 'origin/master' into issue-65

commit 6295045c78d54928efd840d04c88e5dea74dd432
Author: Luke Carbis <luke@carbis.com.au>

    Merge remote-tracking branch 'origin/master' into issue-65

A	connectors/editor.php
M	connectors/installer.php
M	connectors/widgets.php
M	includes/admin.php
M	includes/context-query.php
M	includes/install.php
M	includes/list-table.php
M	includes/network.php
M	includes/query.php
M	includes/settings.php
M	languages/stream-pl_PL.mo
M	languages/stream-pl_PL.po
M	readme.md
M	readme.txt
M	stream.php
M	ui/admin.css
M	ui/admin.js
M	ui/dashboard.js

commit b85794d7f1921920da66478a59f610c5b044ac81
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	includes/install.php

commit a95837064820bd312348789711b8df33a4e86961
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	includes/install.php

commit 681844d1ded1845c1b00f932304b0a6906cdd0c8
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	includes/install.php

commit 522fbf8afd062520af8925c6aa98143b582b8591
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	includes/install.php

commit 2ae72203b488cc4f504b41c3e98de529b2300ec5
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	includes/install.php

commit 89e8c4cc6f9f8206360b57b3b4576dfb9613471d
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue-379 Database update API

M	stream.php

commit abf00dd05fc5f1d6c6dae1e4b281a5134a08f798
Author: Luke Carbis <luke@carbis.com.au>

    Fix for unnecessary static db in last commit

M	stream.php

commit 8f493ad8a7d87ed162ddabdb3bf38b8d4db2cfbd
Author: Luke Carbis <luke@carbis.com.au>

    Capability check if tables do not exist

M	stream.php

commit 6790657cbd141b67c86d8702a60852f44d8dc098
Author: Luke Carbis <luke@carbis.com.au>

    Fix for NULL default for blog_id column

M	includes/install.php
M	includes/list-table.php

commit d2067b5d58c46a16de22d460672b2eb7b66ddbb9
Author: Luke Carbis <luke@carbis.com.au>

    Fix tabs on default settings page

M	ui/admin.js

commit 9d443b4d1e802247be452219fa80a2d777416df6
Author: Luke Carbis <luke@carbis.com.au>

    Fix reset database when network enabled

M	includes/admin.php
M	includes/network.php

commit d5c6e88fe211f62fdf93834182166c79e4f12c37
Author: Luke Carbis <luke@carbis.com.au>

    Remove get_network_sites() since it's not used

M	includes/network.php

commit ee44bf3e59d41a9bb0a3b140a06334ec436f3963
Author: Luke Carbis <luke@carbis.com.au>

    Streamlined saving network and default settings.

M	includes/admin.php
M	includes/network.php
M	includes/settings.php

commit b4cf0c123c8682568794fd8f4d1c36505150badc
Author: Luke Carbis <luke@carbis.com.au>

    Add get_option_key to settings.

M	includes/admin.php
M	includes/network.php
M	includes/settings.php

commit af81256aa839ca9b2339ae40ed003dfe86f1f915
Author: Luke Carbis <luke@carbis.com.au>

    Options working with defaults, but implementation could do with some refining.

M	includes/admin.php
M	includes/network.php
M	includes/settings.php

commit 1f7f39b79115b27b7c723c1799ab9c4bb4d64e18
Author: Luke Carbis <luke@carbis.com.au>

    Various fixes

M	includes/admin.php
M	includes/network.php
M	ui/admin.js

commit fc26be4645cd6d592bb6585b65e8346590897f65
Author: Luke Carbis <luke@carbis.com.au>

    Fix blog_id column in Stream Activity, and rename to Site

M	includes/install.php
M	includes/list-table.php

commit e1b18dd842e06651f8268d8ad52888bebc817d28
Author: Luke Carbis <luke@carbis.com.au>

    Separated Network and Site Settings

M	includes/admin.php
M	includes/network.php

commit c66ce9695b537ecd432b002a4c3512d23bf8e2f6
Author: Luke Carbis <luke@carbis.com.au>

    Remove the ability to change individual blog settings

M	includes/admin.php
M	includes/network.php

commit 4dc0ca9380fbf40e1502b35b838892f2be704cc1
Author: Luke Carbis <luke@carbis.com.au>

    Add a way to handle filter deprecation

M	includes/deprecated.php
M	includes/query.php

commit 76a20e5f96cc1d928f0eabf6646dad14a8df8a2d
Author: Luke Carbis <luke@carbis.com.au>

    Replace stream_test_ with wp_stream_test_

M	classes/connector.php
M	includes/date-interval.php
M	includes/deprecated.php
M	tests/testcase.php

commit c7f71a30c67ff318e8e6c2fa71d0fc17ba4d5b83
Merge: 1118db7 8818976
Author: Luke Carbis <luke@carbis.com.au>

    Merge remote-tracking branch 'origin/develop' into issue-267

commit 1118db7a2910c7a5a3a4926e0a1158532f13342a
Author: Luke Carbis <luke@carbis.com.au>

    Merge remote-tracking branch 'origin/develop' into issue-267

M	classes/connector.php
M	connectors/settings.php
M	connectors/taxonomies.php
M	connectors/widgets.php
M	includes/admin.php
A	includes/date-interval.php
M	includes/feeds.php
M	includes/filters.php
M	includes/list-table.php
M	includes/query.php
M	includes/settings.php
A	includes/vendor/Carbon.php
M	languages/stream-pl_PL.mo
M	languages/stream-pl_PL.po
M	phpcs.ruleset.xml
M	readme.md
M	readme.txt
M	stream.php
M	tests/tests/test-admin.php
M	ui/admin.css
M	ui/admin.js
M	ui/datepicker.css

commit 94a22e3b5df313839df928c94089abcf748394f0
Author: Luke Carbis <luke@carbis.com.au>

    Trimmed Whitespace

M	includes/db-actions.php
M	includes/install.php

commit cec5ac0a39302220168bf3c059c5ce953685a942
Author: Luke Carbis <luke@carbis.com.au>

    Database updates. Fixes storing / retrieving steam entries for blogs.

M	includes/db-actions.php
M	includes/install.php

commit b7604026d5ef055161283be31106d758449d539f
Author: Luke Carbis <luke@carbis.com.au>

    Fixed undefined notice $item->blog_id.

M	includes/list-table.php

commit d3844dc77fbadb23ec3963cc167ca10e02e3f6f5
Author: Luke Carbis <luke@carbis.com.au>

    Merge branch 'origin/develop' into issue-65

M	connectors/widgets.php
M	includes/admin.php
M	includes/date-interval.php
M	includes/feeds.php
M	includes/filters.php
M	includes/list-table.php
M	includes/query.php
M	includes/settings.php
M	languages/stream-pl_PL.mo
M	languages/stream-pl_PL.po
M	readme.md
M	readme.txt
M	stream.php
M	tests/tests/test-admin.php
M	ui/admin.css
M	ui/admin.js
M	ui/datepicker.css

commit d146920dd79caf33d559caa42072e036c5ef51a7
Author: Luke Carbis <luke@carbis.com.au>

    Fixed the network admin settings.

M	includes/network.php

commit a57ad697c92b31f80d7f428ff3b55c34b4285d5e
Author: Luke Carbis <luke@carbis.com.au>

    Fixed some undefined notices.

M	includes/admin.php
M	includes/db-actions.php

commit 523f4d5469d899bf6b1001faf011c85a70f4db0c
Author: Weston Ruter <weston@x-team.com>

    Only do PHP version check once; load up translations for PHP version error

M	stream.php

commit 72f8acf397a72c4a98e7a27157e223a224c62fbf
Author: Weston Ruter <weston@x-team.com>

    Add object-caching to connectors glob, action for clearing cache upon upgrade

M	includes/connectors.php
M	includes/install.php

commit 85d0a816086e8e0692e11d041dbc405b7a04e205
Author: Weston Ruter <weston@x-team.com>

    Rename filters.php to filter-input.php for consistency with WP_Stream_Filter_Input

A	includes/filter-input.php
D	includes/filters.php
M	stream.php

commit 6c33f946d54123902a014165727ef447f42ed076
Author: Weston Ruter <weston@x-team.com>

    Rename db-actions.php to db.php for consistency with WP_Stream_DB class name

D	includes/db-actions.php
A	includes/db.php
M	stream.php
M	tests/tests/test-stream.php

commit 00e5e54cd92b79d251e48a74f9887954b52baa7e
Author: Weston Ruter <weston@x-team.com>

    Move WP_Stream_Connector into includes; remove WP_STREAM_CLASS_DIR

D	classes/connector.php
A	includes/connector.php
M	includes/connectors.php
M	includes/install.php
M	stream.php
M	tests/tests/test-stream.php

commit ecf5646c0e72a9fe0423735d92bc6386519656aa
Author: Weston Ruter <weston@x-team.com>

    Fix license block

M	stream.php

commit 0c34ac8eaf99cdbfff8272965641bc7ee0258eba
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing sniffs in tmp Blogs connector

M	tmp/blogs.php

commit 47ce44fd0a070011df85c96932005523b0610a30
Merge: 0e896c1 e03ff07
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-65

commit 675a31bd0af428dabc3bbd7d852d6c14662c9dd2
Merge: 8ff32c3 fe7c98a
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'develop' into issue-267

commit 4fd7ebf1c4b5bb022a1228bd5557040cbbd6bd3a
Author: Shady Sharaf <shady@sharaf.me>

    Use wp_stream_filter_input in feeds.php

M	includes/feeds.php

commit 0e896c19dbc64dd4aed787ba01ff9992ce09eaa9
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-65] Log using blog's table prefix

M	includes/db-actions.php

commit 4e05ea6e916474896092763902f3f7d1b78b6248
Author: Krzysztof Powelski <kris@x-team.com>

    [issue] Translate Network Admin string

M	includes/list-table.php

commit ba206c5232fcda700c98393f627f8a1073ecc66e
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-65] Add msising parameter

M	includes/list-table.php

commit 67d6029958acf2f824003db2e54863c7fe2c81d8
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-65] Add missing parentheses

M	includes/list-table.php

commit d159b832e66e4014511be7ffe73a224c63e5ed22
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-65] Filter `network` arg value to 0

M	includes/list-table.php

commit 221e7c5285113722a971c36aa007f0452d4629a3
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-65] Use `network` option value instead of `0`

M	includes/list-table.php

commit 85992e1197373748fc126af912def7dcdd54ac62
Author: Krzysztof Powelski <kris@x-team.com>

    [issue-65] Use more descriptive var name

M	includes/list-table.php

commit 11cf7b6e3a61ac85539ca3a979ba22e0272cc7b7
Author: Krzysztof Powelski <kris@x-team.com>

    Display blogs titles in filter dropdown + fix warning

M	includes/list-table.php

commit 8ff32c3d7cebbb258bbf05f6e95ed25fdeab5531
Author: Frankie Jarrett <frankie@x-team.com>

    Use _deprecated_function from core

M	includes/deprecated.php

commit bdb4b16b611872becd7755893d46e9736f799397
Author: Frankie Jarrett <frankie@x-team.com>

    Deprecate query functions

M	connectors/installer.php
M	connectors/posts.php
M	connectors/settings.php
M	connectors/widgets.php
M	includes/admin.php
M	includes/deprecated.php
M	includes/feeds.php
M	includes/list-table.php
M	includes/query.php
M	stream.php
M	tests/tests/test-post-connector.php

commit c2599b5b3069278531a1f67fda5a812f14aeb49e
Author: Frankie Jarrett <frankie@x-team.com>

    Starting deprecated include and deprecated functions function

A	includes/deprecated.php

commit 16e5821bbd01c3fea9d4c83a2089dab51a95f9f2
Merge: bb5b391 3e96c01
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'master' into issue-65

commit bb5b391fb027abd7e0921f255f493c5b710c1a48
Author: Frankie Jarrett <frankie@x-team.com>

    Remove empty lines

M	includes/network.php

commit 23fcafe9943a7c79f0b0cf9f3f05549a34dea800
Author: Frankie Jarrett <frankie@x-team.com>

    Don't use multisite-only functions when not in multisite

M	includes/log.php

commit 8e5bdd182ac9bec9c40ecdb3f7c7e3b0727dda6d
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing phpcs syntax errors in settings

M	includes/settings.php

commit beb3489c54840cc8ea26eec77eb363388947a616
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing phpcs syntax errors in list-table

M	includes/list-table.php

commit aa6cd3322349874e4223975ee1adcf57ea421af3
Author: Frankie Jarrett <frankie@x-team.com>

    Spacing fixes

M	includes/db-actions.php

commit b3b7919c9ee2f97da64c87638210f90bc5b63ec9
Author: Frankie Jarrett <frankie@x-team.com>

    Fixing phpcs syntax errors

M	includes/network.php

commit febce32f6b8191acd696e4c1d310403fe04f6186
Merge: 5431df1 ffa684e
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'master' into issue-65

commit 5431df19ad44b496ded2452ca1509de2cb13efe7
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Network Stream

M	includes/admin.php
M	includes/network.php
M	includes/settings.php

commit b951ff971b732a616487d5f6031aebce2613e845
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Network Wide Stream

M	includes/admin.php
A	includes/network.php
M	includes/settings.php
M	stream.php

commit dfc3437c1aa5fdd54dec5182c62a844ed11e05c7
Author: Frankie Jarrett <frankie@x-team.com>

    Trivial code formatting

M	includes/list-table.php

commit fe004b53120e2656cdd8470269b931d73d0930fe
Author: Frankie Jarrett <frankie@x-team.com>

    Remove ID col from network admin list table view

M	includes/list-table.php

commit ce2b64c8de1977fa5760d967b1b647ee01eeb499
Author: Frankie Jarrett <frankie@x-team.com>

    Just use null for site_id when not in multisite

M	includes/query.php

commit babb077bee8afc15a426ec2550cff328df21f050
Author: Frankie Jarrett <frankie@x-team.com>

    Fix undefined function when multisite is not enabled

M	includes/query.php

commit d3923734e07c6c7da36c3287b9953dcb74ea339a
Merge: dc70230 e23b0d9
Author: Frankie Jarrett <frankie@x-team.com>

    Merge branch 'master' into issue-65

commit dc70230e3386134f0d4b78cf3a6aaa7cbcec6c67
Author: Chris Olbekson <chris.olbekson@x-team.com>

    added filter to blog_id used in log

M	includes/log.php

commit 752fdb120aea03541d178d896b9d9e8e94fc9e2f
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Log, query and display network wide options as blog_id 0

M	includes/list-table.php
M	includes/log.php

commit 343ad53d6a5ba3f5383906545a534e1e5f6b064b
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Move blogs.php to tmp directory during development

D	connectors/blogs.php
A	tmp/blogs.php

commit 8798f35574be69f48c441dbf87b351da4a662ead
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Blogs connector //comment out wp_get_sites to prevent fatal errors before adding connector items

M	connectors/blogs.php

commit cf6674c8888586f8a20791101cd14e5b212a12a1
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Add initial context for blogs connector

A	connectors/blogs.php

commit 9f65ca9bfa673bfbcbcbfdbffdba1c8773b84e56
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Add Stream Activity dashboard widget to network admin screen

M	includes/admin.php

commit e589ede09ae48562eb7456437a963d2557646ec1
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Network Admin Screen

M	includes/admin.php
M	includes/list-table.php
M	includes/query.php

commit 46526d8ef36edff2e2301b9bdfa671b8b8fac6cb
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Network Admin List Table

M	includes/admin.php
M	stream.php

commit cefde8e9bb1cdac9d7aad27761158475ee1882ca
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Network logging

M	includes/db-actions.php
M	includes/log.php
M	includes/query.php

commit fda53325dc4eb7d46f7ba673d606d7be9a24ff8f
Author: Chris Olbekson <chris.olbekson@x-team.com>

    Issue 65 Enable stream network

M	includes/db-actions.php
M	includes/install.php
M	includes/log.php
M	includes/query.php
M	stream.php


git-svn-id: https://plugins.svn.wordpress.org/stream/trunk@901460 b8457f37-d9ea-0310-8a92-e5e31aec5664