2.6.0 release

Bump postgresql from 42.3.3 to 42.4.1

.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - enhancement
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/build.yml

@@ -0,0 +1,20 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                java: ["8", "11", "17"]
+
+        steps:
+            - uses: actions/checkout@v3
+            - name: Set up Java
+              uses: actions/setup-java@v3
+              with:
+                  java-version: ${{ matrix.java }}
+                  distribution: "temurin"
+            - name: Build with Maven
+              run: mvn --batch-mode --update-snapshots verify

.gitignore

@@ -1,8 +1,12 @@
-# config gile
+# config file
 config.yml
 
 # build directory
 target
+target-ide
+
+# database files
+database
 
 # log files
 log
@@ -22,6 +26,7 @@ src/main/app/lib
 .classpath
 .settings
 .factorypath
+.checkstyle
 
 # IntelliJ Idea files
 .idea

.openshift/README.md

@@ -1,3 +0,0 @@
-For information about .openshift directory, consult the documentation:
-
-http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory

.openshift/action_hooks/README.md

@@ -1,3 +0,0 @@
-For information about action hooks, consult the documentation:
-
-http://openshift.github.io/documentation/oo_user_guide.html#action-hooks

.openshift/action_hooks/build

@@ -1,22 +0,0 @@
-#!/bin/bash
-cd $OPENSHIFT_REPO_DIR
-
-rm -rf $OPENSHIFT_REPO_DIR/node
-rm -rf $OPENSHIFT_REPO_DIR/node_modules
-rm -rf $OPENSHIFT_TMP_DIR/npm
-rm -rf $OPENSHIFT_TMP_DIR/npmrc
-rm -rf $OPENSHIFT_TMP_DIR/m2
-rm -rf $OPENSHIFT_TMP_DIR/local
-
-export NPM_CONFIG_PREFIX="$OPENSHIFT_TMP_DIR/npm"
-export NPM_CONFIG_USERCONFIG="$OPENSHIFT_TMP_DIR/npmrc"
-export NPM_CONFIG_CACHE="$OPENSHIFT_TMP_DIR/npm/cache" 
-export MAVEN_OPTS="-Dmaven.repo.local=$OPENSHIFT_TMP_DIR/m2" 
-export HOME="$OPENSHIFT_TMP_DIR/local" 
-
-export NPM_CONFIG_ARCH="x64"
-
-npm install npm
-export PATH="$OPENSHIFT_REPO_DIR/node_modules/.bin:$PATH"
-
-mvn clean package -DskipTests -Dos.arch=x64

.openshift/action_hooks/deploy

@@ -1,9 +0,0 @@
-#!/bin/bash
-cd $OPENSHIFT_REPO_DIR
-sed -i 's/@OPENSHIFT_DIY_IP@/'"$OPENSHIFT_DIY_IP"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_DIY_PORT@/'"$OPENSHIFT_DIY_PORT"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_APP_DNS@/'"$OPENSHIFT_APP_DNS"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_APP_NAME@/'"$OPENSHIFT_APP_NAME"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_MYSQL_DB_HOST@/'"$OPENSHIFT_MYSQL_DB_HOST"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_MYSQL_DB_USERNAME@/'"$OPENSHIFT_MYSQL_DB_USERNAME"'/g' .openshift/config.mysql.yml
-sed -i 's/@OPENSHIFT_MYSQL_DB_PASSWORD@/'"$OPENSHIFT_MYSQL_DB_PASSWORD"'/g' .openshift/config.mysql.yml

.openshift/action_hooks/start

@@ -1,3 +0,0 @@
-#!/bin/bash
-cd $OPENSHIFT_REPO_DIR
-nohup java -jar target/commafeed.jar server .openshift/config.mysql.yml > ${OPENSHIFT_DIY_LOG_DIR}/commafeed.log 2>&1 &

.openshift/action_hooks/stop

@@ -1,8 +0,0 @@
-#!/bin/bash
-source $OPENSHIFT_CARTRIDGE_SDK_BASH
-if [ -z "$(ps -ef | grep commafeed.jar | grep -v grep)" ]
-then
-    client_result "Application is already stopped"
-else
-    kill `ps -ef | grep commafeed.jar | grep -v grep | awk '{ print $2 }'` > /dev/null 2>&1
-fi

.openshift/cron/weekly/README

@@ -1,16 +0,0 @@
-Run scripts or jobs on a weekly basis
-=====================================
-Any scripts or jobs added to this directory will be run on a scheduled basis
-(weekly) using run-parts.
-
-run-parts ignores any files that are hidden or dotfiles (.*) or backup
-files (*~ or *,)  or named *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} and handles
-the files named jobs.deny and jobs.allow specially.
-
-In this specific example, the chronograph script is the only script or job file
-executed on a weekly basis (due to white-listing it in jobs.allow). And the
-README and chrono.dat file are ignored either as a result of being black-listed
-in jobs.deny or because they are NOT white-listed in the jobs.allow file.
-
-For more details, please see ../README.cron file.
-

.openshift/cron/weekly/chrono.dat

@@ -1 +0,0 @@
-Time And Relative D...n In Execution (Open)Shift!

.openshift/cron/weekly/chronograph

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "`date`: `cat $(dirname \"$0\")/chrono.dat`"

.openshift/cron/weekly/jobs.allow

@@ -1,12 +0,0 @@
-#
-#  Script or job files listed in here (one entry per line) will be
-#  executed on a weekly-basis.
-#
-#  Example: The chronograph script will be executed weekly but the README 
-#           and chrono.dat files in this directory will be ignored.
-#
-#           The README file is actually ignored due to the entry in the
-#           jobs.deny which is checked before jobs.allow (this file).
-#
-chronograph
-

.openshift/cron/weekly/jobs.deny

@@ -1,7 +0,0 @@
-#
-#  Any script or job files listed in here (one entry per line) will NOT be
-#  executed (read as ignored by run-parts).
-#
-
-README
-

.openshift/markers/README.md

@@ -1,3 +0,0 @@
-For information about markers, consult the documentation:
-
-http://openshift.github.io/documentation/oo_user_guide.html#markers

.openshift/settings.xml

@@ -1,3 +0,0 @@
-<settings>
-    <localRepository>$OPENSHIFT_DATA_DIR</localRepository>
-</settings>

.prettierrc

@@ -0,0 +1,7 @@
+{
+    "printWidth": 140,
+    "semi": false,
+    "tabWidth": 4,
+    "arrowParens": "avoid",
+    "endOfLine": "auto"
+}

.travis.yml

@@ -1,5 +0,0 @@
-language: java
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8

CHANGELOG

@@ -1,3 +1,44 @@
+v 2.6.0
+  - add support for media content as a backup for missing content (useful for youtube feeds)
+  - correctly follow http error code 308 redirects
+  - fixed a bug that prevented users from deleting their account
+  - fixed a bug that made commafeed store entry contents multiple times
+  - fixed a bug that prevented the app to be used as an installed app on mobile devices if the context path of commafeed was not "/"
+  - fixed a bug that prevented entries from being "marked as read older than xxx" for a feed that was just added
+  - removed support for google+ and readability as those services no longer exist
+  - removed support for deploying on openshift
+  - removed alphabetical sorting of entries because of really poor performance (title cannot be indexed)
+  - improve performance for instances with the heavy load setting enabled by preventing CommaFeed from fetching feeds from users that did not log in for a long time
+  - various dependencies upgrades (notably dropwizard from 1.3 to 2.1)
+  - add support for mariadb
+  - add support for java17+ runtime
+  - various security improvements
+v 2.5.0
+  - unread count is now displayed in a favicon badge when supported
+  - the user agent string for the bot fetching feeds is now configurable
+  - feed parsing performance improvements
+  - support for java9+ runtime
+  - can now properly start from an empty postgresql database
+v 2.4.0
+  - users were not able to change password or delete account
+  - fix api key generation
+  - feed entries can now be sorted alphabetically
+  - fix facebook sharing
+  - fix layout on iOS
+  - postgresql driver update (fix for postgres 9.6)
+  - various internationalization fixes
+  - security fixes
+v 2.3.0
+  - dropwizard upgrade 0.9.1
+  - feed enclosures are hidden if they already displayed in the content 
+  - fix youtube favicons
+  - various internationalization fixes
+v 2.2.0
+  - fix youtube and instagram favicon fetching
+  - mark as read filter was lost when a feed was rearranged with drag&drop
+  - feed entry categories are now displayed if available
+  - various performance and dependencies upgrades
+  - java8 is now required
 v 2.1.0
   - dropwizard upgrade to 0.8.0
   - you have to remove the "app.contextPath" setting from your yml file, you can optionally use server.applicationContextPath instead
@@ -31,4 +72,4 @@ v2.0.0
   - The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances.
     See the README on how to build CommaFeed from now on.
   - CommaFeed should no longer fetch the same feed multiple times in a row  
-  - Users can use their username or email to log in  
+  - Users can use their username or email to log in  

README.md

@@ -3,68 +3,68 @@
 Sources for [CommaFeed.com](http://www.commafeed.com/).
 
 Google Reader inspired self-hosted RSS reader, based on Dropwizard and AngularJS.
+CommaFeed is now considered feature-complete and is in maintenance mode.
 
 ## Related open-source projects
 
-
+Android apps: [News+ extension](https://github.com/Athou/commafeed-newsplus)
-Android apps: [News+ extension](https://github.com/Athou/commafeed-newsplus) - [Android app](https://github.com/doomrobo/CommaFeed-Android-Reader)
 
 Browser extensions: [Chrome](https://github.com/Athou/commafeed-chrome) - [Firefox](https://github.com/Athou/commafeed-firefox) - [Opera](https://github.com/Athou/commafeed-opera) - [Safari](https://github.com/Athou/commafeed-safari)
 
 ## Deployment on your own server
 
-### The short version
+### The very short version (download precompiled package)
+
+    mkdir commafeed && cd commafeed
+    wget https://github.com/Athou/commafeed/releases/download/2.6.0/commafeed.jar
+    wget https://raw.githubusercontent.com/Athou/commafeed/2.6.0/config.yml.example -O config.yml
+    vi config.yml
+    java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
+
+### The short version (build from sources)
 
     git clone https://github.com/Athou/commafeed.git
-	cd commafeed
+    cd commafeed
-    mvn clean package
+    ./mvnw clean package
-	cp config.yml.example config.yml
+    cp config.yml.example config.yml
-	vi config.yml
+    vi config.yml
-	java -jar target/commafeed.jar server config.yml 
+    java -Djava.net.preferIPv4Stack=true -jar target/commafeed.jar server config.yml
 
-### The long version
+### The long version (same as the short version, but more detailed)
 
 CommaFeed 2.0 has been rewritten to use Dropwizard and gulp instead of using tomee and wro4j. The latest version of the 1.x branch is available [here](https://github.com/Athou/commafeed/tree/1.x).
 
-For storage, you can either use an embedded H2 database (use it only to test CommaFeed) or an external MySQL, PostgreSQL or SQLServer database.
+For storage, you can either use an embedded file-based H2 database or an external MySQL, PostgreSQL or SQLServer database.
-You also need Maven 3.x (and a Java 1.7+ JDK) installed in order to build the application.
+You also need the Java 1.8+ JDK in order to build the application.
 
-To install maven and openjdk on Ubuntu, issue the following commands
+To install the required packages to build CommaFeed on Ubuntu, issue the following commands
 
-    sudo apt-get install g++ build-essential openjdk-7-jdk maven
+    # if openjdk-8-jdk is not available on your ubuntu version (14.04 LTS), add the following repo first
-    # Make sure java7 is the selected java version
+    sudo add-apt-repository ppa:openjdk-r/ppa
+    sudo apt-get update
+
+    sudo apt-get install g++ build-essential openjdk-8-jdk
+
+    # Make sure java8 is the selected java version
     sudo update-alternatives --config java
     sudo update-alternatives --config javac
-    
+
-    
-On Windows and other operating systems, just download maven 3.x from the [official site](http://maven.apache.org/), extract it somewhere and add the `bin` directory to your `PATH` environment variable.
-    
 Clone this repository. If you don't have git you can download the sources as a zip file from [here](https://github.com/Athou/commafeed/archive/master.zip)
 
     git clone https://github.com/Athou/commafeed.git
     cd commafeed
-    
+
 Now build the application
 
-    mvn clean package
+    ./mvnw clean package
-    
+
 Copy `config.yml.example` to `config.yml` then edit the file to your liking.
 Issue the following command to run the app, the server will listen by default on `http://localhost:8082`. The default user is `admin` and the default password is `admin`.
 
-	java -jar target/commafeed.jar server config.yml
+    java -Djava.net.preferIPv4Stack=true -jar target/commafeed.jar server config.yml
 
 You can use a proxy http server such as nginx or apache.
 
-## Deployment on OpenShift
-
- [OpenShift](https://openshift.redhat.com) is Red Hat's Platform-as-a-Service (PaaS) that allows developers to quickly develop, host, and scale applications in a cloud environment. CommaFeed runs perfectly on OpenShift and can even be used in the free tier. Follow the [Getting Started](https://developers.openshift.com/en/getting-started-overview.html) guide and after you sign up and install the Command Line Tools (RHC), do:
-
-	rhc create-app commafeed diy-0.1 mysql-5.5
-	cd commafeed
-	git remote add upstream -m master https://github.com/Athou/commafeed.git
-	git pull -s recursive -X theirs upstream master
-	git push
-
 ## Translate CommaFeed into your language
 
 Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/src/main/app/i18n).
@@ -75,12 +75,11 @@ The language has to be referenced in the `src/main/app/js/i18n.js` file to be pi
 
 ## Themes
 
-To create a theme, create a new file  `src/main/webapp/sass/themes/_<theme>.scss`. Your styles should be wrapped in a `#theme-<theme>` element and use the [SCSS format](http://sass-lang.com/) which is a superset of CSS.
+To create a theme, create a new file `src/main/app/sass/themes/_<theme>.scss`. Your styles should be wrapped in a `#theme-<theme>` element and use the [SCSS format](http://sass-lang.com/) which is a superset of CSS.
 
-Don't forget to reference your theme in `src/main/webapp/sass/app.scss` and in `src/main/webapp/js/controllers.js` (look for `$scope.themes`).
+Don't forget to reference your theme in `src/main/app/sass/app.scss` and in `src/main/app/js/controllers.js` (look for `$scope.themes`).
-
-See [_test.scss](https://github.com/Athou/commafeed/blob/master/src/main/webapp/sass/themes/_test.scss) for an example.
 
+See [\_test.scss](https://github.com/Athou/commafeed/blob/master/src/main/app/sass/themes/_test.scss) for an example.
 
 ## Local development
 
@@ -89,13 +88,13 @@ Steps to configuring a development environment for CommaFeed may include, but ma
 1. `git clone https://github.com/Athou/CommaFeed` into some folder to get the project files.
 2. Install Eclipse Luna (or latest) from http://www.eclipse.org/downloads/packages/eclipse-ide-java-developers/lunasr1 or your repo if available.
 3. In Eclipse, Window → Preferences → Maven → Annotation Processing. Check "Automatically configure JDT APT"
-    * You may have to install the m2e-apt connector to have "Annotation Processing" as an option. Do so from Window → Preferences → Maven → Discovery → Open Catalog → type "m2e-apt" in the search box
+    - You may have to install the m2e-apt connector to have "Annotation Processing" as an option. Do so from Window → Preferences → Maven → Discovery → Open Catalog → type "m2e-apt" in the search box
-        * If you have installed Eclipse EE instead of Luna, you may have trouble installing m2e-apt
+        - If you have installed Eclipse EE instead of Luna, you may have trouble installing m2e-apt
 4. Install Lombok into Eclipse from http://projectlombok.org/download.html
-    * You may have to run `java -jar lombok.jar` as an administrator if your eclipse installation is not in your home folder 
+    - You may have to run `java -jar lombok.jar` as an administrator if your eclipse installation is not in your home folder
 5. In Eclipse, File → Import → Maven → Existing Maven Projects. Navigate to where you cloned the CommaFeed files into, and select that as the root directory. Click Finish.
-    * You may notice some errors along the lines of "Plugin execution not covered by lifecycle configuration". These are inconsequential.
+    - You may notice some errors along the lines of "Plugin execution not covered by lifecycle configuration". These are inconsequential.
-6. Find the file "CommaFeedApplication.java" under the navigation pane. 
+6. Find the file "CommaFeedApplication.java" under the navigation pane.
 7. Right click it to bring up the context menu → Debug as... → Debug Configurations
 8. Type `server config.dev.yml` under "Program arguments" in the "Arguments" tab for the Java Application setting "CommaFeedApplication"
 9. Apply and hit "Debug"
@@ -108,13 +107,13 @@ Steps to configuring a development environment for CommaFeed may include, but ma
 
 ## Copyright and license
 
-Copyright 2013-2014 CommaFeed.
+Copyright 2013-2016 CommaFeed.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this work except in compliance with the License.
 You may obtain a copy of the License in the LICENSE file, or at:
 
-   http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

SECURITY.md

@@ -0,0 +1,6 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you found a vulnerability that you deem too sensitive to disclose publicly in a Github issue, please send an email at jeremiepanzer at gmail dot com.
+Thanks !

bower.json

@@ -1,37 +1,37 @@
 {
-  "name": "commafeed",
+    "name": "commafeed",
-  "version": "2.0.0",
+    "version": "2.0.0",
-  "dependencies": {
+    "dependencies": {
-    "jquery": "2.1.1",
+        "jquery": "2.1.3",
-    "jquery-ui": "1.10.3",
+        "jquery-ui": "1.10.3",
-    "jquery-mousewheel": "3.1.12",
+        "jquery-mousewheel": "3.1.12",
-    "lodash": "2.4.1",
+        "lodash": "3.4.0",
-    "bootstrap": "3.3.1",
+        "bootstrap": "3.3.2",
-    "font-awesome": "3.2.1",
+        "font-awesome": "3.2.1",
-    "angular": "1.3.2",
+        "angular": "1.3.14",
-    "angular-resource": "1.3.2",
+        "angular-resource": "1.3.14",
-    "angular-route": "1.3.2",
+        "angular-route": "1.3.14",
-    "angular-sanitize": "1.3.2",
+        "angular-sanitize": "1.3.14",
-    "angular-touch": "1.3.2",
+        "angular-touch": "1.3.14",
-    "angular-animate": "1.3.2",
+        "angular-animate": "1.3.14",
-    "angular-ui-router": "0.2.12",
+        "angular-ui-router": "0.2.13",
-    "angular-ui-utils": "0.1.0",
+        "angular-ui-utils": "0.1.0",
-    "angular-ui-select2": "0.0.5",
+        "angular-ui-select2": "0.0.5",
-    "angular-bootstrap": "0.2.0",
+        "angular-bootstrap": "0.2.0",
-    "angular-loading-bar": "0.6.0",
+        "angular-loading-bar": "0.6.0",
-    "angular-translate": "2.4.2",
+        "angular-translate": "2.6.1",
-    "angular-translate-loader-static-files": "2.4.2",
+        "angular-translate-loader-static-files": "2.6.1",
-    "ngInfiniteScroll": "1.0.0",
+        "ngInfiniteScroll": "1.0.0",
-    "ng-grid": "2.0.6",
+        "ng-grid": "2.0.6",
-    "mousetrap": "1.4.6",
+        "mousetrap": "1.4.6",
-    "momentjs": "2.8.3",
+        "momentjs": "2.9.0",
-    "devicejs": "0.1.16",
+        "devicejs": "0.2.4",
-    "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
+        "zocial-less": "1.0.0",
-    "zocial": "samcollins/css-social-buttons#1f59ecacde475e563fb6771667597493ec4eecb6",
+        "swagger-ui": "2.1.0",
-	"swagger-ui": "2.0.24"
+        "tinycon": "0.6.5"
-  },
+    },
-  "resolutions": {
+    "resolutions": {
-    "angular": "1.3.2",
+        "angular": "1.3.14",
-    "angular-translate": "2.4.2"
+        "angular-translate": "2.6.1"
-  }
+    }
 }

config.dev.yml

@@ -13,6 +13,9 @@ app:
   # put your google analytics tracking code here
   googleAnalyticsTrackingCode:
   
+  # put your google server key (used for youtube favicon fetching)
+  googleAuthKey:
+  
   # number of http threads
   backgroundThreads: 3
   
@@ -25,6 +28,14 @@ app:
   smtpTls: false
   smtpUserName: user
   smtpPassword: pass
+
+  # Graphite Metric settings
+  # Allows those who use Graphite to have CommaFeed send metrics for graphing (time in seconds)
+  graphiteEnabled: false
+  graphitePrefix: "test.commafeed"
+  graphiteHost: "localhost"
+  graphitePort: 2003
+  graphiteInterval: 60
   
   # wether this commafeed instance has a lot of feeds to refresh
   # leave this to false in almost all cases
@@ -56,6 +67,9 @@ app:
   # announcement string displayed on the main page
   announcement:
   
+  # user-agent string that will be used by the http client, leave empty for the default one
+  userAgent:
+  
 # Database connection
 # -------------------  
 # for MySQL
@@ -72,17 +86,12 @@ app:
 
 database:
   driverClass: org.h2.Driver
-  url: jdbc:h2:./target/example;mv_store=false
+  url: jdbc:h2:./target/example
   user: sa
   password: sa
   properties:
     charSet: UTF-8
-    maxWaitForConnection: 1s
+  validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-    validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-    minSize: 1
-    maxSize: 50
-    checkConnectionWhileIdle: true
-    maxConnectionAge: 30m
     
 server:
   applicationConnectors:

config.yml.example

@@ -4,7 +4,7 @@ app:
   # url used to access commafeed
   publicUrl: http://localhost:8082/
   
-  # wether to allow user registrations
+  # whether to allow user registrations
   allowRegistrations: false
   
   # create a demo account the first time the app starts
@@ -13,6 +13,9 @@ app:
   # put your google analytics tracking code here
   googleAnalyticsTrackingCode:
   
+  # put your google server key (used for youtube favicon fetching)
+  googleAuthKey:
+  
   # number of http threads
   backgroundThreads: 3
   
@@ -26,6 +29,14 @@ app:
   smtpUserName:
   smtpPassword:
   smtpFromAddress:
+
+  # Graphite Metric settings
+  # Allows those who use Graphite to have CommaFeed send metrics for graphing (time in seconds)
+  graphiteEnabled: false
+  graphitePrefix: "test.commafeed"
+  graphiteHost: "localhost"
+  graphitePort: 2003
+  graphiteInterval: 60
   
   # wether this commafeed instance has a lot of feeds to refresh
   # leave this to false in almost all cases
@@ -57,6 +68,9 @@ app:
   # announcement string displayed on the main page
   announcement:
   
+  # user-agent string that will be used by the http client, leave empty for the default one
+  userAgent:
+  
 # Database connection
 # -------------------  
 # for MySQL
@@ -73,17 +87,15 @@ app:
 
 database:
   driverClass: org.h2.Driver
-  url: jdbc:h2:/home/commafeed/db;mv_store=false
+  url: jdbc:h2:/home/commafeed/db
   user: sa
   password: sa
   properties:
     charSet: UTF-8
-    maxWaitForConnection: 1s
+  validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-    validationQuery: "/* CommaFeed Health Check */ SELECT 1"
+  minSize: 1
-    minSize: 1
+  maxSize: 50
-    maxSize: 50
+  maxConnectionAge: 30m
-    checkConnectionWhileIdle: true
-    maxConnectionAge: 30m
     
 server:
   applicationConnectors:
@@ -99,6 +111,7 @@ logging:
     com.commafeed: INFO
     liquibase: INFO
     io.dropwizard.server.ServerFactory: INFO
+    org.hibernate.orm.deprecation: "OFF"
   appenders:
     - type: console
     - type: file
@@ -119,4 +132,4 @@ redis:
   timeout: 2000
   database: 0
   maxTotal: 500
-   
+   

dev/EclipseCodeFormatter.xml

@@ -1,49 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
+<profiles version="18">
-<profile kind="CodeFormatterProfile" name="Eclipse [built-in] 140 chars" version="12">
+<profile kind="CodeFormatterProfile" name="CommaFeed" version="18">
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="48"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
@@ -52,10 +62,14 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
@@ -64,9 +78,12 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="140"/>
 <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
@@ -75,18 +92,28 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
@@ -94,80 +121,99 @@
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
@@ -183,8 +229,9 @@
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="48"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
@@ -194,8 +241,11 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
@@ -216,18 +266,21 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
@@ -235,48 +288,62 @@
 <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
@@ -284,9 +351,12 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>

dev/EclipseJavascriptCodeFormatter.xml

@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="Eclipse [built-in] 140 chars" version="11">
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_case" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_compact_if" value="52"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_object_initializer" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_between_type_declarations" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_default" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_objlit_initializer" value="1"/>
-<setting id="org.eclipse.wst.jsdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_objlit_initializer" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_after_package" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_comma_in_objlit_initializer" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_objlit_initializer" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_conditional_expression" value="48"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_after_imports" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="64"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_member_type" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_imports" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.lineSplit" value="140"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_method" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_superclass_in_type_declaration" value="64"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.keep_empty_objlit_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="64"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_object_initializer" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_new_chunk" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_objlit_initializer" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-</profile>
-</profiles>

dev/checkstyle.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+          "https://checkstyle.org/dtds/configuration_1_3.dtd">
+          
+<module name="Checker">
+	<property name="charset" value="UTF-8" />
+	<property name="fileExtensions" value="java" />
+
+	<module name="TreeWalker">
+		<property name="tabWidth" value="4" />
+
+		<!-- Checks for Naming Conventions. -->
+		<!-- See http://checkstyle.sf.net/config_naming.html -->
+		<module name="CatchParameterName">
+			<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$" />
+		</module>
+		<module name="ConstantName">
+			<property name="format" value="^log|[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$" />
+		</module>
+		<module name="ClassTypeParameterName" />
+		<module name="InterfaceTypeParameterName" />
+		<module name="LambdaParameterName" />
+		<module name="LocalFinalVariableName" />
+		<module name="LocalVariableName" />
+		<module name="MemberName" />
+		<module name="MethodName" />
+		<module name="MethodTypeParameterName" />
+		<module name="PackageName">
+			<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$" />
+		</module>
+		<module name="ParameterName" />
+		<module name="StaticVariableName" />
+		<module name="TypeName" />
+
+		<!-- Checks for imports -->
+		<!-- See http://checkstyle.sf.net/config_import.html -->
+		<module name="AvoidStarImport" />
+		<module name="AvoidStaticImport" />
+		<module name="IllegalImport" />
+		<module name="ImportOrder">
+			<property name="groups" value="/^java\./,javax,org,com" />
+			<property name="ordered" value="true" />
+			<property name="separated" value="true" />
+		</module>
+		<module name="RedundantImport" />
+		<module name="UnusedImports" />
+
+		<!-- Modifier Checks -->
+		<!-- See http://checkstyle.sf.net/config_modifier.html -->
+		<module name="ModifierOrder" />
+		<module name="RedundantModifier">
+			<property name="tokens" value="METHOD_DEF, VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF, RESOURCE" />
+		</module>
+
+		<!-- Checks for blocks. You know, those {}'s -->
+		<!-- See http://checkstyle.sf.net/config_blocks.html -->
+		<module name="EmptyCatchBlock">
+			<property name="exceptionVariableName" value="ignore|ignored" />
+			<message key="catch.block.empty"
+				value="Empty catch block. You can use the name 'ignore' or 'ignored' for the exception variable if you really want an empty catch block, but you should strongly consider at the very least logging something." />
+		</module>
+		<module name="LeftCurly" />
+		<module name="NeedBraces" />
+		<module name="RightCurly" />
+
+		<!-- Checks for common coding problems -->
+		<!-- See http://checkstyle.sf.net/config_coding.html -->
+		<module name="DeclarationOrder" />
+		<module name="DefaultComesLast" />
+		<module name="EmptyStatement" />
+		<module name="EqualsHashCode" />
+		<module name="ExplicitInitialization" />
+		<module name="FallThrough" />
+		<module name="IllegalInstantiation">
+			<property name="classes"
+				value="java.lang.Boolean, java.lang.Byte, java.lang.Character, java.lang.Double, java.lang.Float, java.lang.Integer, java.lang.Long, java.lang.Short" />
+		</module>
+		<module name="IllegalType" />
+		<module name="ModifiedControlVariable">
+			<property name="skipEnhancedForLoopVariable" value="true" />
+		</module>
+		<module name="MissingSwitchDefault" />
+		<module name="MultipleVariableDeclarations" />
+		<module name="NoFinalizer" />
+		<module name="OneStatementPerLine" />
+		<module name="OverloadMethodsDeclarationOrder" />
+		<module name="PackageDeclaration" />
+		<module name="SimplifyBooleanExpression" />
+		<module name="SimplifyBooleanReturn" />
+		<module name="StringLiteralEquality" />
+		<module name="UnnecessaryParentheses" />
+
+		<!-- Checks for class design -->
+		<!-- See http://checkstyle.sf.net/config_design.html -->
+		<module name="InnerTypeLast" />
+		<module name="OneTopLevelClass" />
+
+		<!-- Miscellaneous other checks. -->
+		<!-- See http://checkstyle.sf.net/config_misc.html -->
+		<module name="ArrayTypeStyle" />
+		<module name="OuterTypeFilename" />
+		<module name="UpperEll" />
+
+		<!-- Whitespace checks. -->
+		<!-- See http://checkstyle.sourceforge.net/config_whitespace.html -->
+		<module name="MethodParamPad" />
+		<module name="NoLineWrap" />
+		<module name="NoWhitespaceBefore" />
+		<module name="ParenPad" />
+		<module name="RegexpSinglelineJava">
+			<property name="format" value="^\t* +\t*\S" />
+			<property name="message" value="Line has leading space characters; indentation should be performed with tabs only." />
+			<property name="ignoreComments" value="true" />
+		</module>
+		<module name="WhitespaceAround" />
+
+	</module>
+</module>

docker-compose.dev.yml

@@ -0,0 +1,19 @@
+version: "3.1"
+
+services:
+  mysql:
+    image: mariadb
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=commafeed
+    ports:
+      - 3306:3306
+
+  postgresql:
+    image: postgres
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: root
+      POSTGRES_DB: commafeed
+    ports:
+      - 5432:5432

gulpfile.js

@@ -4,7 +4,6 @@ var revReplace = require('gulp-rev-replace');
 var minifyCSS = require('gulp-minify-css');
 var uglify = require('gulp-uglify');
 var filter = require('gulp-filter');
-var bower = require('gulp-bower');
 var connect = require('gulp-connect');
 var modRewrite = require('connect-modrewrite');
 var sass = require('gulp-sass');
@@ -15,10 +14,6 @@ var SRC_DIR = 'src/main/app/';
 var TEMP_DIR = 'target/gulp/'
 var BUILD_DIR = 'target/classes/assets/';
 
-gulp.task('bower', function() {
-	return bower();
-});
-
 gulp.task('images', function() {
 	return gulp.src(SRC_DIR + 'images/**/*').pipe(gulp.dest(BUILD_DIR + 'images'));
 });
@@ -27,34 +22,36 @@ gulp.task('i18n', function() {
 	return gulp.src(SRC_DIR + 'i18n/**/*.js').pipe(gulp.dest(BUILD_DIR + 'i18n'));
 });
 
-gulp.task('favicons', function() {
+gulp.task('resources', function() {
 	var favicons_png = SRC_DIR + '*.png';
 	var favicons_ico = SRC_DIR + '*.ico';
 	var favicons_svg = SRC_DIR + '*.svg';
-	return gulp.src([favicons_png, favicons_ico, favicons_svg]).pipe(gulp.dest(BUILD_DIR));
+	var manifest = SRC_DIR + 'manifest.json';
+	return gulp.src([favicons_png, favicons_ico, favicons_svg, manifest]).pipe(gulp.dest(BUILD_DIR));
 });
 
 gulp.task('sass', function() {
 	return gulp.src(SRC_DIR + 'sass/app.scss').pipe(sass()).pipe(gulp.dest(TEMP_DIR + 'css'));
 });
 
-gulp.task('fonts', ['bower'], function() {
+gulp.task('fonts', function() {
 	var font_awesome = SRC_DIR + 'lib/font-awesome/font/fontawesome-webfont.*';
-	var zocial = SRC_DIR + 'lib/zocial/css/zocial-regular-*';
+	var zocial = SRC_DIR + 'lib/zocial-less/css/zocial-regular-*';
 	var readabilicons = SRC_DIR + 'lib/readabilicons/webfont/fonts/readabilicons-*';
 	return gulp.src([font_awesome, zocial, readabilicons]).pipe(gulp.dest(BUILD_DIR + 'font'));
 });
 
-gulp.task('select2', ['bower'], function() {
+gulp.task('select2', function() {
 	var gif = SRC_DIR + 'lib/select2/*.gif';
 	var png = SRC_DIR + 'lib/select2/*.png';
 	return gulp.src([gif, png]).pipe(gulp.dest(BUILD_DIR + 'css'));
 });
 
-gulp.task('swagger-ui', ['bower'], function() {
+gulp.task('swagger-ui', function() {
 	var index_html = SRC_DIR + 'api/index.html';
+	var swagger_json = 'target/swagger/swagger.json';
 	var lib = SRC_DIR + 'lib/swagger-ui/dist/**/*';
-	return gulp.src([lib, index_html]).pipe(gulp.dest(BUILD_DIR + 'api'));
+	return gulp.src([lib, index_html, swagger_json]).pipe(gulp.dest(BUILD_DIR + 'api'));
 });
 
 gulp.task('template-cache', function() {
@@ -65,7 +62,7 @@ gulp.task('template-cache', function() {
 	return gulp.src(SRC_DIR + 'templates/**/*.html').pipe(templateCache(options)).pipe(gulp.dest(TEMP_DIR + 'js'));
 });
 
-gulp.task('build-dev', ['images', 'i18n', 'favicons', 'sass', 'fonts', 'select2', 'swagger-ui', 'template-cache', 'bower'], function() {
+gulp.task('build-dev', ['images', 'i18n', 'resources', 'sass', 'fonts', 'select2', 'swagger-ui', 'template-cache'], function() {
 	var assets = useref.assets({
 		searchPath : [SRC_DIR, TEMP_DIR]
 	});
@@ -75,7 +72,7 @@ gulp.task('build-dev', ['images', 'i18n', 'favicons', 'sass', 'fonts', 'select2'
 			revReplace()).pipe(gulp.dest(BUILD_DIR)).pipe(connect.reload());
 });
 
-gulp.task('build', ['images', 'i18n', 'favicons', 'sass', 'fonts', 'select2', 'swagger-ui', 'template-cache', 'bower'], function() {
+gulp.task('build', ['images', 'i18n', 'resources', 'sass', 'fonts', 'select2', 'swagger-ui', 'template-cache'], function() {
 	var assets = useref.assets({
 		searchPath : [SRC_DIR, TEMP_DIR]
 	});
@@ -101,8 +98,9 @@ gulp.task('serve', function() {
 	connect.server({
 		root : BUILD_DIR,
 		port : 8082,
-		livereload: true,
+		livereload : true,
 		middleware : function() {
+			var api = '^/api/(.*)$ http://localhost:8083/rest/$1 [P]';
 			var rest = '^/rest/(.*)$ http://localhost:8083/rest/$1 [P]';
 			var next = '^/next(.*)$ http://localhost:8083/next$1 [P]';
 			var logout = '^/logout$ http://localhost:8083/logout [P]';
@@ -114,4 +112,4 @@ gulp.task('serve', function() {
 });
 
 gulp.task('dev', ['build-dev', 'watch', 'serve']);
-gulp.task('default', ['build']);
+gulp.task('default', ['build']);

maven/maven-wrapper.properties

@@ -0,0 +1,3 @@
+#Maven download properties
+#Sat Jul 04 09:06:32 CEST 2015
+distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

mvnw

@@ -0,0 +1,234 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+           #
+           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+           # for the new JDKs provided by Oracle.
+           # 
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+           fi
+           
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+             
+           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
+             #
+             # Oracle JDKs
+             #
+             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi           
+
+           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=`/usr/libexec/java_home`
+           fi
+           ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  local basedir=$(pwd)
+  local wdir=$(pwd)
+  while [ "$wdir" != '/' ] ; do
+    wdir=$(cd "$wdir/.."; pwd)
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# Provide a "standardized" way to retrieve the CLI args that will 
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER="org.apache.maven.wrapper.MavenWrapperMain"
+
+exec "$JAVACMD" \
+     $MAVEN_OPTS \
+     "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  -classpath \
+"$MAVEN_PROJECTBASEDIR/maven/maven-wrapper.jar" \
+  ${WRAPPER_LAUNCHER} "$@"

mvnw.bat

@@ -0,0 +1,141 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:init
+
+set MAVEN_CMD_LINE_ARGS=%*
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\maven\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+%MAVEN_JAVA_EXE% -Dmaven.multiModuleProjectDirectory="" %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% 
+
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

package.json

@@ -4,17 +4,17 @@
   "main": "main.js",
   "private": true,
   "devDependencies": {
-    "gulp": "3.8.10",
+    "bower": "1.8.8",
-    "gulp-rev": "2.0.1",
+    "gulp": "3.8.11",
-    "gulp-rev-replace": "0.3.1",
+    "gulp-rev": "4.0.0",
-    "gulp-minify-css": "0.3.11",
+    "gulp-rev-replace": "0.4.1",
-    "gulp-uglify": "1.0.1",
+    "gulp-minify-css": "1.1.5",
-    "gulp-filter": "1.0.2",
+    "gulp-uglify": "1.2.0",
-    "gulp-bower": "0.0.7",
+    "gulp-filter": "2.0.2",
     "gulp-connect": "2.2.0",
-    "connect-modrewrite": "0.7.9",
+    "connect-modrewrite": "0.8.1",
-    "gulp-sass": "1.1.0",
+    "gulp-sass": "2.0.2",
-    "gulp-useref": "1.0.2",
+    "gulp-useref": "1.1.2",
-    "gulp-angular-templatecache": "1.4.2"
+    "gulp-angular-templatecache": "1.6.0"
   }
 }

pom.xml

@@ -4,28 +4,29 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>2.1.0</version>
+	<version>2.6.0</version>
-	<packaging>jar</packaging>
 	<name>CommaFeed</name>
 
-	<prerequisites>
-		<maven>3.0.0</maven>
-	</prerequisites>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.7</java.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
-		<dropwizard.version>0.8.0-rc1</dropwizard.version>
+		<maven.compiler.target>1.8</maven.compiler.target>
-		<guice.version>4.0-beta5</guice.version>
+		<guice.version>5.1.0</guice.version>
-		<querydsl.version>3.6.0</querydsl.version>
+		<querydsl.version>4.2.1</querydsl.version>
-		<rome.version>1.5.0</rome.version>
+		<rome.version>1.18.0</rome.version>
 	</properties>
 
-	<scm>
+	<dependencyManagement>
-		<connection>scm:git:https://github.com/Athou/commafeed.git</connection>
+		<dependencies>
-		<developerConnection>scm:git:https://github.com/Athou/commafeed.git</developerConnection>
+			<dependency>
-		<url>https://github.com/Athou/commafeed</url>
+				<groupId>io.dropwizard</groupId>
-	</scm>
+				<artifactId>dropwizard-dependencies</artifactId>
+				<version>2.1.1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<build>
 		<finalName>commafeed</finalName>
@@ -35,20 +36,35 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
+
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.10.1</version>
-				<configuration>
+			</plugin>
-					<source>${java.version}</source>
+			<plugin>
-					<target>${java.version}</target>
+				<groupId>org.apache.maven.plugins</groupId>
-				</configuration>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.22.2</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.1.11</version>
+				<version>2.1.13</version>
 				<executions>
 					<execution>
 						<goals>
@@ -65,7 +81,14 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.3</version>
+				<version>3.2.4</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.kordamp.shade</groupId>
+						<artifactId>maven-shade-ext-transformers</artifactId>
+						<version>1.4.0</version>
+					</dependency>
+				</dependencies>
 				<configuration>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<filters>
@@ -91,25 +114,66 @@
 								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<mainClass>com.commafeed.CommaFeedApplication</mainClass>
 								</transformer>
+								<transformer implementation="org.kordamp.shade.resources.PropertiesFileTransformer">
+									<paths>
+										<path>rome.properties</path>
+									</paths>
+									<mergeStrategy>append</mergeStrategy>
+								</transformer>
 							</transformers>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>com.github.kongchen</groupId>
+				<artifactId>swagger-maven-plugin</artifactId>
+				<version>3.1.7</version>
+				<?m2e ignore?>
+				<configuration>
+					<apiSources>
+						<apiSource>
+							<locations>
+								<location>com.commafeed.frontend.resource</location>
+								<location>com.commafeed.frontend.model</location>
+								<location>com.commafeed.frontend.model.request</location>
+							</locations>
+							<swaggerDirectory>target/swagger</swaggerDirectory>
+							<basePath>/rest</basePath>
+							<info>
+								<title>CommaFeed</title>
+								<version>${project.version}</version>
+							</info>
+							<typesToSkip>
+								<typeToSkip>com.commafeed.backend.model.User</typeToSkip>
+							</typesToSkip>
+						</apiSource>
+					</apiSources>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>0.0.19</version>
+				<version>1.6</version>
+				<?m2e ignore?>
 				<executions>
 					<execution>
 						<id>install node and npm</id>
 						<goals>
 							<goal>install-node-and-npm</goal>
 						</goals>
-						<phase>generate-resources</phase>
+						<phase>compile</phase>
 						<configuration>
-							<nodeVersion>v0.10.30</nodeVersion>
+							<nodeVersion>v6.11.4</nodeVersion>
-							<npmVersion>1.3.8</npmVersion>
+							<npmVersion>3.10.6</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -117,21 +181,34 @@
 						<goals>
 							<goal>npm</goal>
 						</goals>
-						<phase>generate-resources</phase>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>install</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>bower install</id>
+						<goals>
+							<goal>bower</goal>
+						</goals>
+						<phase>compile</phase>
+						<configuration>
+							<arguments>install</arguments>
+						</configuration>
 					</execution>
 					<execution>
 						<id>gulp build</id>
 						<goals>
 							<goal>gulp</goal>
 						</goals>
-						<phase>generate-resources</phase>
+						<phase>compile</phase>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.5</version>
+				<version>3.2.2</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -140,26 +217,87 @@
 					</archive>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<consoleOutput>true</consoleOutput>
+					<failsOnError>true</failsOnError>
+					<linkXRef>false</linkXRef>
+					<sourceDirectories>
+						<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+					</sourceDirectories>
+					<testSourceDirectories>
+						<testSourceDirectory>${project.build.testSourceDirectory}</testSourceDirectory>
+					</testSourceDirectories>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+					<configLocation>dev/checkstyle.xml</configLocation>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.diffplug.spotless</groupId>
+				<artifactId>spotless-maven-plugin</artifactId>
+				<version>1.27.0</version>
+				<?m2e ignore?>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<lineEndings>WINDOWS</lineEndings>
+					<java>
+						<eclipse>
+							<file>${project.basedir}/dev/EclipseCodeFormatter.xml</file>
+						</eclipse>
+					</java>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>only-eclipse</id>
+			<activation>
+				<property>
+					<name>m2e.version</name>
+				</property>
+			</activation>
+			<build>
+				<directory>target-ide</directory>
+			</build>
+		</profile>
+	</profiles>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.14.8</version>
+			<version>1.18.22</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.7</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.apache.commons</groupId>
+			<groupId>org.slf4j</groupId>
-			<artifactId>commons-jexl</artifactId>
+			<artifactId>jcl-over-slf4j</artifactId>
-			<version>2.1.1</version>
 		</dependency>
 
 		<dependency>
@@ -167,75 +305,78 @@
 			<artifactId>guice</artifactId>
 			<version>${guice.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.google.inject.extensions</groupId>
-			<artifactId>guice-multibindings</artifactId>
-			<version>${guice.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-core</artifactId>
-			<version>${dropwizard.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-hibernate</artifactId>
-			<version>${dropwizard.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-client</artifactId>
-			<version>${dropwizard.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-migrations</artifactId>
-			<version>${dropwizard.version}</version>
-		</dependency>
-		<!-- TODO remove when dropwizard 0.8.0 is released -->
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
-			<version>3.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-assets</artifactId>
-			<version>${dropwizard.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-forms</artifactId>
-			<version>${dropwizard.version}</version>
+		</dependency>
-			<type>pom</type>
+		<dependency>
+			<groupId>io.dropwizard.metrics</groupId>
+			<artifactId>metrics-graphite</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.dropwizard.metrics</groupId>
+			<artifactId>metrics-json</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.dropwizard.modules</groupId>
+			<artifactId>dropwizard-web</artifactId>
+			<version>1.5.0</version>
 		</dependency>
 
 		<dependency>
-			<groupId>com.wordnik</groupId>
+			<groupId>javax.xml.bind</groupId>
-			<artifactId>swagger-jaxrs_2.10</artifactId>
+			<artifactId>jaxb-api</artifactId>
-			<version>1.3.11</version>
+			<version>2.3.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-afterburner</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
 			<exclusions>
 				<exclusion>
-					<groupId>javax.ws.rs</groupId>
+					<artifactId>commons-logging</artifactId>
-					<artifactId>jsr311-api</artifactId>
+					<groupId>commons-logging</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>commons-lang</artifactId>
-					<groupId>commons-lang</groupId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 
 		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+			<version>1.5.22</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
 			<version>${querydsl.version}</version>
 			<scope>provided</scope>
 			<classifier>hibernate</classifier>
 		</dependency>
 		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
+			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
 			<version>${querydsl.version}</version>
 		</dependency>
@@ -243,33 +384,48 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
-			<version>4.0</version>
+			<version>4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-math3</artifactId>
-			<version>3.3</version>
+			<version>3.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-jexl</artifactId>
+			<version>2.1.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.passay</groupId>
+			<artifactId>passay</artifactId>
+			<version>1.6.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.6.1</version>
+			<version>2.7.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
 			<artifactId>javax.mail</artifactId>
-			<version>1.5.2</version>
+			<version>1.5.3</version>
 		</dependency>
 
 		<dependency>
@@ -277,41 +433,84 @@
 			<artifactId>rome</artifactId>
 			<version>${rome.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.rometools</groupId>
+			<artifactId>rome-modules</artifactId>
+			<version>${rome.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome-opml</artifactId>
 			<version>${rome.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.ahocorasick</groupId>
+			<artifactId>ahocorasick</artifactId>
+			<version>0.6.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.8.1</version>
+			<version>1.14.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
-			<version>54.1.1</version>
+			<version>70.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.cssparser</groupId>
 			<artifactId>cssparser</artifactId>
-			<version>0.9.14</version>
+			<version>0.9.29</version>
+		</dependency>
+		<dependency>
+			<groupId>edu.uci.ics</groupId>
+			<artifactId>crawler4j</artifactId>
+			<version>3.5</version>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-servlet</artifactId>
+			<version>2.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.github.hakky54</groupId>
+			<artifactId>sslcontext-kickstart</artifactId>
+			<version>7.2.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.apis</groupId>
+			<artifactId>google-api-services-youtube</artifactId>
+			<version>v3-rev139-1.20.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava-jdk5</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.182</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.34</version>
+			<version>8.0.28</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.3-1102-jdbc41</version>
+			<version>42.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>
@@ -320,16 +519,30 @@
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
+			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit</artifactId>
+			<artifactId>junit-jupiter-engine</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>1.10.8</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mock-server</groupId>
+			<artifactId>mockserver-junit-jupiter</artifactId>
+			<version>5.13.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.dropwizard</groupId>
+			<artifactId>dropwizard-testing</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>

src/main/app/api/index.html

@@ -1,88 +1,86 @@
 <!DOCTYPE html>
 <html>
-<head>
+    <head>
-  <title>Swagger UI</title>
+        <title>Swagger UI</title>
-  <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
+        <link href="css/typography.css" media="screen" rel="stylesheet" type="text/css" />
-  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+        <link href="css/reset.css" media="screen" rel="stylesheet" type="text/css" />
-  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+        <link href="css/screen.css" media="screen" rel="stylesheet" type="text/css" />
-  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+        <link href="css/reset.css" media="print" rel="stylesheet" type="text/css" />
-  <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
+        <link href="css/screen.css" media="print" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="lib/shred.bundle.js"></script>
+        <script type="text/javascript" src="lib/shred.bundle.js"></script>
-  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+        <script src="lib/jquery-1.8.0.min.js" type="text/javascript"></script>
-  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
+        <script src="lib/jquery.slideto.min.js" type="text/javascript"></script>
-  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
+        <script src="lib/jquery.wiggle.min.js" type="text/javascript"></script>
-  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+        <script src="lib/jquery.ba-bbq.min.js" type="text/javascript"></script>
-  <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
+        <script src="lib/handlebars-2.0.0.js" type="text/javascript"></script>
-  <script src='lib/underscore-min.js' type='text/javascript'></script>
+        <script src="lib/underscore-min.js" type="text/javascript"></script>
-  <script src='lib/backbone-min.js' type='text/javascript'></script>
+        <script src="lib/backbone-min.js" type="text/javascript"></script>
-  <script src='lib/swagger.js' type='text/javascript'></script>
+        <script src="lib/swagger-client.js" type="text/javascript"></script>
-  <script src='swagger-ui.js' type='text/javascript'></script>
+        <script src="swagger-ui.js" type="text/javascript"></script>
-  <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+        <script src="lib/highlight.7.3.pack.js" type="text/javascript"></script>
+        <script src="lib/marked.js" type="text/javascript"></script>
 
-  <!-- enabling this will enable oauth2 implicit scope support -->
+        <!-- enabling this will enable oauth2 implicit scope support -->
-  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
+        <script src="lib/swagger-oauth.js" type="text/javascript"></script>
-
+        <script type="text/javascript">
-  <script type="text/javascript">
+            $(function () {
-    $(function () {
+                window.swaggerUi = new SwaggerUi({
-      window.swaggerUi = new SwaggerUi({
+                    url: "./swagger.json",
-      url: "../rest/api-docs",
+                    dom_id: "swagger-ui-container",
-      dom_id: "swagger-ui-container",
+                    supportedSubmitMethods: ["get", "post", "put", "delete"],
-      supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
+                    onComplete: function (swaggerApi, swaggerUi) {
-      onComplete: function(swaggerApi, swaggerUi){
+                        if (typeof initOAuth == "function") {
-        log("Loaded SwaggerUI");
+                            /*
-
-        if(typeof initOAuth == "function") {
-          /*
           initOAuth({
             clientId: "your-client-id",
             realm: "your-realms",
             appName: "your-app-name"
           });
           */
-        }
+                        }
-        $('pre code').each(function(i, e) {
+                        $("pre code").each(function (i, e) {
-          hljs.highlightBlock(e)
+                            hljs.highlightBlock(e)
-        });
+                        })
-      },
+                    },
-      onFailure: function(data) {
+                    onFailure: function (data) {
-        log("Unable to Load SwaggerUI");
+                        log("Unable to Load SwaggerUI")
-      },
+                    },
-      docExpansion: "none",
+                    docExpansion: "none",
-      sorter : "alpha"
+                    sorter: "alpha",
-    });
+                })
 
-    $('#input_apiKey').change(function() {
+                $("#input_apiKey").change(function () {
-      var key = $('#input_apiKey')[0].value;
+                    var key = $("#input_apiKey")[0].value
-      log("key: " + key);
+                    log("key: " + key)
-      if(key && key.trim() != "") {
+                    if (key && key.trim() != "") {
-        log("added key " + key);
+                        log("added key " + key)
-        window.authorizations.add("key", new ApiKeyAuthorization("api_key", key, "query"));
+                        window.authorizations.add("key", new ApiKeyAuthorization("api_key", key, "query"))
-      }
+                    }
-    })
+                })
-    window.swaggerUi.load();
+                window.swaggerUi.load()
-  });
+            })
-  </script>
+        </script>
-</head>
+    </head>
 
-<body class="swagger-section">
+    <body class="swagger-section">
-<div id='header'>
+        <div id="header">
-  <div class="swagger-ui-wrap">
+            <div class="swagger-ui-wrap">
-    <a id="logo" href="http://swagger.wordnik.com">swagger</a>
+                <a id="logo" href="http://swagger.wordnik.com">swagger</a>
-    <form id='api_selector'>
+                <form id="api_selector">
-      <div class='input icon-btn'>
+                    <div class="input icon-btn">
-        <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis">
+                        <img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis" />
-      </div>
+                    </div>
-      <div class='input icon-btn'>
+                    <div class="input icon-btn">
-        <img id="show-wordnik-dev-icon" src="images/wordnik_api.png" title="Show Wordnik Developer Apis">
+                        <img id="show-wordnik-dev-icon" src="images/wordnik_api.png" title="Show Wordnik Developer Apis" />
-      </div>
+                    </div>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
+                    <div class="input"><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text" /></div>
-      <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
+                    <div class="input"><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text" /></div>
-      <div class='input'><a id="explore" href="#">Explore</a></div>
+                    <div class="input"><a id="explore" href="#">Explore</a></div>
-    </form>
+                </form>
-  </div>
+            </div>
-</div>
+        </div>
 
-<div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
+        <div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+        <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
+    </body>
 </html>

src/main/app/i18n/ar.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Change password",
     "confirm_password" : "Confirm password",
-    "minimum_6_chars" : "Minimum 6 characters",
+    "minimum_8_chars" : "Minimum 8 characters",
     "passwords_do_not_match" : "Passwords do not match",
     "api_key" : "API key",
     "api_key_not_generated" : "Not generated yet",
@@ -174,7 +174,8 @@
       "font_size" : "increase/decrease font size of the current entry ",
       "go_to_all" : "go to the All view ",
       "go_to_starred" : "go to the Starred view ",
-      "feed_search" : "navigate to a subscription by entering the subscription name"
+      "feed_search" : "navigate to a subscription by entering the subscription name",
+      "refresh": "refresh"
     }
   }
-}
+}

src/main/app/i18n/ca.js

@@ -111,7 +111,7 @@
     "email" : "Adreça electrònica",
     "change_password" : "Canvia la contrasenya ",
     "confirm_password" : "Confirma la contrasenya",
-    "minimum_6_chars" : "Mínim de 6 caracters",
+    "minimum_8_chars" : "Mínim de 8 caracters",
     "passwords_do_not_match" : "Les contrasenyes no coincideixen",
     "api_key" : "Clau API ",
     "api_key_not_generated" : "Encara no s'ha generat",

src/main/app/i18n/cs.js

@@ -111,7 +111,7 @@
     "email " : " E-mail",
     "change_password " : " Změnit heslo",
     "confirm_password " : " Potvrdit heslo",
-    "minimum_6_chars " : " Minimum je 6 znaků",
+    "minimum_8_chars " : " Minimum je 8 znaků",
     "passwords_do_not_match " : " Hesla se neshodují",
     "api_key " : " API klíč",
     "api_key_not_generated " : " Není vygenerován",

src/main/app/i18n/cy.js

@@ -111,7 +111,7 @@
     "email" : "E-bost",
     "change_password" : "Newid cyfrinair",
     "confirm_password" : "Cadarnhau cyfrinair",
-    "minimum_6_chars" : "Isafswm 6 nod",
+    "minimum_8_chars" : "Isafswm 8 nod",
     "passwords_do_not_match" : "Mae'r cyfrineiriau yn wahanol",
     "api_key" : "Allwedd API",
     "api_key_not_generated" : "Heb ei gynhyrchu eto",

src/main/app/i18n/da.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Skift adgangskode",
     "confirm_password" : "Bekræft adgangskode",
-    "minimum_6_chars" : "Minimum 6 karakter",
+    "minimum_8_chars" : "Minimum 8 karakter",
     "passwords_do_not_match" : "Adgangskoderne er ikke ens",
     "api_key" : "API nøgle",
     "api_key_not_generated" : "Ikke genereret endnu",

src/main/app/i18n/de.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Passwort ändern",
     "confirm_password" : "Passwort bestätigen",
-    "minimum_6_chars" : "Mindestens 6 Zeichen",
+    "minimum_8_chars" : "Mindestens 8 Zeichen",
     "passwords_do_not_match" : "Passwörter stimmen nicht überein",
     "api_key" : "API Schlüssel",
     "api_key_not_generated" : "Noch nicht generiert",

src/main/app/i18n/en.js

@@ -99,7 +99,7 @@
     "queued_for_refresh" : "Queued for refresh",
     "feed_url" : "Feed URL",
     "filtering_expression" : "Filtering expression",
-    "filtering_expression_help" : "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically.\nAvailable variables are 'title', 'content', 'url' and 'author' and their content is converted to lower case to ease string comparison.\nExample: url.contains('youtube') or (author eq 'athou' and title.contains('github').\nComplete available syntax is available <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>here</a>.",
+    "filtering_expression_help" : "If not empty, an expression evaluating to 'true' or 'false'. If false, new entries for this feed will be marked as read automatically.\nAvailable variables are 'title', 'content', 'url' 'author' and 'categories' and their content is converted to lower case to ease string comparison.\nExample: url.contains('youtube') or (author eq 'athou' and title.contains('github').\nComplete available syntax is available <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>here</a>.",
     "generate_api_key_first" : "Generate an API key in your profile first.",
     "unsubscribe" : "Unsubscribe",
     "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed?",
@@ -111,9 +111,10 @@
   "profile" : {
     "user_name" : "User name",
     "email" : "E-mail",
+    "current_password" : "Current Password",
     "change_password" : "Change password",
     "confirm_password" : "Confirm password",
-    "minimum_6_chars" : "Minimum 6 characters",
+    "minimum_8_chars" : "Minimum 8 characters",
     "passwords_do_not_match" : "Passwords do not match",
     "api_key" : "API key",
     "api_key_not_generated" : "Not generated yet",
@@ -176,7 +177,8 @@
       "font_size" : "increase/decrease font size of the current entry",
       "go_to_all" : "go to the All view",
       "go_to_starred" : "go to the Starred view",
-      "feed_search" : "navigate to a subscription by entering the subscription name"
+      "feed_search" : "navigate to a subscription by entering the subscription name",
+      "refresh": "refresh"
     }
   }
-}
+}

src/main/app/i18n/es.js

@@ -7,24 +7,26 @@
     "download" : "Descargar",
     "link" : "Enlace",
     "bookmark" : "Marcador",
-    "close" : "Close ",
+    "close" : "Cerrar",
-    "tags" : "Tags "
+    "tags" : "Etiquetas"
   },
   "tree" : {
-    "subscribe" : "Subscribir",
+    "subscribe" : "Suscribirse",
     "import" : "Importar",
     "new_category" : "Nueva categoría",
     "all" : "Todos",
-    "starred" : "Destacado"
+    "starred" : "Destacados"
   },
   "subscribe" : {
-    "feed_url" : "URL del Canal",
+    "feed_url" : "URL del canal",
-    "feed_name" : "Nombre del Canal",
+	"filtering_expression" : "Expresión de filtrado",
+	"filtering_expression_help" : "Si no está vacía, una expresión se evalúa como 'cierta' o 'falsa'. Si es falsa, las nueva entradas de este canal se marcarán como leídas automáticamente.\nLas variables disponibles son 'title' (título), 'content'(contenido), 'url' (URL), 'author' (autor), y 'categories' (categorías) y sus contenidos son convertidos a minúsculas para facilitar la comparación de strings (cadenas de texto).\nEjemplo: url.contains('youtube') or (author eq 'athou' and title.contains('github').\nLa sintaxis completa está disponible <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>aquí</a>.",
+    "feed_name" : "Nombre del canal",
     "category" : "Categoría"
   },
   "import" : {
-    "google_reader_prefix" : "Déjame importar tus canales de tu",
+    "google_reader_prefix" : "Déjame importar tus canales de tu cuenta ",
-    "google_reader_suffix" : " cuenta.",
+    "google_reader_suffix" : ".",
     "google_download" : "También puedes subir tu archivo subscriptions.xml.",
     "google_download_link" : "Descárgalo de aquí.",
     "xml_file" : "Archivo OPML"
@@ -34,147 +36,147 @@
     "parent" : "Padre"
   },
   "toolbar" : {
-    "unread" : "Sin Leer",
+    "unread" : "No leídos",
     "all" : "Todos",
-    "previous_entry" : "Entrada Anterior",
+    "previous_entry" : "Entrada anterior",
-    "next_entry" : "Próxima Entrada",
+    "next_entry" : "Entrada siguiente",
-    "refresh" : "Atualizar",
+    "refresh" : "Actualizar",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "Forzar la actualización de todos mis canales.",
-    "sort_by_asc_desc" : "Ordenar por fecha asc/desc",
+    "sort_by_asc_desc" : "Ordenar por fecha asc/desc.",
-    "titles_only" : "Sólo Títulos",
+    "titles_only" : "Sólo títulos",
-    "expanded_view" : "Vista Expandida",
+    "expanded_view" : "Vista expandida",
     "mark_all_as_read" : "Marcar todos como leído",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "Entradas anteriores a 12 horas.",
-    "mark_all_older_day" : "Artículos anteriores a un día",
+    "mark_all_older_day" : "Entradas anteriores a un día.",
-    "mark_all_older_week" : "Artículos más de una semana",
+    "mark_all_older_week" : "Entradas anteriores a una semana.",
-    "mark_all_older_two_weeks" : "Artículos más de does semanas",
+    "mark_all_older_two_weeks" : "Entradas anteriores a 2 semanas.",
     "settings" : "Ajustes",
     "profile" : "Perfil",
     "admin" : "Admin",
-    "about" : "Acerca de",
+    "about" : "Acerca de...",
     "logout" : "Cerrar sesión",
     "donate" : "Donar"
   },
   "view" : {
-    "entry_source" : "from  ",
+    "entry_source" : "de ",
-    "entry_author" : "by  ",
+    "entry_author" : "por ",
-    "error_while_loading_feed" : "Error mientras se cargaba este canal",
+    "error_while_loading_feed" : "Error mientras se cargaba este canal.",
-    "keep_unread" : "Guardar no leídos",
+    "keep_unread" : "Mantener como no leído.",
-    "no_unread_items" : "no tiene items sin leer.",
+    "no_unread_items" : "no tiene entradas sin leer.",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "mark_up_to_here" : "Marcar como leídos hasta aquí.",
-    "search_for" : "searching for:  ",
+    "search_for" : "buscando:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "No se han encontrado resultados para las palabras clave especificadas."
   },
   "feedsearch" : {
-    "hint" : "Type in a subscription... ",
+    "hint" : "Introduce una suscripción...",
-    "help" : "Use the return key to select and arrow keys to navigate. ",
+    "help" : "Usa la tecla Intro para seleccionar y las teclas de flecha para navegar.",
-    "result_prefix" : "Your subscriptions: "
+    "result_prefix" : "Tus suscripciones:"
   },
   "settings" : {
     "general" : {
       "value" : "General",
-      "language" : "Lenguaje",
+      "language" : "Idioma",
-      "language_contribute" : "Contribuye con traducciones",
+      "language_contribute" : "Contribuye con traducciones.",
       "show_unread" : "Mostrar canales y categorías sin entradas no leídas.",
-      "social_buttons" : "Mostrar botones de compartir de redes sociales.",
+      "social_buttons" : "Mostrar botones para compartir de redes sociales.",
-      "scroll_marks" : "En vista expandida, el desplazamiento por las entradas las marca como leídas"
+      "scroll_marks" : "En vista expandida, el desplazamiento por las entradas las marca como leídas."
     },
-    "appearance" : "Appearance ",
+    "appearance" : "Apariencia",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "Velocidad de desplazamiento al navegar entre entradas (en milisegundos)",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "ponlo a 0 para desactivarlo",
-    "theme" : "Theme ",
+    "theme" : "Tema",
-    "submit_your_theme" : "Submit your theme ",
+    "submit_your_theme" : "Envía tu tema ",
-    "custom_css" : "CSS Personalizado"
+    "custom_css" : "CSS personalizado"
   },
   "details" : {
-    "feed_details" : "Detalles de Canales",
+    "feed_details" : "Detalles del canal",
     "url" : "URL",
-    "website" : "Website ",
+    "website" : "Sitio web",
     "name" : "Nombre",
     "category" : "Categoría",
-    "position" : "Position ",
+    "position" : "Posición",
     "last_refresh" : "Última actualización",
-    "message" : "Last refresh message ",
+    "message" : "Último mensaje de actualización",
-    "next_refresh" : "Next refresh ",
+    "next_refresh" : "Próxima actualización",
-    "queued_for_refresh" : "Queued for refresh ",
+    "queued_for_refresh" : "En cola para actualizar",
-    "feed_url" : "URL del Canal",
+    "feed_url" : "URL del canal",
-    "generate_api_key_first" : "Genera una llave API en tu perfil primero.",
+    "generate_api_key_first" : "Genera una clave API en tu perfil primero.",
-    "unsubscribe" : "Terminar subscripción",
+    "unsubscribe" : "Terminar suscripción",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "¿Estás seguro de querer terminar tu suscripción a este canal?",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "¿Estás seguro de querer eliminar esta categoría?",
     "category_details" : "Detalles de la categoría",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Detalles de las etiquetas ",
     "parent_category" : "Categoría principal"
   },
   "profile" : {
     "user_name" : "Nombre de usuario",
-    "email" : "Correo",
+    "email" : "Correo electrónico",
     "change_password" : "Cambiar contraseña",
     "confirm_password" : "Confirmar contraseña",
-    "minimum_6_chars" : "Mínimo 6 caracteres",
+    "minimum_8_chars" : "Mínimo 8 caracteres",
     "passwords_do_not_match" : "Las contraseñas no coinciden",
-    "api_key" : "Llave API",
+    "api_key" : "Clave API",
     "api_key_not_generated" : "No generado todavía",
-    "generate_new_api_key" : "Generar nueva llave API",
+    "generate_new_api_key" : "Generar nueva clave API",
-    "generate_new_api_key_info" : "Al cambiar la contraseña se generará una nueva llave API",
+    "generate_new_api_key_info" : "Al cambiar la contraseña se generará una nueva clave API.",
     "opml_export" : "Exportación de OPML",
     "delete_account" : "Eliminar cuenta",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "¿Eliminar tu cuenta? ¡No habrá vuelta atrás! "
   },
   "about" : {
     "rest_api" : {
       "value" : "REST API",
-      "line1" : "CommaFeed está construido con el uso de JAX-RS y AngularJS. Por eso, un REST API esta disponible.",
+      "line1" : "CommaFeed está construido sobre JAX-RS y AngularJS. Por lo tanto, una REST API está disponible.",
-      "link_to_documentation" : "Vínculo de la documentación."
+      "link_to_documentation" : "Enlace a la documentación."
     },
     "keyboard_shortcuts" : "Atajos de teclado",
-    "version" : "CommaFeed version ",
+    "version" : "Versión de CommaFeed",
-    "line1_prefix" : "CommaFeed es un proyecto open-source. El código se encuentra en ",
+    "line1_prefix" : "CommaFeed es un proyecto de código abierto. El código se encuentra en ",
     "line1_suffix" : ".",
-    "line2_prefix" : "Si encuentras un problema, por favor reportalo en la página de problemas de ",
+    "line2_prefix" : "Si encuentras un problema, por favor repórtalo en la página de problemas de ",
     "line2_suffix" : " del proyecto.",
-    "line3" : "Si te gusta este proyecto, por favor considera realizar una donacion para apoyar al desarrollador y ayudar a cubrir los costos de mantenimiento.",
+    "line3" : "Si te gusta este proyecto, por favor considera realizar una donación para apoyar al desarrollador y ayudar a cubrir los costes de mantenimiento.",
-    "line4" : "For those of you who prefer bitcoin, here is the address ",
+    "line4" : "Para aquellos de vosotros que prefieran bitcoin, aquí está la dirección ",
     "goodies" : {
-      "value" : "Goodies",
+      "value" : "Extras",
-      "android_app" : "Android app ",
+      "android_app" : "Apps para Android",
-      "subscribe_url" : "Subscribe URL ",
+      "subscribe_url" : "URL para suscribirse ",
-      "chrome_extension" : "Extensión de Chrome",
+      "chrome_extension" : "Extensión para Chrome.",
-      "firefox_extension" : "Extensión de Firefox",
+      "firefox_extension" : "Extensión para Firefox.",
-      "opera_extension" : "Opera extension ",
+      "opera_extension" : "Extensón para Opera.",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click) ",
+      "subscribe_bookmarklet" : "Añadir marcador de suscripción (clic).",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
+      "subscribe_bookmarklet_asc" : "Más antiguos primero",
-      "subscribe_bookmarklet_desc" : "Newest first ",
+      "subscribe_bookmarklet_desc" : "Más recientes primero",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar) "
+      "next_unread_bookmarklet" : "Marcador a la siguiente entrada no leída (arástralo a la barra de marcadores) "
     },
     "translation" : {
       "value" : "Traducción",
       "message" : "Necesitamos tu ayuda para ayudar a traducir CommaFeed.",
-      "link" : "Ver como contribuir con traducciones."
+      "link" : "Ver cómo contribuir con traducciones."
     },
     "announcements" : "Anuncios",
     "shortcuts" : {
-      "mouse_middleclick" : "ratón botón medio",
+      "mouse_middleclick" : "click medio",
-      "open_next_entry" : "abrir próxima entrada",
+      "open_next_entry" : "abrir la siguiente entrada",
-      "open_previous_entry" : "abrir entrada previa",
+      "open_previous_entry" : "abrir la entrada anterior",
-      "spacebar" : "space/shift+space ",
+      "spacebar" : "espacio/mayúsculas+espacio",
-      "move_page_down_up" : "moves the page down/up ",
+      "move_page_down_up" : "mueve la página arriba/abajo",
-      "focus_next_entry" : "Establecer el foco en la próxima entrada sin abrirlo",
+      "focus_next_entry" : "establecer el foco en la siguiente entrada sin abrirla",
-      "focus_previous_entry" : "Establecer el foco en la entrada anterior sin abrirlo",
+      "focus_previous_entry" : "establecer el foco en la entrada anterior sin abrirla",
-      "open_next_feed" : "open next feed or category ",
+      "open_next_feed" : "abrir el siguiente canal o categoría",
-      "open_previous_feed" : "open previous feed or category ",
+      "open_previous_feed" : "abrir el canal o categoría previo",
-      "open_close_current_entry" : "abrir/cerrar entrada actual",
+      "open_close_current_entry" : "abrir/cerrar la entrada actual",
-      "open_current_entry_in_new_window" : "abrir entrada actual en una nueva ventana",
+      "open_current_entry_in_new_window" : "abrir la entrada actual en una nueva ventana",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background ",
+      "open_current_entry_in_new_window_background" : "abrir la entrada actual en una nueva ventana en segundo plano",
-      "star_unstar" : "marcar/no marcar la entrada actual",
+      "star_unstar" : "destacar la entrada actual",
-      "mark_current_entry" : "marcar como leída/no la leída entrada actual",
+      "mark_current_entry" : "marcar la entrada actual como leída/no la leída",
       "mark_all_as_read" : "marcar todas las entradas como leídas",
       "open_in_new_tab_mark_as_read" : "abrir entrada en una nueva pestaña y marcar como leída",
-      "fullscreen" : "toggle full screen mode ",
+      "fullscreen" : "activar/desactivar el modo pantalla completa ",
-      "font_size" : "increase/decrease font size of the current entry ",
+      "font_size" : "aumentar/reducir el tamaño de la fuente de la entrada actual",
-      "go_to_all" : "go to the All view ",
+      "go_to_all" : "ver Todos",
-      "go_to_starred" : "go to the Starred view ",
+      "go_to_starred" : "ver Destacados",
-      "feed_search" : "navigate to a subscription by entering the subscription name "
+      "feed_search" : "navega a una suscripción al introducir su nombre"
     }
   }
-}
+}

src/main/app/i18n/fa.js

@@ -111,7 +111,7 @@
     "email" : "رایانامه",
     "change_password" : "تغییر گذرواژه",
     "confirm_password" : "تأیید گذرواژه",
-    "minimum_6_chars" : "حداقل ۶ نویسه",
+    "minimum_8_chars" : "حداقل ۸ نویسه",
     "passwords_do_not_match" : "گذرواژه‌ها انطباق ندارند",
     "api_key" : "کلید API",
     "api_key_not_generated" : "هنوز ایجاد نشده‌است",

src/main/app/i18n/fi.js

@@ -111,7 +111,7 @@
     "email" : "Sähköposti",
     "change_password" : "Vaihda salasana",
     "confirm_password" : "Vahvista uusi salasana",
-    "minimum_6_chars" : "Vähintään 6 merkkiä",
+    "minimum_8_chars" : "Vähintään 8 merkkiä",
     "passwords_do_not_match" : "Salasanat eivät täsmää",
     "api_key" : "API-avain",
     "api_key_not_generated" : "API-avainta ei ole vielä luotu",

src/main/app/i18n/fr.js

@@ -34,24 +34,24 @@
     "parent" : "Parent"
   },
   "toolbar" : {
-    "unread" : "Non-lus",
+    "unread" : "Non lus",
     "all" : "Tous",
     "previous_entry" : "Article précédent",
     "next_entry" : "Article suivant",
     "refresh" : "Rafraîchir",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "Rafraîchir tous les flux",
     "sort_by_asc_desc" : "Trier par date croissante/décroissante",
     "titles_only" : "Titres uniquement",
     "expanded_view" : "Vue étendue",
     "mark_all_as_read" : "Tout marquer comme lu",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "Articles de plus de 12 heures",
-    "mark_all_older_day" : "Articles de plus d'un jour",
+    "mark_all_older_day" : "Articles de plus d'une journée",
     "mark_all_older_week" : "Articles de plus d'une semaine",
     "mark_all_older_two_weeks" : "Articles de plus d'un mois",
     "settings" : "Préférences",
     "profile" : "Profil",
     "admin" : "Administration",
-    "about" : "A propos",
+    "about" : "À propos",
     "logout" : "Déconnexion",
     "donate" : "Faire un don"
   },
@@ -59,16 +59,16 @@
     "entry_source" : "sur",
     "entry_author" : "par ",
     "error_while_loading_feed" : "Erreur durant le chargement de ce flux",
-    "keep_unread" : "Garder non-lu",
+    "keep_unread" : "Garder non lu",
-    "no_unread_items" : "n'a pas d'articles non-lus.",
+    "no_unread_items" : "n'a pas d'articles non lus.",
     "mark_up_to_here" : "Marquer comme lu jusqu'ici",
-    "search_for" : "searching for:  ",
+    "search_for" : "recherche : ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "Pas de résultats avec le terme indiqué."
   },
   "feedsearch" : {
     "hint" : "Tapez un nom de flux",
     "help" : "Utilisez la touche entrée pour sélectionner et les flèches pour naviguer",
-    "result_prefix" : "Vos flux:"
+    "result_prefix" : "Vos flux :"
   },
   "settings" : {
     "general" : {
@@ -76,12 +76,12 @@
       "language" : "Langue",
       "language_contribute" : "Contribuer aux traductions",
       "show_unread" : "Afficher les flux et les catégories pour lesquels tout est déjà lu",
-      "social_buttons" : "Afficher les boutons de partage sur réseaux sociaux",
+      "social_buttons" : "Afficher les boutons de partage sur les réseaux sociaux",
-      "scroll_marks" : "En mode de lecture étendu, marquer comme lu les éléments lorsque la fenêtre descend."
+      "scroll_marks" : "En mode de lecture étendu, marquer les éléments comme lus lorsque la fenêtre descend."
     },
     "appearance" : "Apparence",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "Vitesse de défilement entre les entrées (en millisecondes) ",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "Mettez 0 pour désactiver",
     "theme" : "Thème",
     "submit_your_theme" : "Soumettez votre thème.",
     "custom_css" : "CSS personnelle"
@@ -94,37 +94,38 @@
     "category" : "Catégorie",
     "position" : "Position",
     "last_refresh" : "Dernière mise à jour",
-    "message" : "Last refresh message ",
+    "message" : "Message de la dernière mise à jour ",
     "next_refresh" : "Prochaine mise à jour",
     "queued_for_refresh" : "En file d'attente",
     "feed_url" : "URL du flux",
-    "generate_api_key_first" : "Générez une clé API dans votre profil d'abord.",
+    "generate_api_key_first" : "Générez d'abord une clé API dans votre profil.",
     "unsubscribe" : "Se désabonner",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "Êtes-vous sûr de vouloir vous désabonner de de flux ? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "Êtes-vous sûr de vouloir supprimer cette catégorie ? ",
     "category_details" : "Détails de la catégorie",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Détails du tag",
     "parent_category" : "Catégorie parente"
   },
   "profile" : {
     "user_name" : "Nom",
     "email" : "E-mail",
+    "current_password" : "Mot de passe actuel",
     "change_password" : "Changer de mot de passe",
     "confirm_password" : "Confirmer le mot de passe",
-    "minimum_6_chars" : "Minimum 6 caractères",
+    "minimum_8_chars" : "Minimum 8 caractères",
     "passwords_do_not_match" : "Les mots de passe ne correspondent pas",
     "api_key" : "Clé API",
     "api_key_not_generated" : "Pas encore générée",
     "generate_new_api_key" : "Générer une nouvelle clé API",
-    "generate_new_api_key_info" : "Changer de mot de passe va générer une nouvelle clé API",
+    "generate_new_api_key_info" : "Changer de mot de passe générera une nouvelle clé API",
     "opml_export" : "Export du fichier OPML",
     "delete_account" : "Effacer le compte",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "Êtes-vous sûr de vouloir supprimer définitivement votre compte ?"
   },
   "about" : {
     "rest_api" : {
       "value" : "API REST",
-      "line1" : "CommaFeed utilise JAX-RS et AngularJS, donc une API REST est disponible.",
+      "line1" : "CommaFeed utilise JAX-RS et AngularJS, une API REST est donc disponible.",
       "link_to_documentation" : "Lien vers la documentation."
     },
     "keyboard_shortcuts" : "Raccourcis clavier",
@@ -145,7 +146,7 @@
       "subscribe_bookmarklet" : "Bookmarklet d'ajout d'abonnement",
       "subscribe_bookmarklet_asc" : "Du plus ancien au plus récent",
       "subscribe_bookmarklet_desc" : "Du plus récent au plus ancien",
-      "next_unread_bookmarklet" : "Bookmarklet vers le prochain article non-lu"
+      "next_unread_bookmarklet" : "Bookmarklet vers le prochain article non lu"
     },
     "translation" : {
       "value" : "Traduction",
@@ -165,9 +166,9 @@
       "open_previous_feed" : "Sélectionner le flux ou la catégorie précédente",
       "open_close_current_entry" : "Ouvrir/fermer l'article courant",
       "open_current_entry_in_new_window" : "Ouvrir l'article courant dans une nouvelle fenêtre",
-      "open_current_entry_in_new_window_background" : "Ouvrir l'article courant dans une nouvelle fenêtre en arrière plan",
+      "open_current_entry_in_new_window_background" : "Ouvrir l'article courant dans une nouvelle fenêtre en arrière-plan",
       "star_unstar" : "Ajouter/enlever l'article courant des favoris",
-      "mark_current_entry" : "Marquer comme lue/non-lue l'article courant",
+      "mark_current_entry" : "Marquer comme lu/non lu l'article courant",
       "mark_all_as_read" : "Marquer tous les articles comme lus",
       "open_in_new_tab_mark_as_read" : "Ouvrir l'article courant dans une nouvelle fenêtre et marquer comme lu",
       "fullscreen" : "Activer/désactiver le mode plein-écran",
@@ -177,4 +178,4 @@
       "feed_search" : "Naviguer vers un flux en entrant son nom"
     }
   }
-}
+}

src/main/app/i18n/gl.js

@@ -31,7 +31,7 @@
   },
   "new_category" : {
     "name" : "Nome",
-    "parent" : "Pai"
+    "parent" : "Subcategoría de "
   },
   "toolbar" : {
     "unread" : "Sen Ler",
@@ -39,12 +39,12 @@
     "previous_entry" : "Entrada Anterior",
     "next_entry" : "Próxima Entrada",
     "refresh" : "Actualizar",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "Forzar a actualización de todas as fontes ",
     "sort_by_asc_desc" : "Ordenar por data asc/desc",
     "titles_only" : "Só títulos",
     "expanded_view" : "Vista expandida",
     "mark_all_as_read" : "Marcar todos como lidos",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "Elementos anteriores a 12 h. ",
     "mark_all_older_day" : "Artigos anteriores a un día",
     "mark_all_older_week" : "Artigos de máis de unha semana",
     "mark_all_older_two_weeks" : "Artigos de máis de dúas semanas",
@@ -56,14 +56,14 @@
     "donate" : "Doar"
   },
   "view" : {
-    "entry_source" : "from  ",
+    "entry_source" : "desde  ",
-    "entry_author" : "by  ",
+    "entry_author" : "por  ",
     "error_while_loading_feed" : "Erro mentras se cargaba esta fonte",
     "keep_unread" : "Gardar non lidos",
     "no_unread_items" : "non ten elementos sen ler.",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "mark_up_to_here" : "Marcar como lidos ate aquí ",
-    "search_for" : "searching for:  ",
+    "search_for" : "buscando por:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "Sen coincidencias para as palabras introducidas "
   },
   "feedsearch" : {
     "hint" : "Escriba unha suscrición...",
@@ -80,8 +80,8 @@
       "scroll_marks" : "En vista expandida, o desplazamento polas entradas márcaas como lidas."
     },
     "appearance" : "Aspecto",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "Velocidade de desplazamento navegando entre entradas (en milisegundos) ",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "escriba 0 para deshabilitar ",
     "theme" : "Decorado",
     "submit_your_theme" : "Envíe o seu decorado",
     "custom_css" : "CSS Personalizado"
@@ -89,21 +89,21 @@
   "details" : {
     "feed_details" : "Detalles de fontes",
     "url" : "URL",
-    "website" : "Website ",
+    "website" : "Sitio web ",
     "name" : "Nome",
     "category" : "Categoría",
-    "position" : "Position ",
+    "position" : "Posición ",
     "last_refresh" : "Última actualización",
-    "message" : "Last refresh message ",
+    "message" : "Última mensaxe da actualización ",
     "next_refresh" : "Próxima actualización",
     "queued_for_refresh" : "En cola para actualizar",
     "feed_url" : "URL da fonte",
     "generate_api_key_first" : "Antes debes xerar unha chave API no teu perfil.",
     "unsubscribe" : "Rematar suscripción",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "Seguro que queres desuscribirte de esta fonte? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "Seguro que queres eliminar esta categoría? ",
     "category_details" : "Detalles da categoría",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Detalles da etiqueta ",
     "parent_category" : "Categoría principal"
   },
   "profile" : {
@@ -111,7 +111,7 @@
     "email" : "Correo",
     "change_password" : "Cambiar contrasinal",
     "confirm_password" : "Confirmar contrasinal",
-    "minimum_6_chars" : "Mínimo 6 caracteres",
+    "minimum_8_chars" : "Mínimo 8 caracteres",
     "passwords_do_not_match" : "Os contrasinais non coinciden no coinciden",
     "api_key" : "Chave API",
     "api_key_not_generated" : "Non xerado todavía",
@@ -119,7 +119,7 @@
     "generate_new_api_key_info" : "Ao cambiar o contrasinal xerarase unha nova chave API",
     "opml_export" : "Exportación de OPML",
     "delete_account" : "Eliminar conta",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "Eliminar conta? Non hai volta atrás! "
   },
   "about" : {
     "rest_api" : {
@@ -158,7 +158,7 @@
       "open_next_entry" : "abrir próxima entrada",
       "open_previous_entry" : "abrir entrada anterior",
       "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
+      "move_page_down_up" : "move a páxina arriba/abaixo ",
       "focus_next_entry" : "Establecer o foco na próxima entrada sen abrila",
       "focus_previous_entry" : "Establecer o foco na entrada anterior sen abrila",
       "open_next_feed" : "abrir a seguinte fonte ou categoría",
@@ -170,11 +170,11 @@
       "mark_current_entry" : "marcar como lida/non lida a entrada actual",
       "mark_all_as_read" : "marcar todas as entradas como lidas",
       "open_in_new_tab_mark_as_read" : "abrir entrada nunha nova lapela e marcar como lida",
-      "fullscreen" : "toggle full screen mode ",
+      "fullscreen" : "habilita a pantalla completa ",
-      "font_size" : "increase/decrease font size of the current entry ",
+      "font_size" : "aumenta/diminúe o tamaño da letra da entrada activa ",
-      "go_to_all" : "go to the All view ",
+      "go_to_all" : "ir a vista TODOS",
-      "go_to_starred" : "go to the Starred view ",
+      "go_to_starred" : "ir a vista Destacados ",
       "feed_search" : "navegue ate unha suscrición introducindo o nome da suscrición"
     }
   }
-}
+}

src/main/app/i18n/glk.js

@@ -111,7 +111,7 @@
     "email" : "ایمئل",
     "change_password" : "رمزه عوضأگودن",
     "confirm_password" : "رمزه تأیید گودن",
-    "minimum_6_chars" : "ناقلن 6 کارکتر",
+    "minimum_8_chars" : "ناقلن 8 کارکتر",
     "passwords_do_not_match" : "رمزان کس‌به‌کسه نخانید",
     "api_key" : "کلید API",
     "api_key_not_generated" : "هلئه چاگوده نبؤ",

src/main/app/i18n/hu.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Jelszó megváltoztatás",
     "confirm_password" : "Jelszó megerősítése",
-    "minimum_6_chars" : "Legalább 8 karakter",
+    "minimum_8_chars" : "Legalább 8 karakter",
     "passwords_do_not_match" : "A jelszavak nem egyeznek",
     "api_key" : "API kulcs",
     "api_key_not_generated" : "Még nincsen generálva",

src/main/app/i18n/id.js

@@ -0,0 +1,182 @@
+{
+  "global" : {
+    "save" : "Simpan",
+    "cancel" : "Batal",
+    "delete" : "Hapus",
+    "required" : "Diminta",
+    "download" : "Unduh",
+    "link" : "Tautan",
+    "bookmark" : "Penanda halaman buku",
+    "close" : "Tutup",
+    "tags" : "Penanda"
+  },
+  "tree" : {
+    "subscribe" : "Berlangganan",
+    "import" : "Impor",
+    "new_category" : "Kategori Baru",
+    "all" : "Semua",
+    "starred" : "Diutamakan"
+  },
+  "subscribe" : {
+    "feed_url" : "Umpan URL",
+    "feed_name" : "Nama Umpan",
+    "category" : "Kategori"
+  },
+  "import" : {
+    "google_reader_prefix" : "Izinkan saya mengimpor umpan Anda dari kepunyaan Anda ",
+    "google_reader_suffix" : " akun.",
+    "google_download" : "Atau, unggah berkas subscriptions.xml Anda.",
+    "google_download_link" : "Unggah dari sini.",
+    "xml_file" : "Berkas OPML"
+  },
+  "new_category" : {
+    "name" : "Nama",
+    "parent" : "Induk"
+  },
+  "toolbar" : {
+    "unread" : "Belum dibaca",
+    "all" : "Semua",
+    "previous_entry" : "Catatan sebelumnya",
+    "next_entry" : "Catatan selanjutnya",
+    "refresh" : "Segarkan",
+    "refresh_all" : "Memaksa menyegarkan semua umpan saya",
+    "sort_by_asc_desc" : "Urutkan menurut tanggal asc/desc",
+    "titles_only" : "Hanya Judul",
+    "expanded_view" : "Penglihatan diperluas",
+    "mark_all_as_read" : "Tandai semua sebagai telah dibaca",
+    "mark_all_older_12_hours" : "Butir lebih lama 12 jam",
+    "mark_all_older_day" : "Butir lebih lama sehari",
+    "mark_all_older_week" : "Butir lebih lama seminggu",
+    "mark_all_older_two_weeks" : "Butir lebih lama dua minggu",
+    "settings" : "Pengaturan",
+    "profile" : "Profil",
+    "admin" : "Admin",
+    "about" : "Tentang",
+    "logout" : "Keluar",
+    "donate" : "Donasi"
+  },
+  "view" : {
+    "entry_source" : "dari ",
+    "entry_author" : "oleh ",
+    "error_while_loading_feed" : "Galat saat memuat umpan ini",
+    "keep_unread" : "Tetapkan belum dibaca",
+    "no_unread_items" : "Tidak ada yang butir yang belum dibaca.",
+    "mark_up_to_here" : "Tandai sebagai dibaca di sini",
+    "search_for" : "mencari: ",
+    "no_search_results" : "Tidak ditemukan kata kunci yang sesuai dengan permintaan"
+  },
+  "feedsearch" : {
+    "hint" : "Ketik sebuah langganan...",
+    "help" : "Gunakan tombol enter untuk memilih dan tombol panah untuk navigasi.",
+    "result_prefix" : "Langganan Anda:"
+  },
+  "settings" : {
+    "general" : {
+      "value" : "Umum",
+      "language" : "Bahasa",
+      "language_contribute" : "Kontribusi dengan terjemahan",
+      "show_unread" : "Menampilkan umpan dan kategori tanpa catatan belum dibaca",
+      "social_buttons" : "Menampilkan tombol sosial berbagi",
+      "scroll_marks" : "Di penglihatan luas, menggulir melalui catatan menandakan sebagai telah dibaca"
+    },
+    "appearance" : "Penampilan",
+    "scroll_speed" : "Kecepatan menggulir ketika menavigasi antar catatan (dalam milidetik)",
+    "scroll_speed_help" : "setel ke 0 untuk menonaktifkan",
+    "theme" : "Tema",
+    "submit_your_theme" : "Mengajukan tema Anda",
+    "custom_css" : "Ubah CSS"
+  },
+  "details" : {
+    "feed_details" : "Rincian Umpan",
+    "url" : "URL",
+    "website" : "Situs",
+    "name" : "Nama",
+    "category" : "Kategori",
+    "position" : "Posisi",
+    "last_refresh" : "Penyegaran terakhir",
+    "message" : "Menyegarkan pesan terakhir",
+    "next_refresh" : "Penyegaran selanjutnya",
+    "queued_for_refresh" : "Antri untuk penyegaran",
+    "feed_url" : "Umpan URL",
+    "filtering_expression" : "Penyaring ekspresi",
+    "filtering_expression_help" : "Jika tidak kosong, sebuah ekspresi mengevaluasi ke 'benar' atau 'salah'. Jika salah, catatan baru untuk umpan ini akan ditandai sebagai telah dibaca secara otomatis. \nVariabel yang tersedia adalah 'judul', 'konten', 'url' 'penulis' dan 'kategori' dan konten mereka dikonversi dari huruf kecil ke perbandingan string yang mudah. \nContoh: url.contains('youtube') or (author eq 'athou' and title.contains('github'). \nSintaksis lengkap tersedia di <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>here</a>.",
+    "generate_api_key_first" : "Menghasilkan sebuah kunci API di profil Anda terlebih dahulu.",
+    "unsubscribe" : "Berhenti berlangganan",
+    "unsubscribe_confirmation" : "Apakah Anda yakin ingin berhenti berlangganan dari umpan ini?",
+    "delete_category_confirmation" : "Apakah Anda yakin ingin menghapus dari kategori ini?",
+    "category_details" : "rincian Kategori",
+    "tag_details" : "rincian Penanda",
+    "parent_category" : "kategori Induk"
+  },
+  "profile" : {
+    "user_name" : "nama Pengguna",
+    "email" : "Surel",
+    "change_password" : "Ganti kata sandi",
+    "confirm_password" : "Konfirmasi kata sandi",
+    "minimum_8_chars" : "Minimal 8 karakter",
+    "passwords_do_not_match" : "Kata sandi tidak sesuai",
+    "api_key" : "kunci API",
+    "api_key_not_generated" : "Belum menghasilkan",
+    "generate_new_api_key" : "Hasilkan kunci API baru",
+    "generate_new_api_key_info" : "Mengganti kata sandi akan menghasilkan sebuah kunci API baru",
+    "opml_export" : "ekspor OPML",
+    "delete_account" : "Hapus akun",
+    "delete_account_confirmation" : "Hapus akun Anda? Hal ini tidak dapat dikembalikan!"
+  },
+  "about" : {
+    "rest_api" : {
+      "value" : "REST API",
+      "line1" : "CommaFeed dibangun di atas JAX-RS dan AngularJS. Dengan demikian, tersedia sebuah REST API.",
+      "link_to_documentation" : "Tautan menuju dokumentasi."
+    },
+    "keyboard_shortcuts" : "pintasan Papanketik",
+    "version" : "versi CommaFeed",
+    "line1_prefix" : "CommaFeed adalah suatu proyek open-source. Sumber di ",
+    "line1_suffix" : ".",
+    "line2_prefix" : "Jika Anda mengalami sebuah isu, silahkan laporkan pada halaman isu ",
+    "line2_suffix" : " proyek.",
+    "line3" : "Jika Anda menyukai proyek ini, silahkan mempertimbangkan suatu donasi untuk mendukung pengembang dan membantu menutupi biaya online situs ini.",
+    "line4" : "Untuk Anda yang lebih suka bitcoin, alamatnya di sini",
+    "goodies" : {
+      "value" : "Bingkisan",
+      "android_app" : "Android app",
+      "subscribe_url" : "URL Langganan",
+      "chrome_extension" : "ekstensi Chrome",
+      "firefox_extension" : "ekstensi Firefox",
+      "opera_extension" : "ekstensi Opera",
+      "subscribe_bookmarklet" : "Tambahkan bookmarklet langganan(klik)",
+      "subscribe_bookmarklet_asc" : "Terlama dahulu",
+      "subscribe_bookmarklet_desc" : "Terbaru dahulu",
+      "next_unread_bookmarklet" : "Butir bookmarklet selanjutnya yang belum dibaca (seret ke batang penanda halaman buku)"
+    },
+    "translation" : {
+      "value" : "Terjemahan",
+      "message" : "Kami membutuhkan bantuan Anda untuk menterjemahkan CommaFeed.",
+      "link" : "Lihat bagaimana berkontribusi dengan terjemahan."
+    },
+    "announcements" : "Pengumuman",
+    "shortcuts" : {
+      "mouse_middleclick" : "klik tengah tetikus",
+      "open_next_entry" : "buka catatan selanjutnya",
+      "open_previous_entry" : "buka catatan sebelumnya",
+      "spacebar" : "spasi/shift+spasi",
+      "move_page_down_up" : "pindah halaman bawah/atas",
+      "focus_next_entry" : "setel fokus pada catatan selanjutnya tanpa membukanya",
+      "focus_previous_entry" : "setel fokus pada catatan sebelumnya tanpa membukanya",
+      "open_next_feed" : "buka umpan atau kategori selanjutnya",
+      "open_previous_feed" : "buka umpan atau kategori sebelumnya",
+      "open_close_current_entry" : "buka/tutup catatan saat ini",
+      "open_current_entry_in_new_window" : "buka catatan saat ini di sebuah jendela baru",
+      "open_current_entry_in_new_window_background" : "buka catatan saat ini di sebuah jendela baru pada latar",
+      "star_unstar" : "tanda bintang/tidak catatan saat ini",
+      "mark_current_entry" : "tandai sebagai telah dibaca/belum catatan saat ini",
+      "mark_all_as_read" : "tandai semua catatan sebagai telah dibaca",
+      "open_in_new_tab_mark_as_read" : "buka catatan di tab baru dan tandai sebagai telah dibaca",
+      "fullscreen" : "beralih modus layar penuh",
+      "font_size" : "tingkatkan/turunkan ukuran huruf dari catatan saat ini",
+      "go_to_all" : "menuju ke lihat Semua",
+      "go_to_starred" : "menuju ke lihat Tanda Bintang",
+      "feed_search" : "navigasi ke langganan dengan memasukkan nama langganan"
+    }
+  }
+}

src/main/app/i18n/it.js

@@ -1,50 +1,50 @@
 {
   "global" : {
     "save" : "Salva",
-    "cancel" : "Cancella",
+    "cancel" : "Annulla",
     "delete" : "Elimina",
-    "required" : "Required",
+    "required" : "Richiesto",
     "download" : "Download",
     "link" : "Link",
-    "bookmark" : "Segnalibro ",
+    "bookmark" : "Segnalibro",
     "close" : "Chiudi",
-    "tags" : "Tags "
+    "tags" : "Tag"
   },
   "tree" : {
     "subscribe" : "Iscriviti",
     "import" : "Importa",
     "new_category" : "Nuova categoria",
-    "all" : "Tutto",
+    "all" : "Tutti",
     "starred" : "Preferiti"
   },
   "subscribe" : {
-    "feed_url" : "Feed URL",
+    "feed_url" : "URL feed",
-    "feed_name" : "Nome Feed",
+    "feed_name" : "Nome feed",
     "category" : "Categoria"
   },
   "import" : {
-    "google_reader_prefix" : "Importa i tuoi feed dal tuo ",
+    "google_reader_prefix" : "Permettimi di importare i feed dal tuo account ",
-    "google_reader_suffix" : " account.",
+    "google_reader_suffix" : ".",
-    "google_download" : "Oppure, carica il tuo subscriptions.xml",
+    "google_download" : "Oppure carica il tuo file subscriptions.xml.",
-    "google_download_link" : "Scaricalo da qui",
+    "google_download_link" : "Puoi scaricalo da qui.",
-    "xml_file" : "OPML File"
+    "xml_file" : "File OPML"
   },
   "new_category" : {
     "name" : "Nome",
-    "parent" : "Parent"
+    "parent" : "Gruppo"
   },
   "toolbar" : {
     "unread" : "Non letti",
     "all" : "Tutti",
     "previous_entry" : "Precedente",
     "next_entry" : "Successivo",
-    "refresh" : "Ricarica",
+    "refresh" : "Aggiorna",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "Forza l'aggiornamento di tutti i feed",
-    "sort_by_asc_desc" : "Sort by date asc/desc",
+    "sort_by_asc_desc" : "Ordina per data crescente/decrescente",
-    "titles_only" : "Solo titoli",
+    "titles_only" : "Solo i titoli",
     "expanded_view" : "Espandi",
-    "mark_all_as_read" : "Contrassegna tutto come già letto",
+    "mark_all_as_read" : "Segna tutti come già letti",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "Elementi più vecchi di 12 ore",
     "mark_all_older_day" : "Elementi più vecchi di un giorno",
     "mark_all_older_week" : "Elementi più vecchi di una settimana",
     "mark_all_older_two_weeks" : "Elementi più vecchi di due settimane",
@@ -52,129 +52,132 @@
     "profile" : "Profilo",
     "admin" : "Admin",
     "about" : "Informazioni",
-    "logout" : "Logout",
+    "logout" : "Esci",
     "donate" : "Dona"
   },
   "view" : {
-    "entry_source" : "from  ",
+    "entry_source" : "da ",
-    "entry_author" : "by  ",
+    "entry_author" : "di ",
-    "error_while_loading_feed" : "Si è verificato un errore, mentre caricavo il feed",
+    "error_while_loading_feed" : "Si è verificato un errore durante il caricamento del feed",
-    "keep_unread" : "Mantiene come da leggere",
+    "keep_unread" : "Mantieni come da leggere",
-    "no_unread_items" : "Non ci sono elementi da leggere.",
+    "no_unread_items" : "non contiene elementi da leggere",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "mark_up_to_here" : "Segna come letto fin qui",
-    "search_for" : "searching for:  ",
+    "search_for" : "Cerca: ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "Nessun risultato per le parole chiave cercate"
   },
   "feedsearch" : {
-    "hint" : "Type in a subscription... ",
+    "hint" : "Digita il nome di una sottoscrizione... ",
-    "help" : "Use the return key to select and arrow keys to navigate. ",
+    "help" : "Usa il tasto Invio per selezionare e le frecce per navigare.",
-    "result_prefix" : "Le tue sottoscrizioni"
+    "result_prefix" : "Le tue sottoscrizioni:"
   },
   "settings" : {
     "general" : {
       "value" : "Generali",
       "language" : "Lingua",
-      "language_contribute" : "Contribuisci con le traduzioni",
+      "language_contribute" : "Contribuisci alle traduzioni",
-      "show_unread" : "Show feeds and categories with no unread entries",
+      "show_unread" : "Mostra i feed e le categorie con voci non lette",
-      "social_buttons" : "Visualizza i social button",
+      "social_buttons" : "Mostra i pulsanti di condivisione social",
-      "scroll_marks" : "Marca come letto quando scorri"
+      "scroll_marks" : "In vista estesa, segna come lette le voci che scorri"
     },
-    "appearance" : "Appearance ",
+    "appearance" : "Aspetto",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "Velocità di scorrimento quando navighi tra i feed (in millisecondi)",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "imposta su 0 per disabilitare",
-    "theme" : "Tema ",
+    "theme" : "Tema",
-    "submit_your_theme" : "Sottoponi il tuo tema ",
+    "submit_your_theme" : "Inserisci il tuo tema",
-    "custom_css" : "Css modificato"
+    "custom_css" : "CSS personalizzato"
   },
   "details" : {
     "feed_details" : "Dettagli feed",
     "url" : "URL",
-    "website" : "Website ",
+    "website" : "Sito web",
     "name" : "Nome",
     "category" : "Categoria",
-    "position" : "Posizione ",
+    "position" : "Posizione",
     "last_refresh" : "Ultimo aggiornamento",
-    "message" : "Last refresh message ",
+    "message" : "Ultimo messaggio di aggiornamento",
-    "next_refresh" : "Next refresh ",
+    "next_refresh" : "Prossimo aggiornamento",
-    "queued_for_refresh" : "In attesa per l'aggiornamento ",
+    "queued_for_refresh" : "In coda per l'aggiornamento",
-    "feed_url" : "Feed URL",
+    "feed_url" : "URL feed",
-    "generate_api_key_first" : "Generate an API key in your profile first.",
+    "filtering_expression" : "Espressione filtro",
-    "unsubscribe" : "Annulla l\"'\"iscrizione",
+    "filtering_expression_help" : "Quando non è vuota, l'espressione viene applicata a ogni nuovo elemento e valutata come 'vera' o 'falsa'. Se falsa, l'elemento verrà segnato automaticamente come letto.\nLe variabili accettate sono 'title' (titolo), 'content' (contenuto), 'url', 'author' (autore) e 'categories' (categorie); il loro contenuto è convertito in minuscolo per facilitarne il confronto.\nEsempio: url.contains('youtube') or (author eq 'athou' and title.contains('github')).\nLa sintassi completa è disponibile <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>qui</a> (in inglese).",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "generate_api_key_first" : "Genera prima una chiave API nelle impostazioni del tuo profilo.",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe" : "Disiscriviti",
+    "unsubscribe_confirmation" : "Sei sicuro di voler annullare la sottoscrizione al feed?",
+    "delete_category_confirmation" : "Sei sicuro di voler eliminare questa categoria?",
     "category_details" : "Dettagli categoria",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Dettagli tag",
-    "parent_category" : "Parent category"
+    "parent_category" : "Categoria principale"
   },
   "profile" : {
-    "user_name" : "User name",
+    "user_name" : "Nome utente",
     "email" : "E-mail",
     "change_password" : "Cambia password",
     "confirm_password" : "Conferma password",
-    "minimum_6_chars" : "Minimo 6 caratteri",
+    "minimum_8_chars" : "Minimo 8 caratteri",
     "passwords_do_not_match" : "Le password non corrispondono",
-    "api_key" : "API key",
+    "api_key" : "chiave API",
-    "api_key_not_generated" : "Non generata ancora",
+    "api_key_not_generated" : "Non ancora generata",
     "generate_new_api_key" : "Genera una nuova chiave API",
     "generate_new_api_key_info" : "Cambiando la password sarà generata una nuova chiave API",
     "opml_export" : "Esporta OPML",
     "delete_account" : "Elimina account",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "Vuoi eliminare il tuo account? Non si può tornare indietro!"
   },
   "about" : {
     "rest_api" : {
       "value" : "REST API",
-      "line1" : "CommaFeed is built on top of JAX-RS and AngularJS. As such, a REST API is available.",
+      "line1" : "CommaFeed è basato su JAX-RS e AngularJS. Pertanto è disponibile una REST API.",
       "link_to_documentation" : "Link alla documentazione."
     },
     "keyboard_shortcuts" : "Scorciatoie da tastiera",
-    "version" : "CommaFeed version ",
+    "version" : "Versione di CommaFeed",
-    "line1_prefix" : "Commefeed è un progetto open-source. I codici sono hostati su ",
+    "line1_prefix" : "CommaFeed è un progetto open source. Trovi i sorgenti su ",
     "line1_suffix" : ".",
-    "line2_prefix" : "Se hai qualche problema, segnalalo sulla pagina del ",
+    "line2_prefix" : "Se hai qualche problema, segnalalo sulla pagina del progetto ",
-    "line2_suffix" : " progetto.",
+    "line2_suffix" : ".",
-    "line3" : "Se ti piace il progetto, prendi in considerazione una donazione per supportare lo sviluppatore e contribuire a coprire i costi di mantenenimento di questo sito on-line.",
+    "line3" : "Se ti piace questo progetto, considera una donazione per supportare lo sviluppatore e aiutare a coprire i costi di manutenzione di questo sito.",
-    "line4" : "Per chi preferisce Bitcoin, questo è l\"'\"indirizzo ",
+    "line4" : "Se preferisci Bitcoin, questo è l'indirizzo",
     "goodies" : {
-      "value" : "Goodies",
+      "value" : "Cose che potrebbero interessarti",
-      "android_app" : "Android app ",
+      "android_app" : "Applicazione Android",
-      "subscribe_url" : "Subscribe URL ",
+      "subscribe_url" : "Sottoscrivi URL",
-      "chrome_extension" : "Estenzione per Chrome  ",
+      "chrome_extension" : "Estensione per Chrome",
       "firefox_extension" : "Estensione per Firefox",
       "opera_extension" : "Estensione per Opera",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click) ",
+      "subscribe_bookmarklet" : "Aggiungi la sottoscrizione ai segnalibri (clicca)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
+      "subscribe_bookmarklet_asc" : "Prima i vecchi",
-      "subscribe_bookmarklet_desc" : "Newest first ",
+      "subscribe_bookmarklet_desc" : "Prima i recenti",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar) "
+      "next_unread_bookmarklet" : "Segnalibro al prossimo elemento da leggere (trascinalo nella barra dei segnalibri)"
     },
     "translation" : {
       "value" : "Traduzioni",
       "message" : "Abbiamo bisogno del tuo aiuto per tradurre CommaFeed.",
-      "link" : "Vedi come aiutare con le traduzioni."
+      "link" : "Scopri come aiutarci nelle traduzioni."
     },
     "announcements" : "Annunci",
     "shortcuts" : {
-      "mouse_middleclick" : "mouse middleclick",
+      "mouse_middleclick" : "click centrale del mouse",
-      "open_next_entry" : "open next entry",
+      "open_next_entry" : "apri successivo",
-      "open_previous_entry" : "open previous entry",
+      "open_previous_entry" : "apri precedente",
-      "spacebar" : "space/shift+space ",
+      "spacebar" : "SPAZIO/MAIUSC+SPAZIO",
-      "move_page_down_up" : "moves the page down/up ",
+      "move_page_down_up" : "muove la pagina in su/giù",
-      "focus_next_entry" : "set focus on next entry without opening it ",
+      "focus_next_entry" : "metti a fuoco l'elemento successivo senza aprirlo",
-      "focus_previous_entry" : "set focus on previous entry without opening it ",
+      "focus_previous_entry" : "metti a fuoco l'elemento precedente senza aprirlo",
-      "open_next_feed" : "open next feed or category ",
+      "open_next_feed" : "apri il prossimo feed o categoria",
-      "open_previous_feed" : "open previous feed or category ",
+      "open_previous_feed" : "apri il feed o la categoria precedente",
-      "open_close_current_entry" : "open/close current entry",
+      "open_close_current_entry" : "apri/chiudi la voce corrente",
-      "open_current_entry_in_new_window" : "open current entry in a new window",
+      "open_current_entry_in_new_window" : "apri la voce corrente in una nuova finestra",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background ",
+      "open_current_entry_in_new_window_background" : "apri la voce corrente in una nuova finestra in secondo piano",
-      "star_unstar" : "star/unstar current entry",
+      "star_unstar" : "metti/togli la tua preferenza alla voce corrente",
-      "mark_current_entry" : "mark as read/unread current entry",
+      "mark_current_entry" : "segna la voce corrente come letta/non letta",
-      "mark_all_as_read" : "mark all entries as read",
+      "mark_all_as_read" : "segna tutte le voci come lette",
-      "open_in_new_tab_mark_as_read" : "open entry in new tab and mark as read",
+      "open_in_new_tab_mark_as_read" : "apri voce in un nuovo tab e segna come letta",
-      "fullscreen" : "toggle full screen mode ",
+      "fullscreen" : "commuta la modalità a schermo intero",
-      "font_size" : "increase/decrease font size of the current entry ",
+      "font_size" : "aumenta/decrementa la dimensione del font per la voce corrente",
-      "go_to_all" : "go to the All view ",
+      "go_to_all" : "vai alla vista Tutti",
-      "go_to_starred" : "go to the Starred view ",
+      "go_to_starred" : "vai alla vista Preferiti",
-      "feed_search" : "navigate to a subscription by entering the subscription name "
+      "feed_search" : "raggiungi una sottoscrizione scrivendo il suo nome",
+      "refresh" : "aggiorna"
     }
   }
-}
+}

src/main/app/i18n/ja.js

@@ -3,7 +3,7 @@
     "save" : "保存",
     "cancel" : "取り消し",
     "delete" : "削除",
-    "required" : "Required",
+    "required" : "必須",
     "download" : "ダウンロード",
     "link" : "リンク",
     "bookmark" : "ブックマーク",
@@ -15,7 +15,7 @@
     "import" : "インポート",
     "new_category" : "新しいカテゴリー",
     "all" : "全て",
-    "starred" : "スター付"
+    "starred" : "スター付き"
   },
   "subscribe" : {
     "feed_url" : "フィードURL",
@@ -40,7 +40,7 @@
     "next_entry" : "次のエントリー",
     "refresh" : "更新",
     "refresh_all" : "全てのフィードを更新",
-    "sort_by_asc_desc" : "昇順/降順にソート",
+    "sort_by_asc_desc" : "日時でソート",
     "titles_only" : "タイトルのみ",
     "expanded_view" : "拡張ビュー",
     "mark_all_as_read" : "全て既読にする",
@@ -100,8 +100,8 @@
     "feed_url" : "フィードURL",
     "generate_api_key_first" : "最初にあなたのAPIキーを生成して下さい。",
     "unsubscribe" : "購読解除",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "フィードの購読を解除してよろしいですか?",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "カテゴリーを削除してよろしいですか?",
     "category_details" : "カテゴリー詳細",
     "tag_details" : "タグ詳細",
     "parent_category" : "親カテゴリー"
@@ -111,15 +111,15 @@
     "email" : "E-mail",
     "change_password" : "パスワードの変更",
     "confirm_password" : "変更パスワードの確認",
-    "minimum_6_chars" : "6文字以上",
+    "minimum_8_chars" : "8文字以上",
     "passwords_do_not_match" : "パスワードが一致しません",
     "api_key" : "APIキー",
     "api_key_not_generated" : "APIキーが生成されていません",
     "generate_new_api_key" : "新しいAPIキーを生成",
-    "generate_new_api_key_info" : "パスワードの変更は新しいAPIキーが生成されます",
+    "generate_new_api_key_info" : "パスワードを変更すると新しいAPIキーが生成されます",
     "opml_export" : "OPMLエクスポート",
     "delete_account" : "アカウント削除",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "アカウントを削除してよろしいですか? 削除すると戻すことはできません!"
   },
   "about" : {
     "rest_api" : {
@@ -149,10 +149,10 @@
     },
     "translation" : {
       "value" : "翻訳",
-      "message" : "CommaFeedの翻訳に助けが必要です！",
+      "message" : "CommaFeedの翻訳にご協力ください！",
-      "link" : "どうやって翻訳に貢献できるか見て下さい。"
+      "link" : "翻訳にあたっての案内はこちら"
     },
-    "announcements" : "Announcements",
+    "announcements" : "お知らせ",
     "shortcuts" : {
       "mouse_middleclick" : "中クリック",
       "open_next_entry" : "次のエントリーを開く",
@@ -170,7 +170,7 @@
       "mark_current_entry" : "現在のエントリーを既読/未読にする",
       "mark_all_as_read" : "全エントリーを既読にする",
       "open_in_new_tab_mark_as_read" : "エントリーを既読にして新しいタブで開く",
-      "fullscreen" : "フルスクリーントグル",
+      "fullscreen" : "フルスクリーン切り替え",
       "font_size" : "現在のエントリーのフォントサイズを大きく/小さくする",
       "go_to_all" : "All viewに変更する",
       "go_to_starred" : "スター付きviewに変更する",

src/main/app/i18n/ko.js

@@ -4,23 +4,23 @@
     "cancel" : "취소",
     "delete" : "삭제",
     "required" : "필수",
-    "download" : "Download ",
+    "download" : "다운로드",
-    "link" : "Link ",
+    "link" : "링크",
-    "bookmark" : "Bookmark ",
+    "bookmark" : "북마크",
-    "close" : "Close ",
+    "close" : "닫기 ",
-    "tags" : "Tags "
+    "tags" : "태그 "
   },
   "tree" : {
     "subscribe" : "구독",
-    "import" : "임포트",
+    "import" : "가져오기",
     "new_category" : "새로운 카테고리",
     "all" : "전체",
-    "starred" : "스타"
+    "starred" : "중요 표시됨"
   },
   "subscribe" : {
     "feed_url" : "피드 URL",
     "feed_name" : "피드 이름",
-    "category" : "카테로기"
+    "category" : "카테고리"
   },
   "import" : {
     "google_reader_prefix" : "당신의 Google Reader",
@@ -31,23 +31,23 @@
   },
   "new_category" : {
     "name" : "이름",
-    "parent" : "카테고리  주소로 가기"
+    "parent" : "부모 카테고리"
   },
   "toolbar" : {
-    "unread" : "안읽음",
+    "unread" : "읽지 않음",
     "all" : "전체",
-    "previous_entry" : "Previous entry ",
+    "previous_entry" : "이전 항목",
-    "next_entry" : "Next entry ",
+    "next_entry" : "다음 항목",
-    "refresh" : "리프래쉬",
+    "refresh" : "새로고침",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "모든 피드를 강제로 새로고침",
-    "sort_by_asc_desc" : "Sort by date asc/desc ",
+    "sort_by_asc_desc" : "날짜별 오름차/내림차순 정렬",
-    "titles_only" : "Titles only ",
+    "titles_only" : "제목만 표시하기",
-    "expanded_view" : "Expanded view ",
+    "expanded_view" : "Expanded View",
-    "mark_all_as_read" : "읽음표시",
+    "mark_all_as_read" : "읽음으로 표시",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "12시간보다 오래된 항목",
-    "mark_all_older_day" : "Items older than a day ",
+    "mark_all_older_day" : "1일보다 오래된 항목",
-    "mark_all_older_week" : "Items older than a week ",
+    "mark_all_older_week" : "1주일보다 오래된 항목",
-    "mark_all_older_two_weeks" : "Items older than two weeks ",
+    "mark_all_older_two_weeks" : "2주일보다 오래된 항목",
     "settings" : "설정",
     "profile" : "프로필",
     "admin" : "괸리자",
@@ -57,124 +57,124 @@
   },
   "view" : {
     "entry_source" : "from  ",
-    "entry_author" : "by  ",
+    "entry_author" : "by ",
-    "error_while_loading_feed" : "피드로딩중 에러",
+    "error_while_loading_feed" : "피드 로딩중 에러",
-    "keep_unread" : "안읽은것 저장",
+    "keep_unread" : "항상 읽지 않음으로 표시",
-    "no_unread_items" : " 읽지않은 항목이 없읍니다.",
+    "no_unread_items" : " 읽지 않은 항목이 없습니다.",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "mark_up_to_here" : "이 위로 읽음으로 표시",
-    "search_for" : "searching for:  ",
+    "search_for" : "검색:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "검색 결과 없음"
   },
   "feedsearch" : {
-    "hint" : "Type in a subscription... ",
+    "hint" : "구독 이름을 입력하세요",
-    "help" : "Use the return key to select and arrow keys to navigate. ",
+    "help" : "화살표 키로 이동하고 엔터 키로 선택하세요.",
-    "result_prefix" : "Your subscriptions: "
+    "result_prefix" : "검색 결과:"
   },
   "settings" : {
     "general" : {
       "value" : "일반",
-      "language" : "일반 언어",
+      "language" : "언어",
-      "language_contribute" : "번역 도움하기",
+      "language_contribute" : "번역에 기여하기",
-      "show_unread" : "안읽은 항목들이 있는 피드와 카테고리 보여주기",
+      "show_unread" : "안 읽은 항목들이 있는 피드와 카테고리 보여주기",
-      "social_buttons" : "소셜미디아 버튼들 보여주기",
+      "social_buttons" : "공유 버튼 표시하기",
-      "scroll_marks" : "Expanded View에서 스크롤하면 항목들을 읽음으로 저장하기"
+      "scroll_marks" : "Expanded View에서 스크롤하면 항목들을 읽음으로 표시하기"
     },
-    "appearance" : "Appearance ",
+    "appearance" : "외관",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "항목 사이를 이동할 때 스크롤 속도 (밀리초로 설정)",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "비활성화하려면 0으로 설정하세요",
-    "theme" : "Theme ",
+    "theme" : "테마",
-    "submit_your_theme" : "Submit your theme ",
+    "submit_your_theme" : "새 테마 업로드",
-    "custom_css" : "커스톰 CSS"
+    "custom_css" : "커스텀 CSS"
   },
   "details" : {
-    "feed_details" : "피드 세부",
+    "feed_details" : "피드 상세",
-    "url" : "유알엘",
+    "url" : "URL",
-    "website" : "Website ",
+    "website" : "웹사이트",
     "name" : "이름",
     "category" : "카테고리",
-    "position" : "Position ",
+    "position" : "위치",
-    "last_refresh" : "마지막 리프래쉬",
+    "last_refresh" : "마지막 새로고침",
-    "message" : "Last refresh message ",
+    "message" : "마지막 새로고침 메시지",
-    "next_refresh" : "Next refresh ",
+    "next_refresh" : "다음 새로고침",
-    "queued_for_refresh" : "Queued for refresh ",
+    "queued_for_refresh" : "새로고침 대기중",
-    "feed_url" : "피드 유알엘",
+    "feed_url" : "피드 URL",
     "generate_api_key_first" : "당신의 프로필을 위해 API Key를 먼저 생성하세요.",
-    "unsubscribe" : "주소 삭제",
+    "unsubscribe" : "구독 해제",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "정말 이 피드를 구독 해제하시겠습니까?",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "정말 이 카테고리를 삭제하시겠습니까?",
-    "category_details" : "카테고리 세부",
+    "category_details" : "카테고리 상세",
-    "tag_details" : "Tag details ",
+    "tag_details" : "태그 상세",
     "parent_category" : "부모 카테고리"
   },
   "profile" : {
     "user_name" : "사용자 이름",
     "email" : "이메일",
-    "change_password" : "비밀번호변경",
+    "change_password" : "비밀번호 변경",
-    "confirm_password" : "비밀번호확인",
+    "confirm_password" : "비밀번호 확인",
-    "minimum_6_chars" : "최소로 6자문자가 필요합니다.",
+    "minimum_8_chars" : "최소 8개의 문자가 필요합니다.",
     "passwords_do_not_match" : "비밀번호가 일치하지 않습니다.",
     "api_key" : "API key",
     "api_key_not_generated" : "아직 API Key가 생성되지 않았습니다.",
     "generate_new_api_key" : "API Key 생성하기",
     "generate_new_api_key_info" : "비밀번호를 변경하면 새로운 API Key가 생성됩니다.",
-    "opml_export" : "OPML export ",
+    "opml_export" : "OPML 내보내기",
-    "delete_account" : "프로필삭제",
+    "delete_account" : "계정 삭제하기",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "계정을 삭제하시겠습니까? 되돌릴 수 없어요!"
   },
   "about" : {
     "rest_api" : {
       "value" : "REST API",
-      "line1" : "CommaFeed는 JAX-RS하고 AngularJS를 이용해서 만들었습니다. 그렇기 때문에 REST API를 사용할수있습니다.",
+      "line1" : "CommaFeed는 JAX-RS와 AngularJS를 이용해 만들었습니다. 그렇기 때문에 REST API를 사용할수있습니다.",
       "link_to_documentation" : "문서 링크."
     },
-    "keyboard_shortcuts" : "단축기",
+    "keyboard_shortcuts" : "단축키",
-    "version" : "CommaFeed version ",
+    "version" : "CommaFeed 버전",
-    "line1_prefix" : "CommaFeed는 오픈 소스프로젝트입니다. 소스는",
+    "line1_prefix" : "CommaFeed는 오픈 소스 프로젝트입니다. 소스는",
     "line1_suffix" : "에 있습니다.",
     "line2_prefix" : "문제가 발생하는 경우",
-    "line2_suffix" : " 프로젝트 문제페이지에 보고하십시요.",
+    "line2_suffix" : " 프로젝트 문제 페이지에 보고하십시오.",
-    "line3" : "이 프로젝트를 좋아하시면 개발자를 지원하고 웹사이트 유지용비를 충당하는 데 도움이되는 기부금을 고려하시기 바랍니다.",
+    "line3" : "이 프로젝트를 좋아하시면 개발자를 지원하고 웹사이트 유지비용을 충당하는 데 도움이 되는 기부금을 고려하시기 바랍니다.",
-    "line4" : "For those of you who prefer bitcoin, here is the address ",
+    "line4" : "비트코인으로 기부하기",
     "goodies" : {
       "value" : "Goodies",
-      "android_app" : "Android app ",
+      "android_app" : "안드로이드 앱",
-      "subscribe_url" : "Subscribe URL ",
+      "subscribe_url" : "구독 URL",
-      "chrome_extension" : "Chrome extension ",
+      "chrome_extension" : "Chrome 확장 프로그램",
-      "firefox_extension" : "Firefox extension ",
+      "firefox_extension" : "Firefox 확장 기능",
-      "opera_extension" : "Opera extension ",
+      "opera_extension" : "Opera 확장 기능",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click) ",
+      "subscribe_bookmarklet" : "구독 북마크 추가 (클릭)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
+      "subscribe_bookmarklet_asc" : "오래된 것 먼저",
-      "subscribe_bookmarklet_desc" : "Newest first ",
+      "subscribe_bookmarklet_desc" : "새로운 것 먼저",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar) "
+      "next_unread_bookmarklet" : "안 읽은 항목 북마크 (북마크바에 끌기) "
     },
     "translation" : {
       "value" : "번역",
-      "message" : "CommaFeed를 번역할려면 당신의 도움이 필요합니다.",
+      "message" : "CommaFeed를 번역하는데 당신의 도움이 필요합니다.",
       "link" : "번역에 기여하기"
     },
     "announcements" : "공지",
     "shortcuts" : {
-      "mouse_middleclick" : "마우시 미들클릭",
+      "mouse_middleclick" : "마우스 미들클릭",
       "open_next_entry" : "다음 항목 열기",
       "open_previous_entry" : "이전 항목 열기",
       "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
+      "move_page_down_up" : "페이지 아래/위로 이동 ",
-      "focus_next_entry" : "set focus on next entry without opening it ",
+      "focus_next_entry" : "열지 않고 다음 항목 보기",
-      "focus_previous_entry" : "set focus on previous entry without opening it ",
+      "focus_previous_entry" : "열지 않고 이전 항목 보기",
-      "open_next_feed" : "open next feed or category ",
+      "open_next_feed" : "다음 피드나 카테고리 열기",
-      "open_previous_feed" : "open previous feed or category ",
+      "open_previous_feed" : "이전 피드나 카테고리 열기",
       "open_close_current_entry" : "현재 항목 열기/닫기",
-      "open_current_entry_in_new_window" : "새 창에서 현재 항목열기",
+      "open_current_entry_in_new_window" : "새 창으로 현재 항목 열기",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background ",
+      "open_current_entry_in_new_window_background" : "백그라운드에 새 창으로 현재 항목 열기",
-      "star_unstar" : "현재 항목 스타/스타제거",
+      "star_unstar" : "현재 항목 중요 표시/중요 표시 제거",
       "mark_current_entry" : "현재 항목 읽음/안읽음 표시",
       "mark_all_as_read" : "모든 항목 읽음으로 표시",
       "open_in_new_tab_mark_as_read" : "읽음으로 표시하고 새로운 탭에서 열기",
-      "fullscreen" : "toggle full screen mode ",
+      "fullscreen" : "전체화면 켜기/끄기",
-      "font_size" : "increase/decrease font size of the current entry ",
+      "font_size" : "현재 항목의 글꼴 크기를 크게/작게",
-      "go_to_all" : "go to the All view ",
+      "go_to_all" : "모든 항목 보기",
-      "go_to_starred" : "go to the Starred view ",
+      "go_to_starred" : "중요 표시한 항목 보기",
-      "feed_search" : "navigate to a subscription by entering the subscription name "
+      "feed_search" : "구독 이름으로 구독 찾기"
     }
   }
-}
+}

src/main/app/i18n/ms.js

@@ -111,7 +111,7 @@
     "email" : "E-mel",
     "change_password" : "Tukar kata laluan",
     "confirm_password" : "Sahkan kata laluan",
-    "minimum_6_chars" : "Minimum 6 huruf",
+    "minimum_8_chars" : "Minimum 8 huruf",
     "passwords_do_not_match" : "Kata laluan tidak sama",
     "api_key" : "API key",
     "api_key_not_generated" : "Belum dijana",

src/main/app/i18n/nb.js

@@ -111,7 +111,7 @@
     "email" : "E-post",
     "change_password" : "Endre passord",
     "confirm_password" : "Bekreft passord",
-    "minimum_6_chars" : "Minimum 6 tegn",
+    "minimum_8_chars" : "Minimum 8 tegn",
     "passwords_do_not_match" : "Passordene er ikke like",
     "api_key" : "API-nøkkel",
     "api_key_not_generated" : "Har ikke blitt generert",

src/main/app/i18n/nl.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Verander wachtwoord",
     "confirm_password" : "Bevestig wachtwoord",
-    "minimum_6_chars" : "Minimaal 6 tekens",
+    "minimum_8_chars" : "Minimaal 8 tekens",
     "passwords_do_not_match" : "Wachtwoorden komen niet overeen",
     "api_key" : "API sleutel",
     "api_key_not_generated" : "Nog niet gegenereerd",

src/main/app/i18n/nn.js

@@ -111,7 +111,7 @@
     "email" : "E-post",
     "change_password" : "Endre passord",
     "confirm_password" : "Stadfest passord",
-    "minimum_6_chars" : "Minimum 6 teikn",
+    "minimum_8_chars" : "Minimum 8 teikn",
     "passwords_do_not_match" : "Passorda er usamde",
     "api_key" : "API-nykel",
     "api_key_not_generated" : "Har ikkje vorte generert",

src/main/app/i18n/pl.js

@@ -39,12 +39,12 @@
     "previous_entry" : "Poprzedni element",
     "next_entry" : "Następny element",
     "refresh" : "Odswież",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "Odśwież teraz wszystkie kanały ",
     "sort_by_asc_desc" : "Sortuj od najnowszego/najstarszego",
     "titles_only" : "Widok listy",
     "expanded_view" : "Widok rozwinięty",
     "mark_all_as_read" : "Oznacz wszystko jako przeczytane",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "Elementy starsze niż 12 godzin ",
     "mark_all_older_day" : "Elementy starsze niż dzień",
     "mark_all_older_week" : "Elementy starsze niż tydzień",
     "mark_all_older_two_weeks" : "Elementy starsze niż dwa tygodnie",
@@ -61,9 +61,9 @@
     "error_while_loading_feed" : "Wystąpił błąd podczas ładowania tego kanału.",
     "keep_unread" : "Pozostaw nieprzeczytane",
     "no_unread_items" : " nie ma nieprzeczytanych elementów.",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "mark_up_to_here" : "Oznacz jako przeczytane do tego elementu ",
-    "search_for" : "searching for:  ",
+    "search_for" : "wyszukiwanie dla:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "Nie znaleziono wyników dla wyszukiwanej frazy "
   },
   "feedsearch" : {
     "hint" : "Wpisz subskrybcję...",
@@ -80,8 +80,8 @@
       "scroll_marks" : "W widoku rozwiniętym przewijanie oznacza elementy jako przeczytane"
     },
     "appearance" : "Wygląd",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "Prędkość przewijania podczas nawigowania pomiędzy wpisami (w milisekundach) ",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "ustaw na 0 by wyłączyć ",
     "theme" : "Motyw",
     "submit_your_theme" : "Wyślij swój motyw",
     "custom_css" : "Własny styl CSS"
@@ -89,21 +89,23 @@
   "details" : {
     "feed_details" : "Szczegóły kanału",
     "url" : "URL",
-    "website" : "Website ",
+    "website" : "Strona internetowa",
     "name" : "Nazwa",
     "category" : "Kategoria",
     "position" : "Pozycja",
     "last_refresh" : "Ostatnio odświeżony",
-    "message" : "Last refresh message ",
+    "message" : "Ostatnia odpowiedź odświeżenia",
     "next_refresh" : "Następne odświeżenie",
     "queued_for_refresh" : "W kolejce do odświeżenia",
     "feed_url" : "URL kanału",
+    "filtering_expression" : "Wyrażenie filtrujące",
+    "filtering_expression_help" : "Ustaw puste, by wyłączyć. W przeciwnym razie wyrażenie zwracające 'true' lub 'false'. Dla 'false' nowe elementy w kanale będą autmatycznie \noznaczane jako przeczytane. Dostępne zmienne to: 'title', 'content', 'url' 'author' and 'categories'. Ich zawartość jest konwertowana na małe litery \npodczas porówynywania tekstu. Przykład: url.contains('youtube') albo (author eq 'athou' and title.contains('github') \nPełna dostępna składnia jest dostępna pod <a href='http://commons.apache.org/proper/commons-jexl/reference/syntax.html' target='_blank'>tym</a> adresem.",
     "generate_api_key_first" : "Najpierw wygeneruj klucz API w swoim profilu.",
     "unsubscribe" : "Cofnij subskrypcje",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "Czy na pewno chcesz cofnąć sybskrypcję tego kanału? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "Czy na pewno chcesz usunąć tą kategorię? ",
     "category_details" : "Szczegóły kategorii",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Szczegóły tagu ",
     "parent_category" : "Kategoria nadrzędna"
   },
   "profile" : {
@@ -111,7 +113,7 @@
     "email" : "E-mail",
     "change_password" : "Zmień hasło",
     "confirm_password" : "Potwierdź hasło",
-    "minimum_6_chars" : "Minimum 6 znaków",
+    "minimum_8_chars" : "Minimum 8 znaków",
     "passwords_do_not_match" : "Hasła nie pasują do siebie",
     "api_key" : "Klucz API",
     "api_key_not_generated" : "Jeszcze niewygenerowany",
@@ -119,7 +121,7 @@
     "generate_new_api_key_info" : "Zmiana hasła spowoduje wygenerowanie nowego klucza API",
     "opml_export" : "Eksportuj do pliku OPML",
     "delete_account" : "Usuń konto",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "Na pewno usunąć to konto? Nie można tego cofnąć! "
   },
   "about" : {
     "rest_api" : {
@@ -143,8 +145,8 @@
       "firefox_extension" : "Dodatek do Firefoxa",
       "opera_extension" : "Dodatek do Opery",
       "subscribe_bookmarklet" : "Dodaj subskrybcje jako skryptozakładkę (kliknij)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
+      "subscribe_bookmarklet_asc" : "Najpierw najstarsze ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
+      "subscribe_bookmarklet_desc" : "Najpierw najnowsze ",
       "next_unread_bookmarklet" : "Następny nieprzeczytany element jako skryptozakładka (przeciągnij na pasek zakładek)"
     },
     "translation" : {
@@ -172,9 +174,9 @@
       "open_in_new_tab_mark_as_read" : "otwórz w nowej zakładce i oznacz jako przeczytane",
       "fullscreen" : "przełącz tryb pełnoekranowy",
       "font_size" : "zmień wielkość czcionki",
-      "go_to_all" : "go to the All view ",
+      "go_to_all" : "przejdź do widoku Wszystkich elementów ",
-      "go_to_starred" : "go to the Starred view ",
+      "go_to_starred" : "przejdź do Elementów oznaczonych gwiazdką ",
       "feed_search" : "przejdź do subskrybcji wpisując jej nazwę"
     }
   }
-}
+}

src/main/app/i18n/pt.js

@@ -62,8 +62,8 @@
     "keep_unread" : "Manter como não lido",
     "no_unread_items" : "não tem itens não lidos.",
     "mark_up_to_here" : "Marcar como lido até aqui",
-    "search_for" : "searching for:  ",
+    "search_for" : "Procurando por:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "Nenhum resultado encontrado para a pesquisa."
   },
   "feedsearch" : {
     "hint" : "Digite o nome de uma Inscrição...",
@@ -80,8 +80,8 @@
       "scroll_marks" : "No modo expandido, percorrer os itens marca-os como lidos"
     },
     "appearance" : "Aparência",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "Velocidade de rolagem enquanto navega pelos itens.",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "Deixe em 0 para desabilitar ",
     "theme" : "Tema",
     "submit_your_theme" : "Envie seu tema",
     "custom_css" : "CSS personalizado"
@@ -94,24 +94,24 @@
     "category" : "Categoria",
     "position" : "Posição",
     "last_refresh" : "Última atualização",
-    "message" : "Last refresh message ",
+    "message" : "Ultima mensagem de atualização ",
     "next_refresh" : "Próxima atualização",
     "queued_for_refresh" : "Na fila para atualizar",
     "feed_url" : "URL do feed",
     "generate_api_key_first" : "Gerar uma chave de API em seu perfil primeiro.",
     "unsubscribe" : "Cancelar inscrição",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "Você tem certeza de que deseja se desinscrever desse feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "Você tem certeza de que deseja deletar essa categoria? ",
     "category_details" : "Detalhes da categoria",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Detalhes da tag ",
-    "parent_category" : "Categoria pai"
+    "parent_category" : "Categoria principal"
   },
   "profile" : {
     "user_name" : "Nome de usuário",
     "email" : "E-mail",
     "change_password" : "Trocar senha",
     "confirm_password" : "Confirmar senha",
-    "minimum_6_chars" : "Mínimo de 6 caracteres",
+    "minimum_8_chars" : "Mínimo de 8 caracteres",
     "passwords_do_not_match" : "Senhas não conferem",
     "api_key" : "Chave de API",
     "api_key_not_generated" : "Ainda não gerada",
@@ -119,7 +119,7 @@
     "generate_new_api_key_info" : "Mudar a senha irá gerar uma nova chave de API",
     "opml_export" : "Exportar OPML",
     "delete_account" : "Excluir conta",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "Deseja excluir sua conta? Não há como desfazer essa ação! "
   },
   "about" : {
     "rest_api" : {
@@ -129,7 +129,7 @@
     },
     "keyboard_shortcuts" : "Atalhos de teclado",
     "version" : "CommaFeed versão",
-    "line1_prefix" : "CommaFeed é um projeto de código livre. Fontes estão hospedados em ",
+    "line1_prefix" : "CommaFeed é um projeto de código livre. As sources estão hospedados em ",
     "line1_suffix" : ".",
     "line2_prefix" : "Se você encontrar um problema, por favor relate-o na página de problemas do projeto ",
     "line2_suffix" : ".",
@@ -143,13 +143,13 @@
       "firefox_extension" : "Extensão para o Firefox",
       "opera_extension" : "Extensão para o Opera",
       "subscribe_bookmarklet" : "Bookmarklet para adicionar inscrição (clique)",
-      "subscribe_bookmarklet_asc" : "Mais velhas primeiro",
+      "subscribe_bookmarklet_asc" : "Mais antigas primeiro",
-      "subscribe_bookmarklet_desc" : "Mais novas primeiro",
+      "subscribe_bookmarklet_desc" : "Mais recentes primeiro",
       "next_unread_bookmarklet" : "Bookmarklet para o próximo item não lido (arraste para a barra de favoritos)"
     },
     "translation" : {
       "value" : "Tradução",
-      "message" : "Precisamos de sua ajuda para traduzir CommaFeed.",
+      "message" : "Precisamos de sua ajuda para traduzir o CommaFeed.",
       "link" : "Veja como contribuir com traduções."
     },
     "announcements" : "Anúncios",
@@ -177,4 +177,4 @@
       "feed_search" : "navega entre inscrições buscando pelo nome"
     }
   }
-}
+}

src/main/app/i18n/ru.js

@@ -111,7 +111,7 @@
     "email" : "Эл. почта",
     "change_password" : "Изменить пароль",
     "confirm_password" : "Подтвердите пароль",
-    "minimum_6_chars" : "Не меньше 6 символов",
+    "minimum_8_chars" : "Не меньше 8 символов",
     "passwords_do_not_match" : "Пароли не совпадают",
     "api_key" : "API-ключ",
     "api_key_not_generated" : "Не сгенерирован",
@@ -177,4 +177,4 @@
       "feed_search" : "перейти к подписке по названию"
     }
   }
-}
+}

src/main/app/i18n/sk.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Zmeniť heslo",
     "confirm_password" : "Potvrdiť heslo",
-    "minimum_6_chars" : "Minimum je 6 znakov",
+    "minimum_8_chars" : "Minimum je 8 znakov",
     "passwords_do_not_match" : "Heslá sa nezhodujú",
     "api_key" : "API kľúč",
     "api_key_not_generated" : "Nie je vygenerovaný",

src/main/app/i18n/sv.js

@@ -111,7 +111,7 @@
     "email" : "E-mail",
     "change_password" : "Ändra lösenord",
     "confirm_password" : "Bekräfta lösenord",
-    "minimum_6_chars" : "Minst 6 bokstäver",
+    "minimum_8_chars" : "Minst 8 bokstäver",
     "passwords_do_not_match" : "Lösenorden matchar inte",
     "api_key" : "API-nyckel",
     "api_key_not_generated" : "Inte skapad än",

src/main/app/i18n/tr.js

@@ -8,7 +8,7 @@
     "link" : "Bağlantı",
     "bookmark" : "Yer imi",
     "close" : "Kapat",
-    "tags" : "Tags "
+    "tags" : "Etiketler "
   },
   "tree" : {
     "subscribe" : "Abone ol",
@@ -24,7 +24,7 @@
   },
   "import" : {
     "google_reader_prefix" : "Aboneliklerinizi ",
-    "google_reader_suffix" : " hesabınızdan aktarmama izin verin.",
+    "google_reader_suffix" : "Hesabınızdan aktarmama izin verin.",
     "google_download" : "Veya, subscriptions.xml dosyanızı yükleyin.",
     "google_download_link" : "Buradan indirebilirsiniz.",
     "xml_file" : "OPML dosyası"
@@ -39,15 +39,15 @@
     "previous_entry" : "Önceki ileti",
     "next_entry" : "Sonraki ileti",
     "refresh" : "Yenile",
-    "refresh_all" : "Force refresh all my feeds ",
+    "refresh_all" : "Tüm yayınları yenilemek için zorla",
     "sort_by_asc_desc" : "Tarihe göre sırala artan/azalan",
     "titles_only" : "Sadece başlıklar",
     "expanded_view" : "Genişletilmiş görünüm",
     "mark_all_as_read" : "Tümünü okundu işaretle",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_older_12_hours" : "12 saatten daha eski yayınlar ",
-    "mark_all_older_day" : "Bir günden eski yazılar",
+    "mark_all_older_day" : "Bir günden eski yayınlar",
-    "mark_all_older_week" : "Bir haftadan eski yazılar",
+    "mark_all_older_week" : "Bir haftadan eski yayınlar",
-    "mark_all_older_two_weeks" : "İki haftadan eski yazılar",
+    "mark_all_older_two_weeks" : "İki haftadan eski yayınlar",
     "settings" : "Ayarlar",
     "profile" : "Profil",
     "admin" : "Yönetim",
@@ -56,14 +56,14 @@
     "donate" : "Bağış"
   },
   "view" : {
-    "entry_source" : "from  ",
+    "entry_source" : "kaynak: ",
-    "entry_author" : "by  ",
+    "entry_author" : "yazar: ",
     "error_while_loading_feed" : "Bu aboneliği çekerken hata oluştu.",
     "keep_unread" : "Okunmadı olarak sakla",
-    "no_unread_items" : "okunmamış ileti yok.",
+    "no_unread_items" : "Okunmamış ileti yok.",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "mark_up_to_here" : "Buraya kadar olan bütün yayınları okundu olarak işaretle!",
     "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "no_search_results" : "İstenen anahtar kelimeler için eşleşme bulunamadı"
   },
   "feedsearch" : {
     "hint" : "Bir abonelik yazın...",
@@ -80,8 +80,8 @@
       "scroll_marks" : "Genişletilmiş görünümde götüntülenen iletileri okunmuş işaretle"
     },
     "appearance" : "Görünüm",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
+    "scroll_speed" : "İçerikler arasında gezinirken kaydırma hızı (milisaniye cinsinden)",
-    "scroll_speed_help" : "set to 0 to disable ",
+    "scroll_speed_help" : "ayarı kapatmak için 0 yazınız",
     "theme" : "Tema",
     "submit_your_theme" : "Tema gönder",
     "custom_css" : "Kişiselleştirilmiş CSS"
@@ -100,10 +100,10 @@
     "feed_url" : "Yayın URL'si",
     "generate_api_key_first" : "Öncelikle profilinizden bir API anahtarı oluşturun.",
     "unsubscribe" : "Aboneliği iptal et",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
+    "unsubscribe_confirmation" : "Bu yayından çıkmak istediğinizden emin misiniz? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "delete_category_confirmation" : "Bu kategoriyi silmek istediğinizden emin misiniz? ",
     "category_details" : "Kategori detayları",
-    "tag_details" : "Tag details ",
+    "tag_details" : "Etiket detayları ",
     "parent_category" : "Üst kategori"
   },
   "profile" : {
@@ -111,15 +111,15 @@
     "email" : "E-posta",
     "change_password" : "Şifre değiştir",
     "confirm_password" : "Şifreyi doğrula",
-    "minimum_6_chars" : "En az 6 karakter",
+    "minimum_8_chars" : "En az 8 karakter",
     "passwords_do_not_match" : "Şifreler uyuşmuyor",
     "api_key" : "API anahtarı",
     "api_key_not_generated" : "Henüz oluşturulmadı",
     "generate_new_api_key" : "Yeni bir API anahtarı oluştur",
-    "generate_new_api_key_info" : "Şifre değiştirmek API anahtarının da değiştirilmesine neden olcak.",
+    "generate_new_api_key_info" : "Şifreyi değiştirmek API anahtarının da değiştirilmesine neden olcak.",
     "opml_export" : "OPML dışa aktar",
     "delete_account" : "Hesabı sil",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "delete_account_confirmation" : "Hesabı silmek istediğinize emin misiniz? Bu işlemde geri dönüş yoktur! "
   },
   "about" : {
     "rest_api" : {
@@ -128,24 +128,24 @@
       "link_to_documentation" : "Dökümantasyon için tıklayın."
     },
     "keyboard_shortcuts" : "Klavye kısayolları",
-    "version" : "CommaFeed version ",
+    "version" : "CommaFeed versiyon ",
     "line1_prefix" : "CommaFeed bir açık kaynak projedir. Kaynak dosyaları ",
-    "line1_suffix" : " adresinde yayınlanır.",
+    "line1_suffix" : "adresinde yayınlanır.",
     "line2_prefix" : "Lütfen, bir hata ile karşılaşırsanız bunu  ",
-    "line2_suffix" : " projesinde hatalar sayfasından rapor edin.",
+    "line2_suffix" : "projesinde hatalar sayfasından rapor edin.",
     "line3" : "Eğer bu projeyi beğendiyseniz, lütfen bağış yaparak geliştiriciye bu sayfayı ayakta tutmasında yardımcı olun.",
     "line4" : "Bitcoin'i tercih edenler için adres ",
     "goodies" : {
-      "value" : "Extralar",
+      "value" : "Ekstralar",
-      "android_app" : "Android app ",
+      "android_app" : "Android eklentisi",
       "subscribe_url" : "Abonelik URL'si",
       "chrome_extension" : "Chrome eklentisi",
       "firefox_extension" : "Firefox eklentisi",
       "opera_extension" : "Opera eklentisi",
-      "subscribe_bookmarklet" : "Bookmarklet'a abonelik ekle (tıklayın)",
+      "subscribe_bookmarklet" : "Yer imilerine abonelik ekle (tıklayın)",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
+      "subscribe_bookmarklet_asc" : "Eskiler önce",
-      "subscribe_bookmarklet_desc" : "Newest first ",
+      "subscribe_bookmarklet_desc" : "Yeniler önce ",
-      "next_unread_bookmarklet" : "Bookmarklet'daki en son okunmamış ileti (Sık kullanılan çubuğuna sürükleyin)"
+      "next_unread_bookmarklet" : "Yer imilerindeki en son okunmamış ileti (Sık kullanılan çubuğuna sürükleyin)"
     },
     "translation" : {
       "value" : "Çeviri",
@@ -158,7 +158,7 @@
       "open_next_entry" : "sonraki öğeyi görüntüle",
       "open_previous_entry" : "önceki öğeyi görüntüle",
       "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
+      "move_page_down_up" : "sayfayı aşağı/yukarı hareket ettir",
       "focus_next_entry" : "sonraki öğeyi görüntülemeden işaretle",
       "focus_previous_entry" : "önceki öğeyi görüntülemeden işaretle",
       "open_next_feed" : "sonraki aboneliği veya kategoriyi görüntüle",
@@ -170,11 +170,11 @@
       "mark_current_entry" : "görüntülenen öğeyi okundu/okunmadı işaretle",
       "mark_all_as_read" : "tümünü okundu işaretle",
       "open_in_new_tab_mark_as_read" : "öğeyi yeni bir sekmede aç ve okundu işaretle",
-      "fullscreen" : "toggle full screen mode ",
+      "fullscreen" : "tam ekran moduna geç ",
-      "font_size" : "increase/decrease font size of the current entry ",
+      "font_size" : "mevcut içerik için yazı boyunutunu arttır/azalt",
-      "go_to_all" : "go to the All view ",
+      "go_to_all" : "Tüm öğeleri görüntüle",
-      "go_to_starred" : "go to the Starred view ",
+      "go_to_starred" : "yıldızlı öğerleri görüntüle",
       "feed_search" : "abonelik ismini yazarak aboneliğe git"
     }
   }
-}
+}

src/main/app/i18n/zh.js

@@ -111,7 +111,7 @@
     "email" : "邮箱",
     "change_password" : "修改密码",
     "confirm_password" : "确认密码",
-    "minimum_6_chars" : "最少为 6 个字母",
+    "minimum_8_chars" : "最少为 8 个字母",
     "passwords_do_not_match" : "密码不匹配",
     "api_key" : "API 密钥",
     "api_key_not_generated" : "API 密钥尚未生成",

src/main/app/index.html

@@ -1,81 +1,86 @@
 <!DOCTYPE html>
 <html>
-<head>
+    <head>
-<title>CommaFeed</title>
+        <title>CommaFeed</title>
-<meta charset="utf-8">
+        <meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
-<link rel="apple-touch-icon" href="app-icon-57.png" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="default" />
-<link rel="apple-touch-icon" sizes="72x72" href="app-icon-72.png" />
+        <meta name="mobile-web-app-capable" content="yes" />
-<link rel="apple-touch-icon" sizes="114x114" href="app-icon-114.png" />
+        <link rel="manifest" href="manifest.json" />
-<link rel="apple-touch-icon" sizes="144x144" href="app-icon-144.png" />
+        <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-<link rel="icon" sizes="32x32" href="app-icon-32.png" />
+        <link rel="apple-touch-icon" href="app-icon-57.png" />
-<link rel="icon" sizes="64x64" href="app-icon-64.png" />
+        <link rel="apple-touch-icon" sizes="72x72" href="app-icon-72.png" />
-<link rel="icon" sizes="128x128" href="app-icon-128.png" />
+        <link rel="apple-touch-icon" sizes="114x114" href="app-icon-114.png" />
-<link rel="icon" sizes="192x192" href="app-icon-192.png" />
+        <link rel="apple-touch-icon" sizes="144x144" href="app-icon-144.png" />
-<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+        <link rel="icon" sizes="32x32" href="app-icon-32.png" />
-<meta name="theme-color" content="#F88A14" />
+        <link rel="icon" sizes="64x64" href="app-icon-64.png" />
-<meta name="application-name" content="CommaFeed" />
+        <link rel="icon" sizes="128x128" href="app-icon-128.png" />
-<meta name="msapplication-navbutton-color" content="#F88A14" />
+        <link rel="icon" sizes="192x192" href="app-icon-192.png" />
-<meta name="msapplication-starturl" content="/" />
+        <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-<meta name="msapplication-square70x70logo" content="metro-icon-70.png" />
+        <meta name="theme-color" content="#F88A14" />
-<meta name="msapplication-square150x150logo" content="metro-icon-150.png" />
+        <meta name="application-name" content="CommaFeed" />
-<link rel="fluid-icon" href="app-icon-512.png" title="CommaFeed" />
+        <meta name="msapplication-navbutton-color" content="#F88A14" />
-<link rel="logo" type="image/svg" href="app-icon.svg" />
+        <meta name="msapplication-starturl" content="/" />
+        <meta name="msapplication-square70x70logo" content="metro-icon-70.png" />
+        <meta name="msapplication-square150x150logo" content="metro-icon-150.png" />
+        <link rel="fluid-icon" href="app-icon-512.png" title="CommaFeed" />
+        <link rel="logo" type="image/svg" href="app-icon.svg" />
 
-<!-- build:css css/app.css -->
+        <!-- build:css css/app.css -->
-<link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.css" />
-<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.css" />
+        <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.css" />
-<link rel="stylesheet" href="lib/select2/select2.css" />
+        <link rel="stylesheet" href="lib/select2/select2.css" />
-<link rel="stylesheet" href="lib/ng-grid/ng-grid.css" />
+        <link rel="stylesheet" href="lib/ng-grid/ng-grid.css" />
-<link rel="stylesheet" href="lib/jquery-ui/themes/base/jquery-ui.css" />
+        <link rel="stylesheet" href="lib/jquery-ui/themes/base/jquery-ui.css" />
-<link rel="stylesheet" href="lib/angular-loading-bar/build/loading-bar.css" />
+        <link rel="stylesheet" href="lib/angular-loading-bar/build/loading-bar.css" />
 
-<link rel="stylesheet" href="css/app.css" />
+        <link rel="stylesheet" href="css/app.css" />
-<!-- endbuild -->
+        <!-- endbuild -->
-<link rel="stylesheet" href="custom_css.css" />
+        <link rel="stylesheet" href="custom_css.css" />
-</head>
+    </head>
-<body>
+    <body>
-	<div ng-app="commafeed" id="main" class="main">
+        <div ng-app="commafeed" id="main" class="main">
-		<div ui-view></div>
+            <div ui-view></div>
-	</div>
+        </div>
-	
+
-	<!-- build:js js/app.js -->
+        <!-- build:js js/app.js -->
-	<script type="text/javascript" src="lib/lodash/dist/lodash.js"></script>
+        <script type="text/javascript" src="lib/lodash/lodash.js"></script>
-	<script type="text/javascript" src="lib/jquery/dist/jquery.js"></script>
+        <script type="text/javascript" src="lib/jquery/dist/jquery.js"></script>
-	<script type="text/javascript" src="lib/jquery-ui/ui/jquery-ui.js"></script>
+        <script type="text/javascript" src="lib/jquery-ui/ui/jquery-ui.js"></script>
-	<script type="text/javascript" src="lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+        <script type="text/javascript" src="lib/jquery-mousewheel/jquery.mousewheel.js"></script>
-	<script type="text/javascript" src="lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script type="text/javascript" src="lib/bootstrap/dist/js/bootstrap.js"></script>
-	<script type="text/javascript" src="lib/angular/angular.js"></script>
+        <script type="text/javascript" src="lib/angular/angular.js"></script>
-	<script type="text/javascript" src="lib/angular-route/angular-route.js"></script>
+        <script type="text/javascript" src="lib/angular-route/angular-route.js"></script>
-	<script type="text/javascript" src="lib/angular-resource/angular-resource.js"></script>
+        <script type="text/javascript" src="lib/angular-resource/angular-resource.js"></script>
-	<script type="text/javascript" src="lib/angular-sanitize/angular-sanitize.js"></script>
+        <script type="text/javascript" src="lib/angular-sanitize/angular-sanitize.js"></script>
-	<script type="text/javascript" src="lib/angular-touch/angular-touch.js"></script>
+        <script type="text/javascript" src="lib/angular-touch/angular-touch.js"></script>
-	<script type="text/javascript" src="lib/angular-animate/angular-animate.js"></script>
+        <script type="text/javascript" src="lib/angular-animate/angular-animate.js"></script>
-	<script type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+        <script type="text/javascript" src="lib/angular-bootstrap/ui-bootstrap-tpls.js"></script>
-	<script type="text/javascript" src="lib/angular-loading-bar/build/loading-bar.js"></script>
+        <script type="text/javascript" src="lib/angular-loading-bar/build/loading-bar.js"></script>
-	<script type="text/javascript" src="lib/angular-translate/angular-translate.js"></script>
+        <script type="text/javascript" src="lib/angular-translate/angular-translate.js"></script>
-	<script type="text/javascript" src="lib/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
+        <script type="text/javascript" src="lib/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
-	
+
-	<script type="text/javascript" src="lib/ngInfiniteScroll/build/ng-infinite-scroll.js"></script>
+        <script type="text/javascript" src="lib/ngInfiniteScroll/build/ng-infinite-scroll.js"></script>
-	<script type="text/javascript" src="lib/ng-grid/build/ng-grid.js"></script>
+        <script type="text/javascript" src="lib/ng-grid/build/ng-grid.js"></script>
-	<script type="text/javascript" src="lib/angular-ui-router/release/angular-ui-router.js"></script>
+        <script type="text/javascript" src="lib/angular-ui-router/release/angular-ui-router.js"></script>
-	<script type="text/javascript" src="lib/angular-ui-utils/ui-utils.js"></script>
+        <script type="text/javascript" src="lib/angular-ui-utils/ui-utils.js"></script>
-	<script type="text/javascript" src="lib/angular-ui-select2/src/select2.js"></script>
+        <script type="text/javascript" src="lib/angular-ui-select2/src/select2.js"></script>
-	<script type="text/javascript" src="lib/select2/select2.js"></script>
+        <script type="text/javascript" src="lib/select2/select2.js"></script>
-	<script type="text/javascript" src="lib/mousetrap/mousetrap.js"></script>
+        <script type="text/javascript" src="lib/mousetrap/mousetrap.js"></script>
-	<script type="text/javascript" src="lib/momentjs/min/moment-with-locales.js"></script>
+        <script type="text/javascript" src="lib/momentjs/min/moment-with-locales.js"></script>
-	<script type="text/javascript" src="lib/devicejs/lib/device.js"></script>
+        <script type="text/javascript" src="lib/devicejs/lib/device.js"></script>
-	
+        <script type="text/javascript" src="lib/tinycon/tinycon.js"></script>
-	<script type="text/javascript" src="js/controllers.js"></script>
+
-	<script type="text/javascript" src="js/directives.js"></script>
+        <script type="text/javascript" src="js/controllers.js"></script>
-	<script type="text/javascript" src="js/filters.js"></script>
+        <script type="text/javascript" src="js/directives.js"></script>
-	<script type="text/javascript" src="js/main.js"></script>
+        <script type="text/javascript" src="js/filters.js"></script>
-	<script type="text/javascript" src="js/services.js"></script>
+        <script type="text/javascript" src="js/main.js"></script>
-	<script type="text/javascript" src="js/i18n.js"></script>
+        <script type="text/javascript" src="js/services.js"></script>
-	
+        <script type="text/javascript" src="js/i18n.js"></script>
-	<script type="text/javascript" src="js/templates.js"></script>
+
-	<!-- endbuild -->
+        <script type="text/javascript" src="js/templates.js"></script>
-	<script type="text/javascript" src="analytics.js"></script>
+        <!-- endbuild -->
-</body>
+        <script type="text/javascript" src="analytics.js"></script>
+    </body>
 </html>

src/main/app/js/directives.js

@@ -1,361 +1,402 @@
-var module = angular.module('commafeed.directives', []);
+var module = angular.module("commafeed.directives", [])
 
-module.directive('focus', ['$timeout', function($timeout) {
+module.directive("focus", [
-	return {
+    "$timeout",
-		restrict : 'A',
+    function ($timeout) {
-		link : function(scope, element, attrs) {
+        return {
-			scope.$watch(attrs.focus, function(value) {
+            restrict: "A",
-				if (!value)
+            link: function (scope, element, attrs) {
-					return;
+                scope.$watch(attrs.focus, function (value) {
-				$timeout(function() {
+                    if (!value) return
-					$(element).focus();
+                    $timeout(function () {
-				});
+                        $(element).focus()
-			});
+                    })
-		}
+                })
-	};
+            },
-}]);
+        }
+    },
+])
 
-module.directive('confirmClick', [function() {
+module.directive("confirmClick", [
-	return {
+    function () {
-		priority : -1,
+        return {
-		restrict : 'A',
+            priority: -1,
-		link : function(scope, element, attrs) {
+            restrict: "A",
-			element.bind('click', function(e) {
+            link: function (scope, element, attrs) {
-				var message = scope.$eval(attrs.confirmClick);
+                element.bind("click", function (e) {
-				if (message && !confirm(message)) {
+                    var message = scope.$eval(attrs.confirmClick)
-					e.stopImmediatePropagation();
+                    if (message && !confirm(message)) {
-					e.preventDefault();
+                        e.stopImmediatePropagation()
-				}
+                        e.preventDefault()
-			});
+                    }
-		}
+                })
-	};
+            },
-}]);
+        }
+    },
+])
 
 /**
  * Open a popup window pointing to the url in the href attribute
  */
-module.directive('popup', function() {
+module.directive("popup", function () {
-	var opts = 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=800';
+    var opts = "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=800"
-	return {
+    return {
-		link : function(scope, elm, attrs) {
+        link: function (scope, elm, attrs) {
-			elm.bind('click', function(event) {
+            elm.bind("click", function (event) {
-				window.open(this.href, '', opts);
+                window.open(this.href, "", opts)
-				event.preventDefault();
+                event.preventDefault()
-			});
+            })
-		}
+        },
-	};
+    }
-});
+})
 
 /**
  * entry tag handling
  */
-module.directive('tags', function() {
+module.directive("tags", function () {
-	return {
+    return {
-		restrict : 'E',
+        restrict: "E",
-		scope : {
+        scope: {
-			entry : '='
+            entry: "=",
-		},
+        },
-		replace : true,
+        replace: true,
-		templateUrl : 'templates/_tags.html',
+        templateUrl: "templates/_tags.html",
-		controller : ['$scope', 'EntryService', function($scope, EntryService) {
+        controller: [
-			$scope.select2Options = {
+            "$scope",
-				'multiple' : true,
+            "EntryService",
-				'simple_tags' : true,
+            function ($scope, EntryService) {
-				'maximumInputLength' : 40,
+                $scope.select2Options = {
-				tags : EntryService.tags
+                    multiple: true,
-			};
+                    simple_tags: true,
+                    maximumInputLength: 40,
+                    tags: EntryService.tags,
+                }
 
-			$scope.$watch('entry.tags', function(newValue, oldValue) {
+                $scope.$watch(
-				if (oldValue && newValue != oldValue) {
+                    "entry.tags",
-					var data = {
+                    function (newValue, oldValue) {
-						entryId : $scope.entry.id,
+                        if (oldValue && newValue != oldValue) {
-						tags : []
+                            var data = {
-					};
+                                entryId: $scope.entry.id,
-					if (newValue) {
+                                tags: [],
-						data.tags = newValue;
+                            }
-					}
+                            if (newValue) {
-					EntryService.tag(data);
+                                data.tags = newValue
-				}
+                            }
-			}, true);
+                            EntryService.tag(data)
-		}]
+                        }
-	};
+                    },
-});
+                    true
+                )
+            },
+        ],
+    }
+})
 
 /**
  * Reusable favicon component
  */
-module.directive('favicon', function() {
+module.directive("favicon", function () {
-	var tpl = '<img ng-src="{{url}}" class="favicon"></img>';
+    var tpl = '<img ng-src="{{url}}" class="favicon"></img>'
-	return {
+    return {
-		restrict : 'E',
+        restrict: "E",
-		scope : {
+        scope: {
-			url : '='
+            url: "=",
-		},
+        },
-		replace : true,
+        replace: true,
-		template : tpl
+        template: tpl,
-	};
+    }
-});
+})
 
 /**
  * Support for the blur event
  */
-module.directive('ngBlur', function() {
+module.directive("ngBlur", function () {
-	return {
+    return {
-		restrict : 'A',
+        restrict: "A",
-		link : function(scope, elm, attrs) {
+        link: function (scope, elm, attrs) {
-			elm.bind('blur', function() {
+            elm.bind("blur", function () {
-				scope.$apply(attrs.ngBlur);
+                scope.$apply(attrs.ngBlur)
-			});
+            })
-		}
+        },
-	};
+    }
-});
+})
 
 /**
  * Prevent mousewheel scrolling from propagating to the parent when scrollbar
  * reaches top or bottom
  */
-module.directive('mousewheelScrolling', function() {
+module.directive("mousewheelScrolling", function () {
-	return {
+    return {
-		restrict : 'A',
+        restrict: "A",
-		link : function(scope, elem, attr) {
+        link: function (scope, elem, attr) {
-			elem.bind('mousewheel', function(e, d) {
+            elem.bind("mousewheel", function (e, d) {
-				var t = $(this);
+                var t = $(this)
-				if (d > 0 && t.scrollTop() === 0) {
+                if (d > 0 && t.scrollTop() === 0) {
-					e.preventDefault();
+                    e.preventDefault()
-				} else {
+                } else {
-					if (d < 0 && (t.scrollTop() == t.get(0).scrollHeight - t.innerHeight())) {
+                    if (d < 0 && t.scrollTop() == t.get(0).scrollHeight - t.innerHeight()) {
-						e.preventDefault();
+                        e.preventDefault()
-					}
+                    }
-				}
+                }
-			});
+            })
-		}
+        },
-	};
+    }
-});
+})
 
 /**
  * Needed to use recursive directives. Wrap a recursive element with a
  * <recursive> tag
  */
-module.directive('recursive', ['$compile', function($compile) {
+module.directive("recursive", [
-	return {
+    "$compile",
-		restrict : 'E',
+    function ($compile) {
-		priority : 100000,
+        return {
-		compile : function(tElement, tAttr) {
+            restrict: "E",
-			var contents = tElement.contents().remove();
+            priority: 100000,
-			var compiledContents = null;
+            compile: function (tElement, tAttr) {
-			return function(scope, iElement, iAttr) {
+                var contents = tElement.contents().remove()
-				if (!compiledContents) {
+                var compiledContents = null
-					compiledContents = $compile(contents);
+                return function (scope, iElement, iAttr) {
-				}
+                    if (!compiledContents) {
-				iElement.append(compiledContents(scope, function(clone) {
+                        compiledContents = $compile(contents)
-					return clone;
+                    }
-				}));
+                    iElement.append(
-			};
+                        compiledContents(scope, function (clone) {
-		}
+                            return clone
-	};
+                        })
-}]);
+                    )
+                }
+            },
+        }
+    },
+])
 
 /**
  * Reusable category component
  */
-module.directive('category', [function() {
+module.directive("category", [
-	return {
+    function () {
-		scope : {
+        return {
-			node : '=',
+            scope: {
-			level : '=',
+                node: "=",
-			selectedType : '=',
+                level: "=",
-			selectedId : '=',
+                selectedType: "=",
-			showLabel : '=',
+                selectedId: "=",
-			showChildren : '=',
+                showLabel: "=",
-			unreadCount : '&',
+                showChildren: "=",
-			tag : '='
+                unreadCount: "&",
-		},
+                tag: "=",
-		restrict : 'E',
+            },
-		replace : true,
+            restrict: "E",
-		templateUrl : 'templates/_category.html',
+            replace: true,
-		controller : ['$scope', '$state', 'FeedService', 'CategoryService', 'SettingsService', 'MobileService',
+            templateUrl: "templates/_category.html",
-				function($scope, $state, FeedService, CategoryService, SettingsService, MobileService) {
+            controller: [
-					$scope.settingsService = SettingsService;
+                "$scope",
+                "$state",
+                "FeedService",
+                "CategoryService",
+                "SettingsService",
+                "MobileService",
+                function ($scope, $state, FeedService, CategoryService, SettingsService, MobileService) {
+                    $scope.settingsService = SettingsService
 
-					$scope.getClass = function(level) {
+                    $scope.getClass = function (level) {
-						if ($scope.showLabel) {
+                        if ($scope.showLabel) {
-							return 'indent' + level;
+                            return "indent" + level
-						}
+                        }
-					};
+                    }
 
-					$scope.categoryLabel = function(category) {
+                    $scope.categoryLabel = function (category) {
-						return $scope.showLabel !== true ? $scope.showLabel : category.name;
+                        return $scope.showLabel !== true ? $scope.showLabel : category.name
-					};
+                    }
 
-					$scope.categoryCountLabel = function(category) {
+                    $scope.categoryCountLabel = function (category) {
-						var count = $scope.unreadCount({
+                        var count = $scope.unreadCount({
-							category : category
+                            category: category,
-						});
+                        })
-						var label = '';
+                        var label = ""
-						if (count > 0) {
+                        if (count > 0) {
-							label += count;
+                            label += count
-						}
+                        }
-						return label;
+                        return label
-					};
+                    }
 
-					$scope.feedCountLabel = function(feed) {
+                    $scope.feedCountLabel = function (feed) {
-						var label = '';
+                        var label = ""
-						if (feed.unread > 0) {
+                        if (feed.unread > 0) {
-							label += feed.unread; 
+                            label += feed.unread
-						}
+                        }
-						return label;
+                        return label
-					};
+                    }
 
-					$scope.feedClicked = function(id, event) {
+                    $scope.feedClicked = function (id, event) {
-						// Could be called by a middle click
+                        // Could be called by a middle click
-						if (!event || (!event.ctrlKey && event.which == 1)) {
+                        if (!event || (!event.ctrlKey && event.which == 1)) {
-							MobileService.toggleLeftMenu();
+                            MobileService.toggleLeftMenu()
-							if ($scope.selectedType == 'feed' && id == $scope.selectedId) {
+                            if ($scope.selectedType == "feed" && id == $scope.selectedId) {
-								$scope.$emit('emitReload');
+                                $scope.$emit("emitReload")
-							} else {
+                            } else {
-								$state.transitionTo('feeds.view', {
+                                $state.transitionTo("feeds.view", {
-									_type : 'feed',
+                                    _type: "feed",
-									_id : id
+                                    _id: id,
-								});
+                                })
-							}
+                            }
 
-							if (event) {
+                            if (event) {
-								event.preventDefault();
+                                event.preventDefault()
-								event.stopPropagation();
+                                event.stopPropagation()
-							}
+                            }
-						}
+                        }
-					};
+                    }
 
-					$scope.categoryClicked = function(id, isTag) {
+                    $scope.categoryClicked = function (id, isTag) {
-						MobileService.toggleLeftMenu();
+                        MobileService.toggleLeftMenu()
-						var type = isTag ? 'tag' : 'category';
+                        var type = isTag ? "tag" : "category"
-						if ($scope.selectedType == type && id == $scope.selectedId) {
+                        if ($scope.selectedType == type && id == $scope.selectedId) {
-							$scope.$emit('emitReload');
+                            $scope.$emit("emitReload")
-						} else {
+                        } else {
-							$state.transitionTo('feeds.view', {
+                            $state.transitionTo("feeds.view", {
-								_type : type,
+                                _type: type,
-								_id : id
+                                _id: id,
-							});
+                            })
-						}
+                        }
-					};
+                    }
 
-					$scope.showFeedDetails = function(feed) {
+                    $scope.showFeedDetails = function (feed) {
-						$state.transitionTo('feeds.feed_details', {
+                        $state.transitionTo("feeds.feed_details", {
-							_id : feed.id
+                            _id: feed.id,
-						});
+                        })
-					};
+                    }
 
-					$scope.showCategoryDetails = function(id, isTag) {
+                    $scope.showCategoryDetails = function (id, isTag) {
-						if (isTag) {
+                        if (isTag) {
-							$state.transitionTo('feeds.tag_details', {
+                            $state.transitionTo("feeds.tag_details", {
-								_id : id
+                                _id: id,
-							});
+                            })
-						} else {
+                        } else {
-							$state.transitionTo('feeds.category_details', {
+                            $state.transitionTo("feeds.category_details", {
-								_id : id
+                                _id: id,
-							});
+                            })
-						}
+                        }
-					};
+                    }
 
-					$scope.toggleCategory = function(category, event) {
+                    $scope.toggleCategory = function (category, event) {
-						event.preventDefault();
+                        event.preventDefault()
-						event.stopPropagation();
+                        event.stopPropagation()
-						category.expanded = !category.expanded;
+                        category.expanded = !category.expanded
-						if (category.id == 'all') {
+                        if (category.id == "all") {
-							return;
+                            return
-						}
+                        }
-						CategoryService.collapse({
+                        CategoryService.collapse({
-							id : category.id,
+                            id: category.id,
-							collapse : !category.expanded
+                            collapse: !category.expanded,
-						});
+                        })
-					};
+                    }
-				}]
+                },
-	};
+            ],
-}]);
+        }
+    },
+])
 
-module.directive('draggable', function() {
+module.directive("draggable", function () {
-	return {
+    return {
-		restrict : 'A',
+        restrict: "A",
-		link : function(scope, element, attrs) {
+        link: function (scope, element, attrs) {
-			element.draggable({
+            element
-				revert : 'invalid',
+                .draggable({
-				helper : 'clone',
+                    revert: "invalid",
-				distance : 10,
+                    helper: "clone",
-				axis : 'y'
+                    distance: 10,
-			}).data('source', scope.$eval(attrs.draggable));
+                    axis: "y",
-		}
+                })
-	};
+                .data("source", scope.$eval(attrs.draggable))
-});
+        },
+    }
+})
 
-module.directive('droppable', ['CategoryService', 'FeedService', function(CategoryService, FeedService) {
+module.directive("droppable", [
-	return {
+    "CategoryService",
-		restrict : 'A',
+    "FeedService",
-		link : function(scope, element, attrs) {
+    function (CategoryService, FeedService) {
-			element.droppable({
+        return {
-				tolerance : 'pointer',
+            restrict: "A",
-				over : function(event, ui) {
+            link: function (scope, element, attrs) {
+                element.droppable({
+                    tolerance: "pointer",
+                    over: function (event, ui) {},
+                    drop: function (event, ui) {
+                        var draggable = angular.element(ui.draggable)
 
-				},
+                        var source = draggable.data("source")
-				drop : function(event, ui) {
+                        var target = scope.$eval(attrs.droppable)
-					var draggable = angular.element(ui.draggable);
 
-					var source = draggable.data('source');
+                        if (angular.equals(source, target)) {
-					var target = scope.$eval(attrs.droppable);
+                            return
+                        }
 
-					if (angular.equals(source, target)) {
+                        var data = {
-						return;
+                            id: source.id,
-					}
+                            name: source.name,
+                            filter: source.filter,
+                        }
 
-					var data = {
+                        if (source.children) {
-						id : source.id,
+                            // source is a category
-						name : source.name
+                        } else {
-					};
+                            // source is a feed
 
-					if (source.children) {
+                            if (target.children) {
-						// source is a category
+                                // target is a category
+                                data.categoryId = target.id
+                                data.position = 0
+                            } else {
+                                // target is a feed
+                                data.categoryId = target.categoryId
+                                data.position = target.position
+                            }
 
-					} else {
+                            FeedService.modify(data, function () {
-						// source is a feed
+                                CategoryService.init()
+                            })
+                        }
+                        scope.$apply()
+                    },
+                })
+            },
+        }
+    },
+])
 
-						if (target.children) {
+module.directive("metricMeter", function () {
-							// target is a category
+    return {
-							data.categoryId = target.id;
+        scope: {
-							data.position = 0;
+            metric: "=",
-						} else {
+            label: "=",
-							// target is a feed
+        },
-							data.categoryId = target.categoryId;
+        restrict: "E",
-							data.position = target.position;
+        templateUrl: "templates/_metrics.meter.html",
-						}
+    }
+})
 
-						FeedService.modify(data, function() {
+module.directive("metricGauge", function () {
-							CategoryService.init();
+    return {
-						});
+        scope: {
-					}
+            metric: "=",
-					scope.$apply();
+            label: "=",
-				}
+        },
-			});
+        restrict: "E",
-		}
+        templateUrl: "templates/_metrics.gauge.html",
-	};
+    }
-}]);
+})
 
-module.directive('metricMeter', function() {
+module.directive("metricTimer", function () {
-	return {
+    return {
-		scope : {
+        scope: {
-			metric : '=',
+            metric: "=",
-			label : '='
+            label: "=",
-		},
+        },
-		restrict : 'E',
+        restrict: "E",
-		templateUrl : 'templates/_metrics.meter.html'
+        templateUrl: "templates/_metrics.timer.html",
-	};
+    }
-});
+})
-
-module.directive('metricGauge', function() {
-	return {
-		scope : {
-			metric : '=',
-			label : '='
-		},
-		restrict : 'E',
-		templateUrl : 'templates/_metrics.gauge.html'
-	};
-});

src/main/app/js/filters.js

@@ -1,113 +1,119 @@
-var module = angular.module('commafeed.filters', []);
+var module = angular.module("commafeed.filters", [])
 
 /**
  * smart date formatter
  */
-module.filter('entryDate', function() {
+module.filter("entryDate", function () {
-	return function(timestamp, defaultValue) {
+    return function (timestamp, defaultValue) {
-		if (!timestamp) {
+        if (!timestamp) {
-			return defaultValue;
+            return defaultValue
-		}
+        }
 
-		var d = moment(timestamp);
+        var d = moment(timestamp)
-		var now = moment();
+        var now = moment()
-		var formatted;
+        var formatted
-		if (Math.abs(d.diff(now)) < 86400000) {
+        if (Math.abs(d.diff(now)) < 86400000) {
-			formatted = d.fromNow();
+            formatted = d.fromNow()
-		} else {
+        } else {
-			formatted = d.format('YYYY-MM-DD HH:mm');
+            formatted = d.format("YYYY-MM-DD HH:mm")
-		}
+        }
-		return formatted;
+        return formatted
-	};
+    }
-});
+})
 
 /**
  * rewrites iframes to use https if commafeed uses https
  */
-module.filter('iframeHttpsRewrite', function() {
+module.filter("iframeHttpsRewrite", function () {
-	return function(html) {
+    return function (html) {
-		var result = html;
+        var result = html
-		if (location.protocol === 'https:') {
+        if (location.protocol === "https:") {
-			var wrapper = $('<div></div>').html(html);
+            var wrapper = $("<div></div>").html(html)
-			$('iframe', wrapper).each(function(i, elem) {
+            $("iframe", wrapper).each(function (i, elem) {
-				var e = $(elem);
+                var e = $(elem)
-				e.attr('src', e.attr('src').replace(/^http:\/\//i, 'https://'));
+                e.attr("src", e.attr("src").replace(/^http:\/\//i, "https://"))
-			});
+            })
-			result = wrapper.html();
+            result = wrapper.html()
-		}
+        }
-		return result;
+        return result
-	};
+    }
-});
+})
 
 /**
  * inserts title or alt-text after images, if any
  */
-module.filter('appendImageTitles', function() {
+module.filter("appendImageTitles", function () {
-	return function(html) {
+    return function (html) {
-		var result = html;
+        var result = html
-		var wrapper = $('<div></div>').html(html);
+        var wrapper = $("<div></div>").html(html)
-		$('img', wrapper).each(function(i, elem) {
+        $("img", wrapper).each(function (i, elem) {
-			var e = $(elem);
+            var e = $(elem)
-			var title = e.attr('title') || e.attr('alt');
+            var title = e.attr("title") || e.attr("alt")
-			if (title) {
+            if (title) {
-				var text = $('<span style="font-style: italic;"></span>').text(title);
+                var text = $('<span style="font-style: italic;"></span>').text(title)
-				e.after(text);
+                e.after(text)
-			}
+            }
-		});
+        })
-		result = wrapper.html();
+        result = wrapper.html()
-		return result;
+        return result
-	};
+    }
-});
+})
 
 /**
  * escapes the url
  */
-module.filter('escape', function() {
+module.filter("escape", function () {
-	return encodeURIComponent;
+    return encodeURIComponent
-});
+})
 
 /**
  * returns a trusted html content
  */
-module.filter('trustHtml', ['$sce', function($sce) {
+module.filter("trustHtml", [
-	return function(val) {
+    "$sce",
-		return $sce.trustAsHtml(val);
+    function ($sce) {
-	};
+        return function (val) {
-}]);
+            return $sce.trustAsHtml(val)
+        }
+    },
+])
 
 /**
  * returns a trusted url
  */
-module.filter('trustUrl', ['$sce', function($sce) {
+module.filter("trustUrl", [
-	return function(val) {
+    "$sce",
-		return $sce.trustAsResourceUrl(val);
+    function ($sce) {
-	};
+        return function (val) {
-}]);
+            return $sce.trustAsResourceUrl(val)
+        }
+    },
+])
 
 /**
  * add the 'highlight-search' class to text matching keywords
  */
-module.filter('highlight', function() {
+module.filter("highlight", function () {
-	return function(html, keywords) {
+    return function (html, keywords) {
-		if (keywords) {
+        if (keywords) {
-			var handleKeyword = function(token, html) {
+            var handleKeyword = function (token, html) {
-				var expr = new RegExp(token, 'gi');
+                var expr = new RegExp(token, "gi")
-				var container = $('<span>').html(html);
+                var container = $("<span>").html(html)
-				var elements = container.find('*').addBack();
+                var elements = container.find("*").addBack()
-				var textNodes = elements.not('iframe').contents().not(elements);
+                var textNodes = elements.not("iframe").contents().not(elements)
-				textNodes.each(function() {
+                textNodes.each(function () {
-					var replaced = this.nodeValue.replace(expr, '<span class="highlight-search">$&</span>');
+                    var replaced = this.nodeValue.replace(expr, '<span class="highlight-search">$&</span>')
-					$('<span>').html(replaced).insertBefore(this);
+                    $("<span>").html(replaced).insertBefore(this)
-					$(this).remove();
+                    $(this).remove()
-				});
+                })
-				return container.html();
+                return container.html()
-			};
+            }
 
-			var tokens = keywords.split(' ');
+            var tokens = keywords.split(" ")
-			for (var i = 0; i < tokens.length; i++) {
+            for (var i = 0; i < tokens.length; i++) {
-				html = handleKeyword(tokens[i], html);
+                html = handleKeyword(tokens[i], html)
-			}
+            }
-		}
+        }
-		return html;
+        return html
-	};
+    }
-});
+})

src/main/app/js/i18n.js

@@ -1,34 +1,37 @@
-var module = angular.module('commafeed.i18n', []);
+var module = angular.module("commafeed.i18n", [])
 
-module.service('LangService', [function() {
+module.service("LangService", [
-	this.langs = {
+    function () {
-		'ar': 'العربية',
+        this.langs = {
-		'ca': 'Català',
+            ar: "العربية",
-		'en': 'English',
+            ca: "Català",
-		'es': 'Español',
+            en: "English",
-		'de': 'Deutsch',
+            es: "Español",
-		'fa': 'فارسی',
+            de: "Deutsch",
-		'fr': 'Français',
+            fa: "فارسی",
-		'gl': 'Galician',
+            fr: "Français",
-		'glk': 'گیلکی',
+            gl: "Galician",
-		'hu': 'Magyar',
+            glk: "گیلکی",
-		'ja': '日本語',
+            hu: "Magyar",
-		'ko': '한국어',
+            id: "Indonesian",
-		'nl': 'Nederlands',
+            ja: "日本語",
-		'nb': 'Norsk (bokmål)',
+            ko: "한국어",
-		'nn': 'Norsk (nynorsk)',
+            nl: "Nederlands",
-		'pt': 'Português',
+            nb: "Norsk (bokmål)",
-		'pl': 'Polski',
+            nn: "Norsk (nynorsk)",
-		'ru': 'русский',
+            pt: "Português",
-		'fi': 'Suomi',
+            pl: "Polski",
-		'sv': 'Svenska',
+            ru: "Русский",
-		'zh': '简体中文',
+            fi: "Suomi",
-		'it': 'Italiano',
+            sv: "Svenska",
-		'tr': 'Türkçe',
+            zh: "简体中文",
-		'cy': 'Cymraeg',
+            it: "Italiano",
-		'sk': 'Slovenčina',
+            tr: "Türkçe",
-		'da': 'Danish',
+            cy: "Cymraeg",
-		'cs': 'Čeština',
+            sk: "Slovenčina",
-		'ms': 'Bahasa Malaysian'
+            da: "Danish",
-	}
+            cs: "Čeština",
-}]);
+            ms: "Bahasa Malaysian",
+        }
+    },
+])

src/main/app/js/main.js

@@ -1,145 +1,172 @@
-var app = angular.module('commafeed', ['ngRoute', 'ngTouch', 'ngAnimate', 'ui.utils', 'ui.bootstrap', 'ui.router', 'ui.select2',
+var app = angular.module("commafeed", [
-		'commafeed.directives', 'commafeed.controllers', 'commafeed.services', 'commafeed.filters', 'commafeed.i18n', 'ngSanitize',
+    "ngRoute",
-		'infinite-scroll', 'ngGrid', 'chieffancypants.loadingBar', 'pascalprecht.translate']);
+    "ngTouch",
+    "ngAnimate",
+    "ui.utils",
+    "ui.bootstrap",
+    "ui.router",
+    "ui.select2",
+    "commafeed.directives",
+    "commafeed.controllers",
+    "commafeed.services",
+    "commafeed.filters",
+    "commafeed.i18n",
+    "ngSanitize",
+    "infinite-scroll",
+    "ngGrid",
+    "chieffancypants.loadingBar",
+    "pascalprecht.translate",
+])
 
 app.config([
-		'$routeProvider',
+    "$routeProvider",
-		'$stateProvider',
+    "$stateProvider",
-		'$urlRouterProvider',
+    "$urlRouterProvider",
-		'$httpProvider',
+    "$httpProvider",
-		'$compileProvider',
+    "$compileProvider",
-		'cfpLoadingBarProvider',
+    "cfpLoadingBarProvider",
-		'$translateProvider',
+    "$translateProvider",
-		function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider, cfpLoadingBarProvider,
+    function (
-				$translateProvider) {
+        $routeProvider,
-			
+        $stateProvider,
-			$translateProvider.useStaticFilesLoader({
+        $urlRouterProvider,
-				prefix : 'i18n/',
+        $httpProvider,
-				suffix : '.js'
+        $compileProvider,
-			});
+        cfpLoadingBarProvider,
-			$translateProvider.preferredLanguage('en');
+        $translateProvider
+    ) {
+        $translateProvider.useStaticFilesLoader({
+            prefix: "i18n/",
+            suffix: ".js",
+        })
+        $translateProvider.preferredLanguage("en")
 
-			cfpLoadingBarProvider.includeSpinner = false;
+        cfpLoadingBarProvider.includeSpinner = false
 
-			$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/);
+        $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/)
-			var interceptor = ['$rootScope', '$q', '$injector', function(scope, $q, $injector) {
+        var interceptor = [
-				var f = {};
+            "$rootScope",
-				
+            "$q",
-				f.response = function(response) {
+            "$injector",
-					return response;
+            function (scope, $q, $injector) {
-				};
+                var f = {}
-				
-				f.responseError = function(response) {
-					var status = response.status;
-					if (status == 401) {
-						$injector.get('$state').transitionTo('welcome');
-					}
-					return $q.reject(response);
-				};
-				return f;
-			}];
 
-			$httpProvider.interceptors.push(interceptor);
+                f.response = function (response) {
+                    return response
+                }
 
-			$stateProvider.state('feeds', {
+                f.responseError = function (response) {
-				'abstract' : true,
+                    var status = response.status
-				url : '/feeds',
+                    if (status == 401) {
-				templateUrl : 'templates/feeds.html'
+                        $injector.get("$state").transitionTo("welcome")
-			});
+                    }
-			$stateProvider.state('feeds.view', {
+                    return $q.reject(response)
-				url : '/view/:_type/:_id',
+                }
-				templateUrl : 'templates/feeds.view.html',
+                return f
-				controller : 'FeedListCtrl'
+            },
-			});
+        ]
-			$stateProvider.state('feeds.subscribe', {
-				url : '/subscribe',
-				templateUrl : 'templates/feeds.subscribe.html',
-				controller : 'SubscribeCtrl'
-			});
-			$stateProvider.state('feeds.new_category', {
-				url : '/add_category',
-				templateUrl : 'templates/feeds.new_category.html',
-				controller : 'NewCategoryCtrl'
-			});
-			$stateProvider.state('feeds.import', {
-				url : '/import',
-				templateUrl : 'templates/feeds.import.html',
-				controller : 'ImportCtrl'
-			});
-			$stateProvider.state('feeds.search', {
-				url : '/search/:_keywords',
-				templateUrl : 'templates/feeds.view.html',
-				controller : 'FeedListCtrl'
-			});
-			$stateProvider.state('feeds.feed_details', {
-				url : '/details/feed/:_id',
-				templateUrl : 'templates/feeds.feed_details.html',
-				controller : 'FeedDetailsCtrl'
-			});
-			$stateProvider.state('feeds.category_details', {
-				url : '/details/category/:_id',
-				templateUrl : 'templates/feeds.category_details.html',
-				controller : 'CategoryDetailsCtrl'
-			});
-			$stateProvider.state('feeds.tag_details', {
-				url : '/details/tag/:_id',
-				templateUrl : 'templates/feeds.tag_details.html',
-				controller : 'TagDetailsCtrl'
-			});
-			$stateProvider.state('feeds.help', {
-				url : '/help',
-				templateUrl : 'templates/feeds.help.html',
-				controller : 'HelpController'
-			});
-			$stateProvider.state('feeds.settings', {
-				url : '/settings',
-				templateUrl : 'templates/settings.html',
-				controller : 'SettingsCtrl'
-			});
-			$stateProvider.state('feeds.profile', {
-				url : '/profile',
-				templateUrl : 'templates/profile.html',
-				controller : 'ProfileCtrl'
-			});
 
-			$stateProvider.state('admin', {
+        $httpProvider.interceptors.push(interceptor)
-				'abstract' : true,
-				url : '/admin',
-				templateUrl : 'templates/admin.html'
-			});
-			$stateProvider.state('admin.userlist', {
-				url : '/user/list',
-				templateUrl : 'templates/admin.userlist.html',
-				controller : 'ManageUsersCtrl'
-			});
-			$stateProvider.state('admin.useradd', {
-				url : '/user/add',
-				templateUrl : 'templates/admin.useradd.html',
-				controller : 'ManageUserCtrl'
-			});
-			$stateProvider.state('admin.useredit', {
-				url : '/user/edit/:_id',
-				templateUrl : 'templates/admin.useredit.html',
-				controller : 'ManageUserCtrl'
-			});
-			$stateProvider.state('admin.settings', {
-				url : '/settings',
-				templateUrl : 'templates/admin.settings.html',
-				controller : 'ManageSettingsCtrl'
-			});
-			$stateProvider.state('admin.metrics', {
-				url : '/metrics',
-				templateUrl : 'templates/admin.metrics.html',
-				controller : 'MetricsCtrl'
-			});
 
-			$stateProvider.state('welcome', {
+        $stateProvider.state("feeds", {
-				url : '/welcome',
+            abstract: true,
-				templateUrl : 'templates/welcome.html'
+            url: "/feeds",
-			});
+            templateUrl: "templates/feeds.html",
+        })
+        $stateProvider.state("feeds.view", {
+            url: "/view/:_type/:_id",
+            templateUrl: "templates/feeds.view.html",
+            controller: "FeedListCtrl",
+        })
+        $stateProvider.state("feeds.subscribe", {
+            url: "/subscribe",
+            templateUrl: "templates/feeds.subscribe.html",
+            controller: "SubscribeCtrl",
+        })
+        $stateProvider.state("feeds.new_category", {
+            url: "/add_category",
+            templateUrl: "templates/feeds.new_category.html",
+            controller: "NewCategoryCtrl",
+        })
+        $stateProvider.state("feeds.import", {
+            url: "/import",
+            templateUrl: "templates/feeds.import.html",
+            controller: "ImportCtrl",
+        })
+        $stateProvider.state("feeds.search", {
+            url: "/search/:_keywords",
+            templateUrl: "templates/feeds.view.html",
+            controller: "FeedListCtrl",
+        })
+        $stateProvider.state("feeds.feed_details", {
+            url: "/details/feed/:_id",
+            templateUrl: "templates/feeds.feed_details.html",
+            controller: "FeedDetailsCtrl",
+        })
+        $stateProvider.state("feeds.category_details", {
+            url: "/details/category/:_id",
+            templateUrl: "templates/feeds.category_details.html",
+            controller: "CategoryDetailsCtrl",
+        })
+        $stateProvider.state("feeds.tag_details", {
+            url: "/details/tag/:_id",
+            templateUrl: "templates/feeds.tag_details.html",
+            controller: "TagDetailsCtrl",
+        })
+        $stateProvider.state("feeds.help", {
+            url: "/help",
+            templateUrl: "templates/feeds.help.html",
+            controller: "HelpController",
+        })
+        $stateProvider.state("feeds.settings", {
+            url: "/settings",
+            templateUrl: "templates/settings.html",
+            controller: "SettingsCtrl",
+        })
+        $stateProvider.state("feeds.profile", {
+            url: "/profile",
+            templateUrl: "templates/profile.html",
+            controller: "ProfileCtrl",
+        })
 
-			$urlRouterProvider.when('/', '/feeds/view/category/all');
+        $stateProvider.state("admin", {
-			$urlRouterProvider.when('/admin', '/admin/settings');
+            abstract: true,
-			$urlRouterProvider.otherwise('/');
+            url: "/admin",
+            templateUrl: "templates/admin.html",
+        })
+        $stateProvider.state("admin.userlist", {
+            url: "/user/list",
+            templateUrl: "templates/admin.userlist.html",
+            controller: "ManageUsersCtrl",
+        })
+        $stateProvider.state("admin.useradd", {
+            url: "/user/add",
+            templateUrl: "templates/admin.useradd.html",
+            controller: "ManageUserCtrl",
+        })
+        $stateProvider.state("admin.useredit", {
+            url: "/user/edit/:_id",
+            templateUrl: "templates/admin.useredit.html",
+            controller: "ManageUserCtrl",
+        })
+        $stateProvider.state("admin.settings", {
+            url: "/settings",
+            templateUrl: "templates/admin.settings.html",
+            controller: "ManageSettingsCtrl",
+        })
+        $stateProvider.state("admin.metrics", {
+            url: "/metrics",
+            templateUrl: "templates/admin.metrics.html",
+            controller: "MetricsCtrl",
+        })
 
-		}]);
+        $stateProvider.state("welcome", {
+            url: "/welcome",
+            templateUrl: "templates/welcome.html",
+        })
+
+        $urlRouterProvider.when("/", "/feeds/view/category/all")
+        $urlRouterProvider.when("/admin", "/admin/settings")
+        $urlRouterProvider.otherwise("/")
+    },
+])

src/main/app/js/services.js

@@ -1,336 +1,375 @@
-var module = angular.module('commafeed.services', ['ngResource']);
+var module = angular.module("commafeed.services", ["ngResource"])
 
-module.service('AnalyticsService', ['$state', function($state) {
+module.service("AnalyticsService", [
-	this.track = function(path) {
+    "$state",
-		if (typeof ga === 'undefined') {
+    function ($state) {
-			return;
+        this.track = function (path) {
-		}
+            if (typeof ga === "undefined") {
-		path = path || $state.$current.url.prefix;
+                return
-		ga('send', 'pageview', {
+            }
-			page : path
+            path = path || $state.$current.url.prefix
-		});
+            ga("send", "pageview", {
-	};
+                page: path,
-}]);
+            })
+        }
+    },
+])
 
-module.service('MobileService', ['$state', function($state) {
+module.service("MobileService", [
-	this.leftMenu = false;
+    "$state",
-	this.rightMenu = false;
+    function ($state) {
-	this.toggleLeftMenu = function() {
+        this.leftMenu = false
-		this.leftMenu = !this.leftMenu;
+        this.rightMenu = false
-		$('body').toggleClass('left-menu-active');
+        this.toggleLeftMenu = function () {
-	};
+            this.leftMenu = !this.leftMenu
-	this.toggleRightMenu = function() {
+            $("body").toggleClass("left-menu-active")
-		this.rightMenu = !this.rightMenu;
+        }
-		$('body').toggleClass('right-menu-active');
+        this.toggleRightMenu = function () {
-	};
+            this.rightMenu = !this.rightMenu
-	this.mobile = device.mobile() || device.tablet();
+            $("body").toggleClass("right-menu-active")
-}]);
+        }
+        this.mobile = device.mobile() || device.tablet()
+    },
+])
 
-module.factory('ProfileService', ['$resource', function($resource) {
+module.factory("ProfileService", [
-	var res = $resource('rest/user/profile/');
+    "$resource",
-	res.deleteAccount = $resource('rest/user/profile/deleteAccount').save;
+    function ($resource) {
-	return res;
+        var res = $resource("rest/user/profile/")
-}]);
+        res.deleteAccount = $resource("rest/user/profile/deleteAccount").save
+        return res
+    },
+])
 
-module.factory('SessionService', ['$resource', function($resource) {
+module.factory("SessionService", [
-	var res = {};
+    "$resource",
-	res.login = $resource('rest/user/login').save;
+    function ($resource) {
-	res.register = $resource('rest/user/register').save;
+        var res = {}
-	res.passwordReset = $resource('rest/user/passwordReset').save;
+        res.login = $resource("rest/user/login").save
-	return res;
+        res.register = $resource("rest/user/register").save
-}]);
+        res.passwordReset = $resource("rest/user/passwordReset").save
+        return res
+    },
+])
 
-module.factory('SettingsService', ['$resource', '$translate', function($resource, $translate) {
+module.factory("SettingsService", [
-	var res = $resource('rest/user/settings');
+    "$resource",
+    "$translate",
+    function ($resource, $translate) {
+        var res = $resource("rest/user/settings")
 
-	var s = {};
+        var s = {}
-	s.settings = {};
+        s.settings = {}
-	s.save = function(callback) {
+        s.save = function (callback) {
-		res.save(s.settings, function(data) {
+            res.save(s.settings, function (data) {
-			if (callback) {
+                if (callback) {
-				callback(data);
+                    callback(data)
-			}
+                }
-		});
+            })
-	};
+        }
-	s.init = function(callback) {
+        s.init = function (callback) {
-		res.get(function(data) {
+            res.get(function (data) {
-			s.settings = data;
+                s.settings = data
-			var lang = s.settings.language || 'en';
+                var lang = s.settings.language || "en"
-			$translate.use(lang);
+                $translate.use(lang)
-			if (lang === 'zh') {
+                if (lang === "zh") {
-				lang = 'zh-cn';
+                    lang = "zh-cn"
-			} else if (lang === 'ms') {
+                } else if (lang === "ms") {
-				lang = 'ms-my';
+                    lang = "ms-my"
-			}
+                }
-			moment.locale(lang, {});
+                moment.locale(lang, {})
-			if (callback) {
+                if (callback) {
-				callback(data);
+                    callback(data)
-			}
+                }
-		});
+            })
-	};
+        }
-	s.init();
+        s.init()
-	return s;
+        return s
-}]);
+    },
+])
 
-module.factory('FeedService', ['$resource', '$http', function($resource, $http) {
+module.factory("FeedService", [
-	var actions = {
+    "$resource",
-		entries : {
+    "$http",
-			method : 'GET',
+    function ($resource, $http) {
-			params : {
+        var actions = {
-				_method : 'entries'
+            entries: {
-			}
+                method: "GET",
-		},
+                params: {
-		fetch : {
+                    _method: "entries",
-			method : 'POST',
+                },
-			params : {
+            },
-				_method : 'fetch'
+            fetch: {
-			}
+                method: "POST",
-		},
+                params: {
-		mark : {
+                    _method: "fetch",
-			method : 'POST',
+                },
-			params : {
+            },
-				_method : 'mark'
+            mark: {
-			}
+                method: "POST",
-		},
+                params: {
-		refresh : {
+                    _method: "mark",
-			method : 'POST',
+                },
-			params : {
+            },
-				_method : 'refresh'
+            refresh: {
-			}
+                method: "POST",
-		},
+                params: {
-		refreshAll : {
+                    _method: "refresh",
-			method : 'GET',
+                },
-			params : {
+            },
-				_method : 'refreshAll'
+            refreshAll: {
-			}
+                method: "GET",
-		},
+                params: {
-		subscribe : {
+                    _method: "refreshAll",
-			method : 'POST',
+                },
-			params : {
+            },
-				_method : 'subscribe'
+            subscribe: {
-			}
+                method: "POST",
-		},
+                params: {
-		unsubscribe : {
+                    _method: "subscribe",
-			method : 'POST',
+                },
-			params : {
+            },
-				_method : 'unsubscribe'
+            unsubscribe: {
-			}
+                method: "POST",
-		},
+                params: {
-		modify : {
+                    _method: "unsubscribe",
-			method : 'POST',
+                },
-			params : {
+            },
-				_method : 'modify'
+            modify: {
-			}
+                method: "POST",
-		}
+                params: {
-	};
+                    _method: "modify",
-	var res = $resource('rest/feed/:_method', {}, actions);
+                },
-	res.get = $resource('rest/feed/get/:id').get;
+            },
-	return res;
+        }
-}]);
+        var res = $resource("rest/feed/:_method", {}, actions)
+        res.get = $resource("rest/feed/get/:id").get
+        return res
+    },
+])
 
-module.factory('CategoryService', ['$resource', '$http', function($resource, $http) {
+module.factory("CategoryService", [
+    "$resource",
+    "$http",
+    function ($resource, $http) {
+        var traverse = function (callback, category, parentName) {
+            callback(category, parentName)
+            var children = category.children
+            if (children) {
+                for (var c = 0; c < children.length; c++) {
+                    traverse(callback, children[c], category.name)
+                }
+            }
+        }
 
-	var traverse = function(callback, category, parentName) {
+        // flatten categories
-		callback(category, parentName);
+        var flatten = function (category) {
-		var children = category.children;
+            var array = []
-		if (children) {
+            var callback = function (category, parentName) {
-			for (var c = 0; c < children.length; c++) {
+                var name = category.name
-				traverse(callback, children[c], category.name);
+                if (parentName) {
-			}
+                    name += " (in " + parentName + ")"
-		}
+                }
-	};
+                array.push({
+                    id: category.id,
+                    name: name,
+                    orig: category,
+                })
+            }
+            traverse(callback, category)
+            return array
+        }
 
-	// flatten categories
+        // flatten feeds
-	var flatten = function(category) {
+        var flatFeeds = function (category) {
-		var array = [];
+            var subs = []
-		var callback = function(category, parentName) {
+            var callback = function (category) {
-			var name = category.name;
+                subs.push.apply(subs, category.feeds)
-			if (parentName) {
+            }
-				name += (' (in ' + parentName + ')');
+            traverse(callback, category)
-			}
+            return subs
-			array.push({
+        }
-				id : category.id,
-				name : name,
-				orig : category
-			});
-		};
-		traverse(callback, category);
-		return array;
-	};
 
-	// flatten feeds
+        // flatten everything
-	var flatFeeds = function(category) {
+        var flatAll = function (category, a) {
-		var subs = [];
+            a.push([category.id, "category"])
-		var callback = function(category) {
+            _.each(category.children, function (child) {
-			subs.push.apply(subs, category.feeds);
+                flatAll(child, a)
-		};
+            })
-		traverse(callback, category);
+            _.each(category.feeds, function (feed) {
-		return subs;
+                a.push([feed.id, "feed"])
-	};
+            })
+        }
 
-	// flatten everything
+        var actions = {
-	var flatAll = function(category, a) {
+            get: {
-		a.push([category.id, 'category']);
+                method: "GET",
-		_.each(category.children, function(child) {
+                ignoreLoadingBar: true,
-			flatAll(child, a);
+                params: {
-		});
+                    _method: "get",
-		_.each(category.feeds, function(feed) {
+                },
-			a.push([feed.id, 'feed']);
+            },
-		});
+            entries: {
-	};
+                method: "GET",
+                params: {
+                    _method: "entries",
+                },
+            },
+            mark: {
+                method: "POST",
+                params: {
+                    _method: "mark",
+                },
+            },
+            add: {
+                method: "POST",
+                params: {
+                    _method: "add",
+                },
+            },
+            remove: {
+                method: "POST",
+                params: {
+                    _method: "delete",
+                },
+            },
+            modify: {
+                method: "POST",
+                params: {
+                    _method: "modify",
+                },
+            },
+            collapse: {
+                method: "POST",
+                params: {
+                    _method: "collapse",
+                },
+            },
+        }
+        var res = $resource("rest/category/:_method", {}, actions)
+        res.subscriptions = {}
+        res.flatCategories = {}
+        res.feeds = []
 
-	var actions = {
+        res.init = function (callback) {
-		get : {
+            res.get(function (data) {
-			method : 'GET',
+                res.subscriptions = data
-			ignoreLoadingBar : true,
+                res.flatCategories = flatten(data)
-			params : {
+                res.feeds = flatFeeds(data)
-				_method : 'get'
-			}
-		},
-		entries : {
-			method : 'GET',
-			params : {
-				_method : 'entries'
-			}
-		},
-		mark : {
-			method : 'POST',
-			params : {
-				_method : 'mark'
-			}
-		},
-		add : {
-			method : 'POST',
-			params : {
-				_method : 'add'
-			}
-		},
-		remove : {
-			method : 'POST',
-			params : {
-				_method : 'delete'
-			}
-		},
-		modify : {
-			method : 'POST',
-			params : {
-				_method : 'modify'
-			}
-		},
-		collapse : {
-			method : 'POST',
-			params : {
-				_method : 'collapse'
-			}
-		}
-	};
-	var res = $resource('rest/category/:_method', {}, actions);
-	res.subscriptions = {};
-	res.flatCategories = {};
-	res.feeds = [];
 
-	res.init = function(callback) {
+                res.flatAll = []
-		res.get(function(data) {
+                flatAll(data, res.flatAll)
-			res.subscriptions = data;
+                res.flatAll.splice(1, 0, ["starred", "category"])
-			res.flatCategories = flatten(data);
-			res.feeds = flatFeeds(data);
 
-			res.flatAll = [];
+                if (callback) callback(data)
-			flatAll(data, res.flatAll);
+            })
-			res.flatAll.splice(1, 0, ['starred', 'category']);
+        }
+        res.refresh = function (success, error) {
+            res.get(
+                function (data) {
+                    _.merge(res.subscriptions, data)
+                    if (success) success(data)
+                },
+                function (data) {
+                    if (error) error(data)
+                }
+            )
+        }
 
-			if (callback)
+        res.init()
-				callback(data);
+        return res
-		});
+    },
-	};
+])
-	res.refresh = function(success, error) {
-		res.get(function(data) {
-			_.merge(res.subscriptions, data);
-			if (success)
-				success(data);
-		}, function(data) {
-			if (error)
-				error(data);
-		});
-	};
 
-	res.init();
+module.factory("EntryService", [
-	return res;
+    "$resource",
-}]);
+    "$http",
+    function ($resource, $http) {
+        var actions = {
+            search: {
+                method: "GET",
+                params: {
+                    _method: "search",
+                },
+            },
+            mark: {
+                method: "POST",
+                ignoreLoadingBar: true,
+                params: {
+                    _method: "mark",
+                },
+            },
+            markMultiple: {
+                method: "POST",
+                params: {
+                    _method: "markMultiple",
+                },
+            },
+            star: {
+                method: "POST",
+                params: {
+                    _method: "star",
+                },
+            },
+            tag: {
+                method: "POST",
+                params: {
+                    _method: "tag",
+                },
+            },
+        }
+        var res = $resource("rest/entry/:_method", {}, actions)
+        res.tags = []
+        var initTags = function () {
+            $http.get("rest/entry/tags").success(function (data) {
+                res.tags = []
+                res.tags.push.apply(res.tags, data)
+                res.tags.sort()
+            })
+        }
+        var oldTag = res.tag
+        res.tag = function (data) {
+            oldTag(data, function () {
+                initTags()
+            })
+        }
+        initTags()
+        return res
+    },
+])
 
-module.factory('EntryService', ['$resource', '$http', function($resource, $http) {
+module.factory("AdminUsersService", [
-	var actions = {
+    "$resource",
-		search : {
+    function ($resource) {
-			method : 'GET',
+        var res = {}
-			params : {
+        res.get = $resource("rest/admin/user/get/:id").get
-				_method : 'search'
+        res.getAll = $resource("rest/admin/user/getAll").query
-			}
+        res.save = $resource("rest/admin/user/save").save
-		},
+        res.remove = $resource("rest/admin/user/delete").save
-		mark : {
+        return res
-			method : 'POST',
+    },
-			ignoreLoadingBar : true,
+])
-			params : {
-				_method : 'mark'
-			}
-		},
-		markMultiple : {
-			method : 'POST',
-			params : {
-				_method : 'markMultiple'
-			}
-		},
-		star : {
-			method : 'POST',
-			params : {
-				_method : 'star'
-			}
-		},
-		tag : {
-			method : 'POST',
-			params : {
-				_method : 'tag'
-			}
-		}
-	};
-	var res = $resource('rest/entry/:_method', {}, actions);
-	res.tags = [];
-	var initTags = function() {
-		$http.get('rest/entry/tags').success(function(data) {
-			res.tags = [];
-			res.tags.push.apply(res.tags, data);
-			res.tags.sort();
-		});
-	};
-	var oldTag = res.tag;
-	res.tag = function(data) {
-		oldTag(data, function() {
-			initTags();
-		});
-	};
-	initTags();
-	return res;
-}]);
 
-module.factory('AdminUsersService', ['$resource', function($resource) {
+module.factory("AdminSettingsService", [
-	var res = {};
+    "$resource",
-	res.get = $resource('rest/admin/user/get/:id').get;
+    function ($resource) {
-	res.getAll = $resource('rest/admin/user/getAll').query;
+        var res = $resource("rest/admin/settings/")
-	res.save = $resource('rest/admin/user/save').save;
+        return res
-	res.remove = $resource('rest/admin/user/delete').save;
+    },
-	return res;
+])
-}]);
 
-module.factory('AdminSettingsService', ['$resource', function($resource) {
+module.factory("AdminMetricsService", [
-	var res = $resource('rest/admin/settings/');
+    "$resource",
-	return res;
+    function ($resource) {
-}]);
+        var res = $resource("rest/admin/metrics/")
+        return res
+    },
+])
 
-module.factory('AdminMetricsService', ['$resource', function($resource) {
+module.factory("ServerService", [
-	var res = $resource('rest/admin/metrics/');
+    "$resource",
-	return res;
+    function ($resource) {
-}]);
+        var res = $resource("rest/server/get")
-
+        return res
-module.factory('ServerService', ['$resource', function($resource) {
+    },
-	var res = $resource('rest/server/get');
+])
-	return res;
-}]);

src/main/app/js/welcome.js

@@ -1,7 +1,7 @@
-$(function() {
+$(function () {
-	var reg = $('#register-panel');
+    var reg = $("#register-panel")
-	if (!reg) {
+    if (!reg) {
-		return;
+        return
-	}
+    }
-	$('#login-panel').height(reg.height());
+    $("#login-panel").height(reg.height())
-});
+})

src/main/app/manifest.json

@@ -0,0 +1,32 @@
+{
+    "name": "CommaFeed",
+    "icons": [
+        {
+            "src": "app-icon-72.png",
+            "sizes": "72x72",
+            "type": "image/png",
+            "density": "1.5"
+        },
+        {
+            "src": "app-icon-114.png",
+            "sizes": "96x96",
+            "type": "image/png",
+            "density": "2.0"
+        },
+        {
+            "src": "app-icon-144.png",
+            "sizes": "144x144",
+            "type": "image/png",
+            "density": "3.0"
+        },
+        {
+            "src": "app-icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "density": "4.0"
+        }
+    ],
+    "scope": ".",
+    "start_url": "./",
+    "display": "standalone"
+}

src/main/app/sass/app.scss

@@ -8,7 +8,6 @@
 @import "components/help";
 @import "components/loading-bar";
 
-@import "components/readabilicons";
 @import "components/zocial";
 
 @import "mobile/mobile";

src/main/app/sass/components/_admin-panel.scss

@@ -1,4 +1,4 @@
 /* admin */
 .admin .users-table {
-	height: 400px;
+    height: 400px;
-}
+}

src/main/app/sass/components/_entry-list.scss

@@ -1,271 +1,279 @@
 .main-content {
-	margin-left: 250px;
+    margin-left: 250px;
-	padding-left: 15px;
+    padding-left: 15px;
 }
 
 .full-screen .main-content {
-	width: 100%;
+    width: 100%;
-	margin-left: 0;
+    margin-left: 0;
 }
 
 .entryList {
-	padding-top: 50px;
+    padding-top: 50px;
 }
 
 /* entry list*/
 .entrylist-header {
-	border-bottom: 1px solid #eee;
+    border-bottom: 1px solid #eee;
 }
 
 .entrylist-header h3 {
-	margin: 0;
+    margin: 0;
-	line-height: 40px;
+    line-height: 40px;
 }
 
 .entrylist-header a {
-	color: inherit;
+    color: inherit;
 }
 
-.expanded .entry-header,.expanded .entry-body-content {
+.expanded .entry-header,
-	padding-left: 25px;
+.expanded .entry-body-content {
-	padding-right: 25px;
+    padding-left: 25px;
+    padding-right: 25px;
 }
 
 .expanded .entry-header {
-	max-width: 650px;
+    max-width: 650px;
 }
 
 .full-screen .expanded .entry-header {
-	max-width: 100%;
+    max-width: 100%;
 }
 
-.rtl .entry-header,.rtl .entry-body-content,.rtl.entry-name {
+.rtl .entry-header,
-	direction: rtl;
+.rtl .entry-body-content,
+.rtl.entry-name {
+    direction: rtl;
 }
 
-.rtl ul,.rtl ol {
+.rtl ul,
-	padding: 0;
+.rtl ol {
-	margin: 0 25px 10px 0px;
+    padding: 0;
+    margin: 0 25px 10px 0px;
 }
 
 #feed-accordion .entry {
-	border-bottom: 1px solid #CCCCCC;
+    border-bottom: 1px solid #cccccc;
 }
 
 #feed-accordion .no-entries {
-	text-align: center;
+    text-align: center;
-	font-weight: bold;
+    font-weight: bold;
-	margin-top: 80px;
+    margin-top: 80px;
 }
 
 #feed-accordion .entry-heading {
-	background-color: #ebebeb;
+    background-color: #ebebeb;
 }
 
 #feed-accordion .unread .entry-heading:hover {
-	background-color: #ebebeb;
+    background-color: #ebebeb;
 }
 
 #feed-accordion .unread .entry-heading {
-	background-color: #fff;
+    background-color: #fff;
 }
 
 #feed-accordion .current.closed .entry-heading {
-	background-color: #ffc;
+    background-color: #ffc;
 }
 
 #feed-accordion .entry-heading-link {
-	color: black;
+    color: black;
-	height: 32px;
+    height: 32px;
-	display: block;
+    display: block;
-	cursor: pointer;
+    cursor: pointer;
-	padding: 6px 0px;
+    padding: 6px 0px;
 }
 
 #feed-accordion .entry-heading .feed-name {
-	color: #555;
+    color: #555;
-	display: block;
+    display: block;
-	overflow: hidden;
+    overflow: hidden;
-	white-space: nowrap;
+    white-space: nowrap;
-	position: absolute;
+    position: absolute;
-	width: 145px;
+    width: 145px;
-	text-overflow: ellipsis;
+    text-overflow: ellipsis;
 }
 
 #feed-accordion .entry-heading .entry-name {
-	display: block;
+    display: block;
-	overflow: hidden;
+    overflow: hidden;
-	text-overflow: ellipsis;
+    text-overflow: ellipsis;
-	white-space: nowrap;
+    white-space: nowrap;
-	margin-right: 150px;
+    margin-right: 150px;
 }
 
 #feed-accordion .unread .entry-heading .entry-name {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 #feed-accordion .entry-heading .shrink {
-	margin-left: 150px;
+    margin-left: 150px;
 }
 
 #feed-accordion .entry-heading .entry-date {
-	display: block;
+    display: block;
-	position: absolute;
+    position: absolute;
-	right: 45px;
+    right: 45px;
 }
 
 #feed-accordion a.entry-heading-link:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #feed-accordion .entry-external-link {
-	position: absolute;
+    position: absolute;
-	right: 25px;
+    right: 25px;
-	margin-top: -25px;
+    margin-top: -25px;
-	color: black;
+    color: black;
 }
 
 #feed-accordion .entry-external-link:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #feed-accordion .entry-body .entry-title {
-	margin-top: 5px;
+    margin-top: 5px;
-	margin-bottom: 10px;
+    margin-bottom: 10px;
-	font-size: 130%;
+    font-size: 130%;
-	font-weight: bold;
+    font-weight: bold;
 }
 
 #feed-accordion .entry-body .entry-subtitle {
-	display: block;
+    display: block;
-	font-size: 14px;
+    font-size: 14px;
-	font-weight: normal;
+    font-weight: normal;
 }
 
-#feed-accordion  .entry-body-content {
+#feed-accordion .entry-body-content {
-	max-width: 650px;
+    max-width: 650px;
-	color: black;
+    color: black;
-	padding-bottom: 10px;
+    padding-bottom: 10px;
 }
 
-.full-screen #feed-accordion  .entry-body-content {
+.full-screen #feed-accordion .entry-body-content {
-	max-width: 100%;
+    max-width: 100%;
 }
 
 #feed-accordion .entry-enclosure {
-	clear: both;
+    clear: both;
-	padding-top: 10px;
+    padding-top: 10px;
+}
+
+#feed-accordion .entry-media-description {
+    padding-top: 10px;
 }
 
 #feed-accordion .entry-buttons {
-	clear: both;
+    clear: both;
-	background-color: #fafafa;
+    background-color: #fafafa;
-	padding: 3px 0px;
+    padding: 3px 0px;
-	border-top: 1px solid #ebebeb;
+    border-top: 1px solid #ebebeb;
 }
 
 #feed-accordion .entry-buttons .checkbox.inline {
-	padding-top: 0px;
+    padding-top: 0px;
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 #feed-accordion .entry-buttons .keep-unread label {
-	display: inline;
+    display: inline;
-	font-weight: inherit;
+    font-weight: inherit;
 }
 
 #feed-accordion .share-buttons a {
-	color: #333333;
+    color: #333333;
-	padding-left: 5px;
+    padding-left: 5px;
 }
 
 #feed-accordion .share-buttons a:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #feed-accordion .tags-panel {
-	margin-left: 30px;
+    margin-left: 30px;
 }
 
-#feed-accordion .tags-panel .label{
+#feed-accordion .tags-panel .label {
-	margin-left: 5px;
+    margin-left: 5px;
 }
 
 .select2-container-multi .select2-choices .select2-search-field input {
-	padding: 2px
+    padding: 2px;
 }
 
 #feed-accordion .tag-input {
-	margin: 0 0 0 5px;
+    margin: 0 0 0 5px;
-	padding: 0;
+    padding: 0;
-	width: 200px;
+    width: 200px;
 }
 
 #feed-accordion .entry-buttons label {
-	margin-bottom: 0px;
+    margin-bottom: 0px;
-	font-size: 12px;
+    font-size: 12px;
 }
 
 #feed-accordion a.mark-up-to {
-	color: #333333;
+    color: #333333;
-	position: absolute;
+    position: absolute;
-	right: 30px;
+    right: 30px;
 }
 
 #feed-accordion a.mark-up-to:hover {
-	text-decoration: none;
+    text-decoration: none;
-	cursor: pointer;
+    cursor: pointer;
 }
 
 #feed-accordion .star {
-	text-decoration: none;
+    text-decoration: none;
-	padding: 0px 5px;
+    padding: 0px 5px;
 }
 
 #feed-accordion .icon-star-yellow {
-	color: gold;
+    color: gold;
-	text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
+    text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
 }
 
 #feed-accordion .icon-star-empty {
-	color: #555;
+    color: #555;
 }
 
 #feed-accordion.expanded .entry {
-	margin-bottom: 40px;
+    margin-bottom: 40px;
-	border: 1px solid #ddd;
+    border: 1px solid #ddd;
-	box-shadow: 0 0 4px #e3e5eb;
+    box-shadow: 0 0 4px #e3e5eb;
 }
 
 #feed-accordion.expanded .current {
-	border-left: 1px solid rgb(77, 144, 240);
+    border-left: 1px solid rgb(77, 144, 240);
 }
 
 #feed-accordion .current.entry-font-size-0 {
-	font-size: 14px;
+    font-size: 14px;
 }
 
 #feed-accordion .current.entry-font-size-1 {
-	font-size: 15px;
+    font-size: 15px;
 }
 
 #feed-accordion .current.entry-font-size-2 {
-	font-size: 16px;
+    font-size: 16px;
 }
 
 #feed-accordion .current.entry-font-size-3 {
-	font-size: 17px;
+    font-size: 17px;
 }
 
 #feed-accordion .current.entry-font-size-4 {
-	font-size: 18px;
+    font-size: 18px;
 }
 
 #feed-accordion .current.entry-font-size-5 {
-	font-size: 19px;
+    font-size: 19px;
 }
 
 #feed-accordion .highlight-search {
-	background-color: rgba(255, 255, 140, 0.5);
+    background-color: rgba(255, 255, 140, 0.5);
-	color: #333;
+    color: #333;
-}
+}

src/main/app/sass/components/_help.scss

@@ -1,23 +1,22 @@
 .help {
-	font-size: 85%;
+    font-size: 85%;
-	line-height: 15px;
+    line-height: 15px;
 }
 
 .help .bookmarklet-select {
-	margin: 0;
+    margin: 0;
-	padding: 0;
+    padding: 0;
-	height: auto;
+    height: auto;
 }
 
 .help .about-module {
-	margin-bottom: 40px;
+    margin-bottom: 40px;
 }
 .donate-action {
-	margin-top:20px;
+    margin-top: 20px;
-	
 }
 
 .donate-image {
-	padding-bottom:10px;
+    padding-bottom: 10px;
-	padding-right:16px;
+    padding-right: 16px;
 }

src/main/app/sass/components/_loading-bar.scss

@@ -1,12 +1,15 @@
 #loading-bar .bar {
-	background: #2c3e50;
+    background: #2c3e50;
+    height: 101px;
+    top: -100px;
+    position: fixed;
 }
 
 #loading-bar .peg {
-	box-shadow: 0 0 10px #2c3e50, 0 0 5px #2c3e50;
+    box-shadow: 0 0 10px #2c3e50, 0 0 5px #2c3e50;
 }
 
 #loading-bar-spinner .spinner-icon {
-	border-top-color: #2c3e50;
+    border-top-color: #2c3e50;
-	border-left-color: #2c3e50;
+    border-left-color: #2c3e50;
-}
+}

src/main/app/sass/components/_subscription-list.scss

@@ -1,159 +1,161 @@
 /* feed search dialog */
 .feed-search-dialog .modal-body {
-	overflow: hidden;
+    overflow: hidden;
 }
 
 .feed-search-dialog .filter-input {
-	width: 90%;
+    width: 90%;
 }
 
 .feed-search-dialog .feed-link {
-	font-size: large;
+    font-size: large;
 }
 
 .feed-search-dialog a:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 .feed-search-dialog .focus a {
-	color: black;
+    color: black;
 }
 
 /* tree*/
 .sidebar-nav-fixed {
-	margin-top: 10px;
+    margin-top: 10px;
-	width: 250px;
+    width: 250px;
-	position: fixed;
+    position: fixed;
-	top: 0;
+    top: 0;
-	bottom: 0;
+    bottom: 0;
-	overflow: hidden;
+    overflow: hidden;
 }
 
 .sidebar-nav-fixed:hover {
-	overflow-y: auto;
+    overflow-y: auto;
 }
 
 .sidebar-nav-fixed .ui-resizable-e {
-	width: 5px;
+    width: 5px;
-	right: 0;
+    right: 0;
 }
 
 .full-screen .left-menu {
-	display: none;
+    display: none;
 }
 
 .css-treeview {
-	margin-top: 15px;
+    margin-top: 15px;
-	margin-bottom: 30px;
+    margin-bottom: 30px;
-	font-family: inherit;
+    font-family: inherit;
-	font-size: 13px;
+    font-size: 13px;
-	white-space: nowrap;
+    white-space: nowrap;
 }
 
 .css-treeview ul {
-	list-style: none;
+    list-style: none;
-	margin-left: 0px;
+    margin-left: 0px;
-	padding: 0;
+    padding: 0;
 }
 
 .css-treeview li {
-	line-height: 20px;
+    line-height: 20px;
 }
 
 .css-treeview .fldr {
-	cursor: pointer;
+    cursor: pointer;
-	display: inline-block;
+    display: inline-block;
-	width: 14px;
+    width: 14px;
-	height: 14px;
+    height: 14px;
-	line-height: 14px;
+    line-height: 14px;
-	vertical-align: text-top;
+    vertical-align: text-top;
-	margin-top: 1px;
+    margin-top: 1px;
 }
 
 .css-treeview .error {
-	color: red;
+    color: red;
-	font-style: italic;
+    font-style: italic;
 }
 
 .css-treeview label {
-	overflow: hidden;
+    overflow: hidden;
-	text-overflow: ellipsis;
+    text-overflow: ellipsis;
-	display: block;
+    display: block;
-	margin: 3px 0px 3px;
+    margin: 3px 0px 3px;
 }
 
-.css-treeview label,.css-treeview a,.css-treeview label::before {
+.css-treeview label,
-	font-family: inherit;
+.css-treeview a,
-	font-size: 12px;
+.css-treeview label::before {
-	white-space: nowrap;
+    font-family: inherit;
+    font-size: 12px;
+    white-space: nowrap;
 }
 
 .css-treeview .selected {
-	color: #d14836;
+    color: #d14836;
 }
 
 .css-treeview .unread {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 .css-treeview .unread-counter {
-	color: #666;
+    color: #666;
-	font-size: 11px;
+    font-size: 11px;
 }
 
 .css-treeview .unread ~ .unread-counter::before {
-	content: '(';
+    content: "(";
 }
 
 .css-treeview .unread ~ .unread-counter::after {
-	content: ')';
+    content: ")";
 }
 
 .css-treeview a {
-	cursor: pointer;
+    cursor: pointer;
-	color: black;
+    color: black;
-	display: block;
+    display: block;
-	overflow: hidden;
+    overflow: hidden;
-	text-overflow: ellipsis;
+    text-overflow: ellipsis;
 }
 
 .css-treeview a:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 .css-treeview li .tree-item:hover {
-	background-color: #EBEBEB;
+    background-color: #ebebeb;
-	text-decoration: none;
+    text-decoration: none;
 }
 
 .css-treeview .config {
-	display: none;
+    display: none;
 }
 
 .css-treeview .tree-item:hover .config {
-	display: block;
+    display: block;
-	padding-top: 3px;
+    padding-top: 3px;
-	margin-right: 5px;
+    margin-right: 5px;
-	width: 16px;
+    width: 16px;
-	height: 16px;
+    height: 16px;
 }
 
 .css-treeview .indent1 {
-	padding-left: 16px;
+    padding-left: 16px;
 }
 
 .css-treeview .indent2 {
-	padding-left: 32px;
+    padding-left: 32px;
 }
 
 .css-treeview .indent3 {
-	padding-left: 48px;
+    padding-left: 48px;
 }
 
 .css-treeview .indent4 {
-	padding-left: 64px;
+    padding-left: 64px;
 }
 
 .css-treeview .indent5 {
-	padding-left: 80px;
+    padding-left: 80px;
-}
+}