aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json22
-rw-r--r--requirements.txt1
-rw-r--r--src/web/js/components/RightPanel.react.js5
3 files changed, 15 insertions, 13 deletions
diff --git a/package.json b/package.json
index da2f2ef3..26fd4113 100644
--- a/package.json
+++ b/package.json
@@ -17,22 +17,22 @@
},
"main": "src/web/js/app.js",
"dependencies": {
- "bootstrap": "^3.3.6",
- "classnames": "^2.1.3",
+ "bootstrap": "^3.3.7",
+ "classnames": "^2.2.5",
"flux": "^2.0.1",
- "jquery": "^2.2.3",
+ "jquery": "^3.1.0",
"keymirror": "~0.1.0",
"object-assign": "^4.0.1",
- "react": "^15.0.1",
- "react-bootstrap": "^0.28.5",
- "react-dom": "^15.0.1"
+ "react": "^15.3.1",
+ "react-bootstrap": "^0.30.3",
+ "react-dom": "^15.3.1"
},
"devDependencies": {
- "browserify": "^13.0.0",
- "envify": "^3.0.0",
- "reactify": "^0.15.2",
- "uglify-js": "~2.6.2",
- "watchify": "^3.7.0"
+ "browserify": "^13.1.0",
+ "envify": "^3.4.1",
+ "reactify": "^1.1.1",
+ "uglify-js": "~2.7.3",
+ "watchify": "^3.7.0"
},
"scripts": {
"start": "watchify -o src/web/static/js/bundle.min.js -v -d src/web/js/app.js",
diff --git a/requirements.txt b/requirements.txt
index 5c8a7a98..9ab8e4a8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@ feedparser==5.2.1
beautifulsoup4==4.4.1
lxml==3.6.0
opml==0.5
-psycopg2==2.6.1
SQLAlchemy==1.0.13
alembic==0.8.6
Flask==0.11
diff --git a/src/web/js/components/RightPanel.react.js b/src/web/js/components/RightPanel.react.js
index 6322144f..eeb2c149 100644
--- a/src/web/js/components/RightPanel.react.js
+++ b/src/web/js/components/RightPanel.react.js
@@ -245,7 +245,10 @@ var Feed = React.createClass({
rows.push(<dt key={'d-title'}>Filters</dt>);
for(var i in this.state.obj.filters) {
rows.push(<dd key={'d' + i}>
- When {this.state.obj.filters[i]['action on']} on "{this.state.obj.filters[i].pattern}" ({this.state.obj.filters[i].type}) => {this.state.obj.filters[i].action}
+ When {this.state.obj.filters[i]['action on']}
+ on "{this.state.obj.filters[i].pattern}"
+ ({this.state.obj.filters[i].type})
+ "=" {this.state.obj.filters[i].action}
</dd>);
}
return <dl className="dl-horizontal">{rows}</dl>;
bgstack15