add sphera_php_events to gitignore
Add numChecked for dbjoin as multi-checkbox
Count only label fields not value fields.
Merge remote-tracking branch 'upstream/joomla3' into joomla3
Merge remote-tracking branch 'upstream/joomla3' into joomla3
Revert "add sphera_php_events to gitignore"

This reverts commit d23edf932404b9c50b17eb99cff5068285a3d2b6.
Merge remote-tracking branch 'upstream/joomla3' into joomla3
correct icon name in J25

in administrator/components/com_fabrik/images we don't have
"plus-sign.png" icon
add sphera_php_events to gitignore
fix function get() call itself
Change default error icon to a standard JUI icon
Change tab ids to match JS pages.

Change the bootstrap_tab tab anchors to match bootstrap page anchors.
Adding note about front end select on the join element's WHERE tooltip
added checkin button to any checked out item in admin
Fixed issue with onDeleteRows, if there was a pre-filter, we were
passing the wrong getData row list to the plugin, so things like the
upload element would delete all files from the list, not just the
selected ones.  Needed to clear the 'where' cache when adding plugin
query 'where'.
list tmpl loading check J tmpl override folder
Merge branch 'joomla3' of github.com:Fabrik/fabrik into joomla3
fixed: autocomplete was always setting hidden fields value to that of the visible field, regarless of its options.storeMatchedResultsOnly bool
Merge pull request #969 from Sophist-UK/numChecked-for-dbjoin-as-multi-checkbox

NumChecked JS method for dbjoin as multi-checkbox
Merge pull request #971 from mironim/fix-php-fatal-error-in-J2.5-list-pagination

Fix php fatal error in j2.5 list pagination