projects / scannr.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr

Conflicts:
.idea/workspace.xml
generateHourlys.php

file:a/.gitignore -> file:b/.gitignore
*.wav *.wav
*.pyc *.pyc
/nbproject/private/ /nbproject/private/
/output.txt /output.txt
   
  bin
  gen
  target
  .settings
  .classpath
  .project
  *.keystore
  *.swp
  *.orig
  *.log
  *.properties
  seed.txt
  map.txt
   
file:b/.idea/sqldialects.xml (new)
  <?xml version="1.0" encoding="UTF-8"?>
  <project version="4">
  <component name="SqlDialectMappings">
  <file url="file://$PROJECT_DIR$/db.sql" dialect="PostgreSQL" />
  </component>
  </project>
 
 
file:a/.idea/vcs.xml -> file:b/.idea/vcs.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/js/flotr2" vcs="Git" />  
<mapping directory="$PROJECT_DIR$/pynma" vcs="Git" /> <mapping directory="$PROJECT_DIR$/pynma" vcs="Git" />
</component> </component>
</project> </project>
   
   
file:a/.idea/workspace.xml (deleted)
<?xml version="1.0" encoding="UTF-8"?>  
<project version="4">  
<component name="ChangeListManager">  
<list default="true" id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment="">  
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />  
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" />  
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/404.html" afterPath="$PROJECT_DIR$/404.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Chart.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Chart.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Color.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Color.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Flotr.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Flotr.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Graph.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Graph.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/base64.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/base64.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/basic.json" afterPath="$PROJECT_DIR$/js/flotr2/make/basic.json" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/build.json" afterPath="$PROJECT_DIR$/js/flotr2/make/build.json" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/calllog.php" afterPath="$PROJECT_DIR$/calllog.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/calls.json.php" afterPath="$PROJECT_DIR$/calls.json.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/common.inc.php" afterPath="$PROJECT_DIR$/common.inc.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/examples.js" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/examples.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/examples.json" afterPath="$PROJECT_DIR$/js/flotr2/make/examples.json" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/extending-flotr.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/extending-flotr.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/flotr2.json" afterPath="$PROJECT_DIR$/js/flotr2/make/flotr2.json" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/flotr2.stable.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/flotr2.stable.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/lib/codemirror/lib/util/formatting.js" afterPath="$PROJECT_DIR$/js/flotr2/examples/lib/codemirror/lib/util/formatting.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/generateConvos.php" afterPath="$PROJECT_DIR$/generateConvos.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/getfile.php" afterPath="$PROJECT_DIR$/getfile.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/ie.json" afterPath="$PROJECT_DIR$/js/flotr2/make/ie.json" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/index.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/index.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/index.html" afterPath="$PROJECT_DIR$/js/flotr2/spec/index.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine-html.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine-html.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.css" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.css" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/vendor/jquery-1.8.0.min.js" afterPath="$PROJECT_DIR$/js/vendor/jquery-1.8.0.min.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-data.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-data.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-real-data.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-real-data.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json.txt" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json.txt" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/lib.json" afterPath="$PROJECT_DIR$/js/flotr2/make/lib.json" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/logarithmic-scale.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/logarithmic-scale.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/vendor/modernizr-2.6.1.min.js" afterPath="$PROJECT_DIR$/js/vendor/modernizr-2.6.1.min.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/mouse-zoom-preview.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/mouse-zoom-preview.html" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/nbproject/project.xml" afterPath="$PROJECT_DIR$/nbproject/project.xml" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/prototype.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/prototype.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/scannr.iml" afterPath="$PROJECT_DIR$/.idea/scannr.iml" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/scannr.py" afterPath="$PROJECT_DIR$/scannr.py" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/snd.py" afterPath="$PROJECT_DIR$/snd.py" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/style.css" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/style.css" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-background.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-background.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-boundaries.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-boundaries.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-mountain-nulls.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-mountain-nulls.js" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.py" afterPath="$PROJECT_DIR$/test.py" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test2.py" afterPath="$PROJECT_DIR$/test2.py" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunklog.php" afterPath="$PROJECT_DIR$/trunklog.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/viewcalls.php" afterPath="$PROJECT_DIR$/viewcalls.php" />  
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
</list>  
<ignored path="scannr.iws" />  
<ignored path=".idea/workspace.xml" />  
<file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154429152" ignored="false" />  
<file path="/calllog.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356153807482" ignored="false" />  
<file path="/scannr.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154551131" ignored="false" />  
<file path="/start_script.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155203132" ignored="false" />  
<file path="/a.java" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155211924" ignored="false" />  
<file path="/a.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155216083" ignored="false" />  
<option name="TRACKING_ENABLED" value="true" />  
<option name="SHOW_DIALOG" value="false" />  
<option name="HIGHLIGHT_CONFLICTS" value="true" />  
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />  
<option name="LAST_RESOLUTION" value="IGNORE" />  
</component>  
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />  
<component name="CreatePatchCommitExecutor">  
<option name="PATCH_PATH" value="" />  
</component>  
<component name="DaemonCodeAnalyzer">  
<disable_hints />  
</component>  
<component name="DebuggerManager">  
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />  
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">  
<breakpoint>  
<option name="NOTIFY_CAUGHT" value="true" />  
<option name="NOTIFY_UNCAUGHT" value="true" />  
<option name="ENABLED" value="false" />  
<option name="LOG_ENABLED" value="false" />  
<option name="LOG_EXPRESSION_ENABLED" value="false" />  
<option name="SUSPEND_POLICY" value="SuspendAll" />  
<option name="SUSPEND" value="true" />  
<option name="COUNT_FILTER_ENABLED" value="false" />  
<option name="COUNT_FILTER" value="0" />  
<option name="CONDITION_ENABLED" value="true" />  
<option name="CLASS_FILTERS_ENABLED" value="false" />  
<option name="INSTANCE_FILTERS_ENABLED" value="false" />  
<option name="CONDITION" value="" />  
<option name="LOG_MESSAGE" value="" />  
</breakpoint>  
<breakpoint>  
<option name="NOTIFY_CAUGHT" value="true" />  
<option name="NOTIFY_UNCAUGHT" value="true" />  
<option name="ENABLED" value="false" />  
<option name="LOG_ENABLED" value="false" />  
<option name="LOG_EXPRESSION_ENABLED" value="false" />  
<option name="SUSPEND_POLICY" value="SuspendAll" />  
<option name="SUSPEND" value="true" />  
<option name="COUNT_FILTER_ENABLED" value="false" />  
<option name="COUNT_FILTER" value="0" />  
<option name="CONDITION_ENABLED" value="true" />  
<option name="CLASS_FILTERS_ENABLED" value="false" />  
<option name="INSTANCE_FILTERS_ENABLED" value="false" />  
<option name="CONDITION" value="" />  
<option name="LOG_MESSAGE" value="" />  
</breakpoint>  
</breakpoint_any>  
<breakpoint_rules />  
<ui_properties />  
</component>  
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />  
<component name="FavoritesManager">  
<favorites_list name="scannr" />  
</component>  
<component name="FileEditorManager">  
<leaf>  
<file leaf-file-name="calllog.php" pinned="false" current="false" current-in-tab="false">  
<entry file="file://$PROJECT_DIR$/calllog.php">  
<provider selected="true" editor-type-id="text-editor">  
<state line="9" column="0" selection-start="189" selection-end="189" vertical-scroll-proportion="0.0">  
<folding />  
</state>  
</provider>  
</entry>  
</file>  
<file leaf-file-name="scannr.py" pinned="false" current="true" current-in-tab="true">  
<entry file="file://$PROJECT_DIR$/scannr.py">  
<provider selected="true" editor-type-id="text-editor">  
<state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="-0.31178707">  
<folding />  
</state>  
</provider>  
</entry>  
</file>  
</leaf>  
</component>  
<component name="FindManager">  
<FindUsagesManager>  
<setting name="OPEN_NEW_TAB" value="false" />  
</FindUsagesManager>  
</component>  
<component name="Git.Settings">  
<option name="SYNC_SETTING" value="DONT" />  
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />  
</component>  
<component name="GitLogSettings">  
<option name="myDateState">  
<MyDateState />  
</option>  
</component>  
<component name="IdeDocumentHistory">  
<option name="changedFiles">  
<list>  
<option value="$PROJECT_DIR$/common.inc.php" />  
<option value="$PROJECT_DIR$/calls.json.php" />  
<option value="$PROJECT_DIR$/viewcalls.php" />  
<option value="$PROJECT_DIR$/calllog.php" />  
<option value="$PROJECT_DIR$/scannr.py" />  
</list>  
</option>  
</component>  
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP" />  
<component name="ProjectFrameBounds">  
<option name="y" value="22" />  
<option name="width" value="1680" />  
<option name="height" value="937" />  
</component>  
<component name="ProjectLevelVcsManager" settingsEditedManually="true">  
<OptionsSetting value="true" id="Add" />  
<OptionsSetting value="true" id="Remove" />  
<OptionsSetting value="true" id="Checkout" />  
<OptionsSetting value="true" id="Update" />  
<OptionsSetting value="true" id="Status" />  
<OptionsSetting value="true" id="Edit" />  
<ConfirmationsSetting value="0" id="Add" />  
<ConfirmationsSetting value="0" id="Remove" />  
</component>  
<component name="ProjectReloadState">  
<option name="STATE" value="0" />  
</component>  
<component name="ProjectView">  
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">  
<flattenPackages />  
<showMembers />  
<showModules />  
<showLibraryContents ProjectPane="true" />  
<hideEmptyPackages />