grr
This commit is contained in:
parent
a04628abd0
commit
7f27fb4294
1
.gitignore
vendored
1
.gitignore
vendored
@ -78,3 +78,4 @@ build/Release
|
||||
node_modules
|
||||
/node_modules
|
||||
|
||||
.idea/workspace.xml
|
||||
|
@ -1,36 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="added newer icons and updated mui and jquery">
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/icons/favicon-128.png" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/icons/favicon-196x196.png" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/icons/code.txt" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-114x114.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-114x114.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-120x120.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-120x120.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-144x144.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-144x144.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-152x152.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-152x152.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-57x57.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-57x57.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-60x60.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-60x60.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-72x72.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-72x72.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/apple-touch-icon-76x76.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-76x76.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/favicon-16x16.png" afterPath="$PROJECT_DIR$/html/icons/favicon-16x16.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/favicon-32x32.png" afterPath="$PROJECT_DIR$/html/icons/favicon-32x32.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/favicon-96x96.png" afterPath="$PROJECT_DIR$/html/icons/favicon-96x96.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/favicon.ico" afterPath="$PROJECT_DIR$/html/icons/favicon.ico" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/mstile-144x144.png" afterPath="$PROJECT_DIR$/html/icons/mstile-144x144.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/mstile-150x150.png" afterPath="$PROJECT_DIR$/html/icons/mstile-150x150.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/mstile-310x150.png" afterPath="$PROJECT_DIR$/html/icons/mstile-310x150.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/mstile-310x310.png" afterPath="$PROJECT_DIR$/html/icons/mstile-310x310.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/icons/mstile-70x70.png" afterPath="$PROJECT_DIR$/html/icons/mstile-70x70.png" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" afterPath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/rinser.iml" afterPath="$PROJECT_DIR$/.idea/rinser.iml" />
|
||||
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/index.html" afterPath="$PROJECT_DIR$/html/index.html" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tech.js" afterPath="$PROJECT_DIR$/tech.js" />
|
||||
</list>
|
||||
<ignored path="rinser.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
<ignored path="node_modules/" />
|
||||
<ignored path="$PROJECT_DIR$/.idea/shelf/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="TRACKING_ENABLED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
@ -63,7 +42,7 @@
|
||||
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="19">
|
||||
<state relative-caret-position="57">
|
||||
<caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -113,7 +92,7 @@
|
||||
<file leaf-file-name="jquery.unveil.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/html/js/jquery.unveil.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="19">
|
||||
<state relative-caret-position="304">
|
||||
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
|
||||
<folding>
|
||||
<element signature="n#!!doc" expanded="true" />
|
||||
@ -125,7 +104,7 @@
|
||||
<file leaf-file-name="tech.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/tech.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2413">
|
||||
<state relative-caret-position="2432">
|
||||
<caret line="128" column="7" selection-start-line="128" selection-start-column="7" selection-end-line="128" selection-end-column="7" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -190,7 +169,7 @@
|
||||
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/gulpfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1047">
|
||||
<state relative-caret-position="1235">
|
||||
<caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -210,7 +189,7 @@
|
||||
<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="19">
|
||||
<state relative-caret-position="1235">
|
||||
<caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
@ -355,6 +334,7 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -390,7 +370,6 @@
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scratches" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
@ -548,6 +527,7 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1437394742450</updated>
|
||||
<workItem from="1460106859590" duration="1784000" />
|
||||
<workItem from="1460109270348" duration="68000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="debugging braider">
|
||||
<created>1438335954140</created>
|
||||
@ -833,7 +813,7 @@
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="1784000" />
|
||||
<option name="totallyTimeSpent" value="1852000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="4" y="23" width="1825" height="1177" extended-state="0" />
|
||||
@ -842,9 +822,9 @@
|
||||
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2804878" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="SonarLint" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="SonarLint" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33551913" sideWeight="0.34785393" order="7" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20607176" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20645161" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896176" sideWeight="0.4838976" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
@ -909,7 +889,8 @@
|
||||
<MESSAGE value="update hover colour" />
|
||||
<MESSAGE value="update anchor colour" />
|
||||
<MESSAGE value="appcache and something else" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="appcache and something else" />
|
||||
<MESSAGE value="added newer icons and updated mui and jquery" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="added newer icons and updated mui and jquery" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
@ -1088,7 +1069,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -1128,7 +1108,7 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="19">
|
||||
<state relative-caret-position="57">
|
||||
<caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -1169,7 +1149,7 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="19">
|
||||
<state relative-caret-position="1235">
|
||||
<caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
|
||||
<folding>
|
||||
<element signature="e#0#43#0" expanded="false" />
|
||||
@ -1187,7 +1167,7 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/html/js/jquery.unveil.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="19">
|
||||
<state relative-caret-position="304">
|
||||
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
|
||||
<folding>
|
||||
<element signature="n#!!doc" expanded="true" />
|
||||
@ -1212,7 +1192,7 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/gulpfile.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1047">
|
||||
<state relative-caret-position="1235">
|
||||
<caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -1236,7 +1216,7 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tech.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2413">
|
||||
<state relative-caret-position="2432">
|
||||
<caret line="128" column="7" selection-start-line="128" selection-start-column="7" selection-end-line="128" selection-end-column="7" />
|
||||
<folding />
|
||||
</state>
|
||||
|
2
tech.js
2
tech.js
@ -20,7 +20,7 @@ feeds.simple_test_feed = {
|
||||
"description": "Combined Tech Feed",
|
||||
'site_url': 'http://pipes.silvrtree.co.uk/tech.xml'
|
||||
},
|
||||
"plugins": ['filter_3_days', 'fix_images', 'fix_scripts', 'kill_unwanted_images'],
|
||||
"plugins": ['filter_3_days', 'fix_images', 'fix_scripts'],
|
||||
"sources": [{
|
||||
"count": 100,
|
||||
"feed_url": "http://feeds.feedburner.com/lenovoblogs/designmatters"
|
||||
|
Loading…
Reference in New Issue
Block a user