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

.prettierrc

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

CHANGELOG

@@ -0,0 +1,75 @@
+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
+  - new setting app.maxFeedCapacity for deleting old entries
+  - ability to set filtering expressions for subscriptions to automatically mark new entries as read based on title, content, author or url.
+  - ability to use !keyword or -keyword to exclude a keyword from a search query
+  - facebook feeds now show user favicon instead of facebook favicon
+  - new dark theme 'nightsky'
+v 2.0.3
+  - internet explorer ajax cache workaround
+  - categories are now deletable again
+  - openshift support is back
+  - youtube feeds now show user favicon instead of youtube favicon
+v 2.0.2
+  - api using the api key is now working again
+  - context path is now configurable in config.yml (see app.contextPath in config.yml.example)
+  - fix login on firefox when fields are autofilled by the browser
+  - fix scrolling of subscriptions list on mobile
+  - user is now logged in after registration
+  - fix link to documentation on home page and about page
+  - fields autocomplete is disabled on the profile page
+  - users are able to delete their account again
+  - chinese and malaysian translation files are now correctly loaded
+  - software version in user-agent when fetching feeds is no longer hardcoded
+  - admin settings page is now read only, settings are configured in config.yml 
+  - added link to metrics on the admin settings page
+  - Rome (rss library) upgrade to 1.5.0
+v 2.0.1
+  - the redis pool no longer throws an exception when it is unable to aquire a new connection
+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  

README.md

@@ -1,90 +1,122 @@
-CommaFeed [![Build Status](https://buildhive.cloudbees.com/job/Athou/job/commafeed/badge/icon)](https://buildhive.cloudbees.com/job/Athou/job/commafeed/)
-=========
-Sources for [CommaFeed.com](http://www.commafeed.com/).
-
-Google Reader inspired self-hosted RSS reader, based on Dropwizard and AngularJS.
-
-Related open-source projects
-----------------------------
-
-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
------------------------------
-
-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 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.
-
-To install maven and openjdk on Ubuntu, issue the following commands
-
-    sudo add-apt-repository ppa:natecarlson/maven3
-    sudo apt-get update
-    sudo apt-get install openjdk-7-jdk maven3
-    
-    # Not required but if you don't, use 'mvn3' instead of 'mvn' for the rest of the instructions.
-    sudo ln -s /usr/bin/mvn3 /usr/bin/mvn
-    
-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
-    
-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
-
-You can use nginx or apache as a proxy http server. Note that when using apache, the `ProxyPreserveHost on` option should be set in your config file.
-
-Local development
------------------
-
-To start the dropwizard backend, use your IDE to run CommaFeedApplication as your main class, and pass `server config.dev.yml` as arguments to the program.
-To start the client-side webserver with watches on assets, run `gulp dev`. The server is now running on port 8082 and is proxying REST requests to dropwizard on port 8083.
-
-
-Translate CommaFeed into your language
---------------------------------------
-
-Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/src/main/app/i18n).
-
-To add a new language, create a new file in that directory.
-The name of the file should be the two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
-The language has to be referenced in the `src/main/app/js/i18n.js` file to be picked up.
-
-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.
-
-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`).
-
-See [_test.scss](https://github.com/Athou/commafeed/blob/master/src/main/webapp/sass/themes/_test.scss) for an example.
-
-
-Copyright and license
----------------------
-
-Copyright 2013-2014 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
-
-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.
+# CommaFeed [![Build Status](https://travis-ci.org/Athou/commafeed.svg?branch=master)](https://travis-ci.org/Athou/commafeed)
+
+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)
+
+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 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
+    ./mvnw clean package
+    cp config.yml.example config.yml
+    vi config.yml
+    java -Djava.net.preferIPv4Stack=true -jar target/commafeed.jar server config.yml
+
+### 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 file-based H2 database or an external MySQL, PostgreSQL or SQLServer database.
+You also need the Java 1.8+ JDK in order to build the application.
+
+To install the required packages to build CommaFeed on Ubuntu, issue the following commands
+
+    # if openjdk-8-jdk is not available on your ubuntu version (14.04 LTS), add the following repo first
+    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
+
+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
+
+    ./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 -Djava.net.preferIPv4Stack=true -jar target/commafeed.jar server config.yml
+
+You can use a proxy http server such as nginx or apache.
+
+## Translate CommaFeed into your language
+
+Files for internationalization are located [here](https://github.com/Athou/commafeed/tree/master/src/main/app/i18n).
+
+To add a new language, create a new file in that directory.
+The name of the file should be the two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
+The language has to be referenced in the `src/main/app/js/i18n.js` file to be picked up.
+
+## Themes
+
+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/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/app/sass/themes/_test.scss) for an example.
+
+## Local development
+
+Steps to configuring a development environment for CommaFeed may include, but may not be limited to:
+
+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
+        - 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
+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.
+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"
+10. The debugger is now working. To connect to it, open a terminal (or command prompt) and navigate to the directory where you cloned the CommaFeed files.
+11. Issue the command `gulp dev` on Unix based systems or `gulp.cmd dev` in Windows.
+12. The development server is now running at http://localhost:8082 and is proxying REST requests to dropwizard on port 8083.
+13. Connect to the server from your browser; you should have functional breakpoints and watches on assets.
+14. When you're done developing, create a fork at the top of https://github.com/Athou/CommaFeed page and commit your changes to it.
+15. If you'd like to contribute to CommaFeed, create a pull request from your repository to https://github.com/Athou/CommaFeed when your changes are ready. There's a button to do so at the top of https://github.com/Athou/CommaFeed.
+
+## Copyright and license
+
+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
+
+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.

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,33 +1,37 @@
 {
-  "name": "commafeed",
-  "version": "2.0.0",
-  "dependencies": {
-    "jquery": "1.11.0",
-    "jquery-ui": "1.11",
-    "jquery-mousewheel": "3.1.12",
-    "lodash": "2.4.1",
-    "bootstrap": "3.1.1",
-    "font-awesome": "3.2.1",
-    "angular": "1.2.16",
-    "angular-resource": "1.2.16",
-    "angular-route": "1.2.16",
-    "angular-sanitize": "1.2.16",
-    "angular-touch": "1.2.16",
-    "angular-animate": "1.2.16",
-    "angular-ui-router": "0.2.8",
-    "angular-ui-utils": "0.1.0",
-    "angular-ui-select2": "0.0.5",
-    "angular-bootstrap": "0.2.0",
-    "angular-loading-bar": "0.5.0",
-    "angular-translate": "2.2.0",
-    "angular-translate-loader-static-files": "2.2.0",
-    "ngInfiniteScroll": "1.0.0",
-    "ng-grid": "2.0.6",
-    "mousetrap": "1.4.6",
-    "momentjs": "2.6.0",
-    "device.js": "matthewhudson/device.js#2ae5c775e35ccc837589e5af34e292c54936778c",
-    "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
-    "zocial": "samcollins/css-social-buttons#1f59ecacde475e563fb6771667597493ec4eecb6",
-	"swagger-ui": "2.0.21"
-  }
+    "name": "commafeed",
+    "version": "2.0.0",
+    "dependencies": {
+        "jquery": "2.1.3",
+        "jquery-ui": "1.10.3",
+        "jquery-mousewheel": "3.1.12",
+        "lodash": "3.4.0",
+        "bootstrap": "3.3.2",
+        "font-awesome": "3.2.1",
+        "angular": "1.3.14",
+        "angular-resource": "1.3.14",
+        "angular-route": "1.3.14",
+        "angular-sanitize": "1.3.14",
+        "angular-touch": "1.3.14",
+        "angular-animate": "1.3.14",
+        "angular-ui-router": "0.2.13",
+        "angular-ui-utils": "0.1.0",
+        "angular-ui-select2": "0.0.5",
+        "angular-bootstrap": "0.2.0",
+        "angular-loading-bar": "0.6.0",
+        "angular-translate": "2.6.1",
+        "angular-translate-loader-static-files": "2.6.1",
+        "ngInfiniteScroll": "1.0.0",
+        "ng-grid": "2.0.6",
+        "mousetrap": "1.4.6",
+        "momentjs": "2.9.0",
+        "devicejs": "0.2.4",
+        "zocial-less": "1.0.0",
+        "swagger-ui": "2.1.0",
+        "tinycon": "0.6.5"
+    },
+    "resolutions": {
+        "angular": "1.3.14",
+        "angular-translate": "2.6.1"
+    }
 }

config.dev.yml

@@ -7,9 +7,15 @@ app:
   # wether to allow user registrations
   allowRegistrations: true
   
+  # create a demo account the first time the app starts
+  createDemoAccount: false
+  
   # 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
   
@@ -22,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
@@ -44,12 +58,18 @@ app:
   # time to keep unread statuses (in days), 0 to disable
   keepStatusDays: 0
   
+  # entries to keep per feed, old entries will be deleted, 0 to disable
+  maxFeedCapacity: 500
+  
   # cache service to use, possible values are 'noop' and 'redis'
   cache: noop
   
   # 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
@@ -71,11 +91,7 @@ database:
   password: sa
   properties:
     charSet: UTF-8
-    maxWaitForConnection: 1s
-    validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-    minSize: 1
-    maxSize: 50
-    checkConnectionWhileIdle: true
+  validationQuery: "/* CommaFeed Health Check */ SELECT 1"
     
 server:
   applicationConnectors:
@@ -84,12 +100,13 @@ server:
   adminConnectors:
     - type: http
       port: 8084
+      
 logging:
   level: INFO
   loggers:
     com.commafeed: DEBUG
     liquibase: INFO
-    org.hibernate.SQL: ALL
+    org.hibernate.SQL: INFO # or ALL for sql debugging
     org.hibernate.engine.internal.StatisticalLoggingSessionEventListener: WARN
   appenders:
     - type: console
@@ -99,4 +116,16 @@ logging:
       archive: true
       archivedLogFilenamePattern: log/commafeed-%d.log
       archivedFileCount: 5
-      timeZone: UTC
+      timeZone: UTC
+      
+# Redis pool configuration
+# (only used if app.cache is 'redis')
+# -----------------------------------
+redis:
+  host: localhost
+  port: 6379
+  password: 
+  timeout: 2000
+  database: 0
+  maxTotal: 500
+   

config.yml.example

@@ -4,12 +4,18 @@ 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
+  createDemoAccount: false
+  
   # 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
   
@@ -22,6 +28,15 @@ app:
   smtpTls: false
   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
@@ -44,12 +59,18 @@ app:
   # time to keep unread statuses (in days), 0 to disable
   keepStatusDays: 0
   
+  # entries to keep per feed, old entries will be deleted, 0 to disable
+  maxFeedCapacity: 500
+  
   # cache service to use, possible values are 'noop' and 'redis'
   cache: noop
   
   # 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
@@ -66,16 +87,15 @@ app:
 
 database:
   driverClass: org.h2.Driver
-  url: jdbc:h2:./target/example
+  url: jdbc:h2:/home/commafeed/db
   user: sa
   password: sa
   properties:
     charSet: UTF-8
-    maxWaitForConnection: 1s
-    validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-    minSize: 1
-    maxSize: 50
-    checkConnectionWhileIdle: true
+  validationQuery: "/* CommaFeed Health Check */ SELECT 1"
+  minSize: 1
+  maxSize: 50
+  maxConnectionAge: 30m
     
 server:
   applicationConnectors:
@@ -84,12 +104,14 @@ server:
   adminConnectors:
     - type: http
       port: 8084
+      
 logging:
   level: WARN
   loggers:
     com.commafeed: INFO
     liquibase: INFO
     io.dropwizard.server.ServerFactory: INFO
+    org.hibernate.orm.deprecation: "OFF"
   appenders:
     - type: console
     - type: file
@@ -98,4 +120,16 @@ logging:
       archive: true
       archivedLogFilenamePattern: log/commafeed-%d.log
       archivedFileCount: 5
-      timeZone: UTC
+      timeZone: UTC
+      
+# Redis pool configuration
+# (only used if app.cache is 'redis')
+# -----------------------------------
+redis:
+  host: localhost
+  port: 6379
+  password: 
+  timeout: 2000
+  database: 0
+  maxTotal: 500
+   

dev/EclipseCodeFormatter.xml

@@ -1,283 +1,365 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Eclipse [built-in] 140 chars" version="12">
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<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_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" 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.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<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_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<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_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<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.use_on_off_tags" value="false"/>
-<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_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<profiles version="18">
+<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.comment.insert_new_line_for_parameter" value="insert"/>
-<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.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<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_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" 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.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<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.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<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_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<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_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" 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_closing_angle_bracket_in_type_arguments" 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.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="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_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" 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.insert_space_after_opening_paren_in_for" value="do not 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.alignment_for_selector_in_method_invocation" value="16"/>
-<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.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" 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.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="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.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<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_after_opening_paren_in_parenthesized_expression" 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_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<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.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<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_colon_in_for" value="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.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<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_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<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.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<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_before_comma_in_annotation" value="do not insert"/>
-<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_before_comma_in_method_declaration_throws" value="do not 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.brace_position_for_switch" value="end_of_line"/>
-<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_parenthesized_expression_in_return" value="insert"/>
-<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_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<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.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="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.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<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.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<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_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<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_new_line_after_annotation_on_field" 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.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not 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_space_before_opening_brace_in_switch" value="insert"/>
-<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_after_comma_in_superinterfaces" 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.tabulation.size" value="4"/>
-<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_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" 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.insert_new_line_in_empty_enum_constant" value="insert"/>
-<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_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<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_comma_in_constructor_declaration_throws" 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_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<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_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<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.insert_space_after_opening_paren_in_catch" value="do not 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.insert_space_before_opening_paren_in_method_invocation" value="do not 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.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<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.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" 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.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<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_comma_in_constructor_declaration_parameters" 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.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<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.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<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_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<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_after_opening_angle_bracket_in_type_parameters" value="do not 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_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="48"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="140"/>
+<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.blank_lines_between_import_groups" value="1"/>
-<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.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<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_before_colon_in_conditional" value="insert"/>
-<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_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<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_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="48"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" 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.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<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_colon_in_default" 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_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<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_opening_bracket_in_array_allocation_expression" 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_colon_in_conditional" value="insert"/>
-<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.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<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_after_comma_in_allocation_expression" value="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.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="48"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
-<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.alignment_for_enum_constants" value="48"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<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_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not 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.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" 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_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<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_opening_brace_in_array_initializer" 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_after_opening_paren_in_method_declaration" value="do not insert"/>
-<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_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" 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_closing_paren_in_annotation" value="do not insert"/>
-<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_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<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_after_comma_in_multiple_local_declarations" value="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_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_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<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_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_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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<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.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_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_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.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.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.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.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_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"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<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"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<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_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.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"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<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"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
 </profile>
 </profiles>

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,17 +62,17 @@ 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]
 	});
 	var jsFilter = filter("**/*.js");
 	var cssFilter = filter("**/*.css");
 	return gulp.src([SRC_DIR + 'index.html', TEMP_DIR + 'app.css']).pipe(assets).pipe(rev()).pipe(assets.restore()).pipe(useref()).pipe(
-			revReplace()).pipe(gulp.dest(BUILD_DIR));
+			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,7 +98,9 @@ gulp.task('serve', function() {
 	connect.server({
 		root : BUILD_DIR,
 		port : 8082,
+		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]';
@@ -113,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.7",
-    "gulp-rev": "1.0.0",
-    "gulp-rev-replace": "0.3.0",
-    "gulp-minify-css": "0.3.7",
-    "gulp-uglify": "0.3.1",
-    "gulp-filter": "1.0.0",
-    "gulp-bower": "0.0.6",
-    "gulp-connect": "2.0.6",
-    "connect-modrewrite": "0.7.7",
-    "gulp-sass": "0.7.2",
-    "gulp-useref": "0.6.0",
-    "gulp-angular-templatecache": "1.3.0"
+    "bower": "1.8.8",
+    "gulp": "3.8.11",
+    "gulp-rev": "4.0.0",
+    "gulp-rev-replace": "0.4.1",
+    "gulp-minify-css": "1.1.5",
+    "gulp-uglify": "1.2.0",
+    "gulp-filter": "2.0.2",
+    "gulp-connect": "2.2.0",
+    "connect-modrewrite": "0.8.1",
+    "gulp-sass": "2.0.2",
+    "gulp-useref": "1.1.2",
+    "gulp-angular-templatecache": "1.6.0"
   }
 }

pom.xml

@@ -4,19 +4,30 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>2.0.0</version>
-	<packaging>jar</packaging>
+	<version>2.6.0</version>
 	<name>CommaFeed</name>
 
-	<prerequisites>
-		<maven>3.0.0</maven>
-	</prerequisites>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<dropwizard.version>0.7.1</dropwizard.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<guice.version>5.1.0</guice.version>
+		<querydsl.version>4.2.1</querydsl.version>
+		<rome.version>1.18.0</rome.version>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>io.dropwizard</groupId>
+				<artifactId>dropwizard-dependencies</artifactId>
+				<version>2.1.1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<finalName>commafeed</finalName>
 		<resources>
@@ -25,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>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
+				<version>3.10.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<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.7</version>
+				<version>2.1.13</version>
 				<executions>
 					<execution>
 						<goals>
@@ -49,12 +75,20 @@
 				<configuration>
 					<generateGitPropertiesFile>false</generateGitPropertiesFile>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
+					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 				</configuration>
 			</plugin>
 			<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>
@@ -80,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.15</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>
-							<npmVersion>1.3.8</npmVersion>
+							<nodeVersion>v6.11.4</nodeVersion>
+							<npmVersion>3.10.6</npmVersion>
 						</configuration>
 					</execution>
 					<execution>
@@ -106,182 +181,336 @@
 						<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>3.2.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</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.4</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.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</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>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-assets</artifactId>
-			<version>${dropwizard.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.wordnik</groupId>
-			<artifactId>swagger-jaxrs_2.10</artifactId>
-			<version>1.3.7</version>
+			<groupId>io.dropwizard</groupId>
+			<artifactId>dropwizard-forms</artifactId>
+		</dependency>
+		<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>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<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>
-					<artifactId>jsr311-api</artifactId>
-					<groupId>javax.ws.rs</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>javassist</artifactId>
-					<groupId>javassist</groupId>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</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>3.4.2</version>
+			<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>3.4.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-multipart</artifactId>
-			<version>1.18.1</version>
+			<version>${querydsl.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.2.1</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-collections4</artifactId>
+			<version>4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-math</artifactId>
-			<version>2.2</version>
+			<artifactId>commons-math3</artifactId>
+			<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.5.2</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>
-			<groupId>net.java.dev.rome</groupId>
+			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
-			<version>1.0.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>jdom</groupId>
-					<artifactId>jdom</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>${rome.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.rometools</groupId>
+			<groupId>com.rometools</groupId>
+			<artifactId>rome-modules</artifactId>
+			<version>${rome.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.rometools</groupId>
 			<artifactId>rome-opml</artifactId>
-			<version>1.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>rome</groupId>
-					<artifactId>rome</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>${rome.version}</version>
 		</dependency>
+
 		<dependency>
-			<groupId>org.jdom</groupId>
-			<artifactId>jdom</artifactId>
-			<version>1.1.3</version>
+			<groupId>org.ahocorasick</groupId>
+			<artifactId>ahocorasick</artifactId>
+			<version>0.6.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.7.3</version>
+			<version>1.14.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.juniversalchardet</groupId>
-			<artifactId>juniversalchardet</artifactId>
-			<version>1.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.gwt</groupId>
-			<artifactId>gwt-servlet</artifactId>
-			<version>2.6.1</version>
+			<groupId>com.ibm.icu</groupId>
+			<artifactId>icu4j</artifactId>
+			<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.181</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.32</version>
+			<version>8.0.28</version>
 		</dependency>
 		<dependency>
-			<groupId>postgresql</groupId>
+			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>9.1-901-1.jdbc4</version>
+			<version>42.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jtds</groupId>
@@ -290,9 +519,29 @@
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<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>

src/main/app/api/index.html

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

@@ -98,6 +98,8 @@
     "next_refresh" : "Next refresh",
     "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' '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?",
@@ -109,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",
@@ -174,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 ",
-    "tags" : "Tags "
+    "close" : "Cerrar",
+    "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_name" : "Nombre del Canal",
+    "feed_url" : "URL 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_suffix" : " cuenta.",
+    "google_reader_prefix" : "Déjame importar tus canales de tu 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",
-    "next_entry" : "Próxima Entrada",
-    "refresh" : "Atualizar",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Ordenar por fecha asc/desc",
-    "titles_only" : "Sólo Títulos",
-    "expanded_view" : "Vista Expandida",
+    "previous_entry" : "Entrada anterior",
+    "next_entry" : "Entrada siguiente",
+    "refresh" : "Actualizar",
+    "refresh_all" : "Forzar la actualización de todos mis canales.",
+    "sort_by_asc_desc" : "Ordenar por fecha asc/desc.",
+    "titles_only" : "Sólo títulos",
+    "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_day" : "Artículos anteriores a un día",
-    "mark_all_older_week" : "Artículos más de una semana",
-    "mark_all_older_two_weeks" : "Artículos más de does semanas",
+    "mark_all_older_12_hours" : "Entradas anteriores a 12 horas.",
+    "mark_all_older_day" : "Entradas anteriores a un día.",
+    "mark_all_older_week" : "Entradas anteriores a una semana.",
+    "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_author" : "by  ",
-    "error_while_loading_feed" : "Error mientras se cargaba este canal",
-    "keep_unread" : "Guardar no leídos",
-    "no_unread_items" : "no tiene items sin leer.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "entry_source" : "de ",
+    "entry_author" : "por ",
+    "error_while_loading_feed" : "Error mientras se cargaba este canal.",
+    "keep_unread" : "Mantener como no leído.",
+    "no_unread_items" : "no tiene entradas sin leer.",
+    "mark_up_to_here" : "Marcar como leídos hasta aquí.",
+    "search_for" : "buscando:  ",
+    "no_search_results" : "No se han encontrado resultados para las palabras clave especificadas."
   },
   "feedsearch" : {
-    "hint" : "Type in a subscription... ",
-    "help" : "Use the return key to select and arrow keys to navigate. ",
-    "result_prefix" : "Your subscriptions: "
+    "hint" : "Introduce una suscripción...",
+    "help" : "Usa la tecla Intro para seleccionar y las teclas de flecha para navegar.",
+    "result_prefix" : "Tus suscripciones:"
   },
   "settings" : {
     "general" : {
       "value" : "General",
-      "language" : "Lenguaje",
-      "language_contribute" : "Contribuye con traducciones",
+      "language" : "Idioma",
+      "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.",
-      "scroll_marks" : "En vista expandida, el desplazamiento por las entradas las marca como leídas"
+      "social_buttons" : "Mostrar botones para compartir de redes sociales.",
+      "scroll_marks" : "En vista expandida, el desplazamiento por las entradas las marca como leídas."
     },
-    "appearance" : "Appearance ",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Theme ",
-    "submit_your_theme" : "Submit your theme ",
-    "custom_css" : "CSS Personalizado"
+    "appearance" : "Apariencia",
+    "scroll_speed" : "Velocidad de desplazamiento al navegar entre entradas (en milisegundos)",
+    "scroll_speed_help" : "ponlo a 0 para desactivarlo",
+    "theme" : "Tema",
+    "submit_your_theme" : "Envía tu tema ",
+    "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 ",
-    "next_refresh" : "Next refresh ",
-    "queued_for_refresh" : "Queued for refresh ",
-    "feed_url" : "URL del Canal",
-    "generate_api_key_first" : "Genera una llave API en tu perfil primero.",
-    "unsubscribe" : "Terminar subscripción",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "message" : "Último mensaje de actualización",
+    "next_refresh" : "Próxima actualización",
+    "queued_for_refresh" : "En cola para actualizar",
+    "feed_url" : "URL del canal",
+    "generate_api_key_first" : "Genera una clave API en tu perfil primero.",
+    "unsubscribe" : "Terminar suscripción",
+    "unsubscribe_confirmation" : "¿Estás seguro de querer terminar tu suscripción a este canal?",
+    "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_info" : "Al cambiar la contraseña se generará una 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 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.",
-      "link_to_documentation" : "Vínculo de la documentación."
+      "line1" : "CommaFeed está construido sobre JAX-RS y AngularJS. Por lo tanto, una REST API está disponible.",
+      "link_to_documentation" : "Enlace a la documentación."
     },
     "keyboard_shortcuts" : "Atajos de teclado",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed es un proyecto open-source. El código se encuentra en ",
+    "version" : "Versión de CommaFeed",
+    "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.",
-    "line4" : "For those of you who prefer bitcoin, here is the address ",
+    "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" : "Para aquellos de vosotros que prefieran bitcoin, aquí está la dirección ",
     "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Subscribe URL ",
-      "chrome_extension" : "Extensión de Chrome",
-      "firefox_extension" : "Extensión de Firefox",
-      "opera_extension" : "Opera extension ",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click) ",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar) "
+      "value" : "Extras",
+      "android_app" : "Apps para Android",
+      "subscribe_url" : "URL para suscribirse ",
+      "chrome_extension" : "Extensión para Chrome.",
+      "firefox_extension" : "Extensión para Firefox.",
+      "opera_extension" : "Extensón para Opera.",
+      "subscribe_bookmarklet" : "Añadir marcador de suscripción (clic).",
+      "subscribe_bookmarklet_asc" : "Más antiguos primero",
+      "subscribe_bookmarklet_desc" : "Más recientes primero",
+      "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",
-      "open_next_entry" : "abrir próxima entrada",
-      "open_previous_entry" : "abrir entrada previa",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "Establecer el foco en la próxima entrada sin abrirlo",
-      "focus_previous_entry" : "Establecer el foco en la entrada anterior sin abrirlo",
-      "open_next_feed" : "open next feed or category ",
-      "open_previous_feed" : "open previous feed or category ",
-      "open_close_current_entry" : "abrir/cerrar entrada actual",
-      "open_current_entry_in_new_window" : "abrir entrada actual en una nueva ventana",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background ",
-      "star_unstar" : "marcar/no marcar la entrada actual",
-      "mark_current_entry" : "marcar como leída/no la leída entrada actual",
+      "mouse_middleclick" : "click medio",
+      "open_next_entry" : "abrir la siguiente entrada",
+      "open_previous_entry" : "abrir la entrada anterior",
+      "spacebar" : "espacio/mayúsculas+espacio",
+      "move_page_down_up" : "mueve la página arriba/abajo",
+      "focus_next_entry" : "establecer el foco en la siguiente entrada sin abrirla",
+      "focus_previous_entry" : "establecer el foco en la entrada anterior sin abrirla",
+      "open_next_feed" : "abrir el siguiente canal o categoría",
+      "open_previous_feed" : "abrir el canal o categoría previo",
+      "open_close_current_entry" : "abrir/cerrar la entrada actual",
+      "open_current_entry_in_new_window" : "abrir la entrada actual en una nueva ventana",
+      "open_current_entry_in_new_window_background" : "abrir la entrada actual en una nueva ventana en segundo plano",
+      "star_unstar" : "destacar la 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 ",
-      "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 "
+      "fullscreen" : "activar/desactivar el modo pantalla completa ",
+      "font_size" : "aumentar/reducir el tamaño de la fuente de la entrada actual",
+      "go_to_all" : "ver Todos",
+      "go_to_starred" : "ver Destacados",
+      "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_day" : "Articles de plus d'un jour",
+    "mark_all_older_12_hours" : "Articles de plus de 12 heures",
+    "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",
-    "no_unread_items" : "n'a pas d'articles non-lus.",
+    "keep_unread" : "Garder non lu",
+    "no_unread_items" : "n'a pas d'articles non lus.",
     "mark_up_to_here" : "Marquer comme lu jusqu'ici",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "search_for" : "recherche : ",
+    "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",
-      "scroll_marks" : "En mode de lecture étendu, marquer comme lu les éléments lorsque la fenêtre descend."
+      "social_buttons" : "Afficher les boutons de partage sur les réseaux sociaux",
+      "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_help" : "set to 0 to disable ",
+    "scroll_speed" : "Vitesse de défilement entre les entrées (en millisecondes) ",
+    "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? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe_confirmation" : "Êtes-vous sûr de vouloir vous désabonner de de flux ? ",
+    "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_author" : "by  ",
+    "entry_source" : "desde  ",
+    "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 ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "mark_up_to_here" : "Marcar como lidos ate aquí ",
+    "search_for" : "buscando por:  ",
+    "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_help" : "set to 0 to disable ",
+    "scroll_speed" : "Velocidade de desplazamento navegando entre entradas (en milisegundos) ",
+    "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? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe_confirmation" : "Seguro que queres desuscribirte de esta fonte? ",
+    "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 ",
-      "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 ",
+      "fullscreen" : "habilita a pantalla completa ",
+      "font_size" : "aumenta/diminúe o tamaño da letra da entrada activa ",
+      "go_to_all" : "ir a vista TODOS",
+      "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_name" : "Nome Feed",
+    "feed_url" : "URL feed",
+    "feed_name" : "Nome feed",
     "category" : "Categoria"
   },
   "import" : {
-    "google_reader_prefix" : "Importa i tuoi feed dal tuo ",
-    "google_reader_suffix" : " account.",
-    "google_download" : "Oppure, carica il tuo subscriptions.xml",
-    "google_download_link" : "Scaricalo da qui",
-    "xml_file" : "OPML File"
+    "google_reader_prefix" : "Permettimi di importare i feed dal tuo account ",
+    "google_reader_suffix" : ".",
+    "google_download" : "Oppure carica il tuo file subscriptions.xml.",
+    "google_download_link" : "Puoi scaricalo da qui.",
+    "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_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Sort by date asc/desc",
-    "titles_only" : "Solo titoli",
+    "refresh" : "Aggiorna",
+    "refresh_all" : "Forza l'aggiornamento di tutti i feed",
+    "sort_by_asc_desc" : "Ordina per data crescente/decrescente",
+    "titles_only" : "Solo i titoli",
     "expanded_view" : "Espandi",
-    "mark_all_as_read" : "Contrassegna tutto come già letto",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
+    "mark_all_as_read" : "Segna tutti come già letti",
+    "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_author" : "by  ",
-    "error_while_loading_feed" : "Si è verificato un errore, mentre caricavo il feed",
-    "keep_unread" : "Mantiene come da leggere",
-    "no_unread_items" : "Non ci sono elementi da leggere.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "entry_source" : "da ",
+    "entry_author" : "di ",
+    "error_while_loading_feed" : "Si è verificato un errore durante il caricamento del feed",
+    "keep_unread" : "Mantieni come da leggere",
+    "no_unread_items" : "non contiene elementi da leggere",
+    "mark_up_to_here" : "Segna come letto fin qui",
+    "search_for" : "Cerca: ",
+    "no_search_results" : "Nessun risultato per le parole chiave cercate"
   },
   "feedsearch" : {
-    "hint" : "Type in a subscription... ",
-    "help" : "Use the return key to select and arrow keys to navigate. ",
-    "result_prefix" : "Le tue sottoscrizioni"
+    "hint" : "Digita il nome di una sottoscrizione... ",
+    "help" : "Usa il tasto Invio per selezionare e le frecce per navigare.",
+    "result_prefix" : "Le tue sottoscrizioni:"
   },
   "settings" : {
     "general" : {
       "value" : "Generali",
       "language" : "Lingua",
-      "language_contribute" : "Contribuisci con le traduzioni",
-      "show_unread" : "Show feeds and categories with no unread entries",
-      "social_buttons" : "Visualizza i social button",
-      "scroll_marks" : "Marca come letto quando scorri"
+      "language_contribute" : "Contribuisci alle traduzioni",
+      "show_unread" : "Mostra i feed e le categorie con voci non lette",
+      "social_buttons" : "Mostra i pulsanti di condivisione social",
+      "scroll_marks" : "In vista estesa, segna come lette le voci che scorri"
     },
-    "appearance" : "Appearance ",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Tema ",
-    "submit_your_theme" : "Sottoponi il tuo tema ",
-    "custom_css" : "Css modificato"
+    "appearance" : "Aspetto",
+    "scroll_speed" : "Velocità di scorrimento quando navighi tra i feed (in millisecondi)",
+    "scroll_speed_help" : "imposta su 0 per disabilitare",
+    "theme" : "Tema",
+    "submit_your_theme" : "Inserisci il tuo tema",
+    "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 ",
-    "next_refresh" : "Next refresh ",
-    "queued_for_refresh" : "In attesa per l'aggiornamento ",
-    "feed_url" : "Feed URL",
-    "generate_api_key_first" : "Generate an API key in your profile first.",
-    "unsubscribe" : "Annulla l\"'\"iscrizione",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "message" : "Ultimo messaggio di aggiornamento",
+    "next_refresh" : "Prossimo aggiornamento",
+    "queued_for_refresh" : "In coda per l'aggiornamento",
+    "feed_url" : "URL feed",
+    "filtering_expression" : "Espressione filtro",
+    "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).",
+    "generate_api_key_first" : "Genera prima una chiave API nelle impostazioni del tuo profilo.",
+    "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 ",
-    "parent_category" : "Parent category"
+    "tag_details" : "Dettagli tag",
+    "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_not_generated" : "Non generata ancora",
+    "api_key" : "chiave API",
+    "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 ",
-    "line1_prefix" : "Commefeed è un progetto open-source. I codici sono hostati su ",
+    "version" : "Versione di CommaFeed",
+    "line1_prefix" : "CommaFeed è un progetto open source. Trovi i sorgenti su ",
     "line1_suffix" : ".",
-    "line2_prefix" : "Se hai qualche problema, segnalalo sulla pagina del ",
-    "line2_suffix" : " progetto.",
-    "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.",
-    "line4" : "Per chi preferisce Bitcoin, questo è l\"'\"indirizzo ",
+    "line2_prefix" : "Se hai qualche problema, segnalalo sulla pagina del progetto ",
+    "line2_suffix" : ".",
+    "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" : "Se preferisci Bitcoin, questo è l'indirizzo",
     "goodies" : {
-      "value" : "Goodies",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Subscribe URL ",
-      "chrome_extension" : "Estenzione per Chrome  ",
+      "value" : "Cose che potrebbero interessarti",
+      "android_app" : "Applicazione Android",
+      "subscribe_url" : "Sottoscrivi URL",
+      "chrome_extension" : "Estensione per Chrome",
       "firefox_extension" : "Estensione per Firefox",
       "opera_extension" : "Estensione per Opera",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click) ",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar) "
+      "subscribe_bookmarklet" : "Aggiungi la sottoscrizione ai segnalibri (clicca)",
+      "subscribe_bookmarklet_asc" : "Prima i vecchi",
+      "subscribe_bookmarklet_desc" : "Prima i recenti",
+      "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",
-      "open_next_entry" : "open next entry",
-      "open_previous_entry" : "open previous entry",
-      "spacebar" : "space/shift+space ",
-      "move_page_down_up" : "moves the page down/up ",
-      "focus_next_entry" : "set focus on next entry without opening it ",
-      "focus_previous_entry" : "set focus on previous entry without opening it ",
-      "open_next_feed" : "open next feed or category ",
-      "open_previous_feed" : "open previous feed or category ",
-      "open_close_current_entry" : "open/close current entry",
-      "open_current_entry_in_new_window" : "open current entry in a new window",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background ",
-      "star_unstar" : "star/unstar current entry",
-      "mark_current_entry" : "mark as read/unread current entry",
-      "mark_all_as_read" : "mark all entries as read",
-      "open_in_new_tab_mark_as_read" : "open entry in new tab and mark as read",
-      "fullscreen" : "toggle full screen mode ",
-      "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 "
+      "mouse_middleclick" : "click centrale del mouse",
+      "open_next_entry" : "apri successivo",
+      "open_previous_entry" : "apri precedente",
+      "spacebar" : "SPAZIO/MAIUSC+SPAZIO",
+      "move_page_down_up" : "muove la pagina in su/giù",
+      "focus_next_entry" : "metti a fuoco l'elemento successivo senza aprirlo",
+      "focus_previous_entry" : "metti a fuoco l'elemento precedente senza aprirlo",
+      "open_next_feed" : "apri il prossimo feed o categoria",
+      "open_previous_feed" : "apri il feed o la categoria precedente",
+      "open_close_current_entry" : "apri/chiudi la voce corrente",
+      "open_current_entry_in_new_window" : "apri la voce corrente in una nuova finestra",
+      "open_current_entry_in_new_window_background" : "apri la voce corrente in una nuova finestra in secondo piano",
+      "star_unstar" : "metti/togli la tua preferenza alla voce corrente",
+      "mark_current_entry" : "segna la voce corrente come letta/non letta",
+      "mark_all_as_read" : "segna tutte le voci come lette",
+      "open_in_new_tab_mark_as_read" : "apri voce in un nuovo tab e segna come letta",
+      "fullscreen" : "commuta la modalità a schermo intero",
+      "font_size" : "aumenta/decrementa la dimensione del font per la voce corrente",
+      "go_to_all" : "vai alla vista Tutti",
+      "go_to_starred" : "vai alla vista Preferiti",
+      "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? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe_confirmation" : "フィードの購読を解除してよろしいですか?",
+    "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の翻訳に助けが必要です！",
-      "link" : "どうやって翻訳に貢献できるか見て下さい。"
+      "message" : "CommaFeedの翻訳にご協力ください！",
+      "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 ",
-    "link" : "Link ",
-    "bookmark" : "Bookmark ",
-    "close" : "Close ",
-    "tags" : "Tags "
+    "download" : "다운로드",
+    "link" : "링크",
+    "bookmark" : "북마크",
+    "close" : "닫기 ",
+    "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 ",
-    "next_entry" : "Next entry ",
-    "refresh" : "리프래쉬",
-    "refresh_all" : "Force refresh all my feeds ",
-    "sort_by_asc_desc" : "Sort by date asc/desc ",
-    "titles_only" : "Titles only ",
-    "expanded_view" : "Expanded view ",
-    "mark_all_as_read" : "읽음표시",
-    "mark_all_older_12_hours" : "Items older than 12 hours ",
-    "mark_all_older_day" : "Items older than a day ",
-    "mark_all_older_week" : "Items older than a week ",
-    "mark_all_older_two_weeks" : "Items older than two weeks ",
+    "previous_entry" : "이전 항목",
+    "next_entry" : "다음 항목",
+    "refresh" : "새로고침",
+    "refresh_all" : "모든 피드를 강제로 새로고침",
+    "sort_by_asc_desc" : "날짜별 오름차/내림차순 정렬",
+    "titles_only" : "제목만 표시하기",
+    "expanded_view" : "Expanded View",
+    "mark_all_as_read" : "읽음으로 표시",
+    "mark_all_older_12_hours" : "12시간보다 오래된 항목",
+    "mark_all_older_day" : "1일보다 오래된 항목",
+    "mark_all_older_week" : "1주일보다 오래된 항목",
+    "mark_all_older_two_weeks" : "2주일보다 오래된 항목",
     "settings" : "설정",
     "profile" : "프로필",
     "admin" : "괸리자",
@@ -57,124 +57,124 @@
   },
   "view" : {
     "entry_source" : "from  ",
-    "entry_author" : "by  ",
-    "error_while_loading_feed" : "피드로딩중 에러",
-    "keep_unread" : "안읽은것 저장",
-    "no_unread_items" : " 읽지않은 항목이 없읍니다.",
-    "mark_up_to_here" : "Mark as read up to here ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "entry_author" : "by ",
+    "error_while_loading_feed" : "피드 로딩중 에러",
+    "keep_unread" : "항상 읽지 않음으로 표시",
+    "no_unread_items" : " 읽지 않은 항목이 없습니다.",
+    "mark_up_to_here" : "이 위로 읽음으로 표시",
+    "search_for" : "검색:  ",
+    "no_search_results" : "검색 결과 없음"
   },
   "feedsearch" : {
-    "hint" : "Type in a subscription... ",
-    "help" : "Use the return key to select and arrow keys to navigate. ",
-    "result_prefix" : "Your subscriptions: "
+    "hint" : "구독 이름을 입력하세요",
+    "help" : "화살표 키로 이동하고 엔터 키로 선택하세요.",
+    "result_prefix" : "검색 결과:"
   },
   "settings" : {
     "general" : {
       "value" : "일반",
-      "language" : "일반 언어",
-      "language_contribute" : "번역 도움하기",
-      "show_unread" : "안읽은 항목들이 있는 피드와 카테고리 보여주기",
-      "social_buttons" : "소셜미디아 버튼들 보여주기",
-      "scroll_marks" : "Expanded View에서 스크롤하면 항목들을 읽음으로 저장하기"
+      "language" : "언어",
+      "language_contribute" : "번역에 기여하기",
+      "show_unread" : "안 읽은 항목들이 있는 피드와 카테고리 보여주기",
+      "social_buttons" : "공유 버튼 표시하기",
+      "scroll_marks" : "Expanded View에서 스크롤하면 항목들을 읽음으로 표시하기"
     },
-    "appearance" : "Appearance ",
-    "scroll_speed" : "Scrolling speed when navigating between entries (in milliseconds) ",
-    "scroll_speed_help" : "set to 0 to disable ",
-    "theme" : "Theme ",
-    "submit_your_theme" : "Submit your theme ",
-    "custom_css" : "커스톰 CSS"
+    "appearance" : "외관",
+    "scroll_speed" : "항목 사이를 이동할 때 스크롤 속도 (밀리초로 설정)",
+    "scroll_speed_help" : "비활성화하려면 0으로 설정하세요",
+    "theme" : "테마",
+    "submit_your_theme" : "새 테마 업로드",
+    "custom_css" : "커스텀 CSS"
   },
   "details" : {
-    "feed_details" : "피드 세부",
-    "url" : "유알엘",
-    "website" : "Website ",
+    "feed_details" : "피드 상세",
+    "url" : "URL",
+    "website" : "웹사이트",
     "name" : "이름",
     "category" : "카테고리",
-    "position" : "Position ",
-    "last_refresh" : "마지막 리프래쉬",
-    "message" : "Last refresh message ",
-    "next_refresh" : "Next refresh ",
-    "queued_for_refresh" : "Queued for refresh ",
-    "feed_url" : "피드 유알엘",
+    "position" : "위치",
+    "last_refresh" : "마지막 새로고침",
+    "message" : "마지막 새로고침 메시지",
+    "next_refresh" : "다음 새로고침",
+    "queued_for_refresh" : "새로고침 대기중",
+    "feed_url" : "피드 URL",
     "generate_api_key_first" : "당신의 프로필을 위해 API Key를 먼저 생성하세요.",
-    "unsubscribe" : "주소 삭제",
-    "unsubscribe_confirmation" : "Are you sure you want to unsubscribe from this feed? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
-    "category_details" : "카테고리 세부",
-    "tag_details" : "Tag details ",
+    "unsubscribe" : "구독 해제",
+    "unsubscribe_confirmation" : "정말 이 피드를 구독 해제하시겠습니까?",
+    "delete_category_confirmation" : "정말 이 카테고리를 삭제하시겠습니까?",
+    "category_details" : "카테고리 상세",
+    "tag_details" : "태그 상세",
     "parent_category" : "부모 카테고리"
   },
   "profile" : {
     "user_name" : "사용자 이름",
     "email" : "이메일",
-    "change_password" : "비밀번호변경",
-    "confirm_password" : "비밀번호확인",
-    "minimum_6_chars" : "최소로 6자문자가 필요합니다.",
+    "change_password" : "비밀번호 변경",
+    "confirm_password" : "비밀번호 확인",
+    "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 ",
-    "delete_account" : "프로필삭제",
-    "delete_account_confirmation" : "Delete your acount? There's no turning back! "
+    "opml_export" : "OPML 내보내기",
+    "delete_account" : "계정 삭제하기",
+    "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" : "단축기",
-    "version" : "CommaFeed version ",
-    "line1_prefix" : "CommaFeed는 오픈 소스프로젝트입니다. 소스는",
+    "keyboard_shortcuts" : "단축키",
+    "version" : "CommaFeed 버전",
+    "line1_prefix" : "CommaFeed는 오픈 소스 프로젝트입니다. 소스는",
     "line1_suffix" : "에 있습니다.",
     "line2_prefix" : "문제가 발생하는 경우",
-    "line2_suffix" : " 프로젝트 문제페이지에 보고하십시요.",
-    "line3" : "이 프로젝트를 좋아하시면 개발자를 지원하고 웹사이트 유지용비를 충당하는 데 도움이되는 기부금을 고려하시기 바랍니다.",
-    "line4" : "For those of you who prefer bitcoin, here is the address ",
+    "line2_suffix" : " 프로젝트 문제 페이지에 보고하십시오.",
+    "line3" : "이 프로젝트를 좋아하시면 개발자를 지원하고 웹사이트 유지비용을 충당하는 데 도움이 되는 기부금을 고려하시기 바랍니다.",
+    "line4" : "비트코인으로 기부하기",
     "goodies" : {
       "value" : "Goodies",
-      "android_app" : "Android app ",
-      "subscribe_url" : "Subscribe URL ",
-      "chrome_extension" : "Chrome extension ",
-      "firefox_extension" : "Firefox extension ",
-      "opera_extension" : "Opera extension ",
-      "subscribe_bookmarklet" : "Add subscription bookmarklet (click) ",
-      "subscribe_bookmarklet_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Next unread item bookmarklet (drag to bookmark bar) "
+      "android_app" : "안드로이드 앱",
+      "subscribe_url" : "구독 URL",
+      "chrome_extension" : "Chrome 확장 프로그램",
+      "firefox_extension" : "Firefox 확장 기능",
+      "opera_extension" : "Opera 확장 기능",
+      "subscribe_bookmarklet" : "구독 북마크 추가 (클릭)",
+      "subscribe_bookmarklet_asc" : "오래된 것 먼저",
+      "subscribe_bookmarklet_desc" : "새로운 것 먼저",
+      "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 ",
-      "focus_next_entry" : "set focus on next entry without opening it ",
-      "focus_previous_entry" : "set focus on previous entry without opening it ",
-      "open_next_feed" : "open next feed or category ",
-      "open_previous_feed" : "open previous feed or category ",
+      "move_page_down_up" : "페이지 아래/위로 이동 ",
+      "focus_next_entry" : "열지 않고 다음 항목 보기",
+      "focus_previous_entry" : "열지 않고 이전 항목 보기",
+      "open_next_feed" : "다음 피드나 카테고리 열기",
+      "open_previous_feed" : "이전 피드나 카테고리 열기",
       "open_close_current_entry" : "현재 항목 열기/닫기",
-      "open_current_entry_in_new_window" : "새 창에서 현재 항목열기",
-      "open_current_entry_in_new_window_background" : "open current entry in a new window in the background ",
-      "star_unstar" : "현재 항목 스타/스타제거",
+      "open_current_entry_in_new_window" : "새 창으로 현재 항목 열기",
+      "open_current_entry_in_new_window_background" : "백그라운드에 새 창으로 현재 항목 열기",
+      "star_unstar" : "현재 항목 중요 표시/중요 표시 제거",
       "mark_current_entry" : "현재 항목 읽음/안읽음 표시",
       "mark_all_as_read" : "모든 항목 읽음으로 표시",
       "open_in_new_tab_mark_as_read" : "읽음으로 표시하고 새로운 탭에서 열기",
-      "fullscreen" : "toggle full screen mode ",
-      "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 "
+      "fullscreen" : "전체화면 켜기/끄기",
+      "font_size" : "현재 항목의 글꼴 크기를 크게/작게",
+      "go_to_all" : "모든 항목 보기",
+      "go_to_starred" : "중요 표시한 항목 보기",
+      "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 ",
-    "search_for" : "searching for:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "mark_up_to_here" : "Oznacz jako przeczytane do tego elementu ",
+    "search_for" : "wyszukiwanie dla:  ",
+    "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_help" : "set to 0 to disable ",
+    "scroll_speed" : "Prędkość przewijania podczas nawigowania pomiędzy wpisami (w milisekundach) ",
+    "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? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe_confirmation" : "Czy na pewno chcesz cofnąć sybskrypcję tego kanału? ",
+    "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_desc" : "Newest first ",
+      "subscribe_bookmarklet_asc" : "Najpierw najstarsze ",
+      "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_starred" : "go to the Starred view ",
+      "go_to_all" : "przejdź do widoku Wszystkich elementów ",
+      "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:  ",
-    "no_search_results" : "No match found for the requested keywords "
+    "search_for" : "Procurando por:  ",
+    "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_help" : "set to 0 to disable ",
+    "scroll_speed" : "Velocidade de rolagem enquanto navega pelos itens.",
+    "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? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe_confirmation" : "Você tem certeza de que deseja se desinscrever desse feed? ",
+    "delete_category_confirmation" : "Você tem certeza de que deseja deletar essa categoria? ",
     "category_details" : "Detalhes da categoria",
-    "tag_details" : "Tag details ",
-    "parent_category" : "Categoria pai"
+    "tag_details" : "Detalhes da tag ",
+    "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_desc" : "Mais novas primeiro",
+      "subscribe_bookmarklet_asc" : "Mais antigas 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_day" : "Bir günden eski yazılar",
-    "mark_all_older_week" : "Bir haftadan eski yazılar",
-    "mark_all_older_two_weeks" : "İki haftadan eski yazılar",
+    "mark_all_older_12_hours" : "12 saatten daha eski yayınlar ",
+    "mark_all_older_day" : "Bir günden eski yayınlar",
+    "mark_all_older_week" : "Bir haftadan eski yayınlar",
+    "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_author" : "by  ",
+    "entry_source" : "kaynak: ",
+    "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.",
-    "mark_up_to_here" : "Mark as read up to here ",
+    "no_unread_items" : "Okunmamış ileti yok.",
+    "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_help" : "set to 0 to disable ",
+    "scroll_speed" : "İçerikler arasında gezinirken kaydırma hızı (milisaniye cinsinden)",
+    "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? ",
-    "delete_category_confirmation" : "Are you sure you want to delete this category? ",
+    "unsubscribe_confirmation" : "Bu yayından çıkmak istediğinizden emin misiniz? ",
+    "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",
-      "android_app" : "Android app ",
+      "value" : "Ekstralar",
+      "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_asc" : "Oldest first ",
-      "subscribe_bookmarklet_desc" : "Newest first ",
-      "next_unread_bookmarklet" : "Bookmarklet'daki en son okunmamış ileti (Sık kullanılan çubuğuna sürükleyin)"
+      "subscribe_bookmarklet" : "Yer imilerine abonelik ekle (tıklayın)",
+      "subscribe_bookmarklet_asc" : "Eskiler önce",
+      "subscribe_bookmarklet_desc" : "Yeniler önce ",
+      "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 ",
-      "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 ",
+      "fullscreen" : "tam ekran moduna geç ",
+      "font_size" : "mevcut içerik için yazı boyunutunu arttır/azalt",
+      "go_to_all" : "Tüm öğeleri görüntüle",
+      "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,79 +1,86 @@
 <!DOCTYPE html>
 <html>
-<head>
-<title>CommaFeed</title>
-<meta charset="utf-8">
-<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" />
-<link rel="apple-touch-icon" href="app-icon-57.png" />
-<link rel="apple-touch-icon" sizes="72x72" href="app-icon-72.png" />
-<link rel="apple-touch-icon" sizes="114x114" href="app-icon-114.png" />
-<link rel="apple-touch-icon" sizes="144x144" href="app-icon-144.png" />
-<link rel="icon" sizes="32x32" href="app-icon-32.png" />
-<link rel="icon" sizes="64x64" href="app-icon-64.png" />
-<link rel="icon" sizes="128x128" href="app-icon-128.png" />
-<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-<meta name="application-name" content="CommaFeed" />
-<meta name="msapplication-navbutton-color" content="#F88A14" />
-<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" />
+    <head>
+        <title>CommaFeed</title>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="default" />
+        <meta name="mobile-web-app-capable" content="yes" />
+        <link rel="manifest" href="manifest.json" />
+        <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+        <link rel="apple-touch-icon" href="app-icon-57.png" />
+        <link rel="apple-touch-icon" sizes="72x72" href="app-icon-72.png" />
+        <link rel="apple-touch-icon" sizes="114x114" href="app-icon-114.png" />
+        <link rel="apple-touch-icon" sizes="144x144" href="app-icon-144.png" />
+        <link rel="icon" sizes="32x32" href="app-icon-32.png" />
+        <link rel="icon" sizes="64x64" href="app-icon-64.png" />
+        <link rel="icon" sizes="128x128" href="app-icon-128.png" />
+        <link rel="icon" sizes="192x192" href="app-icon-192.png" />
+        <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+        <meta name="theme-color" content="#F88A14" />
+        <meta name="application-name" content="CommaFeed" />
+        <meta name="msapplication-navbutton-color" content="#F88A14" />
+        <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 -->
-<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/select2/select2.css" />
-<link rel="stylesheet" href="lib/ng-grid/ng-grid.css" />
-<link rel="stylesheet" href="lib/jquery-ui/themes/smoothness/jquery-ui.css" />
-<link rel="stylesheet" href="lib/angular-loading-bar/build/loading-bar.css" />
+        <!-- build:css css/app.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/select2/select2.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/angular-loading-bar/build/loading-bar.css" />
 
-<link rel="stylesheet" href="css/app.css" />
-<!-- endbuild -->
-<link rel="stylesheet" href="custom_css.css" />
-</head>
-<body>
-	<div ng-app="commafeed" id="main" class="main">
-		<div ui-view></div>
-	</div>
-	
-	<!-- build:js js/app.js -->
-	<script type="text/javascript" src="lib/lodash/dist/lodash.js"></script>
-	<script type="text/javascript" src="lib/jquery/dist/jquery.js"></script>
-	<script type="text/javascript" src="lib/jquery-ui/jquery-ui.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/angular/angular.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-sanitize/angular-sanitize.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-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-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/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/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-select2/src/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/momentjs/min/moment-with-langs.js"></script>
-	<script type="text/javascript" src="lib/device.js/lib/device.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/filters.js"></script>
-	<script type="text/javascript" src="js/main.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="analytics.js"></script>
-</body>
+        <link rel="stylesheet" href="css/app.css" />
+        <!-- endbuild -->
+        <link rel="stylesheet" href="custom_css.css" />
+    </head>
+    <body>
+        <div ng-app="commafeed" id="main" class="main">
+            <div ui-view></div>
+        </div>
+
+        <!-- build:js js/app.js -->
+        <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-ui/ui/jquery-ui.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/angular/angular.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-sanitize/angular-sanitize.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-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-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/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/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-select2/src/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/momentjs/min/moment-with-locales.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/filters.js"></script>
+        <script type="text/javascript" src="js/main.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="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) {
-	return {
-		restrict : 'A',
-		link : function(scope, element, attrs) {
-			scope.$watch(attrs.focus, function(value) {
-				if (!value)
-					return;
-				$timeout(function() {
-					$(element).focus();
-				});
-			});
-		}
-	};
-}]);
+module.directive("focus", [
+    "$timeout",
+    function ($timeout) {
+        return {
+            restrict: "A",
+            link: function (scope, element, attrs) {
+                scope.$watch(attrs.focus, function (value) {
+                    if (!value) return
+                    $timeout(function () {
+                        $(element).focus()
+                    })
+                })
+            },
+        }
+    },
+])
 
-module.directive('confirmClick', [function() {
-	return {
-		priority : -1,
-		restrict : 'A',
-		link : function(scope, element, attrs) {
-			element.bind('click', function(e) {
-				var message = scope.$eval(attrs.confirmClick);
-				if (message && !confirm(message)) {
-					e.stopImmediatePropagation();
-					e.preventDefault();
-				}
-			});
-		}
-	};
-}]);
+module.directive("confirmClick", [
+    function () {
+        return {
+            priority: -1,
+            restrict: "A",
+            link: function (scope, element, attrs) {
+                element.bind("click", function (e) {
+                    var message = scope.$eval(attrs.confirmClick)
+                    if (message && !confirm(message)) {
+                        e.stopImmediatePropagation()
+                        e.preventDefault()
+                    }
+                })
+            },
+        }
+    },
+])
 
 /**
  * Open a popup window pointing to the url in the href attribute
  */
-module.directive('popup', function() {
-	var opts = 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=800';
-	return {
-		link : function(scope, elm, attrs) {
-			elm.bind('click', function(event) {
-				window.open(this.href, '', opts);
-				event.preventDefault();
-			});
-		}
-	};
-});
+module.directive("popup", function () {
+    var opts = "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=800"
+    return {
+        link: function (scope, elm, attrs) {
+            elm.bind("click", function (event) {
+                window.open(this.href, "", opts)
+                event.preventDefault()
+            })
+        },
+    }
+})
 
 /**
  * entry tag handling
  */
-module.directive('tags', function() {
-	return {
-		restrict : 'E',
-		scope : {
-			entry : '='
-		},
-		replace : true,
-		templateUrl : 'templates/_tags.html',
-		controller : ['$scope', 'EntryService', function($scope, EntryService) {
-			$scope.select2Options = {
-				'multiple' : true,
-				'simple_tags' : true,
-				'maximumInputLength' : 40,
-				tags : EntryService.tags
-			};
+module.directive("tags", function () {
+    return {
+        restrict: "E",
+        scope: {
+            entry: "=",
+        },
+        replace: true,
+        templateUrl: "templates/_tags.html",
+        controller: [
+            "$scope",
+            "EntryService",
+            function ($scope, EntryService) {
+                $scope.select2Options = {
+                    multiple: true,
+                    simple_tags: true,
+                    maximumInputLength: 40,
+                    tags: EntryService.tags,
+                }
 
-			$scope.$watch('entry.tags', function(newValue, oldValue) {
-				if (oldValue && newValue != oldValue) {
-					var data = {
-						entryId : $scope.entry.id,
-						tags : []
-					};
-					if (newValue) {
-						data.tags = newValue.split(',');
-					}
-					EntryService.tag(data);
-				}
-			}, true);
-		}]
-	};
-});
+                $scope.$watch(
+                    "entry.tags",
+                    function (newValue, oldValue) {
+                        if (oldValue && newValue != oldValue) {
+                            var data = {
+                                entryId: $scope.entry.id,
+                                tags: [],
+                            }
+                            if (newValue) {
+                                data.tags = newValue
+                            }
+                            EntryService.tag(data)
+                        }
+                    },
+                    true
+                )
+            },
+        ],
+    }
+})
 
 /**
  * Reusable favicon component
  */
-module.directive('favicon', function() {
-	var tpl = '<img ng-src="{{url}}" class="favicon"></img>';
-	return {
-		restrict : 'E',
-		scope : {
-			url : '='
-		},
-		replace : true,
-		template : tpl
-	};
-});
+module.directive("favicon", function () {
+    var tpl = '<img ng-src="{{url}}" class="favicon"></img>'
+    return {
+        restrict: "E",
+        scope: {
+            url: "=",
+        },
+        replace: true,
+        template: tpl,
+    }
+})
 
 /**
  * Support for the blur event
  */
-module.directive('ngBlur', function() {
-	return {
-		restrict : 'A',
-		link : function(scope, elm, attrs) {
-			elm.bind('blur', function() {
-				scope.$apply(attrs.ngBlur);
-			});
-		}
-	};
-});
+module.directive("ngBlur", function () {
+    return {
+        restrict: "A",
+        link: function (scope, elm, attrs) {
+            elm.bind("blur", function () {
+                scope.$apply(attrs.ngBlur)
+            })
+        },
+    }
+})
 
 /**
  * Prevent mousewheel scrolling from propagating to the parent when scrollbar
  * reaches top or bottom
  */
-module.directive('mousewheelScrolling', function() {
-	return {
-		restrict : 'A',
-		link : function(scope, elem, attr) {
-			elem.bind('mousewheel', function(e, d) {
-				var t = $(this);
-				if (d > 0 && t.scrollTop() === 0) {
-					e.preventDefault();
-				} else {
-					if (d < 0 && (t.scrollTop() == t.get(0).scrollHeight - t.innerHeight())) {
-						e.preventDefault();
-					}
-				}
-			});
-		}
-	};
-});
+module.directive("mousewheelScrolling", function () {
+    return {
+        restrict: "A",
+        link: function (scope, elem, attr) {
+            elem.bind("mousewheel", function (e, d) {
+                var t = $(this)
+                if (d > 0 && t.scrollTop() === 0) {
+                    e.preventDefault()
+                } else {
+                    if (d < 0 && t.scrollTop() == t.get(0).scrollHeight - t.innerHeight()) {
+                        e.preventDefault()
+                    }
+                }
+            })
+        },
+    }
+})
 
 /**
  * Needed to use recursive directives. Wrap a recursive element with a
  * <recursive> tag
  */
-module.directive('recursive', ['$compile', function($compile) {
-	return {
-		restrict : 'E',
-		priority : 100000,
-		compile : function(tElement, tAttr) {
-			var contents = tElement.contents().remove();
-			var compiledContents = null;
-			return function(scope, iElement, iAttr) {
-				if (!compiledContents) {
-					compiledContents = $compile(contents);
-				}
-				iElement.append(compiledContents(scope, function(clone) {
-					return clone;
-				}));
-			};
-		}
-	};
-}]);
+module.directive("recursive", [
+    "$compile",
+    function ($compile) {
+        return {
+            restrict: "E",
+            priority: 100000,
+            compile: function (tElement, tAttr) {
+                var contents = tElement.contents().remove()
+                var compiledContents = null
+                return function (scope, iElement, iAttr) {
+                    if (!compiledContents) {
+                        compiledContents = $compile(contents)
+                    }
+                    iElement.append(
+                        compiledContents(scope, function (clone) {
+                            return clone
+                        })
+                    )
+                }
+            },
+        }
+    },
+])
 
 /**
  * Reusable category component
  */
-module.directive('category', [function() {
-	return {
-		scope : {
-			node : '=',
-			level : '=',
-			selectedType : '=',
-			selectedId : '=',
-			showLabel : '=',
-			showChildren : '=',
-			unreadCount : '&',
-			tag : '='
-		},
-		restrict : 'E',
-		replace : true,
-		templateUrl : 'templates/_category.html',
-		controller : ['$scope', '$state', 'FeedService', 'CategoryService', 'SettingsService', 'MobileService',
-				function($scope, $state, FeedService, CategoryService, SettingsService, MobileService) {
-					$scope.settingsService = SettingsService;
+module.directive("category", [
+    function () {
+        return {
+            scope: {
+                node: "=",
+                level: "=",
+                selectedType: "=",
+                selectedId: "=",
+                showLabel: "=",
+                showChildren: "=",
+                unreadCount: "&",
+                tag: "=",
+            },
+            restrict: "E",
+            replace: true,
+            templateUrl: "templates/_category.html",
+            controller: [
+                "$scope",
+                "$state",
+                "FeedService",
+                "CategoryService",
+                "SettingsService",
+                "MobileService",
+                function ($scope, $state, FeedService, CategoryService, SettingsService, MobileService) {
+                    $scope.settingsService = SettingsService
 
-					$scope.getClass = function(level) {
-						if ($scope.showLabel) {
-							return 'indent' + level;
-						}
-					};
+                    $scope.getClass = function (level) {
+                        if ($scope.showLabel) {
+                            return "indent" + level
+                        }
+                    }
 
-					$scope.categoryLabel = function(category) {
-						return $scope.showLabel !== true ? $scope.showLabel : category.name;
-					};
+                    $scope.categoryLabel = function (category) {
+                        return $scope.showLabel !== true ? $scope.showLabel : category.name
+                    }
 
-					$scope.categoryCountLabel = function(category) {
-						var count = $scope.unreadCount({
-							category : category
-						});
-						var label = '';
-						if (count > 0) {
-							label = '(' + count + ')';
-						}
-						return label;
-					};
+                    $scope.categoryCountLabel = function (category) {
+                        var count = $scope.unreadCount({
+                            category: category,
+                        })
+                        var label = ""
+                        if (count > 0) {
+                            label += count
+                        }
+                        return label
+                    }
 
-					$scope.feedCountLabel = function(feed) {
-						var label = '';
-						if (feed.unread > 0) {
-							label = '(' + feed.unread + ')';
-						}
-						return label;
-					};
+                    $scope.feedCountLabel = function (feed) {
+                        var label = ""
+                        if (feed.unread > 0) {
+                            label += feed.unread
+                        }
+                        return label
+                    }
 
-					$scope.feedClicked = function(id, event) {
-						// Could be called by a middle click
-						if (!event || (!event.ctrlKey && event.which == 1)) {
-							MobileService.toggleLeftMenu();
-							if ($scope.selectedType == 'feed' && id == $scope.selectedId) {
-								$scope.$emit('emitReload');
-							} else {
-								$state.transitionTo('feeds.view', {
-									_type : 'feed',
-									_id : id
-								});
-							}
+                    $scope.feedClicked = function (id, event) {
+                        // Could be called by a middle click
+                        if (!event || (!event.ctrlKey && event.which == 1)) {
+                            MobileService.toggleLeftMenu()
+                            if ($scope.selectedType == "feed" && id == $scope.selectedId) {
+                                $scope.$emit("emitReload")
+                            } else {
+                                $state.transitionTo("feeds.view", {
+                                    _type: "feed",
+                                    _id: id,
+                                })
+                            }
 
-							if (event) {
-								event.preventDefault();
-								event.stopPropagation();
-							}
-						}
-					};
+                            if (event) {
+                                event.preventDefault()
+                                event.stopPropagation()
+                            }
+                        }
+                    }
 
-					$scope.categoryClicked = function(id, isTag) {
-						MobileService.toggleLeftMenu();
-						var type = isTag ? 'tag' : 'category';
-						if ($scope.selectedType == type && id == $scope.selectedId) {
-							$scope.$emit('emitReload');
-						} else {
-							$state.transitionTo('feeds.view', {
-								_type : type,
-								_id : id
-							});
-						}
-					};
+                    $scope.categoryClicked = function (id, isTag) {
+                        MobileService.toggleLeftMenu()
+                        var type = isTag ? "tag" : "category"
+                        if ($scope.selectedType == type && id == $scope.selectedId) {
+                            $scope.$emit("emitReload")
+                        } else {
+                            $state.transitionTo("feeds.view", {
+                                _type: type,
+                                _id: id,
+                            })
+                        }
+                    }
 
-					$scope.showFeedDetails = function(feed) {
-						$state.transitionTo('feeds.feed_details', {
-							_id : feed.id
-						});
-					};
+                    $scope.showFeedDetails = function (feed) {
+                        $state.transitionTo("feeds.feed_details", {
+                            _id: feed.id,
+                        })
+                    }
 
-					$scope.showCategoryDetails = function(id, isTag) {
-						if (isTag) {
-							$state.transitionTo('feeds.tag_details', {
-								_id : id
-							});
-						} else {
-							$state.transitionTo('feeds.category_details', {
-								_id : id
-							});
-						}
-					};
+                    $scope.showCategoryDetails = function (id, isTag) {
+                        if (isTag) {
+                            $state.transitionTo("feeds.tag_details", {
+                                _id: id,
+                            })
+                        } else {
+                            $state.transitionTo("feeds.category_details", {
+                                _id: id,
+                            })
+                        }
+                    }
 
-					$scope.toggleCategory = function(category, event) {
-						event.preventDefault();
-						event.stopPropagation();
-						category.expanded = !category.expanded;
-						if (category.id == 'all') {
-							return;
-						}
-						CategoryService.collapse({
-							id : category.id,
-							collapse : !category.expanded
-						});
-					};
-				}]
-	};
-}]);
+                    $scope.toggleCategory = function (category, event) {
+                        event.preventDefault()
+                        event.stopPropagation()
+                        category.expanded = !category.expanded
+                        if (category.id == "all") {
+                            return
+                        }
+                        CategoryService.collapse({
+                            id: category.id,
+                            collapse: !category.expanded,
+                        })
+                    }
+                },
+            ],
+        }
+    },
+])
 
-module.directive('draggable', function() {
-	return {
-		restrict : 'A',
-		link : function(scope, element, attrs) {
-			element.draggable({
-				revert : 'invalid',
-				helper : 'clone',
-				distance : 10,
-				axis : 'y'
-			}).data('source', scope.$eval(attrs.draggable));
-		}
-	};
-});
+module.directive("draggable", function () {
+    return {
+        restrict: "A",
+        link: function (scope, element, attrs) {
+            element
+                .draggable({
+                    revert: "invalid",
+                    helper: "clone",
+                    distance: 10,
+                    axis: "y",
+                })
+                .data("source", scope.$eval(attrs.draggable))
+        },
+    }
+})
 
-module.directive('droppable', ['CategoryService', 'FeedService', function(CategoryService, FeedService) {
-	return {
-		restrict : 'A',
-		link : function(scope, element, attrs) {
-			element.droppable({
-				tolerance : 'pointer',
-				over : function(event, ui) {
+module.directive("droppable", [
+    "CategoryService",
+    "FeedService",
+    function (CategoryService, FeedService) {
+        return {
+            restrict: "A",
+            link: function (scope, element, attrs) {
+                element.droppable({
+                    tolerance: "pointer",
+                    over: function (event, ui) {},
+                    drop: function (event, ui) {
+                        var draggable = angular.element(ui.draggable)
 
-				},
-				drop : function(event, ui) {
-					var draggable = angular.element(ui.draggable);
+                        var source = draggable.data("source")
+                        var target = scope.$eval(attrs.droppable)
 
-					var source = draggable.data('source');
-					var target = scope.$eval(attrs.droppable);
+                        if (angular.equals(source, target)) {
+                            return
+                        }
 
-					if (angular.equals(source, target)) {
-						return;
-					}
+                        var data = {
+                            id: source.id,
+                            name: source.name,
+                            filter: source.filter,
+                        }
 
-					var data = {
-						id : source.id,
-						name : source.name
-					};
+                        if (source.children) {
+                            // source is a category
+                        } else {
+                            // source is a feed
 
-					if (source.children) {
-						// source is a category
+                            if (target.children) {
+                                // 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 {
-						// source is a feed
+                            FeedService.modify(data, function () {
+                                CategoryService.init()
+                            })
+                        }
+                        scope.$apply()
+                    },
+                })
+            },
+        }
+    },
+])
 
-						if (target.children) {
-							// target is a category
-							data.categoryId = target.id;
-							data.position = 0;
-						} else {
-							// target is a feed
-							data.categoryId = target.categoryId;
-							data.position = target.position;
-						}
+module.directive("metricMeter", function () {
+    return {
+        scope: {
+            metric: "=",
+            label: "=",
+        },
+        restrict: "E",
+        templateUrl: "templates/_metrics.meter.html",
+    }
+})
 
-						FeedService.modify(data, function() {
-							CategoryService.init();
-						});
-					}
-					scope.$apply();
-				}
-			});
-		}
-	};
-}]);
+module.directive("metricGauge", function () {
+    return {
+        scope: {
+            metric: "=",
+            label: "=",
+        },
+        restrict: "E",
+        templateUrl: "templates/_metrics.gauge.html",
+    }
+})
 
-module.directive('metricMeter', function() {
-	return {
-		scope : {
-			metric : '=',
-			label : '='
-		},
-		restrict : 'E',
-		templateUrl : 'templates/_metrics.meter.html'
-	};
-});
-
-module.directive('metricGauge', function() {
-	return {
-		scope : {
-			metric : '=',
-			label : '='
-		},
-		restrict : 'E',
-		templateUrl : 'templates/_metrics.gauge.html'
-	};
-});
+module.directive("metricTimer", function () {
+    return {
+        scope: {
+            metric: "=",
+            label: "=",
+        },
+        restrict: "E",
+        templateUrl: "templates/_metrics.timer.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() {
-	return function(timestamp, defaultValue) {
-		if (!timestamp) {
-			return defaultValue;
-		}
+module.filter("entryDate", function () {
+    return function (timestamp, defaultValue) {
+        if (!timestamp) {
+            return defaultValue
+        }
 
-		var d = moment(timestamp);
-		var now = moment();
-		var formatted;
-		if (Math.abs(d.diff(now)) < 86400000) {
-			formatted = d.fromNow();
-		} else {
-			formatted = d.format('YYYY-MM-DD HH:mm');
-		}
-		return formatted;
-	};
-});
+        var d = moment(timestamp)
+        var now = moment()
+        var formatted
+        if (Math.abs(d.diff(now)) < 86400000) {
+            formatted = d.fromNow()
+        } else {
+            formatted = d.format("YYYY-MM-DD HH:mm")
+        }
+        return formatted
+    }
+})
 
 /**
  * rewrites iframes to use https if commafeed uses https
  */
-module.filter('iframeHttpsRewrite', function() {
-	return function(html) {
-		var result = html;
-		if (location.protocol === 'https:') {
-			var wrapper = $('<div></div>').html(html);
-			$('iframe', wrapper).each(function(i, elem) {
-				var e = $(elem);
-				e.attr('src', e.attr('src').replace(/^http:\/\//i, 'https://'));
-			});
-			result = wrapper.html();
-		}
-		return result;
-	};
-});
+module.filter("iframeHttpsRewrite", function () {
+    return function (html) {
+        var result = html
+        if (location.protocol === "https:") {
+            var wrapper = $("<div></div>").html(html)
+            $("iframe", wrapper).each(function (i, elem) {
+                var e = $(elem)
+                e.attr("src", e.attr("src").replace(/^http:\/\//i, "https://"))
+            })
+            result = wrapper.html()
+        }
+        return result
+    }
+})
 
 /**
  * inserts title or alt-text after images, if any
  */
-module.filter('appendImageTitles', function() {
-	return function(html) {
-		var result = html;
-		var wrapper = $('<div></div>').html(html);
-		$('img', wrapper).each(function(i, elem) {
-			var e = $(elem);
-			var title = e.attr('title') || e.attr('alt');
-			if (title) {
-				var text = $('<span style="font-style: italic;"></span>').text(title);
-				e.after(text);
-			}
-		});
-		result = wrapper.html();
-		return result;
-	};
-});
+module.filter("appendImageTitles", function () {
+    return function (html) {
+        var result = html
+        var wrapper = $("<div></div>").html(html)
+        $("img", wrapper).each(function (i, elem) {
+            var e = $(elem)
+            var title = e.attr("title") || e.attr("alt")
+            if (title) {
+                var text = $('<span style="font-style: italic;"></span>').text(title)
+                e.after(text)
+            }
+        })
+        result = wrapper.html()
+        return result
+    }
+})
 
 /**
  * escapes the url
  */
-module.filter('escape', function() {
-	return encodeURIComponent;
-});
+module.filter("escape", function () {
+    return encodeURIComponent
+})
 
 /**
  * returns a trusted html content
  */
-module.filter('trustHtml', ['$sce', function($sce) {
-	return function(val) {
-		return $sce.trustAsHtml(val);
-	};
-}]);
+module.filter("trustHtml", [
+    "$sce",
+    function ($sce) {
+        return function (val) {
+            return $sce.trustAsHtml(val)
+        }
+    },
+])
 
 /**
  * returns a trusted url
  */
-module.filter('trustUrl', ['$sce', function($sce) {
-	return function(val) {
-		return $sce.trustAsResourceUrl(val);
-	};
-}]);
+module.filter("trustUrl", [
+    "$sce",
+    function ($sce) {
+        return function (val) {
+            return $sce.trustAsResourceUrl(val)
+        }
+    },
+])
 
 /**
  * add the 'highlight-search' class to text matching keywords
  */
-module.filter('highlight', function() {
-	return function(html, keywords) {
-		if (keywords) {
-			var handleKeyword = function(token, html) {
-				var expr = new RegExp(token, 'gi');
-				var container = $('<span>').html(html);
-				var elements = container.find('*').addBack();
-				var textNodes = elements.not('iframe').contents().not(elements);
-				textNodes.each(function() {
-					var replaced = this.nodeValue.replace(expr, '<span class="highlight-search">$&</span>');
-					$('<span>').html(replaced).insertBefore(this);
-					$(this).remove();
-				});
-				return container.html();
-			};
+module.filter("highlight", function () {
+    return function (html, keywords) {
+        if (keywords) {
+            var handleKeyword = function (token, html) {
+                var expr = new RegExp(token, "gi")
+                var container = $("<span>").html(html)
+                var elements = container.find("*").addBack()
+                var textNodes = elements.not("iframe").contents().not(elements)
+                textNodes.each(function () {
+                    var replaced = this.nodeValue.replace(expr, '<span class="highlight-search">$&</span>')
+                    $("<span>").html(replaced).insertBefore(this)
+                    $(this).remove()
+                })
+                return container.html()
+            }
 
-			var tokens = keywords.split(' ');
-			for (var i = 0; i < tokens.length; i++) {
-				html = handleKeyword(tokens[i], html);
-			}
-		}
-		return html;
-	};
-});
+            var tokens = keywords.split(" ")
+            for (var i = 0; i < tokens.length; i++) {
+                html = handleKeyword(tokens[i], 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() {
-	this.langs = {
-		'ar': 'العربية',
-		'ca': 'Català',
-		'en': 'English',
-		'es': 'Español',
-		'de': 'Deutsch',
-		'fa': 'فارسی',
-		'fr': 'Français',
-		'gl': 'Galician',
-		'glk': 'گیلکی',
-		'hu': 'Magyar',
-		'ja': '日本語',
-		'ko': '한국어',
-		'nl': 'Nederlands',
-		'nb': 'Norsk (bokmål)',
-		'nn': 'Norsk (nynorsk)',
-		'pt': 'Português',
-		'pl': 'Polski',
-		'ru': 'русский',
-		'fi': 'Suomi',
-		'sv': 'Svenska',
-		'zh': '简体中文',
-		'it': 'Italiano',
-		'tr': 'Türkçe',
-		'cy': 'Cymraeg',
-		'sk': 'Slovenčina',
-		'da': 'Danish',
-		'cs': 'Čeština',
-		'ms': 'Bahasa Malaysian'
-	}
-}]);
+module.service("LangService", [
+    function () {
+        this.langs = {
+            ar: "العربية",
+            ca: "Català",
+            en: "English",
+            es: "Español",
+            de: "Deutsch",
+            fa: "فارسی",
+            fr: "Français",
+            gl: "Galician",
+            glk: "گیلکی",
+            hu: "Magyar",
+            id: "Indonesian",
+            ja: "日本語",
+            ko: "한국어",
+            nl: "Nederlands",
+            nb: "Norsk (bokmål)",
+            nn: "Norsk (nynorsk)",
+            pt: "Português",
+            pl: "Polski",
+            ru: "Русский",
+            fi: "Suomi",
+            sv: "Svenska",
+            zh: "简体中文",
+            it: "Italiano",
+            tr: "Türkçe",
+            cy: "Cymraeg",
+            sk: "Slovenčina",
+            da: "Danish",
+            cs: "Čeština",
+            ms: "Bahasa Malaysian",
+        }
+    },
+])

src/main/app/js/main.js

@@ -1,149 +1,172 @@
-var app = angular.module('commafeed', ['ngRoute', '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']);
+var app = angular.module("commafeed", [
+    "ngRoute",
+    "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',
-		'$stateProvider',
-		'$urlRouterProvider',
-		'$httpProvider',
-		'$compileProvider',
-		'cfpLoadingBarProvider',
-		'$translateProvider',
-		function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider, cfpLoadingBarProvider,
-				$translateProvider) {
+    "$routeProvider",
+    "$stateProvider",
+    "$urlRouterProvider",
+    "$httpProvider",
+    "$compileProvider",
+    "cfpLoadingBarProvider",
+    "$translateProvider",
+    function (
+        $routeProvider,
+        $stateProvider,
+        $urlRouterProvider,
+        $httpProvider,
+        $compileProvider,
+        cfpLoadingBarProvider,
+        $translateProvider
+    ) {
+        $translateProvider.useStaticFilesLoader({
+            prefix: "i18n/",
+            suffix: ".js",
+        })
+        $translateProvider.preferredLanguage("en")
 
-			// $translateProvider.useLocalStorage();
-			$translateProvider.useStaticFilesLoader({
-				prefix : '/i18n/',
-				suffix : '.js'
-			});
-			$translateProvider.preferredLanguage('en');
+        cfpLoadingBarProvider.includeSpinner = false
 
-			cfpLoadingBarProvider.includeSpinner = false;
+        $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/)
+        var interceptor = [
+            "$rootScope",
+            "$q",
+            "$injector",
+            function (scope, $q, $injector) {
+                var f = {}
 
-			$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/);
-			var interceptor = ['$rootScope', '$q', '$injector', function(scope, $q, $injector) {
+                f.response = function (response) {
+                    return response
+                }
 
-				var success = function(response) {
-					return response;
-				};
-				var error = function(response) {
-					var status = response.status;
-					if (status == 401) {
-						$injector.get('$state').transitionTo('welcome');
-					}
-					return $q.reject(response);
-				};
+                f.responseError = function (response) {
+                    var status = response.status
+                    if (status == 401) {
+                        $injector.get("$state").transitionTo("welcome")
+                    }
+                    return $q.reject(response)
+                }
+                return f
+            },
+        ]
 
-				var promise = function(promise) {
-					return promise.then(success, error);
-				};
+        $httpProvider.interceptors.push(interceptor)
 
-				return promise;
-			}];
+        $stateProvider.state("feeds", {
+            abstract: true,
+            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",
+        })
 
-			$httpProvider.responseInterceptors.push(interceptor);
+        $stateProvider.state("admin", {
+            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('feeds', {
-				'abstract' : true,
-				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'
-			});
+        $stateProvider.state("welcome", {
+            url: "/welcome",
+            templateUrl: "templates/welcome.html",
+        })
 
-			$stateProvider.state('admin', {
-				'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', {
-				url : '/welcome',
-				templateUrl : 'templates/welcome.html'
-			});
-
-			$urlRouterProvider.when('/', '/feeds/view/category/all');
-			$urlRouterProvider.when('/admin', '/admin/settings');
-			$urlRouterProvider.otherwise('/');
-
-		}]);
+        $urlRouterProvider.when("/", "/feeds/view/category/all")
+        $urlRouterProvider.when("/admin", "/admin/settings")
+        $urlRouterProvider.otherwise("/")
+    },
+])

src/main/app/js/services.js

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

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;
-	padding-left: 15px;
+    margin-left: 250px;
+    padding-left: 15px;
 }
 
 .full-screen .main-content {
-	width: 100%;
-	margin-left: 0;
+    width: 100%;
+    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;
-	line-height: 40px;
+    margin: 0;
+    line-height: 40px;
 }
 
 .entrylist-header a {
-	color: inherit;
+    color: inherit;
 }
 
-.expanded .entry-header,.expanded .entry-body-content {
-	padding-left: 25px;
-	padding-right: 25px;
+.expanded .entry-header,
+.expanded .entry-body-content {
+    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 {
-	direction: rtl;
+.rtl .entry-header,
+.rtl .entry-body-content,
+.rtl.entry-name {
+    direction: rtl;
 }
 
-.rtl ul,.rtl ol {
-	padding: 0;
-	margin: 0 25px 10px 0px;
+.rtl ul,
+.rtl ol {
+    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;
-	font-weight: bold;
-	margin-top: 80px;
+    text-align: center;
+    font-weight: bold;
+    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;
-	height: 32px;
-	display: block;
-	cursor: pointer;
-	padding: 6px 0px;
+    color: black;
+    height: 32px;
+    display: block;
+    cursor: pointer;
+    padding: 6px 0px;
 }
 
 #feed-accordion .entry-heading .feed-name {
-	color: #555;
-	display: block;
-	overflow: hidden;
-	white-space: nowrap;
-	position: absolute;
-	width: 145px;
-	text-overflow: ellipsis;
+    color: #555;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    position: absolute;
+    width: 145px;
+    text-overflow: ellipsis;
 }
 
 #feed-accordion .entry-heading .entry-name {
-	display: block;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	margin-right: 150px;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    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;
-	position: absolute;
-	right: 45px;
+    display: block;
+    position: absolute;
+    right: 45px;
 }
 
 #feed-accordion a.entry-heading-link:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #feed-accordion .entry-external-link {
-	position: absolute;
-	right: 25px;
-	margin-top: -25px;
-	color: black;
+    position: absolute;
+    right: 25px;
+    margin-top: -25px;
+    color: black;
 }
 
 #feed-accordion .entry-external-link:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 #feed-accordion .entry-body .entry-title {
-	margin-top: 5px;
-	margin-bottom: 10px;
-	font-size: 130%;
-	font-weight: bold;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    font-size: 130%;
+    font-weight: bold;
 }
 
 #feed-accordion .entry-body .entry-subtitle {
-	display: block;
-	font-size: 14px;
-	font-weight: normal;
+    display: block;
+    font-size: 14px;
+    font-weight: normal;
 }
 
-#feed-accordion  .entry-body-content {
-	max-width: 650px;
-	color: black;
-	padding-bottom: 10px;
+#feed-accordion .entry-body-content {
+    max-width: 650px;
+    color: black;
+    padding-bottom: 10px;
 }
 
-.full-screen #feed-accordion  .entry-body-content {
-	max-width: 100%;
+.full-screen #feed-accordion .entry-body-content {
+    max-width: 100%;
 }
 
 #feed-accordion .entry-enclosure {
-	clear: both;
-	padding-top: 10px;
+    clear: both;
+    padding-top: 10px;
+}
+
+#feed-accordion .entry-media-description {
+    padding-top: 10px;
 }
 
 #feed-accordion .entry-buttons {
-	clear: both;
-	background-color: #fafafa;
-	padding: 3px 0px;
-	border-top: 1px solid #ebebeb;
+    clear: both;
+    background-color: #fafafa;
+    padding: 3px 0px;
+    border-top: 1px solid #ebebeb;
 }
 
 #feed-accordion .entry-buttons .checkbox.inline {
-	padding-top: 0px;
-	margin-left: 5px;
+    padding-top: 0px;
+    margin-left: 5px;
 }
 
 #feed-accordion .entry-buttons .keep-unread label {
-	display: inline;
-	font-weight: inherit;
+    display: inline;
+    font-weight: inherit;
 }
 
 #feed-accordion .share-buttons a {
-	color: #333333;
-	padding-left: 5px;
+    color: #333333;
+    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{
-	margin-left: 5px;
+#feed-accordion .tags-panel .label {
+    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;
-	padding: 0;
-	width: 200px;
+    margin: 0 0 0 5px;
+    padding: 0;
+    width: 200px;
 }
 
 #feed-accordion .entry-buttons label {
-	margin-bottom: 0px;
-	font-size: 12px;
+    margin-bottom: 0px;
+    font-size: 12px;
 }
 
 #feed-accordion a.mark-up-to {
-	color: #333333;
-	position: absolute;
-	right: 30px;
+    color: #333333;
+    position: absolute;
+    right: 30px;
 }
 
 #feed-accordion a.mark-up-to:hover {
-	text-decoration: none;
-	cursor: pointer;
+    text-decoration: none;
+    cursor: pointer;
 }
 
 #feed-accordion .star {
-	text-decoration: none;
-	padding: 0px 5px;
+    text-decoration: none;
+    padding: 0px 5px;
 }
 
 #feed-accordion .icon-star-yellow {
-	color: gold;
-	text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
+    color: gold;
+    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;
-	border: 1px solid #ddd;
-	box-shadow: 0 0 4px #e3e5eb;
+    margin-bottom: 40px;
+    border: 1px solid #ddd;
+    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);
-	color: #333;
-}
+    background-color: rgba(255, 255, 140, 0.5);
+    color: #333;
+}

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

@@ -1,23 +1,22 @@
 .help {
-	font-size: 85%;
-	line-height: 15px;
+    font-size: 85%;
+    line-height: 15px;
 }
 
 .help .bookmarklet-select {
-	margin: 0;
-	padding: 0;
-	height: auto;
+    margin: 0;
+    padding: 0;
+    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-right:16px;
+    padding-bottom: 10px;
+    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-left-color: #2c3e50;
-}
+    border-top-color: #2c3e50;
+    border-left-color: #2c3e50;
+}

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

@@ -1,151 +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;
-	width: 250px;
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	overflow: hidden;
+    margin-top: 10px;
+    width: 250px;
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    overflow: hidden;
 }
 
 .sidebar-nav-fixed:hover {
-	overflow-y: auto;
+    overflow-y: auto;
 }
 
 .sidebar-nav-fixed .ui-resizable-e {
-	width: 5px;
-	right: 0;
+    width: 5px;
+    right: 0;
 }
 
 .full-screen .left-menu {
-	display: none;
+    display: none;
 }
 
 .css-treeview {
-	margin-top: 15px;
-	margin-bottom: 30px;
-	font-family: inherit;
-	font-size: 13px;
-	white-space: nowrap;
+    margin-top: 15px;
+    margin-bottom: 30px;
+    font-family: inherit;
+    font-size: 13px;
+    white-space: nowrap;
 }
 
 .css-treeview ul {
-	list-style: none;
-	margin-left: 0px;
-	padding: 0;
+    list-style: none;
+    margin-left: 0px;
+    padding: 0;
 }
 
 .css-treeview li {
-	line-height: 20px;
+    line-height: 20px;
 }
 
 .css-treeview .fldr {
-	cursor: pointer;
-	display: inline-block;
-	width: 14px;
-	height: 14px;
-	line-height: 14px;
-	vertical-align: text-top;
-	margin-top: 1px;
+    cursor: pointer;
+    display: inline-block;
+    width: 14px;
+    height: 14px;
+    line-height: 14px;
+    vertical-align: text-top;
+    margin-top: 1px;
 }
 
 .css-treeview .error {
-	color: red;
-	font-style: italic;
+    color: red;
+    font-style: italic;
 }
 
 .css-treeview label {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	display: block;
-	margin: 3px 0px 3px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+    margin: 3px 0px 3px;
 }
 
-.css-treeview label,.css-treeview a,.css-treeview label::before {
-	font-family: inherit;
-	font-size: 12px;
-	white-space: nowrap;
+.css-treeview label,
+.css-treeview a,
+.css-treeview label::before {
+    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;
-	font-size: 11px;
+    color: #666;
+    font-size: 11px;
+}
+
+.css-treeview .unread ~ .unread-counter::before {
+    content: "(";
+}
+
+.css-treeview .unread ~ .unread-counter::after {
+    content: ")";
 }
 
 .css-treeview a {
-	cursor: pointer;
-	color: black;
-	display: block;
-	overflow: hidden;
-	text-overflow: ellipsis;
+    cursor: pointer;
+    color: black;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .css-treeview a:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
 .css-treeview li .tree-item:hover {
-	background-color: #EBEBEB;
-	text-decoration: none;
+    background-color: #ebebeb;
+    text-decoration: none;
 }
 
 .css-treeview .config {
-	display: none;
+    display: none;
 }
 
 .css-treeview .tree-item:hover .config {
-	display: block;
-	padding-top: 3px;
-	margin-right: 5px;
-	width: 16px;
-	height: 16px;
+    display: block;
+    padding-top: 3px;
+    margin-right: 5px;
+    width: 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;
+}

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

@@ -1,16 +1,16 @@
 .toolbar {
-	padding-top: 10px;
-	padding-bottom: 10px;
-	width: 100%;
-	z-index: 10;
-	position: fixed;
-	background-color: #FFF;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    width: 100%;
+    z-index: 10;
+    position: fixed;
+    background-color: #fff;
 }
 
 .toolbar .donate {
-	display: inline-block;
+    display: inline-block;
 }
 
 .toolbar .keywords {
-	width: 244px;
-}
+    width: 244px;
+}

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

@@ -1,20 +0,0 @@
-@font-face {
-	font-family: 'readabilicons';
-	src: url('../font/readabilicons-regular.eot'); /* IE9 Compat Modes */
-	src: url('../font/readabilicons-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-        url('../font/readabilicons-regular.woff') format('woff'), /* Modern Browsers */
-        url('../font/readabilicons-regular.ttf') format('truetype'), /* Safari, Android, iOS */
-        url('../font/readabilicons-regular.svg#readabiliconsregular') format('svg'); /* Legacy iOS */
-	font-style: normal;
-	font-weight: 400;
-}
-
-.icon-couch::before {
-	content: "\e018";
-	font-family: "readabilicons";
-	-webkit-font-smoothing: antialiased;
-	font-size: 21px;
-	top: 5px;
-	position: relative;
-	line-height: 0px;
-}

src/main/app/sass/generic/_misc.scss

@@ -1,135 +1,153 @@
+a:focus {
+    outline: none;
+    text-decoration: none;
+}
+
 .container-full {
-	width: 100%;
-	margin: 0 auto;
-	padding-right: 20px;
-	padding-left: 20px;
+    width: 100%;
+    margin: 0 auto;
+    padding-right: 20px;
+    padding-left: 20px;
 }
 
 body img {
-	max-width: 100%;
-	height: auto;
+    max-width: 100%;
+    height: auto;
 }
 
 body .modal {
-	display: block;
+    display: block;
 }
 
 body .modal-backdrop {
-	opacity: 0.5;
+    opacity: 0.5;
 }
 
 label {
-	font-weight: inherit;
+    font-weight: inherit;
 }
 
 .pointer {
-	cursor: pointer;
+    cursor: pointer;
 }
 
 .nolink {
-	color: inherit;
+    color: inherit;
 }
 
 .nolink:hover {
-	text-decoration: none;
-	color: inherit;
+    text-decoration: none;
+    color: inherit;
 }
 
 .clear-both {
-	clear: both;
+    clear: both;
 }
 
 .block {
-	display: block;
+    display: block;
+}
+
+.pre-wrap {
+    white-space: pre-wrap;
 }
 
 .form-horizontal .control-group {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 
 .bidi-embed {
-	unicode-bidi: embed;
+    unicode-bidi: embed;
 }
 
 .bs-fb ul {
-	margin-bottom: 0px;
+    margin-bottom: 0px;
 }
 
 .horizontal-align {
-	padding-top: 5px;
-	line-height: 20px
+    padding-top: 5px;
+    line-height: 20px;
 }
 
 .welcome .container-fluid {
-	margin-right: auto;
-	margin-left: auto;
-	max-width: 950px;
+    margin-right: auto;
+    margin-left: auto;
+    max-width: 950px;
 }
 
 .welcome .header {
-	margin: 20px 0 20px 0;
+    margin: 20px 0 20px 0;
 }
 
 .welcome h3 {
-	margin-top: 0;
+    margin-top: 0;
 }
 
 .welcome .tagline {
-	color: #B3B3B3;
-	font-size: 28px;
-	padding-top: 110px;
+    color: #b3b3b3;
+    font-size: 28px;
+    padding-top: 110px;
 }
 
 .welcome .preview {
-	margin-top: 20px;
-	margin-bottom: 20px;
+    margin-top: 20px;
+    margin-bottom: 20px;
 }
 
 .welcome .demo {
-	font-size: 24px;
-	color: #B3B3B3;
-	display: block;
+    font-size: 24px;
+    color: #b3b3b3;
+    display: block;
 }
 
 .main .spinner {
-	display: inline-block;
-	margin-left: 11px;
-	top: -4px;
+    display: inline-block;
+    margin-left: 11px;
+    top: -4px;
 }
 
 .icon {
-	width: 14px;
-	height: 14px;
-	display: block;
+    width: 14px;
+    height: 14px;
+    display: block;
 }
 
 .main .dropdown-menu a {
-	cursor: pointer;
+    cursor: pointer;
 }
 
 .favicon {
-	width: 16px;
-	height: 16px;
+    width: 16px;
+    height: 16px;
 }
 
 blockquote p {
-	font-size: 14px;
+    font-size: 14px;
 }
 
-.btn,.btn-large,.btn-small,.btn-mini {
-	border-top-left-radius: 2px;
-	border-top-right-radius: 2px;
-	border-bottom-left-radius: 2px;
-	border-bottom-right-radius: 2px;
+.form-group {
+    margin-bottom: 10px;
 }
 
-.btn-group>.btn:first-child,.btn-group>.btn-large:first-child {
-	border-top-left-radius: 2px;
-	border-bottom-left-radius: 2px;
+.btn,
+.btn-large,
+.btn-small,
+.btn-mini {
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
 }
 
-.btn-group>.btn:last-child,.btn-group>.btn-large:last-child,.btn-group>.dropdown-toggle
-	{
-	border-top-right-radius: 2px;
-	border-bottom-right-radius: 2px;
-}
+.btn-group > .btn:first-child,
+.btn-group > .btn-large:first-child {
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .btn-large:last-child,
+.btn-group > .dropdown-toggle {
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+}

src/main/app/sass/generic/_scrollbar.scss

@@ -1,21 +1,21 @@
 ::-webkit-scrollbar {
-	height: 8px;
-	width: 8px;
+    height: 8px;
+    width: 8px;
 }
 
 ::-webkit-scrollbar-track {
-	background: rgba(0, 0, 0, 0.1);
+    background: rgba(0, 0, 0, 0.1);
 }
 
 ::-webkit-scrollbar-track:hover {
-	background-color: rgba(0, 0, 0, .05);
-	box-shadow: inset 1px 0 0 rgba(0, 0, 0, .1)
+    background-color: rgba(0, 0, 0, 0.05);
+    box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.1);
 }
 
 ::-webkit-scrollbar-thumb {
-	background: rgba(0, 0, 0, 0.2);
+    background: rgba(0, 0, 0, 0.2);
 }
 
 ::-webkit-scrollbar-thumb:hover {
-	background: rgba(0, 0, 0, 0.5);
-}
+    background: rgba(0, 0, 0, 0.5);
+}

src/main/app/sass/mobile/_mobile.scss

@@ -1,86 +1,89 @@
-html.mobile, html.tablet {
-	body {
-		padding-left: 0px;
-		padding-right: 0px;
-	}
-	.container-full {
-		padding-left: 5px;
-		padding-right: 5px;
-	}
-	.row {
-		margin-right: 0;
-		margin-left: 0;	
-	}
+html.mobile,
+html.tablet {
+    body {
+        padding-left: 0px;
+        padding-right: 0px;
+    }
+    .container-full {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+    .row {
+        margin-right: 0;
+        margin-left: 0;
+    }
 
-	.left-menu {
-		display: none !important;
-	}
-	.left-menu .feed-link, .left-menu .category-link {
-		line-height: 30px;
-		font-size: 105%;
-	}
-	.toolbar .toolbar-expand.btn-group {
-		display: inline-block !important;
-	}
-	.main-content {
-		display: block !important;
-		float: none !important;
-		width: 100% !important;
-		margin-left: 0 !important;
-		padding-left: 0;
-		padding-right: 0;
-	}
-	#feed-accordion .entry-heading .shrink {
-		margin-left: 0;
-		margin-right: 0;
-	}
-	#feed-accordion .entry-heading .feed-name {
-		width: 50%;
-	}
-	#feed-accordion .feed-name {
-		margin-top: 22px;
-	}
-	#feed-accordion .entry-external-link {
-		right: 15px;
-		margin-top: -24px;
-	}
-	#feed-accordion .entry-heading-link {
-		height: 52px;
-	}
-	#feed-accordion .entry-heading .entry-date {
-		right: 40px;
-		margin-top: 22px;
-	}
-	#feed-accordion .entry-buttons .checkbox, #feed-accordion .entry-buttons .form-group {
-		display: inline-block;
-	}
-	#feed-accordion .tags-panel {
-		display: block;
-		margin-left: 5px;
-	}
-	#feed-accordion a.mark-up-to {
-		right: 20px;
-		margin-top: -18px;
-	}
-	body.left-menu-active .left-menu {
-		display: block !important;
-		width: 100%;
-	}
-	body.left-menu-active .sidebar-nav-fixed {
-		width: 100%;
-		overflow: auto;
-	}
-	body.left-menu-active .main-content {
-		display: none !important;
-	}
-	body.right-menu-active .toolbar .actions {
-		margin-top: 5px;
-		margin-left: 0;
-	}
-	body.right-menu-active .toolbar .actions {
-		display: inherit !important;
-	}
-	#uvTab {
-		display: none;
-	}
-}
+    .left-menu {
+        display: none !important;
+    }
+    .left-menu .feed-link,
+    .left-menu .category-link {
+        line-height: 30px;
+        font-size: 105%;
+    }
+    .toolbar .toolbar-expand.btn-group {
+        display: inline-block !important;
+    }
+    .main-content {
+        display: block !important;
+        float: none !important;
+        width: 100% !important;
+        margin-left: 0 !important;
+        padding-left: 0;
+        padding-right: 0;
+    }
+    #feed-accordion .entry-heading .shrink {
+        margin-left: 0;
+        margin-right: 0;
+    }
+    #feed-accordion .entry-heading .feed-name {
+        width: 50%;
+    }
+    #feed-accordion .feed-name {
+        margin-top: 22px;
+    }
+    #feed-accordion .entry-external-link {
+        right: 15px;
+        margin-top: -24px;
+    }
+    #feed-accordion .entry-heading-link {
+        height: 52px;
+    }
+    #feed-accordion .entry-heading .entry-date {
+        right: 40px;
+        margin-top: 22px;
+    }
+    #feed-accordion .entry-buttons .checkbox,
+    #feed-accordion .entry-buttons .form-group {
+        display: inline-block;
+    }
+    #feed-accordion .tags-panel {
+        display: block;
+        margin-left: 5px;
+    }
+    #feed-accordion a.mark-up-to {
+        right: 20px;
+        margin-top: -18px;
+    }
+    body.left-menu-active .left-menu {
+        display: block !important;
+        width: 100%;
+    }
+    body.left-menu-active .sidebar-nav-fixed {
+        width: 100%;
+        overflow: auto;
+    }
+    body.left-menu-active .main-content {
+        display: none !important;
+    }
+    body.right-menu-active .toolbar .actions {
+        margin-top: 5px;
+        margin-left: 0;
+    }
+    body.right-menu-active .toolbar .actions {
+        display: inherit !important;
+    }
+    #uvTab {
+        display: none;
+    }
+}

src/main/app/sass/themes/_MRACHINI.scss

@@ -1,34 +1,53 @@
 #theme-MRACHINI {
-/*transitional hightlighting*/
-.entry-title > a.ng-binding:link, .entry-body-content > div.ng-binding a:link{
-	-moz-transition: background-color 1s ease-in 0s;
-	-webkit-transition: background-color 1s ease-in 0s;
-	-o-transition: background-color 1s ease-in 0s;
-}
-.entry-title > a.ng-binding:hover, .entry-body-content > div.ng-binding a:hover{
-	background-color: lime;
-	-moz-transition: background-color 1s ease-out 0s;
-	-webkit-transition: background-color 1s ease-out 0s;
-	-o-transition: background-color 1s ease-out 0s;
-}
-.entry-title > a.ng-binding:active, .entry-body-content > div.ng-binding a:active{
-	background-color: lime;
-	-moz-transition: none;
-	-webkit-transition: none;
-	-o-transition: none;
-}
+    /*transitional hightlighting*/
+    .entry-title > a.ng-binding:link,
+    .entry-body-content > div.ng-binding a:link {
+        -moz-transition: background-color 1s ease-in 0s;
+        -webkit-transition: background-color 1s ease-in 0s;
+        -o-transition: background-color 1s ease-in 0s;
+    }
+    .entry-title > a.ng-binding:hover,
+    .entry-body-content > div.ng-binding a:hover {
+        background-color: lime;
+        -moz-transition: background-color 1s ease-out 0s;
+        -webkit-transition: background-color 1s ease-out 0s;
+        -o-transition: background-color 1s ease-out 0s;
+    }
+    .entry-title > a.ng-binding:active,
+    .entry-body-content > div.ng-binding a:active {
+        background-color: lime;
+        -moz-transition: none;
+        -webkit-transition: none;
+        -o-transition: none;
+    }
 
-/*hovered item*/
-.entry-heading:hover{box-shadow: inset 0 0 40px 0px lime !important;}
-/*hovered tree item*/
-/*.css-treeview li .tree-item:hover{box-shadow: inset 0 0 20px 0px hsla(7,63%,52%,1) !important;}*/
-.css-treeview li .tree-item:hover{box-shadow: inset 0 0 20px 0px lime !important;}
-/*highlight current selected tree item*/
-.css-treeview li .tree-item .selected{box-shadow: inset 0 0 20px 0px lime !important;}
+    /*hovered item*/
+    .entry-heading:hover {
+        box-shadow: inset 0 0 40px 0px lime !important;
+    }
+    /*hovered tree item*/
+    /*.css-treeview li .tree-item:hover{box-shadow: inset 0 0 20px 0px hsla(7,63%,52%,1) !important;}*/
+    .css-treeview li .tree-item:hover {
+        box-shadow: inset 0 0 20px 0px lime !important;
+    }
+    /*highlight current selected tree item*/
+    .css-treeview li .tree-item .selected {
+        box-shadow: inset 0 0 20px 0px lime !important;
+    }
 
-.css-treeview .indent1{padding-left:10px}
-.css-treeview .indent2{padding-left:20px}
-.css-treeview .indent3{padding-left:30px}
-.css-treeview .indent4{padding-left:40px}
-.css-treeview .indent5{padding-left:50px}
-}
+    .css-treeview .indent1 {
+        padding-left: 10px;
+    }
+    .css-treeview .indent2 {
+        padding-left: 20px;
+    }
+    .css-treeview .indent3 {
+        padding-left: 30px;
+    }
+    .css-treeview .indent4 {
+        padding-left: 40px;
+    }
+    .css-treeview .indent5 {
+        padding-left: 50px;
+    }
+}

src/main/app/sass/themes/_bootstrap.scss

@@ -1,348 +1,348 @@
-#theme-bootstrap{
-/*!
+#theme-bootstrap {
+    /*!
  * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+    .btn-default,
+    .btn-primary,
+    .btn-success,
+    .btn-info,
+    .btn-warning,
+    .btn-danger {
+        text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+        -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+    }
+    .btn-default:active,
+    .btn-primary:active,
+    .btn-success:active,
+    .btn-info:active,
+    .btn-warning:active,
+    .btn-danger:active,
+    .btn-default.active,
+    .btn-primary.active,
+    .btn-success.active,
+    .btn-info.active,
+    .btn-warning.active,
+    .btn-danger.active {
+        -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+        box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+    }
+    .btn:active,
+    .btn.active {
+        background-image: none;
+    }
+    .btn-default {
+        text-shadow: 0 1px 0 #fff;
+        background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+        background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-color: #dbdbdb;
+        border-color: #ccc;
+    }
+    .btn-default:hover,
+    .btn-default:focus {
+        background-color: #e0e0e0;
+        background-position: 0 -15px;
+    }
+    .btn-default:active,
+    .btn-default.active {
+        background-color: #e0e0e0;
+        border-color: #dbdbdb;
+    }
+    .btn-primary {
+        background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
+        background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-color: #2b669a;
+    }
+    .btn-primary:hover,
+    .btn-primary:focus {
+        background-color: #2d6ca2;
+        background-position: 0 -15px;
+    }
+    .btn-primary:active,
+    .btn-primary.active {
+        background-color: #2d6ca2;
+        border-color: #2b669a;
+    }
+    .btn-success {
+        background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
+        background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-color: #3e8f3e;
+    }
+    .btn-success:hover,
+    .btn-success:focus {
+        background-color: #419641;
+        background-position: 0 -15px;
+    }
+    .btn-success:active,
+    .btn-success.active {
+        background-color: #419641;
+        border-color: #3e8f3e;
+    }
+    .btn-info {
+        background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+        background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-color: #28a4c9;
+    }
+    .btn-info:hover,
+    .btn-info:focus {
+        background-color: #2aabd2;
+        background-position: 0 -15px;
+    }
+    .btn-info:active,
+    .btn-info.active {
+        background-color: #2aabd2;
+        border-color: #28a4c9;
+    }
+    .btn-warning {
+        background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+        background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-color: #e38d13;
+    }
+    .btn-warning:hover,
+    .btn-warning:focus {
+        background-color: #eb9316;
+        background-position: 0 -15px;
+    }
+    .btn-warning:active,
+    .btn-warning.active {
+        background-color: #eb9316;
+        border-color: #e38d13;
+    }
+    .btn-danger {
+        background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+        background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-color: #b92c28;
+    }
+    .btn-danger:hover,
+    .btn-danger:focus {
+        background-color: #c12e2a;
+        background-position: 0 -15px;
+    }
+    .btn-danger:active,
+    .btn-danger.active {
+        background-color: #c12e2a;
+        border-color: #b92c28;
+    }
+    .thumbnail,
+    .img-thumbnail {
+        -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+    }
+    .dropdown-menu > li > a:hover,
+    .dropdown-menu > li > a:focus {
+        background-color: #e8e8e8;
+        background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+        background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .dropdown-menu > .active > a,
+    .dropdown-menu > .active > a:hover,
+    .dropdown-menu > .active > a:focus {
+        background-color: #357ebd;
+        background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
+        background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .navbar-default {
+        background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+        background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+        border-radius: 4px;
+        -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+    }
+    .navbar-default .navbar-nav > .active > a {
+        background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
+        background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
+        background-repeat: repeat-x;
+        -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
+    }
+    .navbar-brand,
+    .navbar-nav > li > a {
+        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+    }
+    .navbar-inverse {
+        background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
+        background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+        filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+        background-repeat: repeat-x;
+    }
+    .navbar-inverse .navbar-nav > .active > a {
+        background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
+        background-image: linear-gradient(to bottom, #222 0%, #282828 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
+        background-repeat: repeat-x;
+        -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
+        box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
+    }
+    .navbar-inverse .navbar-brand,
+    .navbar-inverse .navbar-nav > li > a {
+        text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    }
+    .navbar-static-top,
+    .navbar-fixed-top,
+    .navbar-fixed-bottom {
+        border-radius: 0;
+    }
+    .alert {
+        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
+        -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+    }
+    .alert-success {
+        background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+        background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+        background-repeat: repeat-x;
+        border-color: #b2dba1;
+    }
+    .alert-info {
+        background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+        background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+        background-repeat: repeat-x;
+        border-color: #9acfea;
+    }
+    .alert-warning {
+        background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+        background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+        background-repeat: repeat-x;
+        border-color: #f5e79e;
+    }
+    .alert-danger {
+        background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+        background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+        background-repeat: repeat-x;
+        border-color: #dca7a7;
+    }
+    .progress {
+        background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+        background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .progress-bar {
+        background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
+        background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .progress-bar-success {
+        background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+        background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .progress-bar-info {
+        background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+        background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .progress-bar-warning {
+        background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+        background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .progress-bar-danger {
+        background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+        background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .list-group {
+        border-radius: 4px;
+        -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+    }
+    .list-group-item.active,
+    .list-group-item.active:hover,
+    .list-group-item.active:focus {
+        text-shadow: 0 -1px 0 #3071a9;
+        background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
+        background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+        background-repeat: repeat-x;
+        border-color: #3278b3;
+    }
+    .panel {
+        -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    }
+    .panel-default > .panel-heading {
+        background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+        background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .panel-primary > .panel-heading {
+        background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
+        background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .panel-success > .panel-heading {
+        background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+        background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .panel-info > .panel-heading {
+        background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+        background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .panel-warning > .panel-heading {
+        background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+        background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .panel-danger > .panel-heading {
+        background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+        background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+        background-repeat: repeat-x;
+    }
+    .well {
+        background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+        background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+        background-repeat: repeat-x;
+        border-color: #dcdcdc;
+        -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+        box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
+    }
 }
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn:active,
-.btn.active {
-  background-image: none;
-}
-.btn-default {
-  text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image:         linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #dbdbdb;
-  border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus {
-  background-color: #e0e0e0;
-  background-position: 0 -15px;
-}
-.btn-default:active,
-.btn-default.active {
-  background-color: #e0e0e0;
-  border-color: #dbdbdb;
-}
-.btn-primary {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #2b669a;
-}
-.btn-primary:hover,
-.btn-primary:focus {
-  background-color: #2d6ca2;
-  background-position: 0 -15px;
-}
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #2d6ca2;
-  border-color: #2b669a;
-}
-.btn-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #3e8f3e;
-}
-.btn-success:hover,
-.btn-success:focus {
-  background-color: #419641;
-  background-position: 0 -15px;
-}
-.btn-success:active,
-.btn-success.active {
-  background-color: #419641;
-  border-color: #3e8f3e;
-}
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
-.btn-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #e38d13;
-}
-.btn-warning:hover,
-.btn-warning:focus {
-  background-color: #eb9316;
-  background-position: 0 -15px;
-}
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #eb9316;
-  border-color: #e38d13;
-}
-.btn-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #b92c28;
-}
-.btn-danger:hover,
-.btn-danger:focus {
-  background-color: #c12e2a;
-  background-position: 0 -15px;
-}
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #c12e2a;
-  border-color: #b92c28;
-}
-.thumbnail,
-.img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background-color: #e8e8e8;
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  background-color: #357ebd;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-  background-repeat: repeat-x;
-}
-.navbar-default {
-  background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image:         linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-}
-.navbar-default .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
-}
-.navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image:         linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-}
-.navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
-  background-image:         linear-gradient(to bottom, #222 0%, #282828 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  border-radius: 0;
-}
-.alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-}
-.alert-success {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #b2dba1;
-}
-.alert-info {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #9acfea;
-}
-.alert-warning {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
-}
-.alert-danger {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dca7a7;
-}
-.progress {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-  background-repeat: repeat-x;
-}
-.progress-bar-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-  background-repeat: repeat-x;
-}
-.list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #3071a9;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #3278b3;
-}
-.panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-}
-.panel-default > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-success > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-info > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-warning > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.panel-danger > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-  background-repeat: repeat-x;
-}
-.well {
-  background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image:         linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dcdcdc;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-}	
-}

src/main/app/sass/themes/_dark.scss

@@ -1,276 +1,274 @@
 #theme-dark {
-  
-* {
-  outline: 0;
-  text-decoration: none;
-}
-.btn {
-  border: none;
-}
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  background: none;
-  text-shadow: none;
-  color: #424345;
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  -ms-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  -o-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  background: #e0e0e0;
-}
-.btn-default {
-  background: #c7cbcc;
-}
-.btn:hover {
-  background: #e0e0e0;
-}
-.dropdown-menu {
-  background: #c7cbcc;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -o-border-radius: 4px;
-  border-radius: 4px;
-  border: none;
-  color: #424345;
-}
-.dropdown-menu a {
-  color: inherit;
-}
-.dropdown-menu .divider {
-  display: none;
-}
-.btn-primary:hover {
-  color: #000;
-}
-.btn-primary:active {
-  color: #000;
-}
-.btn-primary:active:hover {
-  color: #000;
-}
-.btn-default:hover {
-  color: #000;
-}
-.btn-default:active {
-  color: #000;
-}
-.btn-default:active:hover {
-  color: #000;
-}
-.btn {
-  -webkit-transition: all 400ms linear;
-  -moz-transition: all 400ms linear;
-  -ms-transition: all 400ms linear;
-  -o-transition: all 400ms linear;
-  transition: all 400ms linear;
-}
-input[ng-model='keywords'] {
-  -webkit-transition: all 400ms linear;
-  -moz-transition: all 400ms linear;
-  -ms-transition: all 400ms linear;
-  -o-transition: all 400ms linear;
-  transition: all 400ms linear;
-}
-input[ng-model='keywords']:focus {
-  background: #c7cbcc;
-}
-a[ng-click^='tab'] {
-  -webkit-transition: all 390ms linear;
-  -moz-transition: all 390ms linear;
-  -ms-transition: all 390ms linear;
-  -o-transition: all 390ms linear;
-  transition: all 390ms linear;
-}
-a[ng-click^='tab']:hover {
-  color: #000;
-}
-.css-treeview li {
-  -webkit-transition: all 150ms linear;
-  -moz-transition: all 150ms linear;
-  -ms-transition: all 150ms linear;
-  -o-transition: all 150ms linear;
-  transition: all 150ms linear;
-}
-#uvTab {
-  -webkit-transition: all 260ms linear;
-  -moz-transition: all 260ms linear;
-  -ms-transition: all 260ms linear;
-  -o-transition: all 260ms linear;
-  transition: all 260ms linear;
-}
-body {
-  background: #788587;
-  color: #424345;
-}
-body a {
-  color: #e0e0e0;
-}
-body h3 {
-  color: #424345;
-}
-.toolbar {
-  background: #788587;
-}
-.page-header {
-  border: none;
-}
-.entrylist-header {
-  border: none;
-}
-.entrylist-header h3,
-.entrylist-header a {
-  margin: 0;
-}
-#feed-accordion .entry {
-  border: none;
-}
-#feed-accordion .unread .entry-heading {
-  background: #c9c9c9;
-}
-#feed-accordion .unread:nth-of-type(2n) .entry-heading {
-  background: #ddd;
-}
-#feed-accordion .unread .entry-heading:hover,
-#feed-accordion .unread:nth-of-type(2n):hover {
-  background: #ebebeb;
-}
-#feed-accordion .entry-heading-link {
-  color: #383838;
-}
-#feed-accordion .entry-heading-link:hover {
-  color: #000;
-}
-#feed-accordion .entry-body {
-  background: #c7cbcc;
-  padding: 15px 0 0 15px;
-}
-#feed-accordion .entry-body a:not([popup]) {
-  color: #2c4967;
-}
-#feed-accordion .entry-body a:not([popup]):visited {
-  color: #8d8e8e;
-}
-#feed-accordion .entry-body .entry-title {
-  display: none;
-}
-#feed-accordion .entry-body img {
-  -webkit-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  -moz-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  -ms-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  -o-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-}
-#feed-accordion .highlight-search {
-  background: inherit;
-}
-#feed-accordion .entry-buttons {
-  background: #a68589;
-  margin-left: -15px;
-  border: none;
-}
-#feed-accordion.expanded .entry {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  -ms-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-  border: none;
-  margin-bottom: 30px;
-}
-#feed-accordion.expanded .entry .entry-heading-link {
-  color: #a68589;
-}
-input[ng-model='keywords'] {
-  border: none;
-  height: 32px;
-  background: #9ba8aa;
-}
-.css-treeview .selected {
-  color: #905158 !important;
-}
-.css-treeview .unread-counter {
-  color: #000;
-}
-.css-treeview li .tree-item:hover {
-  background: #ebebeb;
-}
-.css-treeview a {
-  color: #383838;
-}
-.css-treeview a:hover {
-  font-size: 1.02em;
-}
-#uvTab {
-  margin-bottom: -23px;
-}
-#uvTab:hover {
-  margin-bottom: 0;
-}
-/*dangerous stuff*/
-#feed-accordion.expanded .entry .entry-heading-link>.feed-name {
-  float: right;
-  display: block;
-  position: relative;
-  margin-right: 150px;
-}
-#feed-accordion.expanded .entry .entry-heading-link .entry-name {
-  margin-left: 40px;
-  color: #a68589;
-}
-@media only screen and (max-width: 800px) {
-  #toolbar {
-    display: none;
-  }
-  .sidebar-nav-fixed>.btn-group {
-    display: none;
-  }
-  .entryList {
-    padding-top: 10px;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name {
-    float: left;
-    width: 50px;
-    font-size: 0;
-    position: initial;
-    display: block;
-    margin-right: 0;
-    margin-right: initial;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name .star {
-    font-size: 14px;
-    font-size: initial;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name img {
-    margin-top: -14px;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name:after {
-    content: '';
-    display: block;
-    clear: left;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link .entry-name {
-    margin-left: 55px;
-    color: #a68589;
-  }
-}
-
+    * {
+        outline: 0;
+        text-decoration: none;
+    }
+    .btn {
+        border: none;
+    }
+    .btn-default,
+    .btn-primary,
+    .btn-success,
+    .btn-info,
+    .btn-warning,
+    .btn-danger {
+        background: none;
+        text-shadow: none;
+        color: #424345;
+    }
+    .btn-default:active,
+    .btn-primary:active,
+    .btn-success:active,
+    .btn-info:active,
+    .btn-warning:active,
+    .btn-danger:active,
+    .btn-default.active,
+    .btn-primary.active,
+    .btn-success.active,
+    .btn-info.active,
+    .btn-warning.active,
+    .btn-danger.active {
+        -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        -ms-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        -o-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        background: #e0e0e0;
+    }
+    .btn-default {
+        background: #c7cbcc;
+    }
+    .btn:hover {
+        background: #e0e0e0;
+    }
+    .dropdown-menu {
+        background: #c7cbcc;
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        -ms-border-radius: 4px;
+        -o-border-radius: 4px;
+        border-radius: 4px;
+        border: none;
+        color: #424345;
+    }
+    .dropdown-menu a {
+        color: inherit;
+    }
+    .dropdown-menu .divider {
+        display: none;
+    }
+    .btn-primary:hover {
+        color: #000;
+    }
+    .btn-primary:active {
+        color: #000;
+    }
+    .btn-primary:active:hover {
+        color: #000;
+    }
+    .btn-default:hover {
+        color: #000;
+    }
+    .btn-default:active {
+        color: #000;
+    }
+    .btn-default:active:hover {
+        color: #000;
+    }
+    .btn {
+        -webkit-transition: all 400ms linear;
+        -moz-transition: all 400ms linear;
+        -ms-transition: all 400ms linear;
+        -o-transition: all 400ms linear;
+        transition: all 400ms linear;
+    }
+    input[ng-model="keywords"] {
+        -webkit-transition: all 400ms linear;
+        -moz-transition: all 400ms linear;
+        -ms-transition: all 400ms linear;
+        -o-transition: all 400ms linear;
+        transition: all 400ms linear;
+    }
+    input[ng-model="keywords"]:focus {
+        background: #c7cbcc;
+    }
+    a[ng-click^="tab"] {
+        -webkit-transition: all 390ms linear;
+        -moz-transition: all 390ms linear;
+        -ms-transition: all 390ms linear;
+        -o-transition: all 390ms linear;
+        transition: all 390ms linear;
+    }
+    a[ng-click^="tab"]:hover {
+        color: #000;
+    }
+    .css-treeview li {
+        -webkit-transition: all 150ms linear;
+        -moz-transition: all 150ms linear;
+        -ms-transition: all 150ms linear;
+        -o-transition: all 150ms linear;
+        transition: all 150ms linear;
+    }
+    #uvTab {
+        -webkit-transition: all 260ms linear;
+        -moz-transition: all 260ms linear;
+        -ms-transition: all 260ms linear;
+        -o-transition: all 260ms linear;
+        transition: all 260ms linear;
+    }
+    body {
+        background: #788587;
+        color: #424345;
+    }
+    body a {
+        color: #e0e0e0;
+    }
+    body h3 {
+        color: #424345;
+    }
+    .toolbar {
+        background: #788587;
+    }
+    .page-header {
+        border: none;
+    }
+    .entrylist-header {
+        border: none;
+    }
+    .entrylist-header h3,
+    .entrylist-header a {
+        margin: 0;
+    }
+    #feed-accordion .entry {
+        border: none;
+    }
+    #feed-accordion .unread .entry-heading {
+        background: #c9c9c9;
+    }
+    #feed-accordion .unread:nth-of-type(2n) .entry-heading {
+        background: #ddd;
+    }
+    #feed-accordion .unread .entry-heading:hover,
+    #feed-accordion .unread:nth-of-type(2n):hover {
+        background: #ebebeb;
+    }
+    #feed-accordion .entry-heading-link {
+        color: #383838;
+    }
+    #feed-accordion .entry-heading-link:hover {
+        color: #000;
+    }
+    #feed-accordion .entry-body {
+        background: #c7cbcc;
+        padding: 15px 0 0 15px;
+    }
+    #feed-accordion .entry-body a:not([popup]) {
+        color: #2c4967;
+    }
+    #feed-accordion .entry-body a:not([popup]):visited {
+        color: #8d8e8e;
+    }
+    #feed-accordion .entry-body .entry-title {
+        display: none;
+    }
+    #feed-accordion .entry-body img {
+        -webkit-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        -moz-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        -ms-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        -o-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+    }
+    #feed-accordion .highlight-search {
+        background: inherit;
+    }
+    #feed-accordion .entry-buttons {
+        background: #a68589;
+        margin-left: -15px;
+        border: none;
+    }
+    #feed-accordion.expanded .entry {
+        -webkit-box-shadow: none;
+        -moz-box-shadow: none;
+        -ms-box-shadow: none;
+        -o-box-shadow: none;
+        box-shadow: none;
+        border: none;
+        margin-bottom: 30px;
+    }
+    #feed-accordion.expanded .entry .entry-heading-link {
+        color: #a68589;
+    }
+    input[ng-model="keywords"] {
+        border: none;
+        height: 32px;
+        background: #9ba8aa;
+    }
+    .css-treeview .selected {
+        color: #905158 !important;
+    }
+    .css-treeview .unread-counter {
+        color: #000;
+    }
+    .css-treeview li .tree-item:hover {
+        background: #ebebeb;
+    }
+    .css-treeview a {
+        color: #383838;
+    }
+    .css-treeview a:hover {
+        font-size: 1.02em;
+    }
+    #uvTab {
+        margin-bottom: -23px;
+    }
+    #uvTab:hover {
+        margin-bottom: 0;
+    }
+    /*dangerous stuff*/
+    #feed-accordion.expanded .entry .entry-heading-link > .feed-name {
+        float: right;
+        display: block;
+        position: relative;
+        margin-right: 150px;
+    }
+    #feed-accordion.expanded .entry .entry-heading-link .entry-name {
+        margin-left: 40px;
+        color: #a68589;
+    }
+    @media only screen and (max-width: 800px) {
+        #toolbar {
+            display: none;
+        }
+        .sidebar-nav-fixed > .btn-group {
+            display: none;
+        }
+        .entryList {
+            padding-top: 10px;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name {
+            float: left;
+            width: 50px;
+            font-size: 0;
+            position: initial;
+            display: block;
+            margin-right: 0;
+            margin-right: initial;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name .star {
+            font-size: 14px;
+            font-size: initial;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name img {
+            margin-top: -14px;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name:after {
+            content: "";
+            display: block;
+            clear: left;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link .entry-name {
+            margin-left: 55px;
+            color: #a68589;
+        }
+    }
 }

src/main/app/sass/themes/_ebraminio.scss

@@ -1,17 +1,21 @@
 #theme-ebraminio {
-  /* My font setting, a bit specific for Persian but is okay in other languages */
-  body {
-    font-family: Tahoma, 'Iranian sans', 'DejaVu Sans', sans-serif;
-  }
-  input, button, select, textarea {
-    font-family: inherit; /* what said above */
-  }
-  /* Change source-codes in feeds background to white */
-  pre {
-    background-color: transparent;
-  }
-  /* 100% forever */
-  .expanded .entry-header, #feed-accordion .entry-body-content {
-    max-width: 100%;
-  }
-}
+    /* My font setting, a bit specific for Persian but is okay in other languages */
+    body {
+        font-family: Tahoma, "Iranian sans", "DejaVu Sans", sans-serif;
+    }
+    input,
+    button,
+    select,
+    textarea {
+        font-family: inherit; /* what said above */
+    }
+    /* Change source-codes in feeds background to white */
+    pre {
+        background-color: transparent;
+    }
+    /* 100% forever */
+    .expanded .entry-header,
+    #feed-accordion .entry-body-content {
+        max-width: 100%;
+    }
+}

src/main/app/sass/themes/_nightsky.scss

@@ -0,0 +1,134 @@
+#theme-nightsky {
+    a {
+        color: #2a9fd6;
+    }
+
+    .nav-pills > li.active > a,
+    .nav-pills > li.active > a:hover,
+    .nav-pills > li.active > a:focus {
+        color: #fff;
+        background-color: #2a9fd6;
+    }
+
+    body,
+    .toolbar {
+        color: #c6c6c6;
+        background-color: #2f2f2f;
+    }
+
+    .btn-default {
+        color: #c6c6c6;
+        background-color: #424242;
+        border-color: #424242;
+    }
+
+    .btn-default:hover,
+    .btn-default:focus,
+    .btn-default.focus,
+    .btn-default:active,
+    .btn-default.active,
+    .open > .dropdown-toggle.btn-default {
+        background-color: #282828;
+        border-color: #232323;
+    }
+
+    .css-treeview li .tree-item:hover {
+        background-color: #282828;
+    }
+
+    .css-treeview .unread-counter {
+        color: #939393;
+    }
+
+    .css-treeview .category-link,
+    .css-treeview a {
+        color: #939393;
+    }
+
+    .css-treeview a .unread,
+    .css-treeview .category-link .unread {
+        color: #c6c6c6;
+    }
+
+    .css-treeview .selected {
+        color: #c00;
+    }
+
+    .entrylist-header {
+        border-bottom: 1px solid #282828;
+    }
+
+    #feed-accordion .entry {
+        border-bottom: 1px solid #282828;
+    }
+
+    #feed-accordion .entry-body .entry-title {
+        font-weight: normal;
+    }
+
+    #feed-accordion .entry-heading .entry-name {
+        color: #939393;
+    }
+
+    #feed-accordion .unread .entry-heading .entry-name {
+        font-weight: normal;
+        color: #c6c6c6;
+    }
+
+    #feed-accordion .unread .entry-heading {
+        background-color: #444;
+    }
+
+    #feed-accordion .entry-heading {
+        background-color: #2f2f2f;
+    }
+
+    #feed-accordion .unread .entry-heading:hover {
+        background-color: #2f2f2f;
+    }
+
+    #feed-accordion .current.closed .entry-heading {
+        background-color: #151515;
+    }
+
+    #feed-accordion .entry-heading-link {
+        color: #c6c6c6;
+    }
+
+    #feed-accordion .entry-external-link {
+        color: #c6c6c6;
+    }
+
+    #feed-accordion .icon-star-empty {
+        color: #c6c6c6;
+    }
+
+    #feed-accordion .entry-heading .feed-name {
+        color: #939393;
+    }
+
+    #feed-accordion .entry-body-content {
+        color: #c6c6c6;
+    }
+
+    #feed-accordion .entry-buttons {
+        background-color: #494949;
+        border-top: 1px solid #282828;
+    }
+
+    #feed-accordion .share-buttons a {
+        color: #c6c6c6;
+    }
+
+    #feed-accordion a.mark-up-to {
+        color: #c6c6c6;
+    }
+
+    #loading-bar .bar {
+        background: #c6c6c6;
+    }
+
+    #loading-bar .peg {
+        box-shadow: 0 0 10px #c6c6c6, 0 0 5px #c6c6c6;
+    }
+}

src/main/app/sass/themes/_svetla.scss

@@ -1,378 +1,377 @@
 #theme-svetla {
-
-* {
-  outline: 0;
-  text-decoration: none;
-}
-:focus {
-  outline: none !important;
-}
-::-moz-focus-inner {
-  border: 0 !important;
-}
-.btn {
-  border: none;
-}
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  background: none;
-  text-shadow: none;
-  color: #788587;
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: 0 -5px 5px 0 rgba(238,232,213,0.2) inset , 0 5px 5px 0 rgba(238,232,213,0.2) inset;
-  -moz-box-shadow: 0 -5px 5px 0 rgba(238,232,213,0.2) inset , 0 5px 5px 0 rgba(238,232,213,0.2) inset;
-  -ms-box-shadow: 0 -5px 5px 0 rgba(238,232,213,0.2) inset , 0 5px 5px 0 rgba(238,232,213,0.2) inset;
-  -o-box-shadow: 0 -5px 5px 0 rgba(238,232,213,0.2) inset , 0 5px 5px 0 rgba(238,232,213,0.2) inset;
-  box-shadow: 0 -5px 5px 0 rgba(238,232,213,0.2) inset , 0 5px 5px 0 rgba(238,232,213,0.2) inset;
-  background: rgba(238,232,213,0.3);
-  color: #788587;
-}
-.btn-default {
-  background: #eee8d5;
-}
-.btn:hover {
-  background: #c4bea6;
-}
-.dropdown-menu {
-  background: #c7cbcc;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  -ms-border-radius: 3px;
-  -o-border-radius: 3px;
-  border-radius: 3px;
-  border: none;
-  color: #424345;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  -ms-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-}
-.dropdown-menu a {
-  color: inherit;
-}
-.dropdown-menu .divider {
-  display: none;
-}
-.btn-primary:hover {
-  color: #000;
-}
-.btn-primary:active {
-  color: #000;
-}
-.btn-primary:active:hover {
-  color: #000;
-}
-.btn-default:hover {
-  color: #000;
-}
-.btn-default:active {
-  color: #000;
-}
-.btn-default:active:hover {
-  color: #000;
-}
-.btn {
-  -webkit-transition: all 400ms linear;
-  -moz-transition: all 400ms linear;
-  -ms-transition: all 400ms linear;
-  -o-transition: all 400ms linear;
-  transition: all 400ms linear;
-}
-input[ng-model='keywords'] {
-  -webkit-transition: all 400ms linear;
-  -moz-transition: all 400ms linear;
-  -ms-transition: all 400ms linear;
-  -o-transition: all 400ms linear;
-  transition: all 400ms linear;
-}
-input[ng-model='keywords']:focus {
-  background: #c7cbcc;
-}
-a[ng-click^='tab'] {
-  -webkit-transition: all 390ms linear;
-  -moz-transition: all 390ms linear;
-  -ms-transition: all 390ms linear;
-  -o-transition: all 390ms linear;
-  transition: all 390ms linear;
-}
-a[ng-click^='tab']:hover {
-  color: #000;
-}
-.css-treeview li {
-  -webkit-transition: all 150ms linear;
-  -moz-transition: all 150ms linear;
-  -ms-transition: all 150ms linear;
-  -o-transition: all 150ms linear;
-  transition: all 150ms linear;
-}
-#uvTab {
-  -webkit-transition: all 260ms linear;
-  -moz-transition: all 260ms linear;
-  -ms-transition: all 260ms linear;
-  -o-transition: all 260ms linear;
-  transition: all 260ms linear;
-}
-body {
-  background: #fdf6e3;
-  color: #424345;
-}
-body a {
-  color: #788587;
-}
-.toolbar {
-  background: #fdf6e3;
-}
-.page-header {
-  border: none;
-}
-.entrylist-header {
-  border: none;
-}
-.entrylist-header h3,
-.entrylist-header a {
-  margin: 0;
-}
-#feed-accordion .entry-heading {
-  background: #edeae6;
-  background: -webkit-moz-linear-gradient(rgba(238,232,213,0.7), #fdf6e3);
-  background: -moz-linear-gradient(rgba(238,232,213,0.7), #fdf6e3);
-  background: -ms-moz-linear-gradient(rgba(238,232,213,0.7), #fdf6e3);
-  background: linear-gradient(rgba(238,232,213,0.7), #fdf6e3);
-}
-#feed-accordion .entry-heading-link {
-  color: #786b47 !important;
-  font-style: italic !important;
-}
-#feed-accordion .entry {
-  border: none;
-}
-#feed-accordion .unread .entry-heading {
-  background: #fdf6e3;
-}
-#feed-accordion .unread .entry-heading .entry-heading-link {
-  color: #404141 !important;
-  font-style: normal !important;
-}
-#feed-accordion .unread:nth-of-type(2n) .entry-heading {
-  background: rgba(238,232,213,0.7);
-}
-#feed-accordion .entry-body {
-  background: #eee8d5;
-  padding: 2px 0 0 15px;
-}
-#feed-accordion .entry-body a.nolink.pointer {
-  color: #424345;
-}
-#feed-accordion .entry-body a:not([popup]) {
-  color: #6c6759;
-}
-#feed-accordion .entry-body a:not([popup]):visited {
-  color: #8d8e8e;
-}
-#feed-accordion .entry-body .entry-title {
-  font-size: 1em;
-}
-#feed-accordion .entry-body .entry-title .entry-subtitle {
-  display: inline;
-}
-#feed-accordion .entry-body .entry-title .entry-subtitle [class^='entry-author'] {
-  font-style: italic;
-}
-#feed-accordion .entry-body .entry-title .entry-subtitle .entry-source {
-  display: none;
-}
-#feed-accordion .entry-body .entry-title a {
-  color: #a7a083;
-}
-#feed-accordion .entry-body img {
-  -webkit-box-shadow: 0 0 2px 0 rgba(0,0,0,0.1);
-  -moz-box-shadow: 0 0 2px 0 rgba(0,0,0,0.1);
-  -ms-box-shadow: 0 0 2px 0 rgba(0,0,0,0.1);
-  -o-box-shadow: 0 0 2px 0 rgba(0,0,0,0.1);
-  box-shadow: 0 0 2px 0 rgba(0,0,0,0.1);
-}
-#feed-accordion .highlight-search {
-  background: inherit;
-}
-#feed-accordion .entry-buttons {
-  background: #a68589;
-  margin-left: -15px;
-  border: none;
-}
-#feed-accordion.expanded .entry {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  -ms-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-  border: none;
-}
-input[ng-model='keywords'] {
-  border: none;
-  height: 32px;
-  -webkit-box-shadow: 0 0 2px 1px #eee8d5 inset;
-  -moz-box-shadow: 0 0 2px 1px #eee8d5 inset;
-  -ms-box-shadow: 0 0 2px 1px #eee8d5 inset;
-  -o-box-shadow: 0 0 2px 1px #eee8d5 inset;
-  box-shadow: 0 0 2px 1px #eee8d5 inset;
-}
-input[ng-model='keywords']:focus {
-  background: #fff;
-}
-.css-treeview .selected {
-  color: #a68589 !important;
-}
-.css-treeview .unread-counter {
-  color: #93a1a1;
-}
-.css-treeview li .tree-item:hover {
-  background: #ebebeb;
-}
-.css-treeview a {
-  color: #93a1a1;
-}
-.css-treeview a:hover {
-  font-size: 1.02em;
-}
-#uvTab {
-  margin-bottom: -23px;
-}
-#uvTab:hover {
-  margin-bottom: 0;
-}
-/* stuff */
-#feed-accordion .entry-external-link {
-  position: absolute;
-  right: auto;
-  margin-left: 15px;
-  color: #c4bea6;
-}
-#feed-accordion .entry .entry-heading-link>.feed-name {
-  font-size: 0;
-  width: 50px;
-  margin-left: 35px;
-}
-#feed-accordion .entry .entry-heading-link>.feed-name .star {
-  font-size: 1em;
-}
-#feed-accordion .entry .entry-heading-link .entry-name {
-  margin-left: 100px;
-}
-#feed-accordion.expanded .entry .entry-heading-link>.feed-name {
-  font-size: 1em;
-  width: auto;
-  float: right;
-  display: block;
-  position: relative;
-  margin-right: 150px;
-}
-#feed-accordion.expanded .entry .entry-heading-link>.feed-name img {
-  margin-top: 0;
-}
-#feed-accordion.expanded .entry .entry-heading-link .entry-name {
-  margin-left: 40px;
-}
-#feed-accordion.expanded .entry .entry-body .entry-body-content {
-  padding-left: 0;
-}
-#feed-accordion.expanded .entry .entry-body .entry-title {
-  display: none;
-}
-@media only screen and (max-width: 800px) {
-  #toolbar {
-    display: none;
-  }
-  .sidebar-nav-fixed>.btn-group {
-    display: none;
-  }
-  .entryList {
-    padding-top: 10px;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name {
-    float: left;
-    width: 50px;
-    font-size: 0;
-    position: initial;
-    display: block;
-    margin-right: 0;
-    margin-right: initial;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name .star {
-    font-size: 14px;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name img {
-    margin-top: -10px;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link>.feed-name:after {
-    content: '';
-    display: block;
-    clear: left;
-  }
-  #feed-accordion.expanded .entry .entry-heading-link .entry-name {
-    margin-left: 55px;
-  }
-}
-#feed-accordion:not(.expanded) .current .entry-heading {
-  background: #eee8d5;
-}
-#feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link {
-  color: #a7a083 !important;
-  font-style: normal !important;
-}
-#feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link .feed-name {
-  width: auto !important;
-  font-size: 1em !important;
-  font-style: normal;
-  color: #a7a083;
-}
-#feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link .feed-name img {
-  margin-top: 0;
-}
-#feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link .entry-name {
-  display: none;
-}
-#feed-accordion.expanded .current .entry-heading {
-  background: #eee8d5;
-}
-#feed-accordion.expanded .current .entry-heading .entry-heading-link {
-  color: #a7a083 !important;
-  font-style: normal !important;
-}
-#feed-accordion.expanded .current .entry-heading .entry-heading-link .feed-name {
-  font-style: inherit;
-  color: inherit;
-}
-#feed-accordion.expanded .current .entry-heading .entry-heading-link .entry-name {
-  color: inherit !important;
-}
-.nav-pills li.active a {
-  color: #424345 !important;
-}
-blockquote {
-  border-left: solid 5px #c4bea6 !important;
-}
-a[href^='http://da.feedsportal.com'] {
-  display: none;
-}
-br {
-  display: none;
-}
-
+    * {
+        outline: 0;
+        text-decoration: none;
+    }
+    :focus {
+        outline: none !important;
+    }
+    ::-moz-focus-inner {
+        border: 0 !important;
+    }
+    .btn {
+        border: none;
+    }
+    .btn-default,
+    .btn-primary,
+    .btn-success,
+    .btn-info,
+    .btn-warning,
+    .btn-danger {
+        background: none;
+        text-shadow: none;
+        color: #788587;
+    }
+    .btn-default:active,
+    .btn-primary:active,
+    .btn-success:active,
+    .btn-info:active,
+    .btn-warning:active,
+    .btn-danger:active,
+    .btn-default.active,
+    .btn-primary.active,
+    .btn-success.active,
+    .btn-info.active,
+    .btn-warning.active,
+    .btn-danger.active {
+        -webkit-box-shadow: 0 -5px 5px 0 rgba(238, 232, 213, 0.2) inset, 0 5px 5px 0 rgba(238, 232, 213, 0.2) inset;
+        -moz-box-shadow: 0 -5px 5px 0 rgba(238, 232, 213, 0.2) inset, 0 5px 5px 0 rgba(238, 232, 213, 0.2) inset;
+        -ms-box-shadow: 0 -5px 5px 0 rgba(238, 232, 213, 0.2) inset, 0 5px 5px 0 rgba(238, 232, 213, 0.2) inset;
+        -o-box-shadow: 0 -5px 5px 0 rgba(238, 232, 213, 0.2) inset, 0 5px 5px 0 rgba(238, 232, 213, 0.2) inset;
+        box-shadow: 0 -5px 5px 0 rgba(238, 232, 213, 0.2) inset, 0 5px 5px 0 rgba(238, 232, 213, 0.2) inset;
+        background: rgba(238, 232, 213, 0.3);
+        color: #788587;
+    }
+    .btn-default {
+        background: #eee8d5;
+    }
+    .btn:hover {
+        background: #c4bea6;
+    }
+    .dropdown-menu {
+        background: #c7cbcc;
+        -webkit-border-radius: 3px;
+        -moz-border-radius: 3px;
+        -ms-border-radius: 3px;
+        -o-border-radius: 3px;
+        border-radius: 3px;
+        border: none;
+        color: #424345;
+        -webkit-box-shadow: none;
+        -moz-box-shadow: none;
+        -ms-box-shadow: none;
+        -o-box-shadow: none;
+        box-shadow: none;
+    }
+    .dropdown-menu a {
+        color: inherit;
+    }
+    .dropdown-menu .divider {
+        display: none;
+    }
+    .btn-primary:hover {
+        color: #000;
+    }
+    .btn-primary:active {
+        color: #000;
+    }
+    .btn-primary:active:hover {
+        color: #000;
+    }
+    .btn-default:hover {
+        color: #000;
+    }
+    .btn-default:active {
+        color: #000;
+    }
+    .btn-default:active:hover {
+        color: #000;
+    }
+    .btn {
+        -webkit-transition: all 400ms linear;
+        -moz-transition: all 400ms linear;
+        -ms-transition: all 400ms linear;
+        -o-transition: all 400ms linear;
+        transition: all 400ms linear;
+    }
+    input[ng-model="keywords"] {
+        -webkit-transition: all 400ms linear;
+        -moz-transition: all 400ms linear;
+        -ms-transition: all 400ms linear;
+        -o-transition: all 400ms linear;
+        transition: all 400ms linear;
+    }
+    input[ng-model="keywords"]:focus {
+        background: #c7cbcc;
+    }
+    a[ng-click^="tab"] {
+        -webkit-transition: all 390ms linear;
+        -moz-transition: all 390ms linear;
+        -ms-transition: all 390ms linear;
+        -o-transition: all 390ms linear;
+        transition: all 390ms linear;
+    }
+    a[ng-click^="tab"]:hover {
+        color: #000;
+    }
+    .css-treeview li {
+        -webkit-transition: all 150ms linear;
+        -moz-transition: all 150ms linear;
+        -ms-transition: all 150ms linear;
+        -o-transition: all 150ms linear;
+        transition: all 150ms linear;
+    }
+    #uvTab {
+        -webkit-transition: all 260ms linear;
+        -moz-transition: all 260ms linear;
+        -ms-transition: all 260ms linear;
+        -o-transition: all 260ms linear;
+        transition: all 260ms linear;
+    }
+    body {
+        background: #fdf6e3;
+        color: #424345;
+    }
+    body a {
+        color: #788587;
+    }
+    .toolbar {
+        background: #fdf6e3;
+    }
+    .page-header {
+        border: none;
+    }
+    .entrylist-header {
+        border: none;
+    }
+    .entrylist-header h3,
+    .entrylist-header a {
+        margin: 0;
+    }
+    #feed-accordion .entry-heading {
+        background: #edeae6;
+        background: -webkit-moz-linear-gradient(rgba(238, 232, 213, 0.7), #fdf6e3);
+        background: -moz-linear-gradient(rgba(238, 232, 213, 0.7), #fdf6e3);
+        background: -ms-moz-linear-gradient(rgba(238, 232, 213, 0.7), #fdf6e3);
+        background: linear-gradient(rgba(238, 232, 213, 0.7), #fdf6e3);
+    }
+    #feed-accordion .entry-heading-link {
+        color: #786b47 !important;
+        font-style: italic !important;
+    }
+    #feed-accordion .entry {
+        border: none;
+    }
+    #feed-accordion .unread .entry-heading {
+        background: #fdf6e3;
+    }
+    #feed-accordion .unread .entry-heading .entry-heading-link {
+        color: #404141 !important;
+        font-style: normal !important;
+    }
+    #feed-accordion .unread:nth-of-type(2n) .entry-heading {
+        background: rgba(238, 232, 213, 0.7);
+    }
+    #feed-accordion .entry-body {
+        background: #eee8d5;
+        padding: 2px 0 0 15px;
+    }
+    #feed-accordion .entry-body a.nolink.pointer {
+        color: #424345;
+    }
+    #feed-accordion .entry-body a:not([popup]) {
+        color: #6c6759;
+    }
+    #feed-accordion .entry-body a:not([popup]):visited {
+        color: #8d8e8e;
+    }
+    #feed-accordion .entry-body .entry-title {
+        font-size: 1em;
+    }
+    #feed-accordion .entry-body .entry-title .entry-subtitle {
+        display: inline;
+    }
+    #feed-accordion .entry-body .entry-title .entry-subtitle [class^="entry-author"] {
+        font-style: italic;
+    }
+    #feed-accordion .entry-body .entry-title .entry-subtitle .entry-source {
+        display: none;
+    }
+    #feed-accordion .entry-body .entry-title a {
+        color: #a7a083;
+    }
+    #feed-accordion .entry-body img {
+        -webkit-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
+        -moz-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
+        -ms-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
+        -o-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
+        box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.1);
+    }
+    #feed-accordion .highlight-search {
+        background: inherit;
+    }
+    #feed-accordion .entry-buttons {
+        background: #a68589;
+        margin-left: -15px;
+        border: none;
+    }
+    #feed-accordion.expanded .entry {
+        -webkit-box-shadow: none;
+        -moz-box-shadow: none;
+        -ms-box-shadow: none;
+        -o-box-shadow: none;
+        box-shadow: none;
+        border: none;
+    }
+    input[ng-model="keywords"] {
+        border: none;
+        height: 32px;
+        -webkit-box-shadow: 0 0 2px 1px #eee8d5 inset;
+        -moz-box-shadow: 0 0 2px 1px #eee8d5 inset;
+        -ms-box-shadow: 0 0 2px 1px #eee8d5 inset;
+        -o-box-shadow: 0 0 2px 1px #eee8d5 inset;
+        box-shadow: 0 0 2px 1px #eee8d5 inset;
+    }
+    input[ng-model="keywords"]:focus {
+        background: #fff;
+    }
+    .css-treeview .selected {
+        color: #a68589 !important;
+    }
+    .css-treeview .unread-counter {
+        color: #93a1a1;
+    }
+    .css-treeview li .tree-item:hover {
+        background: #ebebeb;
+    }
+    .css-treeview a {
+        color: #93a1a1;
+    }
+    .css-treeview a:hover {
+        font-size: 1.02em;
+    }
+    #uvTab {
+        margin-bottom: -23px;
+    }
+    #uvTab:hover {
+        margin-bottom: 0;
+    }
+    /* stuff */
+    #feed-accordion .entry-external-link {
+        position: absolute;
+        right: auto;
+        margin-left: 15px;
+        color: #c4bea6;
+    }
+    #feed-accordion .entry .entry-heading-link > .feed-name {
+        font-size: 0;
+        width: 50px;
+        margin-left: 35px;
+    }
+    #feed-accordion .entry .entry-heading-link > .feed-name .star {
+        font-size: 1em;
+    }
+    #feed-accordion .entry .entry-heading-link .entry-name {
+        margin-left: 100px;
+    }
+    #feed-accordion.expanded .entry .entry-heading-link > .feed-name {
+        font-size: 1em;
+        width: auto;
+        float: right;
+        display: block;
+        position: relative;
+        margin-right: 150px;
+    }
+    #feed-accordion.expanded .entry .entry-heading-link > .feed-name img {
+        margin-top: 0;
+    }
+    #feed-accordion.expanded .entry .entry-heading-link .entry-name {
+        margin-left: 40px;
+    }
+    #feed-accordion.expanded .entry .entry-body .entry-body-content {
+        padding-left: 0;
+    }
+    #feed-accordion.expanded .entry .entry-body .entry-title {
+        display: none;
+    }
+    @media only screen and (max-width: 800px) {
+        #toolbar {
+            display: none;
+        }
+        .sidebar-nav-fixed > .btn-group {
+            display: none;
+        }
+        .entryList {
+            padding-top: 10px;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name {
+            float: left;
+            width: 50px;
+            font-size: 0;
+            position: initial;
+            display: block;
+            margin-right: 0;
+            margin-right: initial;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name .star {
+            font-size: 14px;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name img {
+            margin-top: -10px;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link > .feed-name:after {
+            content: "";
+            display: block;
+            clear: left;
+        }
+        #feed-accordion.expanded .entry .entry-heading-link .entry-name {
+            margin-left: 55px;
+        }
+    }
+    #feed-accordion:not(.expanded) .current .entry-heading {
+        background: #eee8d5;
+    }
+    #feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link {
+        color: #a7a083 !important;
+        font-style: normal !important;
+    }
+    #feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link .feed-name {
+        width: auto !important;
+        font-size: 1em !important;
+        font-style: normal;
+        color: #a7a083;
+    }
+    #feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link .feed-name img {
+        margin-top: 0;
+    }
+    #feed-accordion:not(.expanded) .current .entry-heading .entry-heading-link .entry-name {
+        display: none;
+    }
+    #feed-accordion.expanded .current .entry-heading {
+        background: #eee8d5;
+    }
+    #feed-accordion.expanded .current .entry-heading .entry-heading-link {
+        color: #a7a083 !important;
+        font-style: normal !important;
+    }
+    #feed-accordion.expanded .current .entry-heading .entry-heading-link .feed-name {
+        font-style: inherit;
+        color: inherit;
+    }
+    #feed-accordion.expanded .current .entry-heading .entry-heading-link .entry-name {
+        color: inherit !important;
+    }
+    .nav-pills li.active a {
+        color: #424345 !important;
+    }
+    blockquote {
+        border-left: solid 5px #c4bea6 !important;
+    }
+    a[href^='http://da.feedsportal.com']
+    {
+        display: none;
+    }
+    br {
+        display: none;
+    }
 }

src/main/app/sass/themes/_test.scss

@@ -1,5 +1,5 @@
 #theme-test {
-	body {
-		background-color: black;
-	}	
-}
+    body {
+        background-color: black;
+    }
+}

src/main/app/sass/themes/_third.scss

@@ -1,262 +1,260 @@
 #theme-third {
-
-* {
-  outline: 0;
-  text-decoration: none;
-}
-.btn {
-  border: none;
-}
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  background: none;
-  text-shadow: none;
-  color: #424345;
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  -ms-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  -o-box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  box-shadow: inset 0 1px 0 rgba(255,255,255,0.15) 0 1px 1px rgba(0,0,0,0.075);
-  background: #e0e0e0;
-}
-.btn-default {
-  background: #6e797c;
-}
-.btn:hover {
-  background: #e0e0e0;
-}
-.dropdown-menu {
-  background: #c7cbcc;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -o-border-radius: 4px;
-  border-radius: 4px;
-  border: none;
-  color: #424345;
-}
-.dropdown-menu a {
-  color: inherit;
-}
-.dropdown-menu .divider {
-  display: none;
-}
-.btn-primary:hover {
-  color: #000;
-}
-.btn-primary:active {
-  color: #000;
-}
-.btn-primary:active:hover {
-  color: #000;
-}
-.btn-default:hover {
-  color: #000;
-}
-.btn-default:active {
-  color: #000;
-}
-.btn-default:active:hover {
-  color: #000;
-}
-.btn {
-  -webkit-transition: all 400ms linear;
-  -moz-transition: all 400ms linear;
-  -ms-transition: all 400ms linear;
-  -o-transition: all 400ms linear;
-  transition: all 400ms linear;
-}
-input[ng-model='keywords'] {
-  -webkit-transition: all 400ms linear;
-  -moz-transition: all 400ms linear;
-  -ms-transition: all 400ms linear;
-  -o-transition: all 400ms linear;
-  transition: all 400ms linear;
-}
-input[ng-model='keywords']:focus {
-  background: #c7cbcc;
-}
-a[ng-click^='tab'] {
-  -webkit-transition: all 390ms linear;
-  -moz-transition: all 390ms linear;
-  -ms-transition: all 390ms linear;
-  -o-transition: all 390ms linear;
-  transition: all 390ms linear;
-}
-a[ng-click^='tab']:hover {
-  color: #000;
-}
-.css-treeview li {
-  -webkit-transition: all 150ms linear;
-  -moz-transition: all 150ms linear;
-  -ms-transition: all 150ms linear;
-  -o-transition: all 150ms linear;
-  transition: all 150ms linear;
-}
-#uvTab {
-  -webkit-transition: all 260ms linear;
-  -moz-transition: all 260ms linear;
-  -ms-transition: all 260ms linear;
-  -o-transition: all 260ms linear;
-  transition: all 260ms linear;
-}
-#toolbar {
-  -webkit-transition: all 280ms linear;
-  -moz-transition: all 280ms linear;
-  -ms-transition: all 280ms linear;
-  -o-transition: all 280ms linear;
-  transition: all 280ms linear;
-}
-body {
-  background: #788587;
-  color: #424345;
-}
-body a {
-  color: #e0e0e0;
-}
-body h3 {
-  color: #424345;
-}
-.toolbar {
-  background: #788587;
-  margin-top: -45px;
-}
-.toolbar:after {
-  display: block;
-  content: '...toolbar';
-  background: rgba(0,0,0,0.07);
-}
-.toolbar:hover {
-  margin: 0;
-}
-.toolbar:hover:after {
-  display: none;
-}
-.page-header {
-  border: none;
-}
-.entrylist-header {
-  border: none;
-}
-.entrylist-header h3,
-.entrylist-header a {
-  margin: 0;
-}
-.entryList {
-  padding-top: 18px;
-}
-#feed-accordion .entry {
-  border: none;
-}
-#feed-accordion .unread .entry-heading {
-  background: #c9c9c9;
-}
-#feed-accordion .unread:nth-of-type(2n) .entry-heading {
-  background: #ddd;
-}
-#feed-accordion .unread .entry-heading:hover,
-#feed-accordion .unread:nth-of-type(2n):hover {
-  background: #ebebeb;
-}
-#feed-accordion .entry-heading-link {
-  color: #5a6069 !important;
-}
-#feed-accordion .entry-heading-link:hover {
-  color: #000;
-}
-#feed-accordion .entry-body {
-  background: #c7cbcc;
-  padding-left: 15px;
-}
-#feed-accordion .entry-body a:not([popup]) {
-  color: #a68589;
-}
-#feed-accordion .entry-body a:not([popup]):visited {
-  color: #8d8e8e;
-}
-#feed-accordion .entry-body img {
-  -webkit-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  -moz-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  -ms-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  -o-box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-  box-shadow: 0 0 2px 0 rgba(0,0,0,0.2);
-}
-#feed-accordion .highlight-search {
-  background: inherit;
-}
-#feed-accordion .entry-buttons {
-  background: #a68589;
-  margin-left: -15px;
-  border: none;
-}
-#feed-accordion.expanded .entry {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  -ms-box-shadow: none;
-  -o-box-shadow: none;
-  box-shadow: none;
-  border: none;
-  margin-bottom: 30px;
-}
-input[ng-model='keywords'] {
-  border: none;
-  height: 32px;
-  background: #9ba8aa;
-}
-.css-treeview .selected {
-  color: #2c4967;
-  text-decoration: underline;
-}
-.css-treeview .unread-counter {
-  color: #222;
-}
-.css-treeview li .tree-item:hover {
-  background: #ebebeb;
-}
-.css-treeview a {
-  color: #5a6069;
-}
-.css-treeview a:hover {
-  font-size: 1.02em;
-}
-.css-treeview a:hover img {
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  -ms-border-radius: 1px;
-  -o-border-radius: 1px;
-  border-radius: 1px;
-  opacity: 1;
-}
-.css-treeview img {
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -o-border-radius: 4px;
-  border-radius: 4px;
-  opacity: 0.85;
-}
-#uvTab {
-  margin-bottom: -23px;
-}
-#uvTab:hover {
-  margin-bottom: 0;
-}
-
+    * {
+        outline: 0;
+        text-decoration: none;
+    }
+    .btn {
+        border: none;
+    }
+    .btn-default,
+    .btn-primary,
+    .btn-success,
+    .btn-info,
+    .btn-warning,
+    .btn-danger {
+        background: none;
+        text-shadow: none;
+        color: #424345;
+    }
+    .btn-default:active,
+    .btn-primary:active,
+    .btn-success:active,
+    .btn-info:active,
+    .btn-warning:active,
+    .btn-danger:active,
+    .btn-default.active,
+    .btn-primary.active,
+    .btn-success.active,
+    .btn-info.active,
+    .btn-warning.active,
+    .btn-danger.active {
+        -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        -ms-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        -o-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15) 0 1px 1px rgba(0, 0, 0, 0.075);
+        background: #e0e0e0;
+    }
+    .btn-default {
+        background: #6e797c;
+    }
+    .btn:hover {
+        background: #e0e0e0;
+    }
+    .dropdown-menu {
+        background: #c7cbcc;
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        -ms-border-radius: 4px;
+        -o-border-radius: 4px;
+        border-radius: 4px;
+        border: none;
+        color: #424345;
+    }
+    .dropdown-menu a {
+        color: inherit;
+    }
+    .dropdown-menu .divider {
+        display: none;
+    }
+    .btn-primary:hover {
+        color: #000;
+    }
+    .btn-primary:active {
+        color: #000;
+    }
+    .btn-primary:active:hover {
+        color: #000;
+    }
+    .btn-default:hover {
+        color: #000;
+    }
+    .btn-default:active {
+        color: #000;
+    }
+    .btn-default:active:hover {
+        color: #000;
+    }
+    .btn {
+        -webkit-transition: all 400ms linear;
+        -moz-transition: all 400ms linear;
+        -ms-transition: all 400ms linear;
+        -o-transition: all 400ms linear;
+        transition: all 400ms linear;
+    }
+    input[ng-model="keywords"] {
+        -webkit-transition: all 400ms linear;
+        -moz-transition: all 400ms linear;
+        -ms-transition: all 400ms linear;
+        -o-transition: all 400ms linear;
+        transition: all 400ms linear;
+    }
+    input[ng-model="keywords"]:focus {
+        background: #c7cbcc;
+    }
+    a[ng-click^="tab"] {
+        -webkit-transition: all 390ms linear;
+        -moz-transition: all 390ms linear;
+        -ms-transition: all 390ms linear;
+        -o-transition: all 390ms linear;
+        transition: all 390ms linear;
+    }
+    a[ng-click^="tab"]:hover {
+        color: #000;
+    }
+    .css-treeview li {
+        -webkit-transition: all 150ms linear;
+        -moz-transition: all 150ms linear;
+        -ms-transition: all 150ms linear;
+        -o-transition: all 150ms linear;
+        transition: all 150ms linear;
+    }
+    #uvTab {
+        -webkit-transition: all 260ms linear;
+        -moz-transition: all 260ms linear;
+        -ms-transition: all 260ms linear;
+        -o-transition: all 260ms linear;
+        transition: all 260ms linear;
+    }
+    #toolbar {
+        -webkit-transition: all 280ms linear;
+        -moz-transition: all 280ms linear;
+        -ms-transition: all 280ms linear;
+        -o-transition: all 280ms linear;
+        transition: all 280ms linear;
+    }
+    body {
+        background: #788587;
+        color: #424345;
+    }
+    body a {
+        color: #e0e0e0;
+    }
+    body h3 {
+        color: #424345;
+    }
+    .toolbar {
+        background: #788587;
+        margin-top: -45px;
+    }
+    .toolbar:after {
+        display: block;
+        content: "...toolbar";
+        background: rgba(0, 0, 0, 0.07);
+    }
+    .toolbar:hover {
+        margin: 0;
+    }
+    .toolbar:hover:after {
+        display: none;
+    }
+    .page-header {
+        border: none;
+    }
+    .entrylist-header {
+        border: none;
+    }
+    .entrylist-header h3,
+    .entrylist-header a {
+        margin: 0;
+    }
+    .entryList {
+        padding-top: 18px;
+    }
+    #feed-accordion .entry {
+        border: none;
+    }
+    #feed-accordion .unread .entry-heading {
+        background: #c9c9c9;
+    }
+    #feed-accordion .unread:nth-of-type(2n) .entry-heading {
+        background: #ddd;
+    }
+    #feed-accordion .unread .entry-heading:hover,
+    #feed-accordion .unread:nth-of-type(2n):hover {
+        background: #ebebeb;
+    }
+    #feed-accordion .entry-heading-link {
+        color: #5a6069 !important;
+    }
+    #feed-accordion .entry-heading-link:hover {
+        color: #000;
+    }
+    #feed-accordion .entry-body {
+        background: #c7cbcc;
+        padding-left: 15px;
+    }
+    #feed-accordion .entry-body a:not([popup]) {
+        color: #a68589;
+    }
+    #feed-accordion .entry-body a:not([popup]):visited {
+        color: #8d8e8e;
+    }
+    #feed-accordion .entry-body img {
+        -webkit-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        -moz-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        -ms-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        -o-box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+        box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
+    }
+    #feed-accordion .highlight-search {
+        background: inherit;
+    }
+    #feed-accordion .entry-buttons {
+        background: #a68589;
+        margin-left: -15px;
+        border: none;
+    }
+    #feed-accordion.expanded .entry {
+        -webkit-box-shadow: none;
+        -moz-box-shadow: none;
+        -ms-box-shadow: none;
+        -o-box-shadow: none;
+        box-shadow: none;
+        border: none;
+        margin-bottom: 30px;
+    }
+    input[ng-model="keywords"] {
+        border: none;
+        height: 32px;
+        background: #9ba8aa;
+    }
+    .css-treeview .selected {
+        color: #2c4967;
+        text-decoration: underline;
+    }
+    .css-treeview .unread-counter {
+        color: #222;
+    }
+    .css-treeview li .tree-item:hover {
+        background: #ebebeb;
+    }
+    .css-treeview a {
+        color: #5a6069;
+    }
+    .css-treeview a:hover {
+        font-size: 1.02em;
+    }
+    .css-treeview a:hover img {
+        -webkit-border-radius: 1px;
+        -moz-border-radius: 1px;
+        -ms-border-radius: 1px;
+        -o-border-radius: 1px;
+        border-radius: 1px;
+        opacity: 1;
+    }
+    .css-treeview img {
+        -webkit-border-radius: 4px;
+        -moz-border-radius: 4px;
+        -ms-border-radius: 4px;
+        -o-border-radius: 4px;
+        border-radius: 4px;
+        opacity: 0.85;
+    }
+    #uvTab {
+        margin-bottom: -23px;
+    }
+    #uvTab:hover {
+        margin-bottom: 0;
+    }
 }

src/main/app/templates/_category.html

@@ -1,38 +1,66 @@
 <li>
-	<div class="pointer tree-item" ng-if="showLabel" ng-class="getClass(level - 1)" droppable="node">
-		<div class="dropdown pull-right">
-			<div class="pull-right" ng-click="showCategoryDetails(node.id, node.isTag)">
-				<i class="icon-wrench config pointer"></i>
-			</div>
-		</div>
-		<div class="category-link" ng-click="categoryClicked(node.id, node.isTag)" ng-dblclick="showCategoryDetails(node.id, node.isTag)">
-			<span class="fldr">
-				<i ng-class="{'icon-caret-right': !node.expanded, 'icon-caret-down': node.expanded}" ng-click="toggleCategory(node, $event)"
-					ng-show="showChildren"></i>
-				<i ng-class="{'icon-star' : node.id == 'starred', 'icon-inbox': node.id == 'all', 'icon-tag' : node.isTag}" ng-show="!showChildren"></i>
-			</span>
-			<span ng-class="{selected: (node.id == selectedId && (node.isTag ? selectedType == 'tag' : selectedType == 'category'))}">
-				<span ng-class="{unread: unreadCount({category:node})}" class="bidi-embed"> {{categoryLabel(node)}} </span>
-				<span class="unread-counter"> {{categoryCountLabel(node)}} </span>
-			</span>
-		</div>
-	</div>
-	<ul ng-show="node.expanded && showChildren">
-		<recursive> <category ng-repeat="child in node.children"
-			ng-show="settingsService.settings.showRead == true || unreadCount({category:node}) > 0" node="child" level="level + 1"
-			selected-type="selectedType" selected-id="selectedId" show-label="true" show-children="true"
-			unread-count="unreadCount({category:category})"> </category> </recursive>
-		<li ng-repeat="feed in node.feeds" ng-class="getClass(level)" class="tree-item" draggable="feed" droppable="feed"
-			ng-show="settingsService.settings.showRead == true || feed.unread > 0">
-			<div class="pull-right" ng-click="showFeedDetails(feed)">
-				<i class="icon-wrench config pointer"></i>
-			</div>
-			<a ng-click="feedClicked(feed.id, $event)" ng-dblclick="showFeedDetails(feed)" class="feed-link" href="{{feed.feedLink}}" target="_blank"
-				ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed') }">
-				<favicon url="feed.iconUrl" />
-				<span ng-class="{unread: feed.unread}" class="bidi-embed"> {{feed.name}} </span>
-				<span class="unread-counter"> {{feedCountLabel(feed)}} </span>
-			</a>
-		</li>
-	</ul>
+    <div class="pointer tree-item" ng-if="showLabel" ng-class="getClass(level - 1)" droppable="node">
+        <div class="dropdown pull-right">
+            <div class="pull-right" ng-click="showCategoryDetails(node.id, node.isTag)">
+                <i class="icon-wrench config pointer"></i>
+            </div>
+        </div>
+        <div class="category-link" ng-click="categoryClicked(node.id, node.isTag)" ng-dblclick="showCategoryDetails(node.id, node.isTag)">
+            <span class="fldr">
+                <i
+                    ng-class="{'icon-caret-right': !node.expanded, 'icon-caret-down': node.expanded}"
+                    ng-click="toggleCategory(node, $event)"
+                    ng-show="showChildren"
+                ></i>
+                <i
+                    ng-class="{'icon-star' : node.id == 'starred', 'icon-inbox': node.id == 'all', 'icon-tag' : node.isTag}"
+                    ng-show="!showChildren"
+                ></i>
+            </span>
+            <span ng-class="{selected: (node.id == selectedId && (node.isTag ? selectedType == 'tag' : selectedType == 'category'))}">
+                <span ng-class="{unread: unreadCount({category:node})}" class="bidi-embed">{{categoryLabel(node)}}</span>
+                <span class="unread-counter">{{categoryCountLabel(node)}}</span>
+            </span>
+        </div>
+    </div>
+    <ul ng-show="node.expanded && showChildren">
+        <recursive>
+            <category
+                ng-repeat="child in node.children"
+                ng-show="settingsService.settings.showRead == true || unreadCount({category:node}) > 0"
+                node="child"
+                level="level + 1"
+                selected-type="selectedType"
+                selected-id="selectedId"
+                show-label="true"
+                show-children="true"
+                unread-count="unreadCount({category:category})"
+            >
+            </category>
+        </recursive>
+        <li
+            ng-repeat="feed in node.feeds"
+            ng-class="getClass(level)"
+            class="tree-item"
+            draggable="feed"
+            droppable="feed"
+            ng-show="settingsService.settings.showRead == true || feed.unread > 0"
+        >
+            <div class="pull-right" ng-click="showFeedDetails(feed)">
+                <i class="icon-wrench config pointer"></i>
+            </div>
+            <a
+                ng-click="feedClicked(feed.id, $event)"
+                ng-dblclick="showFeedDetails(feed)"
+                class="feed-link"
+                href="{{feed.feedLink}}"
+                target="_blank"
+                ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed') }"
+            >
+                <favicon url="feed.iconUrl" />
+                <span ng-class="{unread: feed.unread}" class="bidi-embed">{{feed.name}}</span>
+                <span class="unread-counter">{{feedCountLabel(feed)}}</span>
+            </a>
+        </li>
+    </ul>
 </li>

src/main/app/templates/_feedsearch.html

@@ -1,29 +1,33 @@
 <div ng-controller="FeedSearchCtrl">
-	<div modal="feedSearchModal" close="close()" options="{dialogClass: 'modal feed-search-dialog'}">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" ng-click="close()">&times;</button>
-					<h4>
-						<input ng-model="filter" class="filter-input"
-							ui-keydown="{'up': 'focusPrevious($event)', 'down': 'focusNext($event)', 'enter': 'openFocused()' }" placeholder="'feedsearch.hint' | translate"
-							focus="feedSearchModal">
-					</h4>
-					<small>{{ 'feedsearch.help' | translate }}</small>
-				</div>
-				<div class="modal-body">
-					<strong>{{ 'feedsearch.result_prefix' | translate }}</strong>
-					<span ng-repeat="feed in (filtered = (CategoryService.feeds | filter:{name: filter} | limitTo:40))">
-						<span ng-class="{block: filter, focus: focus.id == feed.id}" class="feed-link">
-							<a class=" pointer" ng-click="goToFeed(feed.id)">
-								<favicon url="feed.iconUrl" />
-								&nbsp;{{feed.name}}
-							</a>
-							<span ng-show="!filter && !$last">&bull;</span>
-						</span>
-					</span>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
+    <div modal="feedSearchModal" close="close()" options="{dialogClass: 'modal feed-search-dialog'}">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" ng-click="close()">&times;</button>
+                    <h4>
+                        <input
+                            ng-model="filter"
+                            class="filter-input"
+                            ui-keydown="{'up': 'focusPrevious($event)', 'down': 'focusNext($event)', 'enter': 'openFocused()' }"
+                            placeholder="{{'feedsearch.hint' | translate}}"
+                            focus="feedSearchModal"
+                        />
+                    </h4>
+                    <small>{{ 'feedsearch.help' | translate }}</small>
+                </div>
+                <div class="modal-body">
+                    <strong>{{ 'feedsearch.result_prefix' | translate }}</strong>
+                    <span ng-repeat="feed in (filtered = (CategoryService.feeds | filter:{name: filter} | limitTo:40))">
+                        <span ng-class="{block: filter, focus: focus.id == feed.id}" class="feed-link">
+                            <a class="pointer" ng-click="goToFeed(feed.id)">
+                                <favicon url="feed.iconUrl" />
+                                &nbsp;{{feed.name}}
+                            </a>
+                            <span ng-show="!filter && !$last">&bull;</span>
+                        </span>
+                    </span>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/main/app/templates/_footer.html

@@ -1,3 +1,3 @@
 <div ng-controller="FooterController">
-	<iframe ng-if="subToMeUrl" style="display: none;" ng-src='{{subToMeUrl}}'></iframe>
-</div>
+    <iframe ng-if="subToMeUrl" style="display: none" ng-src="{{subToMeUrl}}"></iframe>
+</div>