gitphp 0.2.9.1 :: scannr.git/commitdiff

Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr

Conflicts:
.idea/workspace.xml
generateHourlys.php

368 files changed: (show all)
.gitattributes (new)
.gitignore
.gitmodules
.htaccess (new)
.idea/.name (new)
.idea/compiler.xml (new)
.idea/copyright/profiles_settings.xml (new)
.idea/dictionaries/Madoka.xml (new)
.idea/encodings.xml (new)
.idea/misc.xml (new)
.idea/modules.xml (new)
.idea/scannr.iml (new)
.idea/scopes/scope_settings.xml (new)
.idea/sqldialects.xml (new)
.idea/uiDesigner.xml (new)
.idea/vcs.xml (new)
404.html (new)
CHANGELOG.md (new)
LICENSE.md (new)
README.txt (deleted)
apple-touch-icon-114x114-precomposed.png (new)
apple-touch-icon-144x144-precomposed.png (new)
apple-touch-icon-57x57-precomposed.png (new)
apple-touch-icon-72x72-precomposed.png (new)
apple-touch-icon-precomposed.png (new)
apple-touch-icon.png (new)
calllog.php (new)
calls.json.php
common.inc.php
crossdomain.xml (new)
css/daterangepicker.css (new)
css/main.css (new)
css/normalize.css (new)
datepicker.php (new)
db.sql (new)
favicon.ico (new)
ffmpeg.exe (new)
generateHourlys.php (new)
getfile.php (new)
humans.txt (new)
img/.gitignore (new)
inserttgid.txt (new)
js/daterangepicker.js (new)
js/flotr2 (deleted)
js/flotr2/.gitignore (new)
js/flotr2/LICENSE (new)
js/flotr2/Makefile (new)
js/flotr2/README.md (new)
js/flotr2/dev/notes.txt (new)
js/flotr2/examples/dev.html (new)
js/flotr2/examples/editor.css (new)
js/flotr2/examples/examples.css (new)
js/flotr2/examples/images/butterfly.jpg (new)
js/flotr2/examples/images/checkmark.png (new)
js/flotr2/examples/images/xmark.png (new)
js/flotr2/examples/index.html (new)
js/flotr2/examples/js/Editor.js (new)
js/flotr2/examples/js/Example.js (new)
js/flotr2/examples/js/ExampleList.js (new)
js/flotr2/examples/js/Examples.js (new)
js/flotr2/examples/js/Profile.js (new)
js/flotr2/examples/js/examples/advanced-markers.js (new)
js/flotr2/examples/js/examples/advanced-titles.js (new)
js/flotr2/examples/js/examples/basic-axis.js (new)
js/flotr2/examples/js/examples/basic-bars-stacked.js (new)
js/flotr2/examples/js/examples/basic-bars.js (new)
js/flotr2/examples/js/examples/basic-bubble.js (new)
js/flotr2/examples/js/examples/basic-candle.js (new)
js/flotr2/examples/js/examples/basic-legend.js (new)
js/flotr2/examples/js/examples/basic-pie.js (new)
js/flotr2/examples/js/examples/basic-radar.js (new)
js/flotr2/examples/js/examples/basic-stacked.js (new)
js/flotr2/examples/js/examples/basic-stepped.js (new)
js/flotr2/examples/js/examples/basic-time.js (new)
js/flotr2/examples/js/examples/basic-timeline.js (new)
js/flotr2/examples/js/examples/basic.js (new)
js/flotr2/examples/js/examples/click-example.js (new)
js/flotr2/examples/js/examples/color-gradients.js (new)
js/flotr2/examples/js/examples/download-data.js (new)
js/flotr2/examples/js/examples/download-image.js (new)
js/flotr2/examples/js/examples/mouse-drag.js (new)
js/flotr2/examples/js/examples/mouse-tracking.js (new)
js/flotr2/examples/js/examples/mouse-zoom.js (new)
js/flotr2/examples/js/examples/negative-values.js (new)
js/flotr2/examples/js/examples/profile-bars.js (new)
js/flotr2/examples/js/includes.dev.js (new)
js/flotr2/examples/js/includes.min.js (new)
js/flotr2/examples/lib/beautify.js (new)
js/flotr2/examples/lib/codemirror/LICENSE (new)
js/flotr2/examples/lib/codemirror/README.md (new)
js/flotr2/examples/lib/codemirror/demo/activeline.html (new)
js/flotr2/examples/lib/codemirror/demo/changemode.html (new)
js/flotr2/examples/lib/codemirror/demo/complete.html (new)
js/flotr2/examples/lib/codemirror/demo/emacs.html (new)
js/flotr2/examples/lib/codemirror/demo/folding.html (new)
js/flotr2/examples/lib/codemirror/demo/formatting.html (new)
js/flotr2/examples/lib/codemirror/demo/fullscreen.html (new)
js/flotr2/examples/lib/codemirror/demo/marker.html (new)
js/flotr2/examples/lib/codemirror/demo/mustache.html (new)
js/flotr2/examples/lib/codemirror/demo/preview.html (new)
js/flotr2/examples/lib/codemirror/demo/resize.html (new)
js/flotr2/examples/lib/codemirror/demo/runmode.html (new)
js/flotr2/examples/lib/codemirror/demo/search.html (new)
js/flotr2/examples/lib/codemirror/demo/theme.html (new)
js/flotr2/examples/lib/codemirror/demo/vim.html (new)
js/flotr2/examples/lib/codemirror/demo/visibletabs.html (new)
js/flotr2/examples/lib/codemirror/doc/baboon.png (new)
js/flotr2/examples/lib/codemirror/doc/baboon_vector.svg (new)
js/flotr2/examples/lib/codemirror/doc/compress.html (new)
js/flotr2/examples/lib/codemirror/doc/docs.css (new)
js/flotr2/examples/lib/codemirror/doc/internals.html (new)
js/flotr2/examples/lib/codemirror/doc/manual.html (new)
js/flotr2/examples/lib/codemirror/doc/oldrelease.html (new)
js/flotr2/examples/lib/codemirror/doc/reporting.html (new)
js/flotr2/examples/lib/codemirror/doc/upgrade_v2.2.html (new)
js/flotr2/examples/lib/codemirror/index.html (new)
js/flotr2/examples/lib/codemirror/keymap/emacs.js (new)
js/flotr2/examples/lib/codemirror/keymap/vim.js (new)
js/flotr2/examples/lib/codemirror/lib/codemirror.css (new)
js/flotr2/examples/lib/codemirror/lib/codemirror.js (new)
js/flotr2/examples/lib/codemirror/lib/util/dialog.css (new)
js/flotr2/examples/lib/codemirror/lib/util/dialog.js (new)
js/flotr2/examples/lib/codemirror/lib/util/foldcode.js (new)
js/flotr2/examples/lib/codemirror/lib/util/formatting.js (new)
js/flotr2/examples/lib/codemirror/lib/util/javascript-hint.js (new)
js/flotr2/examples/lib/codemirror/lib/util/overlay.js (new)
js/flotr2/examples/lib/codemirror/lib/util/runmode.js (new)
js/flotr2/examples/lib/codemirror/lib/util/search.js (new)
js/flotr2/examples/lib/codemirror/lib/util/searchcursor.js (new)
js/flotr2/examples/lib/codemirror/lib/util/simple-hint.css (new)
js/flotr2/examples/lib/codemirror/lib/util/simple-hint.js (new)
js/flotr2/examples/lib/codemirror/mode/clike/clike.js (new)
js/flotr2/examples/lib/codemirror/mode/clike/index.html (new)
js/flotr2/examples/lib/codemirror/mode/clojure/clojure.js (new)
js/flotr2/examples/lib/codemirror/mode/clojure/index.html (new)
js/flotr2/examples/lib/codemirror/mode/coffeescript/LICENSE (new)
js/flotr2/examples/lib/codemirror/mode/coffeescript/coffeescript.js (new)
js/flotr2/examples/lib/codemirror/mode/coffeescript/index.html (new)
js/flotr2/examples/lib/codemirror/mode/css/css.js (new)
js/flotr2/examples/lib/codemirror/mode/css/index.html (new)
js/flotr2/examples/lib/codemirror/mode/diff/diff.css (new)
js/flotr2/examples/lib/codemirror/mode/diff/diff.js (new)
js/flotr2/examples/lib/codemirror/mode/diff/index.html (new)
js/flotr2/examples/lib/codemirror/mode/gfm/gfm.js (new)
js/flotr2/examples/lib/codemirror/mode/gfm/index.html (new)
js/flotr2/examples/lib/codemirror/mode/groovy/groovy.js (new)
js/flotr2/examples/lib/codemirror/mode/groovy/index.html (new)
js/flotr2/examples/lib/codemirror/mode/haskell/haskell.js (new)
js/flotr2/examples/lib/codemirror/mode/haskell/index.html (new)
js/flotr2/examples/lib/codemirror/mode/htmlembedded/htmlembedded.js (new)
js/flotr2/examples/lib/codemirror/mode/htmlembedded/index.html (new)
js/flotr2/examples/lib/codemirror/mode/htmlmixed/htmlmixed.js (new)
js/flotr2/examples/lib/codemirror/mode/htmlmixed/index.html (new)
js/flotr2/examples/lib/codemirror/mode/javascript/index.html (new)
js/flotr2/examples/lib/codemirror/mode/javascript/javascript.js (new)
js/flotr2/examples/lib/codemirror/mode/jinja2/index.html (new)
js/flotr2/examples/lib/codemirror/mode/jinja2/jinja2.js (new)
js/flotr2/examples/lib/codemirror/mode/lua/index.html (new)
js/flotr2/examples/lib/codemirror/mode/lua/lua.js (new)
js/flotr2/examples/lib/codemirror/mode/markdown/index.html (new)
js/flotr2/examples/lib/codemirror/mode/markdown/markdown.js (new)
js/flotr2/examples/lib/codemirror/mode/ntriples/index.html (new)
js/flotr2/examples/lib/codemirror/mode/ntriples/ntriples.js (new)
js/flotr2/examples/lib/codemirror/mode/pascal/LICENSE (new)
js/flotr2/examples/lib/codemirror/mode/pascal/index.html (new)
js/flotr2/examples/lib/codemirror/mode/pascal/pascal.js (new)
js/flotr2/examples/lib/codemirror/mode/perl/LICENSE (new)
js/flotr2/examples/lib/codemirror/mode/perl/index.html (new)
js/flotr2/examples/lib/codemirror/mode/perl/perl.js (new)
js/flotr2/examples/lib/codemirror/mode/php/index.html (new)
js/flotr2/examples/lib/codemirror/mode/php/php.js (new)
js/flotr2/examples/lib/codemirror/mode/plsql/index.html (new)
js/flotr2/examples/lib/codemirror/mode/plsql/plsql.js (new)
js/flotr2/examples/lib/codemirror/mode/python/LICENSE.txt (new)
js/flotr2/examples/lib/codemirror/mode/python/index.html (new)
js/flotr2/examples/lib/codemirror/mode/python/python.js (new)
js/flotr2/examples/lib/codemirror/mode/r/LICENSE (new)
js/flotr2/examples/lib/codemirror/mode/r/index.html (new)
js/flotr2/examples/lib/codemirror/mode/r/r.js (new)
js/flotr2/examples/lib/codemirror/mode/rpm/changes/changes.js (new)
js/flotr2/examples/lib/codemirror/mode/rpm/changes/index.html (new)
js/flotr2/examples/lib/codemirror/mode/rpm/spec/index.html (new)
js/flotr2/examples/lib/codemirror/mode/rpm/spec/spec.css (new)
js/flotr2/examples/lib/codemirror/mode/rpm/spec/spec.js (new)
js/flotr2/examples/lib/codemirror/mode/rst/index.html (new)
js/flotr2/examples/lib/codemirror/mode/rst/rst.js (new)
js/flotr2/examples/lib/codemirror/mode/ruby/LICENSE (new)
js/flotr2/examples/lib/codemirror/mode/ruby/index.html (new)
js/flotr2/examples/lib/codemirror/mode/ruby/ruby.js (new)
js/flotr2/examples/lib/codemirror/mode/rust/index.html (new)
js/flotr2/examples/lib/codemirror/mode/rust/rust.js (new)
js/flotr2/examples/lib/codemirror/mode/scheme/index.html (new)
js/flotr2/examples/lib/codemirror/mode/scheme/scheme.js (new)
js/flotr2/examples/lib/codemirror/mode/smalltalk/index.html (new)
js/flotr2/examples/lib/codemirror/mode/smalltalk/smalltalk.js (new)
js/flotr2/examples/lib/codemirror/mode/sparql/index.html (new)
js/flotr2/examples/lib/codemirror/mode/sparql/sparql.js (new)
js/flotr2/examples/lib/codemirror/mode/stex/index.html (new)
js/flotr2/examples/lib/codemirror/mode/stex/stex.js (new)
js/flotr2/examples/lib/codemirror/mode/tiddlywiki/index.html (new)
js/flotr2/examples/lib/codemirror/mode/tiddlywiki/tiddlywiki.css (new)
js/flotr2/examples/lib/codemirror/mode/tiddlywiki/tiddlywiki.js (new)
js/flotr2/examples/lib/codemirror/mode/velocity/index.html (new)
js/flotr2/examples/lib/codemirror/mode/velocity/velocity.js (new)
js/flotr2/examples/lib/codemirror/mode/xml/index.html (new)
js/flotr2/examples/lib/codemirror/mode/xml/xml.js (new)
js/flotr2/examples/lib/codemirror/mode/xmlpure/index.html (new)
js/flotr2/examples/lib/codemirror/mode/xmlpure/xmlpure.js (new)
js/flotr2/examples/lib/codemirror/mode/yaml/index.html (new)
js/flotr2/examples/lib/codemirror/mode/yaml/yaml.js (new)
js/flotr2/examples/lib/codemirror/test/index.html (new)
js/flotr2/examples/lib/codemirror/test/test.js (new)
js/flotr2/examples/lib/codemirror/theme/cobalt.css (new)
js/flotr2/examples/lib/codemirror/theme/eclipse.css (new)
js/flotr2/examples/lib/codemirror/theme/elegant.css (new)
js/flotr2/examples/lib/codemirror/theme/monokai.css (new)
js/flotr2/examples/lib/codemirror/theme/neat.css (new)
js/flotr2/examples/lib/codemirror/theme/night.css (new)
js/flotr2/examples/lib/codemirror/theme/rubyblue.css (new)
js/flotr2/examples/lib/jquery-1.7.1.min.js (new)
js/flotr2/examples/lib/jquery.ba-hashchange.min.js (new)
js/flotr2/examples/lib/randomseed.js (new)
js/flotr2/examples/old_examples/ajax-financial-data.php (new)
js/flotr2/examples/old_examples/basic-watermark.html (new)
js/flotr2/examples/old_examples/blank.cur (new)
js/flotr2/examples/old_examples/examples.js (new)
js/flotr2/examples/old_examples/extending-flotr.html (new)
js/flotr2/examples/old_examples/includes.js (new)
js/flotr2/examples/old_examples/index.html (new)
js/flotr2/examples/old_examples/json-data.html (new)
js/flotr2/examples/old_examples/json-real-data.html (new)
js/flotr2/examples/old_examples/json.txt (new)
js/flotr2/examples/old_examples/logarithmic-scale.html (new)
js/flotr2/examples/old_examples/mouse-zoom-preview.html (new)
js/flotr2/examples/old_examples/style.css (new)
js/flotr2/examples/profile.html (new)
js/flotr2/flotr2.amd.js (new)
js/flotr2/flotr2.examples.min.js (new)
js/flotr2/flotr2.examples.types.js (new)
js/flotr2/flotr2.ie.min.js (new)
js/flotr2/flotr2.js (new)
js/flotr2/flotr2.min.js (new)
js/flotr2/js/Axis.js (new)
js/flotr2/js/Color.js (new)
js/flotr2/js/DOM.js (new)
js/flotr2/js/Date.js (new)
js/flotr2/js/DefaultOptions.js (new)
js/flotr2/js/EventAdapter.js (new)
js/flotr2/js/Flotr.js (new)
js/flotr2/js/Graph.js (new)
js/flotr2/js/Series.js (new)
js/flotr2/js/Text.js (new)
js/flotr2/js/amd/p