fixed jobs feed and added it to the main viewer

This commit is contained in:
Martin Donnelly 2016-04-27 16:33:32 +01:00
parent 45e1a4ca86
commit c95d691da6
2 changed files with 2051 additions and 12 deletions

View File

@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/css/custom-mui.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="rinser.iws" />
@ -133,6 +134,16 @@
</split-first>
<split-second>
<leaf>
<file leaf-file-name="news.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jobs-local.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jobs-local.js">
<provider selected="true" editor-type-id="text-editor">
@ -143,7 +154,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="app.v3.js" pinned="false" current-in-tab="true">
<file leaf-file-name="app.v3.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
@ -348,6 +359,116 @@
<recent name="C:\mddev\Rinser\html" />
</key>
</component>
<component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
<UpdatedFiles>
<FILE-GROUP>
<option name="myUpdateName" value="Updated from server" />
<option name="myStatusName" value="Changed on server" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CHANGED_ON_SERVER" />
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UPDATED" />
<PATH vcs="Git" revision="">$PROJECT_DIR$/news.js</PATH>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Skipped" />
<option name="myStatusName" value="Skipped" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SKIPPED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with conflicts" />
<option name="myStatusName" value="Will be merged with conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_CONFLICTS" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with tree conflicts" />
<option name="myStatusName" value="Merged with tree conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with property conflicts" />
<option name="myStatusName" value="Will be merged with property conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged" />
<option name="myStatusName" value="Will be merged" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Not in repository" />
<option name="myStatusName" value="Not in repository" />
<option name="mySupportsDeletion" value="true" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UNKNOWN" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally added" />
<option name="myStatusName" value="Locally added" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_ADDED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally removed" />
<option name="myStatusName" value="Locally removed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_REMOVED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Switched" />
<option name="myStatusName" value="Switched" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SWITCHED" />
</FILE-GROUP>
</UpdatedFiles>
</component>
<component name="RunManager" selected="Node.js.Lifestyle">
<configuration default="false" name="paleo.js" type="NodeJSConfigurationType" factoryName="Node.js" temporary="true" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="paleo.js" working-dir="$PROJECT_DIR$">
<method />
@ -474,7 +595,7 @@
<workItem from="1460978110601" duration="7244000" />
<workItem from="1461072492931" duration="636000" />
<workItem from="1461576712373" duration="1929000" />
<workItem from="1461770676482" duration="486000" />
<workItem from="1461770676482" duration="531000" />
</task>
<task id="LOCAL-00001" summary="debugging braider">
<created>1438335954140</created>
@ -798,11 +919,18 @@
<option name="project" value="LOCAL" />
<updated>1461771156305</updated>
</task>
<option name="localTasksCounter" value="47" />
<task id="LOCAL-00047" summary="fixed jobs feed and added it to the main viewer">
<created>1461771167601</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1461771167601</updated>
</task>
<option name="localTasksCounter" value="48" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="21740000" />
<option name="totallyTimeSpent" value="21785000" />
</component>
<component name="ToolWindowManager">
<frame x="4" y="23" width="1825" height="1177" extended-state="0" />
@ -1142,14 +1270,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lifestyle.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2413">
@ -1240,5 +1360,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

1911
html/css/custom-mui.css Normal file

File diff suppressed because it is too large Load Diff