release: Merge default into stable for release preparation

docs/admin/repo-admin.rst

@@ -0,0 +1,28 b''
+.. _repo-admin-set:
+.. _permissions-info-add-group-ref:
+
+Repository Administration
+=========================
+
+Repository permissions in |RCE| can be managed in a number of different ways.
+This overview should give you an insight into how you could adopt particular
+settings for your needs:
+
+* Global |repo| permissions: This allows you to set the default permissions
+  for each new |repo| created within |RCE|, see :ref:`repo-default-ref`. All
+  |repos| created will inherit these permissions unless explicitly configured.
+* Individual |repo| permissions: To set individual |repo| permissions,
+  see :ref:`set-repo-perms`.
+* Repository Group permissions: This allows you to define the permissions for
+  a group, and all |repos| created within that group will inherit the same
+  permissions.
+
+.. toctree::
+
+    repo_admin/repo-perm-steps
+    repo_admin/repo-extra-fields
+    repo_admin/repo-hooks
+    repo_admin/repo-issue-tracker
+    repo_admin/repo-vcs
+    repo_admin/restore-deleted-repositories
+    repo_admin/repo-admin-tasks
  No newline at end of file

docs/admin/repo_admin/repo-admin-tasks.rst

@@ -0,0 +1,24 b''
+.. _repo-admin-tasks:
+
+Common Admin Tasks for Repositories
+-----------------------------------
+
+
+Manually Force Delete Repository
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In case of attached forks or pull-requests repositories should be archived.
+Here is how to force delete a repository and remove all dependent objects
+
+
+.. code-block:: bash
+
+    # starts the ishell interactive prompt
+    $ rccontrol ishell enterprise-1
+
+.. code-block:: python
+
+    In [4]: from rhodecode.model.repo import RepoModel
+    In [3]: repo = Repository.get_by_repo_name('test_repos/repo_with_prs')
+    In [5]: RepoModel().delete(repo, forks='detach', pull_requests='delete')
+    In [6]: Session().commit()

docs/admin/user_admin/user-admin-tasks.rst

@@ -0,0 +1,24 b''
+.. _user-admin-tasks:
+
+Common Admin Tasks for Users
+----------------------------
+
+
+Manually Set Personal Repository Group
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Here is how to set a repository group as personal for a user using ishell.
+
+
+.. code-block:: bash
+
+    # starts the ishell interactive prompt
+    $ rccontrol ishell enterprise-1
+
+.. code-block:: python
+
+    In [1]: repo_group = RepoGroup.get_by_group_name('some_group_name')
+    In [2]: user = User.get_by_username('some_user')
+    In [3]: repo_group.user = user
+    In [4]: repo_group.personal = True
+    In [5]: Session().add(repo_group);Session().commit()

docs/api/methods/search-methods.rst

@@ -0,0 +1,35 b''
+.. _search-methods-ref:
+
+search methods
+==============
+
+search 
+------
+
+.. py:function:: search(apiuser, search_query, search_type, page_limit=<Optional:10>, page=<Optional:1>, search_sort=<Optional:'newfirst'>, repo_name=<Optional:None>, repo_group_name=<Optional:None>)
+
+   Fetch Full Text Search results using API.
+
+   :param apiuser: This is filled automatically from the |authtoken|.
+   :type apiuser: AuthUser
+   :param search_query: Search query.
+   :type search_query: str
+   :param search_type: Search type. The following are valid options:
+       * commit
+       * content
+       * path
+   :type search_type: str
+   :param page_limit: Page item limit, from 1 to 500. Default 10 items.
+   :type page_limit: Optional(int)
+   :param page: Page number. Default first page.
+   :type page: Optional(int)
+   :param search_sort: Search sort order. Default newfirst. The following are valid options:
+       * newfirst
+       * oldfirst
+   :type search_sort: Optional(str)
+   :param repo_name: Filter by one repo. Default is all.
+   :type repo_name: Optional(str)
+   :param repo_group_name: Filter by one repo group. Default is all.
+   :type repo_group_name: Optional(str)
+
+

docs/release-notes/release-notes-4.17.0.rst

@@ -0,0 +1,85 b''
+|RCE| 4.17.0 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2019-07-04
+
+
+New Features
+^^^^^^^^^^^^
+
+- New artifacts feature.
+  Ability to store binary artifacts for repository with ACL
+- UI/UX refresh for most of the pages. This includes multiple fixes and improvements.
+- Diffs: store wide-diff mode in user sessions to store user preference for diff display.
+- Mercurial: added support for Mercurial 4.9
+- API: Added search API methods
+- Files: adding/editing allows previews for generated content.
+- Files: allowed multi file upload using UI.
+- Repository Groups: last change is now smartly calculated based on latest change
+  from all it's children repositories.
+- Archives: it's now currently possible to download partial directories from files view.
+- SVN: allowed executing pre-commit code with rcextensions, also added example to
+  validate SVN file size and paths on pre-commit level.
+
+
+General
+^^^^^^^
+- Exception store: add filter for display and deletion.
+- Files: loading history doesn't display hidden and obsolete commits anymore.
+- Repositories: bring back missing watch action in summary view.
+- Admin: user groups is now using pure DB filtering to speed up display
+  for large number of groups.
+- Mercurial: enabled full evolve+topic extensions when evolve is enabled.
+- Dependencies: bumped evolve to 8.5.1
+- Dependencies: bumped pyramid to 1.10.4
+- Dependencies: bumped psutil to 5.5.1
+- Dependencies: bumped pygments to 2.4.2
+- Dependencies: bumped pyramid to 1.10.4
+- Dependencies: bumped psycopg2 to 2.8.3
+- Dependencies [security]: updated colander to 1.7.0
+
+
+Security
+^^^^^^^^
+
+- SSH: replaced pycrypto with cryptography to generate SSH keys as pycrypto isn't
+  considered safe anymore.
+
+
+Performance
+^^^^^^^^^^^
+
+- Config: updated header limits on gunicorn to prevent errors on large Mercurial repositories.
+- User sessions: added option to cleanup redis based sessions in user session interface.
+- Authentication: reduced usage of raw auth calls inside templates to speed up rendering.
+- Sessions: don't touch session for API calls. Before each API call created new session
+  object which wasn't required.
+
+
+Fixes
+^^^^^
+
+- hHooks: fixed more unicode problems with new pull-request link generator.
+- Mercurial: fix ssh-server support for mercurial custom options.
+- Pull requests: updated metadata information for failed merges with multiple heads.
+- Pull requests: calculate ancestor in the same way as creation mode.
+  Fixed problem with updates generating wrong diffs in case of merges.
+- Pull requests: fixed a bug in removal of multiple reviewers at once.
+- Summary: fix timeout issues loading summary page without styling.
+- SSH: fix invocation of custom hgrc.
+- SSH: call custom hooks via SSH backend
+- Markup: fix styling for check-lists.
+- Archives: allows downloading refs that have slashes and special refs. e.g f/feat1 branch names.
+- Files: ensure we generate archives with consistent hashing (except for .tar.gz which uses temp files names in header)
+- Files: fixed rendering of readme files under non-ascii paths.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- In this release we introduced new UI across the application.
+  In case of problems with the display on your systems please send us info to [e-mail].
+

requirements_pinned.txt

@@ -0,0 +1,19 b''
+# contains not directly required libraries we want to pin the version.
+
+atomicwrites==1.2.1
+attrs==18.2.0
+billiard==3.5.0.3
+chameleon==2.24
+cffi==1.12.2
+ecdsa==0.13.2
+hupper==1.6.1
+gnureadline==6.3.8
+jinja2==2.9.6
+jsonschema==2.6.0
+pyramid-jinja2==2.7
+pluggy==0.11.0
+setproctitle==1.1.10
+scandir==1.10.0
+tempita==0.5.2
+vine==1.3.0
+configparser==3.7.4

rhodecode/api/tests/test_fts_search.py

@@ -0,0 +1,93 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2019 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import pytest
+from rhodecode.tests import HG_REPO
+from rhodecode.api.tests.utils import (
+    build_data, api_call, assert_error, assert_ok)
+
+
[e-mail]("testuser_api", "app")
+class TestApiSearch(object):
+
+    @pytest.mark.parametrize("query, expected_hits, expected_paths", [
+        ('todo', 23, [
+            'vcs/backends/hg/inmemory.py',
+            'vcs/tests/test_git.py']),
+        ('extension:rst installation', 6, [
+            'docs/index.rst',
+            'docs/installation.rst']),
+        ('def repo', 87, [
+            'vcs/tests/test_git.py',
+            'vcs/tests/test_changesets.py']),
+        ('repository:%s def test' % HG_REPO, 18, [
+            'vcs/tests/test_git.py',
+            'vcs/tests/test_changesets.py']),
+        ('"def main"', 9, [
+            'vcs/__init__.py',
+            'vcs/tests/__init__.py',
+            'vcs/utils/progressbar.py']),
+        ('owner:test_admin', 358, [
+            'vcs/tests/base.py',
+            'MANIFEST.in',
+            'vcs/utils/termcolors.py',
+            'docs/theme/ADC/static/documentation.png']),
+        ('owner:test_admin def main', 72, [
+            'vcs/__init__.py',
+            'vcs/tests/test_utils_filesize.py',
+            'vcs/tests/test_cli.py']),
+        ('owner:michał test', 0, []),
+    ])
+    def test_search_content_results(self, query, expected_hits, expected_paths):
+        id_, params = build_data(
+            self.apikey_regular, 'search',
+            search_query=query,
+            search_type='content')
+
+        response = api_call(self.app, params)
+        json_response = response.json
+
+        assert json_response['result']['item_count'] == expected_hits
+        paths = [x['f_path'] for x in json_response['result']['results']]
+
+        for expected_path in expected_paths:
+            assert expected_path in paths
+
+    @pytest.mark.parametrize("query, expected_hits, expected_paths", [
+        ('readme.rst', 3, []),
+        ('test*', 75, []),
+        ('*model*', 1, []),
+        ('extension:rst', 48, []),
+        ('extension:rst api', 24, []),
+    ])
+    def test_search_file_paths(self, query, expected_hits, expected_paths):
+        id_, params = build_data(
+            self.apikey_regular, 'search',
+            search_query=query,
+            search_type='path')
+
+        response = api_call(self.app, params)
+        json_response = response.json
+
+        assert json_response['result']['item_count'] == expected_hits
+        paths = [x['f_path'] for x in json_response['result']['results']]
+
+        for expected_path in expected_paths:
+            assert expected_path in paths

rhodecode/api/views/search_api.py

@@ -0,0 +1,112 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2019 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+
+import logging
+
+from rhodecode.api import jsonrpc_method
+from rhodecode.api.exc import JSONRPCValidationError
+from rhodecode.api.utils import Optional
+from rhodecode.lib.index import searcher_from_config
+from rhodecode.model import validation_schema
+from rhodecode.model.validation_schema.schemas import search_schema
+
+log = logging.getLogger(__name__)
+
+
+@jsonrpc_method()
+def search(request, apiuser, search_query, search_type, page_limit=Optional(10),
+           page=Optional(1), search_sort=Optional('newfirst'),
+           repo_name=Optional(None), repo_group_name=Optional(None)):
+    """
+    Fetch Full Text Search results using API.
+
+    :param apiuser: This is filled automatically from the |authtoken|.
+    :type apiuser: AuthUser
+    :param search_query: Search query.
+    :type search_query: str
+    :param search_type: Search type. The following are valid options:
+        * commit
+        * content
+        * path
+    :type search_type: str
+    :param page_limit: Page item limit, from 1 to 500. Default 10 items.
+    :type page_limit: Optional(int)
+    :param page: Page number. Default first page.
+    :type page: Optional(int)
+    :param search_sort: Search sort order. Default newfirst. The following are valid options:
+        * newfirst
+        * oldfirst
+    :type search_sort: Optional(str)
+    :param repo_name: Filter by one repo. Default is all.
+    :type repo_name: Optional(str)
+    :param repo_group_name: Filter by one repo group. Default is all.
+    :type repo_group_name: Optional(str)
+    """
+
+    data = {'execution_time': ''}
+    repo_name = Optional.extract(repo_name)
+    repo_group_name = Optional.extract(repo_group_name)
+
+    schema = search_schema.SearchParamsSchema()
+
+    try:
+        search_params = schema.deserialize(
+            dict(search_query=search_query,
+                 search_type=search_type,
+                 search_sort=Optional.extract(search_sort),
+                 page_limit=Optional.extract(page_limit),
+                 requested_page=Optional.extract(page))
+        )
+    except validation_schema.Invalid as err:
+        raise JSONRPCValidationError(colander_exc=err)
+
+    search_query = search_params.get('search_query')
+    search_type = search_params.get('search_type')
+    search_sort = search_params.get('search_sort')
+
+    if search_params.get('search_query'):
+        page_limit = search_params['page_limit']
+        requested_page = search_params['requested_page']
+
+        searcher = searcher_from_config(request.registry.settings)
+
+        try:
+            search_result = searcher.search(
+                search_query, search_type, apiuser, repo_name, repo_group_name,
+                requested_page=requested_page, page_limit=page_limit, sort=search_sort)
+
+            data.update(dict(
+                results=list(search_result['results']), page=requested_page,
+                item_count=search_result['count'],
+                items_per_page=page_limit))
+        finally:
+            searcher.cleanup()
+
+        if not search_result['error']:
+            data['execution_time'] = '%s results (%.3f seconds)' % (
+                search_result['count'],
+                search_result['runtime'])
+        else:
+            node = schema['search_query']
+            raise JSONRPCValidationError(
+                colander_exc=validation_schema.Invalid(node, search_result['error']))
+
+    return data

rhodecode/apps/repository/views/repo_artifacts.py

@@ -0,0 +1,48 b''
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2011-2019 RhodeCode GmbH
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License, version 3
+# (only), as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# This program is dual-licensed. If you wish to learn more about the
+# RhodeCode Enterprise Edition, including its added features, Support services,
+# and proprietary license terms, please see https://rhodecode.com/licenses/
+
+import logging
+
+from pyramid.view import view_config
+
+from rhodecode.apps._base import RepoAppView
+from rhodecode.lib.auth import (
+    LoginRequired, HasRepoPermissionAnyDecorator)
+
+log = logging.getLogger(__name__)
+
+
+class RepoArtifactsView(RepoAppView):
+
+    def load_default_context(self):
+        c = self._get_local_tmpl_context(include_app_defaults=True)
+        c.rhodecode_repo = self.rhodecode_vcs_repo
+        return c
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator(
+        'repository.read', 'repository.write', 'repository.admin')
+    @view_config(
+        route_name='repo_artifacts_list', request_method='GET',
+        renderer='rhodecode:templates/artifacts/artifact_list.mako')
+    def repo_artifacts(self):
+        c = self.load_default_context()
+        c.active = 'artifacts'
+        return self._get_template_context(c)

rhodecode/lib/dbmigrate/versions/096_version_4_17_0.py

@@ -0,0 +1,55 b''
+# -*- coding: utf-8 -*-
+
+import logging
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+from sqlalchemy import String, Column
+from sqlalchemy.sql import text
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.lib.utils2 import safe_str
+from rhodecode.model import meta, init_model_encryption
+from rhodecode.model.db import RepoGroup
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2
+
+    init_model_encryption(db_4_16_0_2)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    repo_group = db_4_16_0_2.RepoGroup.__table__
+
+    with op.batch_alter_table(repo_group.name) as batch_op:
+        batch_op.add_column(
+            Column("repo_group_name_hash", String(1024), nullable=True, unique=False))
+
+    _generate_repo_group_name_hashes(db_4_16_0_2, op, meta.Session)
+
+
+def downgrade(migrate_engine):
+    pass
+
+
+def _generate_repo_group_name_hashes(models, op, session):
+    repo_groups = models.RepoGroup.get_all()
+    for repo_group in repo_groups:
+        print(safe_str(repo_group.group_name))
+        hash_ = RepoGroup.hash_repo_group_name(repo_group.group_name)
+        params = {'hash': hash_, 'id': repo_group.group_id}
+        query = text(
+            'UPDATE groups SET repo_group_name_hash = :hash'
+            ' WHERE group_id = :id').bindparams(**params)
+        op.execute(query)
+    session().commit()

rhodecode/lib/dbmigrate/versions/097_version_4_17_0.py

@@ -0,0 +1,35 b''
+# -*- coding: utf-8 -*-
+
+import logging
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2
+
+    init_model_encryption(db_4_16_0_2)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    repo_group = db_4_16_0_2.RepoGroup.__table__
+
+    with op.batch_alter_table(repo_group.name) as batch_op:
+        batch_op.alter_column("repo_group_name_hash", nullable=False)
+
+
+def downgrade(migrate_engine):
+    pass

rhodecode/lib/dbmigrate/versions/098_version_4_17_0.py

@@ -0,0 +1,37 b''
+# -*- coding: utf-8 -*-
+
+import logging
+
+from alembic.migration import MigrationContext
+from alembic.operations import Operations
+from sqlalchemy import Column, LargeBinary
+
+from rhodecode.lib.dbmigrate.versions import _reset_base
+from rhodecode.model import init_model_encryption
+
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2
+
+    init_model_encryption(db_4_16_0_2)
+
+    context = MigrationContext.configure(migrate_engine.connect())
+    op = Operations(context)
+
+    repo_group = db_4_16_0_2.RepoGroup.__table__
+
+    with op.batch_alter_table(repo_group.name) as batch_op:
+        batch_op.add_column(
+            Column("changeset_cache", LargeBinary(1024), nullable=True))
+
+
+def downgrade(migrate_engine):
+    pass

rhodecode/lib/encrypt2.py

@@ -0,0 +1,69 b''
+import os
+import base64
+from cryptography.fernet import Fernet, InvalidToken
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
+
+
+class Encryptor(object):
+    key_format = 'enc2$salt:{}$data:{}'
+    pref_len = 5  # salt:, data:
+
+    def __init__(self, enc_key):
+        self.enc_key = enc_key
+
+    def b64_encode(self, data):
+        return base64.urlsafe_b64encode(data)
+
+    def b64_decode(self, data):
+        return base64.urlsafe_b64decode(data)
+
+    def get_encryptor(self, salt):
+        """
+        Uses Fernet as encryptor with HMAC signature
+        :param salt: random salt used for encrypting the data
+        """
+        kdf = PBKDF2HMAC(
+            algorithm=hashes.SHA512(),
+            length=32,
+            salt=salt,
+            iterations=100000,
+            backend=default_backend()
+        )
+        key = self.b64_encode(kdf.derive(self.enc_key))
+        return Fernet(key)
+
+    def _get_parts(self, enc_data):
+        parts = enc_data.split('$', 3)
+        if len(parts) != 3:
+            raise ValueError('Encrypted Data has invalid format, expected {}'.format(self.key_format))
+        prefix, salt, enc_data = parts
+
+        try:
+            salt = self.b64_decode(salt[self.pref_len:])
+        except TypeError:
+            # bad base64
+            raise ValueError('Encrypted Data salt invalid format, expected base64 format')
+
+        enc_data = enc_data[self.pref_len:]
+        return prefix, salt, enc_data
+
+    def encrypt(self, data):
+        salt = os.urandom(64)
+        encryptor = self.get_encryptor(salt)
+        enc_data = encryptor.encrypt(data)
+        return self.key_format.format(self.b64_encode(salt), enc_data)
+
+    def decrypt(self, data, safe=True):
+        parts = self._get_parts(data)
+        salt = parts[1]
+        enc_data = parts[2]
+        encryptor = self.get_encryptor(salt)
+        try:
+            return encryptor.decrypt(enc_data)
+        except (InvalidToken,):
+            if safe:
+                return ''
+            else:
+                raise

rhodecode/lib/rc_beaker.py

@@ -0,0 +1,200 b''
+# Copyright (c) 2010 Agendaless Consulting and Contributors.
+# (http://www.agendaless.com), All Rights Reserved
+# License: BSD-derived (http://www.repoze.org/LICENSE.txt)
+# With Patches from RhodeCode GmBH
+
+
+import os
+
+from beaker import cache
+from beaker.session import SessionObject
+from beaker.util import coerce_cache_params
+from beaker.util import coerce_session_params
+
+from pyramid.interfaces import ISession
+from pyramid.settings import asbool
+from zope.interface import implementer
+
+from binascii import hexlify
+
+
+def BeakerSessionFactoryConfig(**options):
+    """ Return a Pyramid session factory using Beaker session settings
+    supplied directly as ``**options``"""
+
+    class PyramidBeakerSessionObject(SessionObject):
+        _options = options
+        _cookie_on_exception = _options.pop('cookie_on_exception', True)
+        _constant_csrf_token = _options.pop('constant_csrf_token', False)
+
+        def __init__(self, request):
+            SessionObject.__init__(self, request.environ, **self._options)
+
+            def session_callback(request, response):
+                exception = getattr(request, 'exception', None)
+                if (exception is None or self._cookie_on_exception) and self.accessed():
+                    self.persist()
+                    headers = self.__dict__['_headers']
+                    if headers['set_cookie'] and headers['cookie_out']:
+                        response.headerlist.append(('Set-Cookie', headers['cookie_out']))
+            request.add_response_callback(session_callback)
+
+        # ISession API
+
+        @property
+        def id(self):
+            # this is as inspected in SessionObject.__init__
+            if self.__dict__['_params'].get('type') != 'cookie':
+                return self._session().id
+            return None
+
+        @property
+        def new(self):
+            return self.last_accessed is None
+
+        changed = SessionObject.save
+
+        # modifying dictionary methods
+
+        @call_save
+        def clear(self):
+            return self._session().clear()
+
+        @call_save
+        def update(self, d, **kw):
+            return self._session().update(d, **kw)
+
+        @call_save
+        def setdefault(self, k, d=None):
+            return self._session().setdefault(k, d)
+
+        @call_save
+        def pop(self, k, d=None):
+            return self._session().pop(k, d)
+
+        @call_save
+        def popitem(self):
+            return self._session().popitem()
+
+        __setitem__ = call_save(SessionObject.__setitem__)
+        __delitem__ = call_save(SessionObject.__delitem__)
+
+        # Flash API methods
+        def flash(self, msg, queue='', allow_duplicate=True):
+            storage = self.setdefault('_f_' + queue, [])
+            if allow_duplicate or (msg not in storage):
+                storage.append(msg)
+
+        def pop_flash(self, queue=''):
+            storage = self.pop('_f_' + queue, [])
+            return storage
+
+        def peek_flash(self, queue=''):
+            storage = self.get('_f_' + queue, [])
+            return storage
+
+        # CSRF API methods
+        def new_csrf_token(self):
+            token = (self._constant_csrf_token
+                     or hexlify(os.urandom(20)).decode('ascii'))
+            self['_csrft_'] = token
+            return token
+
+        def get_csrf_token(self):
+            token = self.get('_csrft_', None)
+            if token is None:
+                token = self.new_csrf_token()
+            return token
+
+    return implementer(ISession)(PyramidBeakerSessionObject)
+
+
+def call_save(wrapped):
+    """ By default, in non-auto-mode beaker badly wants people to
+    call save even though it should know something has changed when
+    a mutating method is called.  This hack should be removed if
+    Beaker ever starts to do this by default. """
+    def save(session, *arg, **kw):
+        value = wrapped(session, *arg, **kw)
+        session.save()
+        return value
+    save.__doc__ = wrapped.__doc__
+    return save
+
+
+def session_factory_from_settings(settings):
+    """ Return a Pyramid session factory using Beaker session settings
+    supplied from a Paste configuration file"""
+    prefixes = ('session.', 'beaker.session.')
+    options = {}
+
+    # Pull out any config args meant for beaker session. if there are any
+    for k, v in settings.items():
+        for prefix in prefixes:
+            if k.startswith(prefix):
+                option_name = k[len(prefix):]
+                if option_name == 'cookie_on_exception':
+                    v = asbool(v)
+                options[option_name] = v
+
+    options = coerce_session_params(options)
+    return BeakerSessionFactoryConfig(**options)
+
+
+def set_cache_regions_from_settings(settings):
+    """ Add cache support to the Pylons application.
+
+    The ``settings`` passed to the configurator are used to setup
+    the cache options. Cache options in the settings should start
+    with either 'beaker.cache.' or 'cache.'.
+
+    """
+    cache_settings = {'regions': []}
+    for key in settings.keys():
+        for prefix in ['beaker.cache.', 'cache.']:
+            if key.startswith(prefix):
+                name = key.split(prefix)[1].strip()
+                cache_settings[name] = settings[key].strip()
+
+    if ('expire' in cache_settings
+            and isinstance(cache_settings['expire'], basestring)
+            and cache_settings['expire'].lower() in ['none', 'no']):
+        cache_settings['expire'] = None
+
+    coerce_cache_params(cache_settings)
+
+    if 'enabled' not in cache_settings:
+        cache_settings['enabled'] = True
+
+    regions = cache_settings['regions']
+    if regions:
+        for region in regions:
+            if not region:
+                continue
+
+            region_settings = {
+                'data_dir': cache_settings.get('data_dir'),
+                'lock_dir': cache_settings.get('lock_dir'),
+                'expire': cache_settings.get('expire', 60),
+                'enabled': cache_settings['enabled'],
+                'key_length': cache_settings.get('key_length', 250),
+                'type': cache_settings.get('type'),
+                'url': cache_settings.get('url'),
+            }
+            region_prefix = '%s.' % region
+            region_len = len(region_prefix)
+            for key in list(cache_settings.keys()):
+                if key.startswith(region_prefix):
+                    region_settings[key[region_len:]] = cache_settings.pop(key)
+
+            if (isinstance(region_settings['expire'], basestring)
+                    and region_settings['expire'].lower() in ['none', 'no']):
+                region_settings['expire'] = None
+            coerce_cache_params(region_settings)
+            cache.cache_regions[region] = region_settings
+
+
+def includeme(config):
+    session_factory = session_factory_from_settings(config.registry.settings)
+    config.set_session_factory(session_factory)
+    set_cache_regions_from_settings(config.registry.settings)

rhodecode/public/css/ipython.less

@@ -0,0 +1,11669 b''
+div.ipynb {
+/*!
+*
+* Twitter Bootstrap
+*
+*/
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+audio,
+canvas,
+progress,
+video {
+  display: inline-block;
+  vertical-align: baseline;
+}
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+[hidden],
+template {
+  display: none;
+}
+a {
+  background-color: transparent;
+}
+a:active,
+a:hover {
+  outline: 0;
+}
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+b,
+strong {
+  font-weight: bold;
+}
+dfn {
+  font-style: italic;
+}
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+mark {
+  background: #ff0;
+  color: #000;
+}
+small {
+  font-size: 80%;
+}
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  border: 0;
+}
+svg:not(:root) {
+  overflow: hidden;
+}
+figure {
+  margin: 1em 40px;
+}
+hr {
+  box-sizing: content-box;
+  height: 0;
+}
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit;
+  font: inherit;
+  margin: 0;
+}
+button {
+  overflow: visible;
+}
+button,
+select {
+  text-transform: none;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button;
+  cursor: pointer;
+}
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box;
+  padding: 0;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+input[type="search"] {
+  -webkit-appearance: textfield;
+  box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
+  border: 0;
+  padding: 0;
+}
+textarea {
+  overflow: auto;
+}
+optgroup {
+  font-weight: bold;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+td,
+th {
+  padding: 0;
+}
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+@media print {
+  *,
+  *:before,
+  *:after {
+    background: transparent !important;
+    color: #000 !important;
+    box-shadow: none !important;
+    text-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  a[href^="#"]:after,
+  a[href^="javascript:"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+  .navbar {
+    display: none;
+  }
+  .btn > .caret,
+  .dropup > .btn > .caret {
+    border-top-color: #000 !important;
+  }
+  .label {
+    border: 1px solid #000;
+  }
+  .table {
+    border-collapse: collapse !important;
+  }
+  .table td,
+  .table th {
+    background-color: #fff !important;
+  }
+  .table-bordered th,
+  .table-bordered td {
+    border: 1px solid #ddd !important;
+  }
+}
+@font-face {
+  font-family: 'Glyphicons Halflings';
+  src: url('../components/bootstrap/fonts/glyphicons-halflings-regular.eot');
+  src: url('../components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.glyphicon-asterisk:before {
+  content: "\002a";
+}
+.glyphicon-plus:before {
+  content: "\002b";
+}
+.glyphicon-euro:before,
+.glyphicon-eur:before {
+  content: "\20ac";
+}
+.glyphicon-minus:before {
+  content: "\2212";
+}
+.glyphicon-cloud:before {
+  content: "\2601";
+}
+.glyphicon-envelope:before {
+  content: "\2709";
+}
+.glyphicon-pencil:before {
+  content: "\270f";
+}
+.glyphicon-glass:before {
+  content: "\e001";
+}
+.glyphicon-music:before {
+  content: "\e002";
+}
+.glyphicon-search:before {
+  content: "\e003";
+}
+.glyphicon-heart:before {
+  content: "\e005";
+}
+.glyphicon-star:before {
+  content: "\e006";
+}
+.glyphicon-star-empty:before {
+  content: "\e007";
+}
+.glyphicon-user:before {
+  content: "\e008";
+}
+.glyphicon-film:before {
+  content: "\e009";
+}
+.glyphicon-th-large:before {
+  content: "\e010";
+}
+.glyphicon-th:before {
+  content: "\e011";
+}
+.glyphicon-th-list:before {
+  content: "\e012";
+}
+.glyphicon-ok:before {
+  content: "\e013";
+}
+.glyphicon-remove:before {
+  content: "\e014";
+}
+.glyphicon-zoom-in:before {
+  content: "\e015";
+}
+.glyphicon-zoom-out:before {
+  content: "\e016";
+}
+.glyphicon-off:before {
+  content: "\e017";
+}
+.glyphicon-signal:before {
+  content: "\e018";
+}
+.glyphicon-cog:before {
+  content: "\e019";
+}
+.glyphicon-trash:before {
+  content: "\e020";
+}
+.glyphicon-home:before {
+  content: "\e021";
+}
+.glyphicon-file:before {
+  content: "\e022";
+}
+.glyphicon-time:before {
+  content: "\e023";
+}
+.glyphicon-road:before {
+  content: "\e024";
+}
+.glyphicon-download-alt:before {
+  content: "\e025";
+}
+.glyphicon-download:before {
+  content: "\e026";
+}
+.glyphicon-upload:before {
+  content: "\e027";
+}
+.glyphicon-inbox:before {
+  content: "\e028";
+}
+.glyphicon-play-circle:before {
+  content: "\e029";
+}
+.glyphicon-repeat:before {
+  content: "\e030";
+}
+.glyphicon-refresh:before {
+  content: "\e031";
+}
+.glyphicon-list-alt:before {
+  content: "\e032";
+}
+.glyphicon-lock:before {
+  content: "\e033";
+}
+.glyphicon-flag:before {
+  content: "\e034";
+}
+.glyphicon-headphones:before {
+  content: "\e035";
+}
+.glyphicon-volume-off:before {
+  content: "\e036";
+}
+.glyphicon-volume-down:before {
+  content: "\e037";
+}
+.glyphicon-volume-up:before {
+  content: "\e038";
+}
+.glyphicon-qrcode:before {
+  content: "\e039";
+}
+.glyphicon-barcode:before {
+  content: "\e040";
+}
+.glyphicon-tag:before {
+  content: "\e041";
+}
+.glyphicon-tags:before {
+  content: "\e042";
+}
+.glyphicon-book:before {
+  content: "\e043";
+}
+.glyphicon-bookmark:before {
+  content: "\e044";
+}
+.glyphicon-print:before {
+  content: "\e045";
+}
+.glyphicon-camera:before {
+  content: "\e046";
+}
+.glyphicon-font:before {
+  content: "\e047";
+}
+.glyphicon-bold:before {
+  content: "\e048";
+}
+.glyphicon-italic:before {
+  content: "\e049";
+}
+.glyphicon-text-height:before {
+  content: "\e050";
+}
+.glyphicon-text-width:before {
+  content: "\e051";
+}
+.glyphicon-align-left:before {
+  content: "\e052";
+}
+.glyphicon-align-center:before {
+  content: "\e053";
+}
+.glyphicon-align-right:before {
+  content: "\e054";
+}
+.glyphicon-align-justify:before {
+  content: "\e055";
+}
+.glyphicon-list:before {
+  content: "\e056";
+}
+.glyphicon-indent-left:before {
+  content: "\e057";
+}
+.glyphicon-indent-right:before {
+  content: "\e058";
+}
+.glyphicon-facetime-video:before {
+  content: "\e059";
+}
+.glyphicon-picture:before {
+  content: "\e060";
+}
+.glyphicon-map-marker:before {
+  content: "\e062";
+}
+.glyphicon-adjust:before {
+  content: "\e063";
+}
+.glyphicon-tint:before {
+  content: "\e064";
+}
+.glyphicon-edit:before {
+  content: "\e065";
+}
+.glyphicon-share:before {
+  content: "\e066";
+}
+.glyphicon-check:before {
+  content: "\e067";
+}
+.glyphicon-move:before {
+  content: "\e068";
+}
+.glyphicon-step-backward:before {
+  content: "\e069";
+}
+.glyphicon-fast-backward:before {
+  content: "\e070";
+}
+.glyphicon-backward:before {
+  content: "\e071";
+}
+.glyphicon-play:before {
+  content: "\e072";
+}
+.glyphicon-pause:before {
+  content: "\e073";
+}
+.glyphicon-stop:before {
+  content: "\e074";
+}
+.glyphicon-forward:before {
+  content: "\e075";
+}
+.glyphicon-fast-forward:before {
+  content: "\e076";
+}
+.glyphicon-step-forward:before {
+  content: "\e077";
+}
+.glyphicon-eject:before {
+  content: "\e078";
+}
+.glyphicon-chevron-left:before {
+  content: "\e079";
+}
+.glyphicon-chevron-right:before {
+  content: "\e080";
+}
+.glyphicon-plus-sign:before {
+  content: "\e081";
+}
+.glyphicon-minus-sign:before {
+  content: "\e082";
+}
+.glyphicon-remove-sign:before {
+  content: "\e083";
+}
+.glyphicon-ok-sign:before {
+  content: "\e084";
+}
+.glyphicon-question-sign:before {
+  content: "\e085";
+}
+.glyphicon-info-sign:before {
+  content: "\e086";
+}
+.glyphicon-screenshot:before {
+  content: "\e087";
+}
+.glyphicon-remove-circle:before {
+  content: "\e088";
+}
+.glyphicon-ok-circle:before {
+  content: "\e089";
+}
+.glyphicon-ban-circle:before {
+  content: "\e090";
+}
+.glyphicon-arrow-left:before {
+  content: "\e091";
+}
+.glyphicon-arrow-right:before {
+  content: "\e092";
+}
+.glyphicon-arrow-up:before {
+  content: "\e093";
+}
+.glyphicon-arrow-down:before {
+  content: "\e094";
+}
+.glyphicon-share-alt:before {
+  content: "\e095";
+}
+.glyphicon-resize-full:before {
+  content: "\e096";
+}
+.glyphicon-resize-small:before {
+  content: "\e097";
+}
+.glyphicon-exclamation-sign:before {
+  content: "\e101";
+}
+.glyphicon-gift:before {
+  content: "\e102";
+}
+.glyphicon-leaf:before {
+  content: "\e103";
+}
+.glyphicon-fire:before {
+  content: "\e104";
+}
+.glyphicon-eye-open:before {
+  content: "\e105";
+}
+.glyphicon-eye-close:before {
+  content: "\e106";
+}
+.glyphicon-warning-sign:before {
+  content: "\e107";
+}
+.glyphicon-plane:before {
+  content: "\e108";
+}
+.glyphicon-calendar:before {
+  content: "\e109";
+}
+.glyphicon-random:before {
+  content: "\e110";
+}
+.glyphicon-comment:before {
+  content: "\e111";
+}
+.glyphicon-magnet:before {
+  content: "\e112";
+}
+.glyphicon-chevron-up:before {
+  content: "\e113";
+}
+.glyphicon-chevron-down:before {
+  content: "\e114";
+}
+.glyphicon-retweet:before {
+  content: "\e115";
+}
+.glyphicon-shopping-cart:before {
+  content: "\e116";
+}
+.glyphicon-folder-close:before {
+  content: "\e117";
+}
+.glyphicon-folder-open:before {
+  content: "\e118";
+}
+.glyphicon-resize-vertical:before {
+  content: "\e119";
+}
+.glyphicon-resize-horizontal:before {
+  content: "\e120";
+}
+.glyphicon-hdd:before {
+  content: "\e121";
+}
+.glyphicon-bullhorn:before {
+  content: "\e122";
+}
+.glyphicon-bell:before {
+  content: "\e123";
+}
+.glyphicon-certificate:before {
+  content: "\e124";
+}
+.glyphicon-thumbs-up:before {
+  content: "\e125";
+}
+.glyphicon-thumbs-down:before {
+  content: "\e126";
+}
+.glyphicon-hand-right:before {
+  content: "\e127";
+}
+.glyphicon-hand-left:before {
+  content: "\e128";
+}
+.glyphicon-hand-up:before {
+  content: "\e129";
+}
+.glyphicon-hand-down:before {
+  content: "\e130";
+}
+.glyphicon-circle-arrow-right:before {
+  content: "\e131";
+}
+.glyphicon-circle-arrow-left:before {
+  content: "\e132";
+}
+.glyphicon-circle-arrow-up:before {
+  content: "\e133";
+}
+.glyphicon-circle-arrow-down:before {
+  content: "\e134";
+}
+.glyphicon-globe:before {
+  content: "\e135";
+}
+.glyphicon-wrench:before {
+  content: "\e136";
+}
+.glyphicon-tasks:before {
+  content: "\e137";
+}
+.glyphicon-filter:before {
+  content: "\e138";
+}
+.glyphicon-briefcase:before {
+  content: "\e139";
+}
+.glyphicon-fullscreen:before {
+  content: "\e140";
+}
+.glyphicon-dashboard:before {
+  content: "\e141";
+}
+.glyphicon-paperclip:before {
+  content: "\e142";
+}
+.glyphicon-heart-empty:before {
+  content: "\e143";
+}
+.glyphicon-link:before {
+  content: "\e144";
+}
+.glyphicon-phone:before {
+  content: "\e145";
+}
+.glyphicon-pushpin:before {
+  content: "\e146";
+}
+.glyphicon-usd:before {
+  content: "\e148";
+}
+.glyphicon-gbp:before {
+  content: "\e149";
+}
+.glyphicon-sort:before {
+  content: "\e150";
+}
+.glyphicon-sort-by-alphabet:before {
+  content: "\e151";
+}
+.glyphicon-sort-by-alphabet-alt:before {
+  content: "\e152";
+}
+.glyphicon-sort-by-order:before {
+  content: "\e153";
+}
+.glyphicon-sort-by-order-alt:before {
+  content: "\e154";
+}
+.glyphicon-sort-by-attributes:before {
+  content: "\e155";
+}
+.glyphicon-sort-by-attributes-alt:before {
+  content: "\e156";
+}
+.glyphicon-unchecked:before {
+  content: "\e157";
+}
+.glyphicon-expand:before {
+  content: "\e158";
+}
+.glyphicon-collapse-down:before {
+  content: "\e159";
+}
+.glyphicon-collapse-up:before {
+  content: "\e160";
+}
+.glyphicon-log-in:before {
+  content: "\e161";
+}
+.glyphicon-flash:before {
+  content: "\e162";
+}
+.glyphicon-log-out:before {
+  content: "\e163";
+}
+.glyphicon-new-window:before {
+  content: "\e164";
+}
+.glyphicon-record:before {
+  content: "\e165";
+}
+.glyphicon-save:before {
+  content: "\e166";
+}
+.glyphicon-open:before {
+  content: "\e167";
+}
+.glyphicon-saved:before {
+  content: "\e168";
+}
+.glyphicon-import:before {
+  content: "\e169";
+}
+.glyphicon-export:before {
+  content: "\e170";
+}
+.glyphicon-send:before {
+  content: "\e171";
+}
+.glyphicon-floppy-disk:before {
+  content: "\e172";
+}
+.glyphicon-floppy-saved:before {
+  content: "\e173";
+}
+.glyphicon-floppy-remove:before {
+  content: "\e174";
+}
+.glyphicon-floppy-save:before {
+  content: "\e175";
+}
+.glyphicon-floppy-open:before {
+  content: "\e176";
+}
+.glyphicon-credit-card:before {
+  content: "\e177";
+}
+.glyphicon-transfer:before {
+  content: "\e178";
+}
+.glyphicon-cutlery:before {
+  content: "\e179";
+}
+.glyphicon-header:before {
+  content: "\e180";
+}
+.glyphicon-compressed:before {
+  content: "\e181";
+}
+.glyphicon-earphone:before {
+  content: "\e182";
+}
+.glyphicon-phone-alt:before {
+  content: "\e183";
+}
+.glyphicon-tower:before {
+  content: "\e184";
+}
+.glyphicon-stats:before {
+  content: "\e185";
+}
+.glyphicon-sd-video:before {
+  content: "\e186";
+}
+.glyphicon-hd-video:before {
+  content: "\e187";
+}
+.glyphicon-subtitles:before {
+  content: "\e188";
+}
+.glyphicon-sound-stereo:before {
+  content: "\e189";
+}
+.glyphicon-sound-dolby:before {
+  content: "\e190";
+}
+.glyphicon-sound-5-1:before {
+  content: "\e191";
+}
+.glyphicon-sound-6-1:before {
+  content: "\e192";
+}
+.glyphicon-sound-7-1:before {
+  content: "\e193";
+}
+.glyphicon-copyright-mark:before {
+  content: "\e194";
+}
+.glyphicon-registration-mark:before {
+  content: "\e195";
+}
+.glyphicon-cloud-download:before {
+  content: "\e197";
+}
+.glyphicon-cloud-upload:before {
+  content: "\e198";
+}
+.glyphicon-tree-conifer:before {
+  content: "\e199";
+}
+.glyphicon-tree-deciduous:before {
+  content: "\e200";
+}
+.glyphicon-cd:before {
+  content: "\e201";
+}
+.glyphicon-save-file:before {
+  content: "\e202";
+}
+.glyphicon-open-file:before {
+  content: "\e203";
+}
+.glyphicon-level-up:before {
+  content: "\e204";
+}
+.glyphicon-copy:before {
+  content: "\e205";
+}
+.glyphicon-paste:before {
+  content: "\e206";
+}
+.glyphicon-alert:before {
+  content: "\e209";
+}
+.glyphicon-equalizer:before {
+  content: "\e210";
+}
+.glyphicon-king:before {
+  content: "\e211";
+}
+.glyphicon-queen:before {
+  content: "\e212";
+}
+.glyphicon-pawn:before {
+  content: "\e213";
+}
+.glyphicon-bishop:before {
+  content: "\e214";
+}
+.glyphicon-knight:before {
+  content: "\e215";
+}
+.glyphicon-baby-formula:before {
+  content: "\e216";
+}
+.glyphicon-tent:before {
+  content: "\26fa";
+}
+.glyphicon-blackboard:before {
+  content: "\e218";
+}
+.glyphicon-bed:before {
+  content: "\e219";
+}
+.glyphicon-apple:before {
+  content: "\f8ff";
+}
+.glyphicon-erase:before {
+  content: "\e221";
+}
+.glyphicon-hourglass:before {
+  content: "\231b";
+}
+.glyphicon-lamp:before {
+  content: "\e223";
+}
+.glyphicon-duplicate:before {
+  content: "\e224";
+}
+.glyphicon-piggy-bank:before {
+  content: "\e225";
+}
+.glyphicon-scissors:before {
+  content: "\e226";
+}
+.glyphicon-bitcoin:before {
+  content: "\e227";
+}
+.glyphicon-btc:before {
+  content: "\e227";
+}
+.glyphicon-xbt:before {
+  content: "\e227";
+}
+.glyphicon-yen:before {
+  content: "\00a5";
+}
+.glyphicon-jpy:before {
+  content: "\00a5";
+}
+.glyphicon-ruble:before {
+  content: "\20bd";
+}
+.glyphicon-rub:before {
+  content: "\20bd";
+}
+.glyphicon-scale:before {
+  content: "\e230";
+}
+.glyphicon-ice-lolly:before {
+  content: "\e231";
+}
+.glyphicon-ice-lolly-tasted:before {
+  content: "\e232";
+}
+.glyphicon-education:before {
+  content: "\e233";
+}
+.glyphicon-option-horizontal:before {
+  content: "\e234";
+}
+.glyphicon-option-vertical:before {
+  content: "\e235";
+}
+.glyphicon-menu-hamburger:before {
+  content: "\e236";
+}
+.glyphicon-modal-window:before {
+  content: "\e237";
+}
+.glyphicon-oil:before {
+  content: "\e238";
+}
+.glyphicon-grain:before {
+  content: "\e239";
+}
+.glyphicon-sunglasses:before {
+  content: "\e240";
+}
+.glyphicon-text-size:before {
+  content: "\e241";
+}
+.glyphicon-text-color:before {
+  content: "\e242";
+}
+.glyphicon-text-background:before {
+  content: "\e243";
+}
+.glyphicon-object-align-top:before {
+  content: "\e244";
+}
+.glyphicon-object-align-bottom:before {
+  content: "\e245";
+}
+.glyphicon-object-align-horizontal:before {
+  content: "\e246";
+}
+.glyphicon-object-align-left:before {
+  content: "\e247";
+}
+.glyphicon-object-align-vertical:before {
+  content: "\e248";
+}
+.glyphicon-object-align-right:before {
+  content: "\e249";
+}
+.glyphicon-triangle-right:before {
+  content: "\e250";
+}
+.glyphicon-triangle-left:before {
+  content: "\e251";
+}
+.glyphicon-triangle-bottom:before {
+  content: "\e252";
+}
+.glyphicon-triangle-top:before {
+  content: "\e253";
+}
+.glyphicon-console:before {
+  content: "\e254";
+}
+.glyphicon-superscript:before {
+  content: "\e255";
+}
+.glyphicon-subscript:before {
+  content: "\e256";
+}
+.glyphicon-menu-left:before {
+  content: "\e257";
+}
+.glyphicon-menu-right:before {
+  content: "\e258";
+}
+.glyphicon-menu-down:before {
+  content: "\e259";
+}
+.glyphicon-menu-up:before {
+  content: "\e260";
+}
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+*:before,
+*:after {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+html {
+  font-size: 10px;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #000;
+  background-color: #fff;
+}
+input,
+button,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+a {
+  color: #337ab7;
+  text-decoration: none;
+}
+a:hover,
+a:focus {
+  color: #23527c;
+  text-decoration: underline;
+}
+a:focus {
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+figure {
+  margin: 0;
+}
+img {
+  vertical-align: middle;
+}
+.img-responsive,
+.thumbnail > img,
+.thumbnail a > img,
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  max-width: 100%;
+  height: auto;
+}
+.img-rounded {
+  border-radius: 3px;
+}
+.img-thumbnail {
+  padding: 4px;
+  line-height: 1.42857143;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+  -webkit-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+  display: inline-block;
+  max-width: 100%;
+  height: auto;
+}
+.img-circle {
+  border-radius: 50%;
+}
+hr {
+  margin-top: 18px;
+  margin-bottom: 18px;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}
+[role="button"] {
+  cursor: pointer;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6 {
+  font-family: inherit;
+  font-weight: 500;
+  line-height: 1.1;
+  color: inherit;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small,
+.h1 small,
+.h2 small,
+.h3 small,
+.h4 small,
+.h5 small,
+.h6 small,
+h1 .small,
+h2 .small,
+h3 .small,
+h4 .small,
+h5 .small,
+h6 .small,
+.h1 .small,
+.h2 .small,
+.h3 .small,
+.h4 .small,
+.h5 .small,
+.h6 .small {
+  font-weight: normal;
+  line-height: 1;
+  color: #777777;
+}
+h1,
+.h1,
+h2,
+.h2,
+h3,
+.h3 {
+  margin-top: 18px;
+  margin-bottom: 9px;
+}
+h1 small,
+.h1 small,
+h2 small,
+.h2 small,
+h3 small,
+.h3 small,
+h1 .small,
+.h1 .small,
+h2 .small,
+.h2 .small,
+h3 .small,
+.h3 .small {
+  font-size: 65%;
+}
+h4,
+.h4,
+h5,
+.h5,
+h6,
+.h6 {
+  margin-top: 9px;
+  margin-bottom: 9px;
+}
+h4 small,
+.h4 small,
+h5 small,
+.h5 small,
+h6 small,
+.h6 small,
+h4 .small,
+.h4 .small,
+h5 .small,
+.h5 .small,
+h6 .small,
+.h6 .small {
+  font-size: 75%;
+}
+h1,
+.h1 {
+  font-size: 33px;
+}
+h2,
+.h2 {
+  font-size: 27px;
+}
+h3,
+.h3 {
+  font-size: 23px;
+}
+h4,
+.h4 {
+  font-size: 17px;
+}
+h5,
+.h5 {
+  font-size: 13px;
+}
+h6,
+.h6 {
+  font-size: 12px;
+}
+p {
+  margin: 0 0 9px;
+}
+.lead {
+  margin-bottom: 18px;
+  font-size: 14px;
+  font-weight: 300;
+  line-height: 1.4;
+}
+@media (min-width: 768px) {
+  .lead {
+    font-size: 19.5px;
+  }
+}
+small,
+.small {
+  font-size: 92%;
+}
+mark,
+.mark {
+  background-color: #fcf8e3;
+  padding: .2em;
+}
+.text-left {
+  text-align: left;
+}
+.text-right {
+  text-align: right;
+}
+.text-center {
+  text-align: center;
+}
+.text-justify {
+  text-align: justify;
+}
+.text-nowrap {
+  white-space: nowrap;
+}
+.text-lowercase {
+  text-transform: lowercase;
+}
+.text-uppercase {
+  text-transform: uppercase;
+}
+.text-capitalize {
+  text-transform: capitalize;
+}
+.text-muted {
+  color: #777777;
+}
+.text-primary {
+  color: #337ab7;
+}
+a.text-primary:hover,
+a.text-primary:focus {
+  color: #286090;
+}
+.text-success {
+  color: #3c763d;
+}
+a.text-success:hover,
+a.text-success:focus {
+  color: #2b542c;
+}
+.text-info {
+  color: #31708f;
+}
+a.text-info:hover,
+a.text-info:focus {
+  color: #245269;
+}
+.text-warning {
+  color: #8a6d3b;
+}
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #66512c;
+}
+.text-danger {
+  color: #a94442;
+}
+a.text-danger:hover,
+a.text-danger:focus {
+  color: #843534;
+}
+.bg-primary {
+  color: #fff;
+  background-color: #337ab7;
+}
+a.bg-primary:hover,
+a.bg-primary:focus {
+  background-color: #286090;
+}
+.bg-success {
+  background-color: #dff0d8;
+}
+a.bg-success:hover,
+a.bg-success:focus {
+  background-color: #c1e2b3;
+}
+.bg-info {
+  background-color: #d9edf7;
+}
+a.bg-info:hover,
+a.bg-info:focus {
+  background-color: #afd9ee;
+}
+.bg-warning {
+  background-color: #fcf8e3;
+}
+a.bg-warning:hover,
+a.bg-warning:focus {
+  background-color: #f7ecb5;
+}
+.bg-danger {
+  background-color: #f2dede;
+}
+a.bg-danger:hover,
+a.bg-danger:focus {
+  background-color: #e4b9b9;
+}
+.page-header {
+  padding-bottom: 8px;
+  margin: 36px 0 18px;
+  border-bottom: 1px solid #eeeeee;
+}
+ul,
+ol {
+  margin-top: 0;
+  margin-bottom: 9px;
+}
+ul ul,
+ol ul,
+ul ol,
+ol ol {
+  margin-bottom: 0;
+}
+.list-unstyled {
+  padding-left: 0;
+  list-style: none;
+}
+.list-inline {
+  padding-left: 0;
+  list-style: none;
+  margin-left: -5px;
+}
+.list-inline > li {
+  display: inline-block;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+dl {
+  margin-top: 0;
+  margin-bottom: 18px;
+}
+dt,
+dd {
+  line-height: 1.42857143;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: 0;
+}
+@media (min-width: 541px) {
+  .dl-horizontal dt {
+    float: left;
+    width: 160px;
+    clear: left;
+    text-align: right;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dl-horizontal dd {
+    margin-left: 180px;
+  }
+}
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #777777;
+}
+.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+blockquote {
+  padding: 9px 18px;
+  margin: 0 0 18px;
+  font-size: inherit;
+  border-left: 5px solid #eeeeee;
+}
+blockquote p:last-child,
+blockquote ul:last-child,
+blockquote ol:last-child {
+  margin-bottom: 0;
+}
+blockquote footer,
+blockquote small,
+blockquote .small {
+  display: block;
+  font-size: 80%;
+  line-height: 1.42857143;
+  color: #777777;
+}
+blockquote footer:before,
+blockquote small:before,
+blockquote .small:before {
+  content: '\2014 \00A0';
+}
+.blockquote-reverse,
+blockquote.pull-right {
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+  text-align: right;
+}
+.blockquote-reverse footer:before,
+blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
+blockquote.pull-right small:before,
+.blockquote-reverse .small:before,
+blockquote.pull-right .small:before {
+  content: '';
+}
+.blockquote-reverse footer:after,
+blockquote.pull-right footer:after,
+.blockquote-reverse small:after,
+blockquote.pull-right small:after,
+.blockquote-reverse .small:after,
+blockquote.pull-right .small:after {
+  content: '\00A0 \2014';
+}
+address {
+  margin-bottom: 18px;
+  font-style: normal;
+  line-height: 1.42857143;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace;
+}
+code {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #c7254e;
+  background-color: #f9f2f4;
+  border-radius: 2px;
+}
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #888;
+  background-color: transparent;
+  border-radius: 1px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+kbd kbd {
+  padding: 0;
+  font-size: 100%;
+  font-weight: bold;
+  box-shadow: none;
+}
+pre {
+  display: block;
+  padding: 8.5px;
+  margin: 0 0 9px;
+  font-size: 12px;
+  line-height: 1.42857143;
+  word-break: break-all;
+  word-wrap: break-word;
+  color: #333333;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+}
+pre code {
+  padding: 0;
+  font-size: inherit;
+  color: inherit;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border-radius: 0;
+}
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 0px;
+  padding-right: 0px;
+}
+@media (min-width: 768px) {
+  .container {
+    width: 768px;
+  }
+}
+@media (min-width: 992px) {
+  .container {
+    width: 940px;
+  }
+}
+@media (min-width: 1200px) {
+  .container {
+    width: 1140px;
+  }
+}
+.container-fluid {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 0px;
+  padding-right: 0px;
+}
+.row {
+  margin-left: 0px;
+  margin-right: 0px;
+}
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+  position: relative;
+  min-height: 1px;
+  padding-left: 0px;
+  padding-right: 0px;
+}
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
+  float: left;
+}
+.col-xs-12 {
+  width: 100%;
+}
+.col-xs-11 {
+  width: 91.66666667%;
+}
+.col-xs-10 {
+  width: 83.33333333%;
+}
+.col-xs-9 {
+  width: 75%;
+}
+.col-xs-8 {
+  width: 66.66666667%;
+}
+.col-xs-7 {
+  width: 58.33333333%;
+}
+.col-xs-6 {
+  width: 50%;
+}
+.col-xs-5 {
+  width: 41.66666667%;
+}
+.col-xs-4 {
+  width: 33.33333333%;
+}
+.col-xs-3 {
+  width: 25%;
+}
+.col-xs-2 {
+  width: 16.66666667%;
+}
+.col-xs-1 {
+  width: 8.33333333%;
+}
+.col-xs-pull-12 {
+  right: 100%;
+}
+.col-xs-pull-11 {
+  right: 91.66666667%;
+}
+.col-xs-pull-10 {
+  right: 83.33333333%;
+}
+.col-xs-pull-9 {
+  right: 75%;
+}
+.col-xs-pull-8 {
+  right: 66.66666667%;
+}
+.col-xs-pull-7 {
+  right: 58.33333333%;
+}
+.col-xs-pull-6 {
+  right: 50%;
+}
+.col-xs-pull-5 {
+  right: 41.66666667%;
+}
+.col-xs-pull-4 {
+  right: 33.33333333%;
+}
+.col-xs-pull-3 {
+  right: 25%;
+}
+.col-xs-pull-2 {
+  right: 16.66666667%;
+}
+.col-xs-pull-1 {
+  right: 8.33333333%;
+}
+.col-xs-pull-0 {
+  right: auto;
+}
+.col-xs-push-12 {
+  left: 100%;
+}
+.col-xs-push-11 {
+  left: 91.66666667%;
+}
+.col-xs-push-10 {
+  left: 83.33333333%;
+}
+.col-xs-push-9 {
+  left: 75%;
+}
+.col-xs-push-8 {
+  left: 66.66666667%;
+}
+.col-xs-push-7 {
+  left: 58.33333333%;
+}
+.col-xs-push-6 {
+  left: 50%;
+}
+.col-xs-push-5 {
+  left: 41.66666667%;
+}
+.col-xs-push-4 {
+  left: 33.33333333%;
+}
+.col-xs-push-3 {
+  left: 25%;
+}
+.col-xs-push-2 {
+  left: 16.66666667%;
+}
+.col-xs-push-1 {
+  left: 8.33333333%;
+}
+.col-xs-push-0 {
+  left: auto;
+}
+.col-xs-offset-12 {
+  margin-left: 100%;
+}
+.col-xs-offset-11 {
+  margin-left: 91.66666667%;
+}
+.col-xs-offset-10 {
+  margin-left: 83.33333333%;
+}
+.col-xs-offset-9 {
+  margin-left: 75%;
+}
+.col-xs-offset-8 {
+  margin-left: 66.66666667%;
+}
+.col-xs-offset-7 {
+  margin-left: 58.33333333%;
+}
+.col-xs-offset-6 {
+  margin-left: 50%;
+}
+.col-xs-offset-5 {
+  margin-left: 41.66666667%;
+}
+.col-xs-offset-4 {
+  margin-left: 33.33333333%;
+}
+.col-xs-offset-3 {
+  margin-left: 25%;
+}
+.col-xs-offset-2 {
+  margin-left: 16.66666667%;
+}
+.col-xs-offset-1 {
+  margin-left: 8.33333333%;
+}
+.col-xs-offset-0 {
+  margin-left: 0%;
+}
+@media (min-width: 768px) {
+  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666667%;
+  }
+  .col-sm-10 {
+    width: 83.33333333%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666667%;
+  }
+  .col-sm-7 {
+    width: 58.33333333%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.66666667%;
+  }
+  .col-sm-1 {
+    width: 8.33333333%;
+  }
+  .col-sm-pull-12 {
+    right: 100%;
+  }
+  .col-sm-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-sm-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-sm-pull-9 {
+    right: 75%;
+  }
+  .col-sm-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-sm-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-sm-pull-6 {
+    right: 50%;
+  }
+  .col-sm-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-sm-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-sm-pull-3 {
+    right: 25%;
+  }
+  .col-sm-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-sm-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-sm-pull-0 {
+    right: auto;
+  }
+  .col-sm-push-12 {
+    left: 100%;
+  }
+  .col-sm-push-11 {
+    left: 91.66666667%;
+  }
+  .col-sm-push-10 {
+    left: 83.33333333%;
+  }
+  .col-sm-push-9 {
+    left: 75%;
+  }
+  .col-sm-push-8 {
+    left: 66.66666667%;
+  }
+  .col-sm-push-7 {
+    left: 58.33333333%;
+  }
+  .col-sm-push-6 {
+    left: 50%;
+  }
+  .col-sm-push-5 {
+    left: 41.66666667%;
+  }
+  .col-sm-push-4 {
+    left: 33.33333333%;
+  }
+  .col-sm-push-3 {
+    left: 25%;
+  }
+  .col-sm-push-2 {
+    left: 16.66666667%;
+  }
+  .col-sm-push-1 {
+    left: 8.33333333%;
+  }
+  .col-sm-push-0 {
+    left: auto;
+  }
+  .col-sm-offset-12 {
+    margin-left: 100%;
+  }
+  .col-sm-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-sm-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-sm-offset-9 {
+    margin-left: 75%;
+  }
+  .col-sm-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-sm-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-sm-offset-6 {
+    margin-left: 50%;
+  }
+  .col-sm-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-sm-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-sm-offset-3 {
+    margin-left: 25%;
+  }
+  .col-sm-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-sm-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-sm-offset-0 {
+    margin-left: 0%;
+  }
+}
+@media (min-width: 992px) {
+  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+    float: left;
+  }
+  .col-md-12 {
+    width: 100%;
+  }
+  .col-md-11 {
+    width: 91.66666667%;
+  }
+  .col-md-10 {
+    width: 83.33333333%;
+  }
+  .col-md-9 {
+    width: 75%;
+  }
+  .col-md-8 {
+    width: 66.66666667%;
+  }
+  .col-md-7 {
+    width: 58.33333333%;
+  }
+  .col-md-6 {
+    width: 50%;
+  }
+  .col-md-5 {
+    width: 41.66666667%;
+  }
+  .col-md-4 {
+    width: 33.33333333%;
+  }
+  .col-md-3 {
+    width: 25%;
+  }
+  .col-md-2 {
+    width: 16.66666667%;
+  }
+  .col-md-1 {
+    width: 8.33333333%;
+  }
+  .col-md-pull-12 {
+    right: 100%;
+  }
+  .col-md-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-md-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-md-pull-9 {
+    right: 75%;
+  }
+  .col-md-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-md-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-md-pull-6 {
+    right: 50%;
+  }
+  .col-md-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-md-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-md-pull-3 {
+    right: 25%;
+  }
+  .col-md-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-md-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-md-pull-0 {
+    right: auto;
+  }
+  .col-md-push-12 {
+    left: 100%;
+  }
+  .col-md-push-11 {
+    left: 91.66666667%;
+  }
+  .col-md-push-10 {
+    left: 83.33333333%;
+  }
+  .col-md-push-9 {
+    left: 75%;
+  }
+  .col-md-push-8 {
+    left: 66.66666667%;
+  }
+  .col-md-push-7 {
+    left: 58.33333333%;
+  }
+  .col-md-push-6 {
+    left: 50%;
+  }
+  .col-md-push-5 {
+    left: 41.66666667%;
+  }
+  .col-md-push-4 {
+    left: 33.33333333%;
+  }
+  .col-md-push-3 {
+    left: 25%;
+  }
+  .col-md-push-2 {
+    left: 16.66666667%;
+  }
+  .col-md-push-1 {
+    left: 8.33333333%;
+  }
+  .col-md-push-0 {
+    left: auto;
+  }
+  .col-md-offset-12 {
+    margin-left: 100%;
+  }
+  .col-md-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-md-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-md-offset-9 {
+    margin-left: 75%;
+  }
+  .col-md-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-md-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-md-offset-6 {
+    margin-left: 50%;
+  }
+  .col-md-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-md-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-md-offset-3 {
+    margin-left: 25%;
+  }
+  .col-md-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-md-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-md-offset-0 {
+    margin-left: 0%;
+  }
+}
+@media (min-width: 1200px) {
+  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+    float: left;
+  }
+  .col-lg-12 {
+    width: 100%;
+  }
+  .col-lg-11 {
+    width: 91.66666667%;
+  }
+  .col-lg-10 {
+    width: 83.33333333%;
+  }
+  .col-lg-9 {
+    width: 75%;
+  }
+  .col-lg-8 {
+    width: 66.66666667%;
+  }
+  .col-lg-7 {
+    width: 58.33333333%;
+  }
+  .col-lg-6 {
+    width: 50%;
+  }
+  .col-lg-5 {
+    width: 41.66666667%;
+  }
+  .col-lg-4 {
+    width: 33.33333333%;
+  }
+  .col-lg-3 {
+    width: 25%;
+  }
+  .col-lg-2 {
+    width: 16.66666667%;
+  }
+  .col-lg-1 {
+    width: 8.33333333%;
+  }
+  .col-lg-pull-12 {
+    right: 100%;
+  }
+  .col-lg-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-lg-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-lg-pull-9 {
+    right: 75%;
+  }
+  .col-lg-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-lg-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-lg-pull-6 {
+    right: 50%;
+  }
+  .col-lg-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-lg-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-lg-pull-3 {
+    right: 25%;
+  }
+  .col-lg-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-lg-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-lg-pull-0 {
+    right: auto;
+  }
+  .col-lg-push-12 {
+    left: 100%;
+  }
+  .col-lg-push-11 {
+    left: 91.66666667%;
+  }
+  .col-lg-push-10 {
+    left: 83.33333333%;
+  }
+  .col-lg-push-9 {
+    left: 75%;
+  }
+  .col-lg-push-8 {
+    left: 66.66666667%;
+  }
+  .col-lg-push-7 {
+    left: 58.33333333%;
+  }
+  .col-lg-push-6 {
+    left: 50%;
+  }
+  .col-lg-push-5 {
+    left: 41.66666667%;
+  }
+  .col-lg-push-4 {
+    left: 33.33333333%;
+  }
+  .col-lg-push-3 {
+    left: 25%;
+  }
+  .col-lg-push-2 {
+    left: 16.66666667%;
+  }
+  .col-lg-push-1 {
+    left: 8.33333333%;
+  }
+  .col-lg-push-0 {
+    left: auto;
+  }
+  .col-lg-offset-12 {
+    margin-left: 100%;
+  }
+  .col-lg-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-lg-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-lg-offset-9 {
+    margin-left: 75%;
+  }
+  .col-lg-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-lg-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-lg-offset-6 {
+    margin-left: 50%;
+  }
+  .col-lg-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-lg-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-lg-offset-3 {
+    margin-left: 25%;
+  }
+  .col-lg-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-lg-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-lg-offset-0 {
+    margin-left: 0%;
+  }
+}
+table {
+  background-color: transparent;
+}
+caption {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  color: #777777;
+  text-align: left;
+}
+th {
+  text-align: left;
+}
+.table {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 18px;
+}
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+  padding: 8px;
+  line-height: 1.42857143;
+  vertical-align: top;
+  border-top: 1px solid #ddd;
+}
+.table > thead > tr > th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #ddd;
+}
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
+  border-top: 0;
+}
+.table > tbody + tbody {
+  border-top: 2px solid #ddd;
+}
+.table .table {
+  background-color: #fff;
+}
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
+  padding: 5px;
+}
+.table-bordered {
+  border: 1px solid #ddd;
+}
+.table-bordered > thead > tr > th,
+.table-bordered > tbody > tr > th,
+.table-bordered > tfoot > tr > th,
+.table-bordered > thead > tr > td,
+.table-bordered > tbody > tr > td,
+.table-bordered > tfoot > tr > td {
+  border: 1px solid #ddd;
+}
+.table-bordered > thead > tr > th,
+.table-bordered > thead > tr > td {
+  border-bottom-width: 2px;
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: #f9f9f9;
+}
+.table-hover > tbody > tr:hover {
+  background-color: #f5f5f5;
+}
+table col[class*="col-"] {
+  position: static;
+  float: none;
+  display: table-column;
+}
+table td[class*="col-"],
+table th[class*="col-"] {
+  position: static;
+  float: none;
+  display: table-cell;
+}
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
+  background-color: #f5f5f5;
+}
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr:hover > .active,
+.table-hover > tbody > tr.active:hover > th {
+  background-color: #e8e8e8;
+}
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
+  background-color: #dff0d8;
+}
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr:hover > .success,
+.table-hover > tbody > tr.success:hover > th {
+  background-color: #d0e9c6;
+}
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
+}
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr:hover > .info,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
+  background-color: #fcf8e3;
+}
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr:hover > .warning,
+.table-hover > tbody > tr.warning:hover > th {
+  background-color: #faf2cc;
+}
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr:hover > .danger,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
+.table-responsive {
+  overflow-x: auto;
+  min-height: 0.01%;
+}
+@media screen and (max-width: 767px) {
+  .table-responsive {
+    width: 100%;
+    margin-bottom: 13.5px;
+    overflow-y: hidden;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+    border: 1px solid #ddd;
+  }
+  .table-responsive > .table {
+    margin-bottom: 0;
+  }
+  .table-responsive > .table > thead > tr > th,
+  .table-responsive > .table > tbody > tr > th,
+  .table-responsive > .table > tfoot > tr > th,
+  .table-responsive > .table > thead > tr > td,
+  .table-responsive > .table > tbody > tr > td,
+  .table-responsive > .table > tfoot > tr > td {
+    white-space: nowrap;
+  }
+  .table-responsive > .table-bordered {
+    border: 0;
+  }
+  .table-responsive > .table-bordered > thead > tr > th:first-child,
+  .table-responsive > .table-bordered > tbody > tr > th:first-child,
+  .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+  .table-responsive > .table-bordered > thead > tr > td:first-child,
+  .table-responsive > .table-bordered > tbody > tr > td:first-child,
+  .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+    border-left: 0;
+  }
+  .table-responsive > .table-bordered > thead > tr > th:last-child,
+  .table-responsive > .table-bordered > tbody > tr > th:last-child,
+  .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+  .table-responsive > .table-bordered > thead > tr > td:last-child,
+  .table-responsive > .table-bordered > tbody > tr > td:last-child,
+  .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+    border-right: 0;
+  }
+  .table-responsive > .table-bordered > tbody > tr:last-child > th,
+  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+  .table-responsive > .table-bordered > tbody > tr:last-child > td,
+  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+    border-bottom: 0;
+  }
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+  min-width: 0;
+}
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 18px;
+  font-size: 19.5px;
+  line-height: inherit;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+label {
+  display: inline-block;
+  max-width: 100%;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+input[type="search"] {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  line-height: normal;
+}
+input[type="file"] {
+  display: block;
+}
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
+select[multiple],
+select[size] {
+  height: auto;
+}
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+output {
+  display: block;
+  padding-top: 7px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #555555;
+}
+.form-control {
+  display: block;
+  width: 100%;
+  height: 32px;
+  padding: 6px 12px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #555555;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+.form-control:focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.form-control::-moz-placeholder {
+  color: #999;
+  opacity: 1;
+}
+.form-control:-ms-input-placeholder {
+  color: #999;
+}
+.form-control::-webkit-input-placeholder {
+  color: #999;
+}
+.form-control::-ms-expand {
+  border: 0;
+  background-color: transparent;
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: #eeeeee;
+  opacity: 1;
+}
+.form-control[disabled],
+fieldset[disabled] .form-control {
+  cursor: not-allowed;
+}
+textarea.form-control {
+  height: auto;
+}
+input[type="search"] {
+  -webkit-appearance: none;
+}
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  input[type="date"].form-control,
+  input[type="time"].form-control,
+  input[type="datetime-local"].form-control,
+  input[type="month"].form-control {
+    line-height: 32px;
+  }
+  input[type="date"].input-sm,
+  input[type="time"].input-sm,
+  input[type="datetime-local"].input-sm,
+  input[type="month"].input-sm,
+  .input-group-sm input[type="date"],
+  .input-group-sm input[type="time"],
+  .input-group-sm input[type="datetime-local"],
+  .input-group-sm input[type="month"] {
+    line-height: 30px;
+  }
+  input[type="date"].input-lg,
+  input[type="time"].input-lg,
+  input[type="datetime-local"].input-lg,
+  input[type="month"].input-lg,
+  .input-group-lg input[type="date"],
+  .input-group-lg input[type="time"],
+  .input-group-lg input[type="datetime-local"],
+  .input-group-lg input[type="month"] {
+    line-height: 45px;
+  }
+}
+.form-group {
+  margin-bottom: 15px;
+}
+.radio,
+.checkbox {
+  position: relative;
+  display: block;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.radio label,
+.checkbox label {
+  min-height: 18px;
+  padding-left: 20px;
+  margin-bottom: 0;
+  font-weight: normal;
+  cursor: pointer;
+}
+.radio input[type="radio"],
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+  position: absolute;
+  margin-left: -20px;
+  margin-top: 4px \9;
+}
+.radio + .radio,
+.checkbox + .checkbox {
+  margin-top: -5px;
+}
+.radio-inline,
+.checkbox-inline {
+  position: relative;
+  display: inline-block;
+  padding-left: 20px;
+  margin-bottom: 0;
+  vertical-align: middle;
+  font-weight: normal;
+  cursor: pointer;
+}
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+  margin-top: 0;
+  margin-left: 10px;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"].disabled,
+input[type="checkbox"].disabled,
+fieldset[disabled] input[type="radio"],
+fieldset[disabled] input[type="checkbox"] {
+  cursor: not-allowed;
+}
+.radio-inline.disabled,
+.checkbox-inline.disabled,
+fieldset[disabled] .radio-inline,
+fieldset[disabled] .checkbox-inline {
+  cursor: not-allowed;
+}
+.radio.disabled label,
+.checkbox.disabled label,
+fieldset[disabled] .radio label,
+fieldset[disabled] .checkbox label {
+  cursor: not-allowed;
+}
+.form-control-static {
+  padding-top: 7px;
+  padding-bottom: 7px;
+  margin-bottom: 0;
+  min-height: 31px;
+}
+.form-control-static.input-lg,
+.form-control-static.input-sm {
+  padding-left: 0;
+  padding-right: 0;
+}
+.input-sm {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+}
+select.input-sm {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.input-sm,
+select[multiple].input-sm {
+  height: auto;
+}
+.form-group-sm .form-control {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+}
+.form-group-sm select.form-control {
+  height: 30px;
+  line-height: 30px;
+}
+.form-group-sm textarea.form-control,
+.form-group-sm select[multiple].form-control {
+  height: auto;
+}
+.form-group-sm .form-control-static {
+  height: 30px;
+  min-height: 30px;
+  padding: 6px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.input-lg {
+  height: 45px;
+  padding: 10px 16px;
+  font-size: 17px;
+  line-height: 1.3333333;
+  border-radius: 3px;
+}
+select.input-lg {
+  height: 45px;
+  line-height: 45px;
+}
+textarea.input-lg,
+select[multiple].input-lg {
+  height: auto;
+}
+.form-group-lg .form-control {
+  height: 45px;
+  padding: 10px 16px;
+  font-size: 17px;
+  line-height: 1.3333333;
+  border-radius: 3px;
+}
+.form-group-lg select.form-control {
+  height: 45px;
+  line-height: 45px;
+}
+.form-group-lg textarea.form-control,
+.form-group-lg select[multiple].form-control {
+  height: auto;
+}
+.form-group-lg .form-control-static {
+  height: 45px;
+  min-height: 35px;
+  padding: 11px 16px;
+  font-size: 17px;
+  line-height: 1.3333333;
+}
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-right: 40px;
+}
+.form-control-feedback {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  display: block;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  pointer-events: none;
+}
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
+  width: 45px;
+  height: 45px;
+  line-height: 45px;
+}
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
+  width: 30px;
+  height: 30px;
+  line-height: 30px;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline,
+.has-success.radio label,
+.has-success.checkbox label,
+.has-success.radio-inline label,
+.has-success.checkbox-inline label {
+  color: #3c763d;
+}
+.has-success .form-control {
+  border-color: #3c763d;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+}
+.has-success .input-group-addon {
+  color: #3c763d;
+  border-color: #3c763d;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #3c763d;
+}
+.has-warning .help-block,
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline,
+.has-warning.radio label,
+.has-warning.checkbox label,
+.has-warning.radio-inline label,
+.has-warning.checkbox-inline label {
+  color: #8a6d3b;
+}
+.has-warning .form-control {
+  border-color: #8a6d3b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-warning .form-control:focus {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+}
+.has-warning .input-group-addon {
+  color: #8a6d3b;
+  border-color: #8a6d3b;
+  background-color: #fcf8e3;
+}
+.has-warning .form-control-feedback {
+  color: #8a6d3b;
+}
+.has-error .help-block,
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline,
+.has-error.radio label,
+.has-error.checkbox label,
+.has-error.radio-inline label,
+.has-error.checkbox-inline label {
+  color: #a94442;
+}
+.has-error .form-control {
+  border-color: #a94442;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-error .form-control:focus {
+  border-color: #843534;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+}
+.has-error .input-group-addon {
+  color: #a94442;
+  border-color: #a94442;
+  background-color: #f2dede;
+}
+.has-error .form-control-feedback {
+  color: #a94442;
+}
+.has-feedback label ~ .form-control-feedback {
+  top: 23px;
+}
+.has-feedback label.sr-only ~ .form-control-feedback {
+  top: 0;
+}
+.help-block {
+  display: block;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: #404040;
+}
+@media (min-width: 768px) {
+  .form-inline .form-group {
+    display: inline-block;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .form-control {
+    display: inline-block;
+    width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .form-control-static {
+    display: inline-block;
+  }
+  .form-inline .input-group {
+    display: inline-table;
+    vertical-align: middle;
+  }
+  .form-inline .input-group .input-group-addon,
+  .form-inline .input-group .input-group-btn,
+  .form-inline .input-group .form-control {
+    width: auto;
+  }
+  .form-inline .input-group > .form-control {
+    width: 100%;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .radio,
+  .form-inline .checkbox {
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .radio label,
+  .form-inline .checkbox label {
+    padding-left: 0;
+  }
+  .form-inline .radio input[type="radio"],
+  .form-inline .checkbox input[type="checkbox"] {
+    position: relative;
+    margin-left: 0;
+  }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
+}
+.form-horizontal .radio,
+.form-horizontal .checkbox,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 7px;
+}
+.form-horizontal .radio,
+.form-horizontal .checkbox {
+  min-height: 25px;
+}
+.form-horizontal .form-group {
+  margin-left: 0px;
+  margin-right: 0px;
+}
+@media (min-width: 768px) {
+  .form-horizontal .control-label {
+    text-align: right;
+    margin-bottom: 0;
+    padding-top: 7px;
+  }
+}
+.form-horizontal .has-feedback .form-control-feedback {
+  right: 0px;
+}
+@media (min-width: 768px) {
+  .form-horizontal .form-group-lg .control-label {
+    padding-top: 11px;
+    font-size: 17px;
+  }
+}
+@media (min-width: 768px) {
+  .form-horizontal .form-group-sm .control-label {
+    padding-top: 6px;
+    font-size: 12px;
+  }
+}
+.btn {
+  display: inline-block;
+  margin-bottom: 0;
+  font-weight: normal;
+  text-align: center;
+  vertical-align: middle;
+  touch-action: manipulation;
+  cursor: pointer;
+  background-image: none;
+  border: 1px solid transparent;
+  white-space: nowrap;
+  padding: 6px 12px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  border-radius: 2px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.btn:focus,
+.btn:active:focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn.active.focus {
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.btn:hover,
+.btn:focus,
+.btn.focus {
+  color: #333;
+  text-decoration: none;
+}
+.btn:active,
+.btn.active {
+  outline: 0;
+  background-image: none;
+  -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.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+  cursor: not-allowed;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+a.btn.disabled,
+fieldset[disabled] a.btn {
+  pointer-events: none;
+}
+.btn-default {
+  color: #333;
+  background-color: #fff;
+  border-color: #ccc;
+}
+.btn-default:focus,
+.btn-default.focus {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #8c8c8c;
+}
+.btn-default:hover {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+.btn-default:active,
+.btn-default.active,
+.open > .dropdown-toggle.btn-default {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+.btn-default:active:hover,
+.btn-default.active:hover,
+.open > .dropdown-toggle.btn-default:hover,
+.btn-default:active:focus,
+.btn-default.active:focus,
+.open > .dropdown-toggle.btn-default:focus,
+.btn-default:active.focus,
+.btn-default.active.focus,
+.open > .dropdown-toggle.btn-default.focus {
+  color: #333;
+  background-color: #d4d4d4;
+  border-color: #8c8c8c;
+}
+.btn-default:active,
+.btn-default.active,
+.open > .dropdown-toggle.btn-default {
+  background-image: none;
+}
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus {
+  background-color: #fff;
+  border-color: #ccc;
+}
+.btn-default .badge {
+  color: #fff;
+  background-color: #333;
+}
+.btn-primary {
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #2e6da4;
+}
+.btn-primary:focus,
+.btn-primary.focus {
+  color: #fff;
+  background-color: #286090;
+  border-color: #122b40;
+}
+.btn-primary:hover {
+  color: #fff;
+  background-color: #286090;
+  border-color: #204d74;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+  color: #fff;
+  background-color: #286090;
+  border-color: #204d74;
+}
+.btn-primary:active:hover,
+.btn-primary.active:hover,
+.open > .dropdown-toggle.btn-primary:hover,
+.btn-primary:active:focus,
+.btn-primary.active:focus,
+.open > .dropdown-toggle.btn-primary:focus,
+.btn-primary:active.focus,
+.btn-primary.active.focus,
+.open > .dropdown-toggle.btn-primary.focus {
+  color: #fff;
+  background-color: #204d74;
+  border-color: #122b40;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+  background-image: none;
+}
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus {
+  background-color: #337ab7;
+  border-color: #2e6da4;
+}
+.btn-primary .badge {
+  color: #337ab7;
+  background-color: #fff;
+}
+.btn-success {
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success:focus,
+.btn-success.focus {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #255625;
+}
+.btn-success:hover {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+.btn-success:active:hover,
+.btn-success.active:hover,
+.open > .dropdown-toggle.btn-success:hover,
+.btn-success:active:focus,
+.btn-success.active:focus,
+.open > .dropdown-toggle.btn-success:focus,
+.btn-success:active.focus,
+.btn-success.active.focus,
+.open > .dropdown-toggle.btn-success.focus {
+  color: #fff;
+  background-color: #398439;
+  border-color: #255625;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+  background-image: none;
+}
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success .badge {
+  color: #5cb85c;
+  background-color: #fff;
+}
+.btn-info {
+  color: #fff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info:focus,
+.btn-info.focus {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #1b6d85;
+}
+.btn-info:hover {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #269abc;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #269abc;
+}
+.btn-info:active:hover,
+.btn-info.active:hover,
+.open > .dropdown-toggle.btn-info:hover,
+.btn-info:active:focus,
+.btn-info.active:focus,
+.open > .dropdown-toggle.btn-info:focus,
+.btn-info:active.focus,
+.btn-info.active.focus,
+.open > .dropdown-toggle.btn-info.focus {
+  color: #fff;
+  background-color: #269abc;
+  border-color: #1b6d85;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+  background-image: none;
+}
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus {
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #fff;
+}
+.btn-warning {
+  color: #fff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:focus,
+.btn-warning.focus {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #985f0d;
+}
+.btn-warning:hover {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #d58512;
+}
+.btn-warning:active:hover,
+.btn-warning.active:hover,
+.open > .dropdown-toggle.btn-warning:hover,
+.btn-warning:active:focus,
+.btn-warning.active:focus,
+.open > .dropdown-toggle.btn-warning:focus,
+.btn-warning:active.focus,
+.btn-warning.active.focus,
+.open > .dropdown-toggle.btn-warning.focus {
+  color: #fff;
+  background-color: #d58512;
+  border-color: #985f0d;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #fff;
+}
+.btn-danger {
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:focus,
+.btn-danger.focus {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #761c19;
+}
+.btn-danger:hover {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.btn-danger:active:hover,
+.btn-danger.active:hover,
+.open > .dropdown-toggle.btn-danger:hover,
+.btn-danger:active:focus,
+.btn-danger.active:focus,
+.open > .dropdown-toggle.btn-danger:focus,
+.btn-danger:active.focus,
+.btn-danger.active.focus,
+.open > .dropdown-toggle.btn-danger.focus {
+  color: #fff;
+  background-color: #ac2925;
+  border-color: #761c19;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #fff;
+}
+.btn-link {
+  color: #337ab7;
+  font-weight: normal;
+  border-radius: 0;
+}
+.btn-link,
+.btn-link:active,
+.btn-link.active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+  background-color: transparent;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+  border-color: transparent;
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: #23527c;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:hover,
+.btn-link[disabled]:focus,
+fieldset[disabled] .btn-link:focus {
+  color: #777777;
+  text-decoration: none;
+}
+.btn-lg,
+.btn-group-lg > .btn {
+  padding: 10px 16px;
+  font-size: 17px;
+  line-height: 1.3333333;
+  border-radius: 3px;
+}
+.btn-sm,
+.btn-group-sm > .btn {
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+}
+.btn-xs,
+.btn-group-xs > .btn {
+  padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+}
+.btn-block {
+  display: block;
+  width: 100%;
+}
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  display: none;
+}
+.collapse.in {
+  display: block;
+}
+tr.collapse.in {
+  display: table-row;
+}
+tbody.collapse.in {
+  display: table-row-group;
+}
+.collapsing {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition-property: height, visibility;
+  transition-property: height, visibility;
+  -webkit-transition-duration: 0.35s;
+  transition-duration: 0.35s;
+  -webkit-transition-timing-function: ease;
+  transition-timing-function: ease;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: 4px dashed;
+  border-top: 4px solid \9;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+}
+.dropup,
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle:focus {
+  outline: 0;
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  font-size: 13px;
+  text-align: left;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 2px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 8px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
+}
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 1.42857143;
+  color: #333333;
+  white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+  text-decoration: none;
+  color: #262626;
+  background-color: #f5f5f5;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #fff;
+  text-decoration: none;
+  outline: 0;
+  background-color: #337ab7;
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #777777;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  cursor: not-allowed;
+}
+.open > .dropdown-menu {
+  display: block;
+}
+.open > a {
+  outline: 0;
+}
+.dropdown-menu-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: 12px;
+  line-height: 1.42857143;
+  color: #777777;
+  white-space: nowrap;
+}
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: 990;
+}
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px dashed;
+  border-bottom: 4px solid \9;
+  content: "";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 2px;
+}
+@media (min-width: 541px) {
+  .navbar-right .dropdown-menu {
+    left: auto;
+    right: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    left: 0;
+    right: auto;
+  }
+}
+.btn-group,
+.btn-group-vertical {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+}
+.btn-group > .btn,
+.btn-group-vertical > .btn {
+  position: relative;
+  float: left;
+}
+.btn-group > .btn:hover,
+.btn-group-vertical > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus,
+.btn-group > .btn:active,
+.btn-group-vertical > .btn:active,
+.btn-group > .btn.active,
+.btn-group-vertical > .btn.active {
+  z-index: 2;
+}
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
+  margin-left: -1px;
+}
+.btn-toolbar {
+  margin-left: -5px;
+}
+.btn-toolbar .btn,
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+  float: left;
+}
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
+  margin-left: 5px;
+}
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-radius: 0;
+}
+.btn-group > .btn:first-child {
+  margin-left: 0;
+}
+.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+.btn-group > .btn-group {
+  float: left;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+.btn-group > .btn-lg + .dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+}
+.btn-group.open .dropdown-toggle {
+  -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-group.open .dropdown-toggle.btn-link {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.btn .caret {
+  margin-left: 0;
+}
+.btn-lg .caret {
+  border-width: 5px 5px 0;
+  border-bottom-width: 0;
+}
+.dropup .btn-lg .caret {
+  border-width: 0 5px 5px;
+}
+.btn-group-vertical > .btn,
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
+  display: block;
+  float: none;
+  width: 100%;
+  max-width: 100%;
+}
+.btn-group-vertical > .btn-group > .btn {
+  float: none;
+}
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+  margin-top: -1px;
+  margin-left: 0;
+}
+.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
+  border-radius: 0;
+}
+.btn-group-vertical > .btn:first-child:not(:last-child) {
+  border-top-right-radius: 2px;
+  border-top-left-radius: 2px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn:last-child:not(:first-child) {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.btn-group-justified {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: separate;
+}
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
+  float: none;
+  display: table-cell;
+  width: 1%;
+}
+.btn-group-justified > .btn-group .btn {
+  width: 100%;
+}
+.btn-group-justified > .btn-group .dropdown-menu {
+  left: auto;
+}
+[data-toggle="buttons"] > .btn input[type="radio"],
+[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
+[data-toggle="buttons"] > .btn input[type="checkbox"],
+[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
+  position: absolute;
+  clip: rect(0, 0, 0, 0);
+  pointer-events: none;
+}
+.input-group {
+  position: relative;
+  display: table;
+  border-collapse: separate;
+}
+.input-group[class*="col-"] {
+  float: none;
+  padding-left: 0;
+  padding-right: 0;
+}
+.input-group .form-control {
+  position: relative;
+  z-index: 2;
+  float: left;
+  width: 100%;
+  margin-bottom: 0;
+}
+.input-group .form-control:focus {
+  z-index: 3;
+}
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
+  height: 45px;
+  padding: 10px 16px;
+  font-size: 17px;
+  line-height: 1.3333333;
+  border-radius: 3px;
+}
+select.input-group-lg > .form-control,
+select.input-group-lg > .input-group-addon,
+select.input-group-lg > .input-group-btn > .btn {
+  height: 45px;
+  line-height: 45px;
+}
+textarea.input-group-lg > .form-control,
+textarea.input-group-lg > .input-group-addon,
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
+  height: auto;
+}
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .btn {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+}
+select.input-group-sm > .form-control,
+select.input-group-sm > .input-group-addon,
+select.input-group-sm > .input-group-btn > .btn {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.input-group-sm > .form-control,
+textarea.input-group-sm > .input-group-addon,
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
+  height: auto;
+}
+.input-group-addon,
+.input-group-btn,
+.input-group .form-control {
+  display: table-cell;
+}
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child),
+.input-group .form-control:not(:first-child):not(:last-child) {
+  border-radius: 0;
+}
+.input-group-addon,
+.input-group-btn {
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+.input-group-addon {
+  padding: 6px 12px;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  color: #555555;
+  text-align: center;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+}
+.input-group-addon.input-sm {
+  padding: 5px 10px;
+  font-size: 12px;
+  border-radius: 1px;
+}
+.input-group-addon.input-lg {
+  padding: 10px 16px;
+  font-size: 17px;
+  border-radius: 3px;
+}
+.input-group-addon input[type="radio"],
+.input-group-addon input[type="checkbox"] {
+  margin-top: 0;
+}
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
+.input-group-btn:first-child > .dropdown-toggle,
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.input-group-addon:first-child {
+  border-right: 0;
+}
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
+.input-group-btn:last-child > .dropdown-toggle,
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+.input-group-addon:last-child {
+  border-left: 0;
+}
+.input-group-btn {
+  position: relative;
+  font-size: 0;
+  white-space: nowrap;
+}
+.input-group-btn > .btn {
+  position: relative;
+}
+.input-group-btn > .btn + .btn {
+  margin-left: -1px;
+}
+.input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
+.input-group-btn > .btn:active {
+  z-index: 2;
+}
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  z-index: 2;
+  margin-left: -1px;
+}
+.nav {
+  margin-bottom: 0;
+  padding-left: 0;
+  list-style: none;
+}
+.nav > li {
+  position: relative;
+  display: block;
+}
+.nav > li > a {
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+.nav > li.disabled > a {
+  color: #777777;
+}
+.nav > li.disabled > a:hover,
+.nav > li.disabled > a:focus {
+  color: #777777;
+  text-decoration: none;
+  background-color: transparent;
+  cursor: not-allowed;
+}
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
+  background-color: #eeeeee;
+  border-color: #337ab7;
+}
+.nav .nav-divider {
+  height: 1px;
+  margin: 8px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
+}
+.nav > li > a > img {
+  max-width: none;
+}
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+  float: left;
+  margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+  margin-right: 2px;
+  line-height: 1.42857143;
+  border: 1px solid transparent;
+  border-radius: 2px 2px 0 0;
+}
+.nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #ddd;
+}
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+  color: #555555;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.nav-tabs.nav-justified {
+  width: 100%;
+  border-bottom: 0;
+}
+.nav-tabs.nav-justified > li {
+  float: none;
+}
+.nav-tabs.nav-justified > li > a {
+  text-align: center;
+  margin-bottom: 5px;
+}
+.nav-tabs.nav-justified > .dropdown .dropdown-menu {
+  top: auto;
+  left: auto;
+}
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li {
+    display: table-cell;
+    width: 1%;
+  }
+  .nav-tabs.nav-justified > li > a {
+    margin-bottom: 0;
+  }
+}
+.nav-tabs.nav-justified > li > a {
+  margin-right: 0;
+  border-radius: 2px;
+}
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+  border: 1px solid #ddd;
+}
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #ddd;
+    border-radius: 2px 2px 0 0;
+  }
+  .nav-tabs.nav-justified > .active > a,
+  .nav-tabs.nav-justified > .active > a:hover,
+  .nav-tabs.nav-justified > .active > a:focus {
+    border-bottom-color: #fff;
+  }
+}
+.nav-pills > li {
+  float: left;
+}
+.nav-pills > li > a {
+  border-radius: 2px;
+}
+.nav-pills > li + li {
+  margin-left: 2px;
+}
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:hover,
+.nav-pills > li.active > a:focus {
+  color: #fff;
+  background-color: #337ab7;
+}
+.nav-stacked > li {
+  float: none;
+}
+.nav-stacked > li + li {
+  margin-top: 2px;
+  margin-left: 0;
+}
+.nav-justified {
+  width: 100%;
+}
+.nav-justified > li {
+  float: none;
+}
+.nav-justified > li > a {
+  text-align: center;
+  margin-bottom: 5px;
+}
+.nav-justified > .dropdown .dropdown-menu {
+  top: auto;
+  left: auto;
+}
+@media (min-width: 768px) {
+  .nav-justified > li {
+    display: table-cell;
+    width: 1%;
+  }
+  .nav-justified > li > a {
+    margin-bottom: 0;
+  }
+}
+.nav-tabs-justified {
+  border-bottom: 0;
+}
+.nav-tabs-justified > li > a {
+  margin-right: 0;
+  border-radius: 2px;
+}
+.nav-tabs-justified > .active > a,
+.nav-tabs-justified > .active > a:hover,
+.nav-tabs-justified > .active > a:focus {
+  border: 1px solid #ddd;
+}
+@media (min-width: 768px) {
+  .nav-tabs-justified > li > a {
+    border-bottom: 1px solid #ddd;
+    border-radius: 2px 2px 0 0;
+  }
+  .nav-tabs-justified > .active > a,
+  .nav-tabs-justified > .active > a:hover,
+  .nav-tabs-justified > .active > a:focus {
+    border-bottom-color: #fff;
+  }
+}
+.tab-content > .tab-pane {
+  display: none;
+}
+.tab-content > .active {
+  display: block;
+}
+.nav-tabs .dropdown-menu {
+  margin-top: -1px;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.navbar {
+  position: relative;
+  min-height: 30px;
+  margin-bottom: 18px;
+  border: 1px solid transparent;
+}
+@media (min-width: 541px) {
+  .navbar {
+    border-radius: 2px;
+  }
+}
+@media (min-width: 541px) {
+  .navbar-header {
+    float: left;
+  }
+}
+.navbar-collapse {
+  overflow-x: visible;
+  padding-right: 0px;
+  padding-left: 0px;
+  border-top: 1px solid transparent;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
+  -webkit-overflow-scrolling: touch;
+}
+.navbar-collapse.in {
+  overflow-y: auto;
+}
+@media (min-width: 541px) {
+  .navbar-collapse {
+    width: auto;
+    border-top: 0;
+    box-shadow: none;
+  }
+  .navbar-collapse.collapse {
+    display: block !important;
+    height: auto !important;
+    padding-bottom: 0;
+    overflow: visible !important;
+  }
+  .navbar-collapse.in {
+    overflow-y: visible;
+  }
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-static-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
+.navbar-fixed-top .navbar-collapse,
+.navbar-fixed-bottom .navbar-collapse {
+  max-height: 340px;
+}
+@media (max-device-width: 540px) and (orientation: landscape) {
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    max-height: 200px;
+  }
+}
+.container > .navbar-header,
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
+  margin-right: 0px;
+  margin-left: 0px;
+}
+@media (min-width: 541px) {
+  .container > .navbar-header,
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
+    margin-right: 0;
+    margin-left: 0;
+  }
+}
+.navbar-static-top {
+  z-index: 1000;
+  border-width: 0 0 1px;
+}
+@media (min-width: 541px) {
+  .navbar-static-top {
+    border-radius: 0;
+  }
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+@media (min-width: 541px) {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    border-radius: 0;
+  }
+}
+.navbar-fixed-top {
+  top: 0;
+  border-width: 0 0 1px;
+}
+.navbar-fixed-bottom {
+  bottom: 0;
+  margin-bottom: 0;
+  border-width: 1px 0 0;
+}
+.navbar-brand {
+  float: left;
+  padding: 6px 0px;
+  font-size: 17px;
+  line-height: 18px;
+  height: 30px;
+}
+.navbar-brand:hover,
+.navbar-brand:focus {
+  text-decoration: none;
+}
+.navbar-brand > img {
+  display: block;
+}
+@media (min-width: 541px) {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
+    margin-left: 0px;
+  }
+}
+.navbar-toggle {
+  position: relative;
+  float: right;
+  margin-right: 0px;
+  padding: 9px 10px;
+  margin-top: -2px;
+  margin-bottom: -2px;
+  background-color: transparent;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 2px;
+}
+.navbar-toggle:focus {
+  outline: 0;
+}
+.navbar-toggle .icon-bar {
+  display: block;
+  width: 22px;
+  height: 2px;
+  border-radius: 1px;
+}
+.navbar-toggle .icon-bar + .icon-bar {
+  margin-top: 4px;
+}
+@media (min-width: 541px) {
+  .navbar-toggle {
+    display: none;
+  }
+}
+.navbar-nav {
+  margin: 3px 0px;
+}
+.navbar-nav > li > a {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  line-height: 18px;
+}
+@media (max-width: 540px) {
+  .navbar-nav .open .dropdown-menu {
+    position: static;
+    float: none;
+    width: auto;
+    margin-top: 0;
+    background-color: transparent;
+    border: 0;
+    box-shadow: none;
+  }
+  .navbar-nav .open .dropdown-menu > li > a,
+  .navbar-nav .open .dropdown-menu .dropdown-header {
+    padding: 5px 15px 5px 25px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a {
+    line-height: 18px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-nav .open .dropdown-menu > li > a:focus {
+    background-image: none;
+  }
+}
+@media (min-width: 541px) {
+  .navbar-nav {
+    float: left;
+    margin: 0;
+  }
+  .navbar-nav > li {
+    float: left;
+  }
+  .navbar-nav > li > a {
+    padding-top: 6px;
+    padding-bottom: 6px;
+  }
+}
+.navbar-form {
+  margin-left: 0px;
+  margin-right: 0px;
+  padding: 10px 0px;
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+@media (min-width: 768px) {
+  .navbar-form .form-group {
+    display: inline-block;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .form-control {
+    display: inline-block;
+    width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .form-control-static {
+    display: inline-block;
+  }
+  .navbar-form .input-group {
+    display: inline-table;
+    vertical-align: middle;
+  }
+  .navbar-form .input-group .input-group-addon,
+  .navbar-form .input-group .input-group-btn,
+  .navbar-form .input-group .form-control {
+    width: auto;
+  }
+  .navbar-form .input-group > .form-control {
+    width: 100%;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .radio,
+  .navbar-form .checkbox {
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .radio label,
+  .navbar-form .checkbox label {
+    padding-left: 0;
+  }
+  .navbar-form .radio input[type="radio"],
+  .navbar-form .checkbox input[type="checkbox"] {
+    position: relative;
+    margin-left: 0;
+  }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
+}
+@media (max-width: 540px) {
+  .navbar-form .form-group {
+    margin-bottom: 5px;
+  }
+  .navbar-form .form-group:last-child {
+    margin-bottom: 0;
+  }
+}
+@media (min-width: 541px) {
+  .navbar-form {
+    width: auto;
+    border: 0;
+    margin-left: 0;
+    margin-right: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+}
+.navbar-nav > li > .dropdown-menu {
+  margin-top: 0;
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  margin-bottom: 0;
+  border-top-right-radius: 2px;
+  border-top-left-radius: 2px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.navbar-btn {
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+.navbar-btn.btn-sm {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+.navbar-btn.btn-xs {
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
+.navbar-text {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+@media (min-width: 541px) {
+  .navbar-text {
+    float: left;
+    margin-left: 0px;
+    margin-right: 0px;
+  }
+}
+@media (min-width: 541px) {
+  .navbar-left {
+    float: left !important;
+    float: left;
+  }
+  .navbar-right {
+    float: right !important;
+    float: right;
+    margin-right: 0px;
+  }
+  .navbar-right ~ .navbar-right {
+    margin-right: 0;
+  }
+}
+.navbar-default {
+  background-color: #f8f8f8;
+  border-color: #e7e7e7;
+}
+.navbar-default .navbar-brand {
+  color: #777;
+}
+.navbar-default .navbar-brand:hover,
+.navbar-default .navbar-brand:focus {
+  color: #5e5e5e;
+  background-color: transparent;
+}
+.navbar-default .navbar-text {
+  color: #777;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #777;
+}
+.navbar-default .navbar-nav > li > a:hover,
+.navbar-default .navbar-nav > li > a:focus {
+  color: #333;
+  background-color: transparent;
+}
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+  color: #555;
+  background-color: #e7e7e7;
+}
+.navbar-default .navbar-nav > .disabled > a,
+.navbar-default .navbar-nav > .disabled > a:hover,
+.navbar-default .navbar-nav > .disabled > a:focus {
+  color: #ccc;
+  background-color: transparent;
+}
+.navbar-default .navbar-toggle {
+  border-color: #ddd;
+}
+.navbar-default .navbar-toggle:hover,
+.navbar-default .navbar-toggle:focus {
+  background-color: #ddd;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #888;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #e7e7e7;
+}
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:hover,
+.navbar-default .navbar-nav > .open > a:focus {
+  background-color: #e7e7e7;
+  color: #555;
+}
+@media (max-width: 540px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #777;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #333;
+    background-color: transparent;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #555;
+    background-color: #e7e7e7;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #ccc;
+    background-color: transparent;
+  }
+}
+.navbar-default .navbar-link {
+  color: #777;
+}
+.navbar-default .navbar-link:hover {
+  color: #333;
+}
+.navbar-default .btn-link {
+  color: #777;
+}
+.navbar-default .btn-link:hover,
+.navbar-default .btn-link:focus {
+  color: #333;
+}
+.navbar-default .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-default .btn-link:hover,
+.navbar-default .btn-link[disabled]:focus,
+fieldset[disabled] .navbar-default .btn-link:focus {
+  color: #ccc;
+}
+.navbar-inverse {
+  background-color: #222;
+  border-color: #080808;
+}
+.navbar-inverse .navbar-brand {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-brand:hover,
+.navbar-inverse .navbar-brand:focus {
+  color: #fff;
+  background-color: transparent;
+}
+.navbar-inverse .navbar-text {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-nav > li > a {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
+  color: #fff;
+  background-color: transparent;
+}
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+.navbar-inverse .navbar-nav > .active > a:focus {
+  color: #fff;
+  background-color: #080808;
+}
+.navbar-inverse .navbar-nav > .disabled > a,
+.navbar-inverse .navbar-nav > .disabled > a:hover,
+.navbar-inverse .navbar-nav > .disabled > a:focus {
+  color: #444;
+  background-color: transparent;
+}
+.navbar-inverse .navbar-toggle {
+  border-color: #333;
+}
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+  background-color: #333;
+}
+.navbar-inverse .navbar-toggle .icon-bar {
+  background-color: #fff;
+}
+.navbar-inverse .navbar-collapse,
+.navbar-inverse .navbar-form {
+  border-color: #101010;
+}
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+  background-color: #080808;
+  color: #fff;
+}
+@media (max-width: 540px) {
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
+    border-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #fff;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #fff;
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #444;
+    background-color: transparent;
+  }
+}
+.navbar-inverse .navbar-link {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-link:hover {
+  color: #fff;
+}
+.navbar-inverse .btn-link {
+  color: #9d9d9d;
+}
+.navbar-inverse .btn-link:hover,
+.navbar-inverse .btn-link:focus {
+  color: #fff;
+}
+.navbar-inverse .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-inverse .btn-link:hover,
+.navbar-inverse .btn-link[disabled]:focus,
+fieldset[disabled] .navbar-inverse .btn-link:focus {
+  color: #444;
+}
+.breadcrumb {
+  padding: 8px 15px;
+  margin-bottom: 18px;
+  list-style: none;
+  background-color: #f5f5f5;
+  border-radius: 2px;
+}
+.breadcrumb > li {
+  display: inline-block;
+}
+.breadcrumb > li + li:before {
+  content: "/\00a0";
+  padding: 0 5px;
+  color: #5e5e5e;
+}
+.breadcrumb > .active {
+  color: #777777;
+}
+.pagination {
+  display: inline-block;
+  padding-left: 0;
+  margin: 18px 0;
+  border-radius: 2px;
+}
+.pagination > li {
+  display: inline;
+}
+.pagination > li > a,
+.pagination > li > span {
+  position: relative;
+  float: left;
+  padding: 6px 12px;
+  line-height: 1.42857143;
+  text-decoration: none;
+  color: #337ab7;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  margin-left: -1px;
+}
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
+  margin-left: 0;
+  border-bottom-left-radius: 2px;
+  border-top-left-radius: 2px;
+}
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
+  border-bottom-right-radius: 2px;
+  border-top-right-radius: 2px;
+}
+.pagination > li > a:hover,
+.pagination > li > span:hover,
+.pagination > li > a:focus,
+.pagination > li > span:focus {
+  z-index: 2;
+  color: #23527c;
+  background-color: #eeeeee;
+  border-color: #ddd;
+}
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+  z-index: 3;
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #337ab7;
+  cursor: default;
+}
+.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus {
+  color: #777777;
+  background-color: #fff;
+  border-color: #ddd;
+  cursor: not-allowed;
+}
+.pagination-lg > li > a,
+.pagination-lg > li > span {
+  padding: 10px 16px;
+  font-size: 17px;
+  line-height: 1.3333333;
+}
+.pagination-lg > li:first-child > a,
+.pagination-lg > li:first-child > span {
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.pagination-lg > li:last-child > a,
+.pagination-lg > li:last-child > span {
+  border-bottom-right-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.pagination-sm > li > a,
+.pagination-sm > li > span {
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.pagination-sm > li:first-child > a,
+.pagination-sm > li:first-child > span {
+  border-bottom-left-radius: 1px;
+  border-top-left-radius: 1px;
+}
+.pagination-sm > li:last-child > a,
+.pagination-sm > li:last-child > span {
+  border-bottom-right-radius: 1px;
+  border-top-right-radius: 1px;
+}
+.pager {
+  padding-left: 0;
+  margin: 18px 0;
+  list-style: none;
+  text-align: center;
+}
+.pager li {
+  display: inline;
+}
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 15px;
+}
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #777777;
+  background-color: #fff;
+  cursor: not-allowed;
+}
+.label {
+  display: inline;
+  padding: .2em .6em .3em;
+  font-size: 75%;
+  font-weight: bold;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: .25em;
+}
+a.label:hover,
+a.label:focus {
+  color: #fff;
+  text-decoration: none;
+  cursor: pointer;
+}
+.label:empty {
+  display: none;
+}
+.btn .label {
+  position: relative;
+  top: -1px;
+}
+.label-default {
+  background-color: #777777;
+}
+.label-default[href]:hover,
+.label-default[href]:focus {
+  background-color: #5e5e5e;
+}
+.label-primary {
+  background-color: #337ab7;
+}
+.label-primary[href]:hover,
+.label-primary[href]:focus {
+  background-color: #286090;
+}
+.label-success {
+  background-color: #5cb85c;
+}
+.label-success[href]:hover,
+.label-success[href]:focus {
+  background-color: #449d44;
+}
+.label-info {
+  background-color: #5bc0de;
+}
+.label-info[href]:hover,
+.label-info[href]:focus {
+  background-color: #31b0d5;
+}
+.label-warning {
+  background-color: #f0ad4e;
+}
+.label-warning[href]:hover,
+.label-warning[href]:focus {
+  background-color: #ec971f;
+}
+.label-danger {
+  background-color: #d9534f;
+}
+.label-danger[href]:hover,
+.label-danger[href]:focus {
+  background-color: #c9302c;
+}
+.badge {
+  display: inline-block;
+  min-width: 10px;
+  padding: 3px 7px;
+  font-size: 12px;
+  font-weight: bold;
+  color: #fff;
+  line-height: 1;
+  vertical-align: middle;
+  white-space: nowrap;
+  text-align: center;
+  background-color: #777777;
+  border-radius: 10px;
+}
+.badge:empty {
+  display: none;
+}
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+.btn-xs .badge,
+.btn-group-xs > .btn .badge {
+  top: 0;
+  padding: 1px 5px;
+}
+a.badge:hover,
+a.badge:focus {
+  color: #fff;
+  text-decoration: none;
+  cursor: pointer;
+}
+.list-group-item.active > .badge,
+.nav-pills > .active > a > .badge {
+  color: #337ab7;
+  background-color: #fff;
+}
+.list-group-item > .badge {
+  float: right;
+}
+.list-group-item > .badge + .badge {
+  margin-right: 5px;
+}
+.nav-pills > li > a > .badge {
+  margin-left: 3px;
+}
+.jumbotron {
+  padding-top: 30px;
+  padding-bottom: 30px;
+  margin-bottom: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+}
+.jumbotron h1,
+.jumbotron .h1 {
+  color: inherit;
+}
+.jumbotron p {
+  margin-bottom: 15px;
+  font-size: 20px;
+  font-weight: 200;
+}
+.jumbotron > hr {
+  border-top-color: #d5d5d5;
+}
+.container .jumbotron,
+.container-fluid .jumbotron {
+  border-radius: 3px;
+  padding-left: 0px;
+  padding-right: 0px;
+}
+.jumbotron .container {
+  max-width: 100%;
+}
+@media screen and (min-width: 768px) {
+  .jumbotron {
+    padding-top: 48px;
+    padding-bottom: 48px;
+  }
+  .container .jumbotron,
+  .container-fluid .jumbotron {
+    padding-left: 60px;
+    padding-right: 60px;
+  }
+  .jumbotron h1,
+  .jumbotron .h1 {
+    font-size: 59px;
+  }
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  margin-bottom: 18px;
+  line-height: 1.42857143;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+  -webkit-transition: border 0.2s ease-in-out;
+  -o-transition: border 0.2s ease-in-out;
+  transition: border 0.2s ease-in-out;
+}
+.thumbnail > img,
+.thumbnail a > img {
+  margin-left: auto;
+  margin-right: auto;
+}
+a.thumbnail:hover,
+a.thumbnail:focus,
+a.thumbnail.active {
+  border-color: #337ab7;
+}
+.thumbnail .caption {
+  padding: 9px;
+  color: #000;
+}
+.alert {
+  padding: 15px;
+  margin-bottom: 18px;
+  border: 1px solid transparent;
+  border-radius: 2px;
+}
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
+}
+.alert .alert-link {
+  font-weight: bold;
+}
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+.alert > p + p {
+  margin-top: 5px;
+}
+.alert-dismissable,
+.alert-dismissible {
+  padding-right: 35px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
+}
+.alert-success {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #3c763d;
+}
+.alert-success hr {
+  border-top-color: #c9e2b3;
+}
+.alert-success .alert-link {
+  color: #2b542c;
+}
+.alert-info {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+  color: #31708f;
+}
+.alert-info hr {
+  border-top-color: #a6e1ec;
+}
+.alert-info .alert-link {
+  color: #245269;
+}
+.alert-warning {
+  background-color: #fcf8e3;
+  border-color: #faebcc;
+  color: #8a6d3b;
+}
+.alert-warning hr {
+  border-top-color: #f7e1b5;
+}
+.alert-warning .alert-link {
+  color: #66512c;
+}
+.alert-danger {
+  background-color: #f2dede;
+  border-color: #ebccd1;
+  color: #a94442;
+}
+.alert-danger hr {
+  border-top-color: #e4b9c0;
+}
+.alert-danger .alert-link {
+  color: #843534;
+}
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+.progress {
+  overflow: hidden;
+  height: 18px;
+  margin-bottom: 18px;
+  background-color: #f5f5f5;
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+.progress-bar {
+  float: left;
+  width: 0%;
+  height: 100%;
+  font-size: 12px;
+  line-height: 18px;
+  color: #fff;
+  text-align: center;
+  background-color: #337ab7;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-transition: width 0.6s ease;
+  -o-transition: width 0.6s ease;
+  transition: width 0.6s ease;
+}
+.progress-striped .progress-bar,
+.progress-bar-striped {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-size: 40px 40px;
+}
+.progress.active .progress-bar,
+.progress-bar.active {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+  -o-animation: progress-bar-stripes 2s linear infinite;
+  animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-bar-success {
+  background-color: #5cb85c;
+}
+.progress-striped .progress-bar-success {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-info {
+  background-color: #5bc0de;
+}
+.progress-striped .progress-bar-info {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-warning {
+  background-color: #f0ad4e;
+}
+.progress-striped .progress-bar-warning {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-danger {
+  background-color: #d9534f;
+}
+.progress-striped .progress-bar-danger {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.media {
+  margin-top: 15px;
+}
+.media:first-child {
+  margin-top: 0;
+}
+.media,
+.media-body {
+  zoom: 1;
+  overflow: hidden;
+}
+.media-body {
+  width: 10000px;
+}
+.media-object {
+  display: block;
+}
+.media-object.img-thumbnail {
+  max-width: none;
+}
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
+}
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
+.media-left,
+.media-right,
+.media-body {
+  display: table-cell;
+  vertical-align: top;
+}
+.media-middle {
+  vertical-align: middle;
+}
+.media-bottom {
+  vertical-align: bottom;
+}
+.media-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.media-list {
+  padding-left: 0;
+  list-style: none;
+}
+.list-group {
+  margin-bottom: 20px;
+  padding-left: 0;
+}
+.list-group-item {
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+  margin-bottom: -1px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+.list-group-item:first-child {
+  border-top-right-radius: 2px;
+  border-top-left-radius: 2px;
+}
+.list-group-item:last-child {
+  margin-bottom: 0;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+a.list-group-item,
+button.list-group-item {
+  color: #555;
+}
+a.list-group-item .list-group-item-heading,
+button.list-group-item .list-group-item-heading {
+  color: #333;
+}
+a.list-group-item:hover,
+button.list-group-item:hover,
+a.list-group-item:focus,
+button.list-group-item:focus {
+  text-decoration: none;
+  color: #555;
+  background-color: #f5f5f5;
+}
+button.list-group-item {
+  width: 100%;
+  text-align: left;
+}
+.list-group-item.disabled,
+.list-group-item.disabled:hover,
+.list-group-item.disabled:focus {
+  background-color: #eeeeee;
+  color: #777777;
+  cursor: not-allowed;
+}
+.list-group-item.disabled .list-group-item-heading,
+.list-group-item.disabled:hover .list-group-item-heading,
+.list-group-item.disabled:focus .list-group-item-heading {
+  color: inherit;
+}
+.list-group-item.disabled .list-group-item-text,
+.list-group-item.disabled:hover .list-group-item-text,
+.list-group-item.disabled:focus .list-group-item-text {
+  color: #777777;
+}
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  z-index: 2;
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #337ab7;
+}
+.list-group-item.active .list-group-item-heading,
+.list-group-item.active:hover .list-group-item-heading,
+.list-group-item.active:focus .list-group-item-heading,
+.list-group-item.active .list-group-item-heading > small,
+.list-group-item.active:hover .list-group-item-heading > small,
+.list-group-item.active:focus .list-group-item-heading > small,
+.list-group-item.active .list-group-item-heading > .small,
+.list-group-item.active:hover .list-group-item-heading > .small,
+.list-group-item.active:focus .list-group-item-heading > .small {
+  color: inherit;
+}
+.list-group-item.active .list-group-item-text,
+.list-group-item.active:hover .list-group-item-text,
+.list-group-item.active:focus .list-group-item-text {
+  color: #c7ddef;
+}
+.list-group-item-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+}
+a.list-group-item-success,
+button.list-group-item-success {
+  color: #3c763d;
+}
+a.list-group-item-success .list-group-item-heading,
+button.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+button.list-group-item-success:hover,
+a.list-group-item-success:focus,
+button.list-group-item-success:focus {
+  color: #3c763d;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+button.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+button.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus,
+button.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #3c763d;
+  border-color: #3c763d;
+}
+.list-group-item-info {
+  color: #31708f;
+  background-color: #d9edf7;
+}
+a.list-group-item-info,
+button.list-group-item-info {
+  color: #31708f;
+}
+a.list-group-item-info .list-group-item-heading,
+button.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+button.list-group-item-info:hover,
+a.list-group-item-info:focus,
+button.list-group-item-info:focus {
+  color: #31708f;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+button.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+button.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus,
+button.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #31708f;
+  border-color: #31708f;
+}
+.list-group-item-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning,
+button.list-group-item-warning {
+  color: #8a6d3b;
+}
+a.list-group-item-warning .list-group-item-heading,
+button.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+button.list-group-item-warning:hover,
+a.list-group-item-warning:focus,
+button.list-group-item-warning:focus {
+  color: #8a6d3b;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+button.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+button.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus,
+button.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #8a6d3b;
+  border-color: #8a6d3b;
+}
+.list-group-item-danger {
+  color: #a94442;
+  background-color: #f2dede;
+}
+a.list-group-item-danger,
+button.list-group-item-danger {
+  color: #a94442;
+}
+a.list-group-item-danger .list-group-item-heading,
+button.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+button.list-group-item-danger:hover,
+a.list-group-item-danger:focus,
+button.list-group-item-danger:focus {
+  color: #a94442;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+button.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+button.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus,
+button.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #a94442;
+  border-color: #a94442;
+}
+.list-group-item-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.list-group-item-text {
+  margin-bottom: 0;
+  line-height: 1.3;
+}
+.panel {
+  margin-bottom: 18px;
+  background-color: #fff;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.panel-body {
+  padding: 15px;
+}
+.panel-heading {
+  padding: 10px 15px;
+  border-bottom: 1px solid transparent;
+  border-top-right-radius: 1px;
+  border-top-left-radius: 1px;
+}
+.panel-heading > .dropdown .dropdown-toggle {
+  color: inherit;
+}
+.panel-title {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 15px;
+  color: inherit;
+}
+.panel-title > a,
+.panel-title > small,
+.panel-title > .small,
+.panel-title > small > a,
+.panel-title > .small > a {
+  color: inherit;
+}
+.panel-footer {
+  padding: 10px 15px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  border-bottom-right-radius: 1px;
+  border-bottom-left-radius: 1px;
+}
+.panel > .list-group,
+.panel > .panel-collapse > .list-group {
+  margin-bottom: 0;
+}
+.panel > .list-group .list-group-item,
+.panel > .panel-collapse > .list-group .list-group-item {
+  border-width: 1px 0;
+  border-radius: 0;
+}
+.panel > .list-group:first-child .list-group-item:first-child,
+.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
+  border-top: 0;
+  border-top-right-radius: 1px;
+  border-top-left-radius: 1px;
+}
+.panel > .list-group:last-child .list-group-item:last-child,
+.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
+  border-bottom: 0;
+  border-bottom-right-radius: 1px;
+  border-bottom-left-radius: 1px;
+}
+.panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+.panel-heading + .list-group .list-group-item:first-child {
+  border-top-width: 0;
+}
+.list-group + .panel-footer {
+  border-top-width: 0;
+}
+.panel > .table,
+.panel > .table-responsive > .table,
+.panel > .panel-collapse > .table {
+  margin-bottom: 0;
+}
+.panel > .table caption,
+.panel > .table-responsive > .table caption,
+.panel > .panel-collapse > .table caption {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+.panel > .table:first-child,
+.panel > .table-responsive:first-child > .table:first-child {
+  border-top-right-radius: 1px;
+  border-top-left-radius: 1px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {
+  border-top-left-radius: 1px;
+  border-top-right-radius: 1px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 1px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 1px;
+}
+.panel > .table:last-child,
+.panel > .table-responsive:last-child > .table:last-child {
+  border-bottom-right-radius: 1px;
+  border-bottom-left-radius: 1px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {
+  border-bottom-left-radius: 1px;
+  border-bottom-right-radius: 1px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 1px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 1px;
+}
+.panel > .panel-body + .table,
+.panel > .panel-body + .table-responsive,
+.panel > .table + .panel-body,
+.panel > .table-responsive + .panel-body {
+  border-top: 1px solid #ddd;
+}
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
+  border-top: 0;
+}
+.panel > .table-bordered,
+.panel > .table-responsive > .table-bordered {
+  border: 0;
+}
+.panel > .table-bordered > thead > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
+.panel > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-bordered > thead > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
+.panel > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-bordered > tfoot > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+  border-left: 0;
+}
+.panel > .table-bordered > thead > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
+.panel > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-bordered > thead > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
+.panel > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-bordered > tfoot > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+  border-right: 0;
+}
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
+  border-bottom: 0;
+}
+.panel > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
+  border-bottom: 0;
+}
+.panel > .table-responsive {
+  border: 0;
+  margin-bottom: 0;
+}
+.panel-group {
+  margin-bottom: 18px;
+}
+.panel-group .panel {
+  margin-bottom: 0;
+  border-radius: 2px;
+}
+.panel-group .panel + .panel {
+  margin-top: 5px;
+}
+.panel-group .panel-heading {
+  border-bottom: 0;
+}
+.panel-group .panel-heading + .panel-collapse > .panel-body,
+.panel-group .panel-heading + .panel-collapse > .list-group {
+  border-top: 1px solid #ddd;
+}
+.panel-group .panel-footer {
+  border-top: 0;
+}
+.panel-group .panel-footer + .panel-collapse .panel-body {
+  border-bottom: 1px solid #ddd;
+}
+.panel-default {
+  border-color: #ddd;
+}
+.panel-default > .panel-heading {
+  color: #333333;
+  background-color: #f5f5f5;
+  border-color: #ddd;
+}
+.panel-default > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #ddd;
+}
+.panel-default > .panel-heading .badge {
+  color: #f5f5f5;
+  background-color: #333333;
+}
+.panel-default > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #ddd;
+}
+.panel-primary {
+  border-color: #337ab7;
+}
+.panel-primary > .panel-heading {
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #337ab7;
+}
+.panel-primary > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #337ab7;
+}
+.panel-primary > .panel-heading .badge {
+  color: #337ab7;
+  background-color: #fff;
+}
+.panel-primary > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #337ab7;
+}
+.panel-success {
+  border-color: #d6e9c6;
+}
+.panel-success > .panel-heading {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+.panel-success > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #d6e9c6;
+}
+.panel-success > .panel-heading .badge {
+  color: #dff0d8;
+  background-color: #3c763d;
+}
+.panel-success > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #d6e9c6;
+}
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-heading .badge {
+  color: #d9edf7;
+  background-color: #31708f;
+}
+.panel-info > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #bce8f1;
+}
+.panel-warning {
+  border-color: #faebcc;
+}
+.panel-warning > .panel-heading {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
+}
+.panel-warning > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #faebcc;
+}
+.panel-warning > .panel-heading .badge {
+  color: #fcf8e3;
+  background-color: #8a6d3b;
+}
+.panel-warning > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #faebcc;
+}
+.panel-danger {
+  border-color: #ebccd1;
+}
+.panel-danger > .panel-heading {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #ebccd1;
+}
+.panel-danger > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #ebccd1;
+}
+.panel-danger > .panel-heading .badge {
+  color: #f2dede;
+  background-color: #a94442;
+}
+.panel-danger > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #ebccd1;
+}
+.embed-responsive {
+  position: relative;
+  display: block;
+  height: 0;
+  padding: 0;
+  overflow: hidden;
+}
+.embed-responsive .embed-responsive-item,
+.embed-responsive iframe,
+.embed-responsive embed,
+.embed-responsive object,
+.embed-responsive video {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  height: 100%;
+  width: 100%;
+  border: 0;
+}
+.embed-responsive-16by9 {
+  padding-bottom: 56.25%;
+}
+.embed-responsive-4by3 {
+  padding-bottom: 75%;
+}
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.well-lg {
+  padding: 24px;
+  border-radius: 3px;
+}
+.well-sm {
+  padding: 9px;
+  border-radius: 1px;
+}
+.close {
+  float: right;
+  font-size: 19.5px;
+  font-weight: bold;
+  line-height: 1;
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+.close:hover,
+.close:focus {
+  color: #000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+.modal-open {
+  overflow: hidden;
+}
+.modal {
+  display: none;
+  overflow: hidden;
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
+}
+.modal.fade .modal-dialog {
+  -webkit-transform: translate(0, -25%);
+  -ms-transform: translate(0, -25%);
+  -o-transform: translate(0, -25%);
+  transform: translate(0, -25%);
+  -webkit-transition: -webkit-transform 0.3s ease-out;
+  -moz-transition: -moz-transform 0.3s ease-out;
+  -o-transition: -o-transform 0.3s ease-out;
+  transition: transform 0.3s ease-out;
+}
+.modal.in .modal-dialog {
+  -webkit-transform: translate(0, 0);
+  -ms-transform: translate(0, 0);
+  -o-transform: translate(0, 0);
+  transform: translate(0, 0);
+}
+.modal-open .modal {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.modal-dialog {
+  position: relative;
+  width: auto;
+  margin: 10px;
+}
+.modal-content {
+  position: relative;
+  background-color: #fff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 3px;
+  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+  background-clip: padding-box;
+  outline: 0;
+}
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000;
+}
+.modal-backdrop.fade {
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
+.modal-backdrop.in {
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+.modal-header {
+  padding: 15px;
+  border-bottom: 1px solid #e5e5e5;
+}
+.modal-header .close {
+  margin-top: -2px;
+}
+.modal-title {
+  margin: 0;
+  line-height: 1.42857143;
+}
+.modal-body {
+  position: relative;
+  padding: 15px;
+}
+.modal-footer {
+  padding: 15px;
+  text-align: right;
+  border-top: 1px solid #e5e5e5;
+}
+.modal-footer .btn + .btn {
+  margin-left: 5px;
+  margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+.modal-scrollbar-measure {
+  position: absolute;
+  top: -9999px;
+  width: 50px;
+  height: 50px;
+  overflow: scroll;
+}
+@media (min-width: 768px) {
+  .modal-dialog {
+    width: 600px;
+    margin: 30px auto;
+  }
+  .modal-content {
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+  }
+  .modal-sm {
+    width: 300px;
+  }
+}
+@media (min-width: 992px) {
+  .modal-lg {
+    width: 900px;
+  }
+}
+.tooltip {
+  position: absolute;
+  z-index: 1070;
+  display: block;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-style: normal;
+  font-weight: normal;
+  letter-spacing: normal;
+  line-break: auto;
+  line-height: 1.42857143;
+  text-align: left;
+  text-align: start;
+  text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  white-space: normal;
+  word-break: normal;
+  word-spacing: normal;
+  word-wrap: normal;
+  font-size: 12px;
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
+.tooltip.in {
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+.tooltip.top {
+  margin-top: -3px;
+  padding: 5px 0;
+}
+.tooltip.right {
+  margin-left: 3px;
+  padding: 0 5px;
+}
+.tooltip.bottom {
+  margin-top: 3px;
+  padding: 5px 0;
+}
+.tooltip.left {
+  margin-left: -3px;
+  padding: 0 5px;
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: #fff;
+  text-align: center;
+  background-color: #000;
+  border-radius: 2px;
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000;
+}
+.tooltip.top-left .tooltip-arrow {
+  bottom: 0;
+  right: 5px;
+  margin-bottom: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000;
+}
+.tooltip.top-right .tooltip-arrow {
+  bottom: 0;
+  left: 5px;
+  margin-bottom: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-width: 5px 5px 5px 0;
+  border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-width: 5px 0 5px 5px;
+  border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000;
+}
+.tooltip.bottom-left .tooltip-arrow {
+  top: 0;
+  right: 5px;
+  margin-top: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000;
+}
+.tooltip.bottom-right .tooltip-arrow {
+  top: 0;
+  left: 5px;
+  margin-top: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1060;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-style: normal;
+  font-weight: normal;
+  letter-spacing: normal;
+  line-break: auto;
+  line-height: 1.42857143;
+  text-align: left;
+  text-align: start;
+  text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  white-space: normal;
+  word-break: normal;
+  word-spacing: normal;
+  word-wrap: normal;
+  font-size: 13px;
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: 3px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+}
+.popover.top {
+  margin-top: -10px;
+}
+.popover.right {
+  margin-left: 10px;
+}
+.popover.bottom {
+  margin-top: 10px;
+}
+.popover.left {
+  margin-left: -10px;
+}
+.popover-title {
+  margin: 0;
+  padding: 8px 14px;
+  font-size: 13px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  border-radius: 2px 2px 0 0;
+}
+.popover-content {
+  padding: 9px 14px;
+}
+.popover > .arrow,
+.popover > .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.popover > .arrow {
+  border-width: 11px;
+}
+.popover > .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+.popover.top > .arrow {
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-width: 0;
+  border-top-color: #999999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  bottom: -11px;
+}
+.popover.top > .arrow:after {
+  content: " ";
+  bottom: 1px;
+  margin-left: -10px;
+  border-bottom-width: 0;
+  border-top-color: #fff;
+}
+.popover.right > .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-left-width: 0;
+  border-right-color: #999999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+}
+.popover.right > .arrow:after {
+  content: " ";
+  left: 1px;
+  bottom: -10px;
+  border-left-width: 0;
+  border-right-color: #fff;
+}
+.popover.bottom > .arrow {
+  left: 50%;
+  margin-left: -11px;
+  border-top-width: 0;
+  border-bottom-color: #999999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  top: -11px;
+}
+.popover.bottom > .arrow:after {
+  content: " ";
+  top: 1px;
+  margin-left: -10px;
+  border-top-width: 0;
+  border-bottom-color: #fff;
+}
+.popover.left > .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-right-width: 0;
+  border-left-color: #999999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+}
+.popover.left > .arrow:after {
+  content: " ";
+  right: 1px;
+  border-right-width: 0;
+  border-left-color: #fff;
+  bottom: -10px;
+}
+.carousel {
+  position: relative;
+}
+.carousel-inner {
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+}
+.carousel-inner > .item {
+  display: none;
+  position: relative;
+  -webkit-transition: 0.6s ease-in-out left;
+  -o-transition: 0.6s ease-in-out left;
+  transition: 0.6s ease-in-out left;
+}
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  line-height: 1;
+}
+@media all and (transform-3d), (-webkit-transform-3d) {
+  .carousel-inner > .item {
+    -webkit-transition: -webkit-transform 0.6s ease-in-out;
+    -moz-transition: -moz-transform 0.6s ease-in-out;
+    -o-transition: -o-transform 0.6s ease-in-out;
+    transition: transform 0.6s ease-in-out;
+    -webkit-backface-visibility: hidden;
+    -moz-backface-visibility: hidden;
+    backface-visibility: hidden;
+    -webkit-perspective: 1000px;
+    -moz-perspective: 1000px;
+    perspective: 1000px;
+  }
+  .carousel-inner > .item.next,
+  .carousel-inner > .item.active.right {
+    -webkit-transform: translate3d(100%, 0, 0);
+    transform: translate3d(100%, 0, 0);
+    left: 0;
+  }
+  .carousel-inner > .item.prev,
+  .carousel-inner > .item.active.left {
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+    left: 0;
+  }
+  .carousel-inner > .item.next.left,
+  .carousel-inner > .item.prev.right,
+  .carousel-inner > .item.active {
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+    left: 0;
+  }
+}
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+.carousel-inner > .active {
+  left: 0;
+}
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel-inner > .next {
+  left: 100%;
+}
+.carousel-inner > .prev {
+  left: -100%;
+}
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+.carousel-inner > .active.left {
+  left: -100%;
+}
+.carousel-inner > .active.right {
+  left: 100%;
+}
+.carousel-control {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 15%;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+  font-size: 20px;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  background-color: rgba(0, 0, 0, 0);
+}
+.carousel-control.left {
+  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
+  background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+}
+.carousel-control.right {
+  left: auto;
+  right: 0;
+  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
+  background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+}
+.carousel-control:hover,
+.carousel-control:focus {
+  outline: 0;
+  color: #fff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+.carousel-control .icon-prev,
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right {
+  position: absolute;
+  top: 50%;
+  margin-top: -10px;
+  z-index: 5;
+  display: inline-block;
+}
+.carousel-control .icon-prev,
+.carousel-control .glyphicon-chevron-left {
+  left: 50%;
+  margin-left: -10px;
+}
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-right {
+  right: 50%;
+  margin-right: -10px;
+}
+.carousel-control .icon-prev,
+.carousel-control .icon-next {
+  width: 20px;
+  height: 20px;
+  line-height: 1;
+  font-family: serif;
+}
+.carousel-control .icon-prev:before {
+  content: '\2039';
+}
+.carousel-control .icon-next:before {
+  content: '\203a';
+}
+.carousel-indicators {
+  position: absolute;
+  bottom: 10px;
+  left: 50%;
+  z-index: 15;
+  width: 60%;
+  margin-left: -30%;
+  padding-left: 0;
+  list-style: none;
+  text-align: center;
+}
+.carousel-indicators li {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin: 1px;
+  text-indent: -999px;
+  border: 1px solid #fff;
+  border-radius: 10px;
+  cursor: pointer;
+  background-color: #000 \9;
+  background-color: rgba(0, 0, 0, 0);
+}
+.carousel-indicators .active {
+  margin: 0;
+  width: 12px;
+  height: 12px;
+  background-color: #fff;
+}
+.carousel-caption {
+  position: absolute;
+  left: 15%;
+  right: 15%;
+  bottom: 20px;
+  z-index: 10;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+}
+.carousel-caption .btn {
+  text-shadow: none;
+}
+@media screen and (min-width: 768px) {
+  .carousel-control .glyphicon-chevron-left,
+  .carousel-control .glyphicon-chevron-right,
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next {
+    width: 30px;
+    height: 30px;
+    margin-top: -10px;
+    font-size: 30px;
+  }
+  .carousel-control .glyphicon-chevron-left,
+  .carousel-control .icon-prev {
+    margin-left: -10px;
+  }
+  .carousel-control .glyphicon-chevron-right,
+  .carousel-control .icon-next {
+    margin-right: -10px;
+  }
+  .carousel-caption {
+    left: 20%;
+    right: 20%;
+    padding-bottom: 30px;
+  }
+  .carousel-indicators {
+    bottom: 20px;
+  }
+}
+.clearfix:before,
+.clearfix:after,
+.dl-horizontal dd:before,
+.dl-horizontal dd:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-header:before,
+.modal-header:after,
+.modal-footer:before,
+.modal-footer:after,
+.item_buttons:before,
+.item_buttons:after {
+  content: " ";
+  display: table;
+}
+.clearfix:after,
+.dl-horizontal dd:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-header:after,
+.modal-footer:after,
+.item_buttons:after {
+  clear: both;
+}
+.center-block {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+.pull-right {
+  float: right !important;
+}
+.pull-left {
+  float: left !important;
+}
+.hide {
+  display: none !important;
+}
+.show {
+  display: block !important;
+}
+.invisible {
+  visibility: hidden;
+}
+.text-hide {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+.hidden {
+  display: none !important;
+}
+.affix {
+  position: fixed;
+}
+@-ms-viewport {
+  width: device-width;
+}
+.visible-xs,
+.visible-sm,
+.visible-md,
+.visible-lg {
+  display: none !important;
+}
+.visible-xs-block,
+.visible-xs-inline,
+.visible-xs-inline-block,
+.visible-sm-block,
+.visible-sm-inline,
+.visible-sm-inline-block,
+.visible-md-block,
+.visible-md-inline,
+.visible-md-inline-block,
+.visible-lg-block,
+.visible-lg-inline,
+.visible-lg-inline-block {
+  display: none !important;
+}
+@media (max-width: 767px) {
+  .visible-xs {
+    display: block !important;
+  }
+  table.visible-xs {
+    display: table !important;
+  }
+  tr.visible-xs {
+    display: table-row !important;
+  }
+  th.visible-xs,
+  td.visible-xs {
+    display: table-cell !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-block {
+    display: block !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline {
+    display: inline !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm {
+    display: block !important;
+  }
+  table.visible-sm {
+    display: table !important;
+  }
+  tr.visible-sm {
+    display: table-row !important;
+  }
+  th.visible-sm,
+  td.visible-sm {
+    display: table-cell !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm-block {
+    display: block !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm-inline {
+    display: inline !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md {
+    display: block !important;
+  }
+  table.visible-md {
+    display: table !important;
+  }
+  tr.visible-md {
+    display: table-row !important;
+  }
+  th.visible-md,
+  td.visible-md {
+    display: table-cell !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md-block {
+    display: block !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md-inline {
+    display: inline !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg {
+    display: block !important;
+  }
+  table.visible-lg {
+    display: table !important;
+  }
+  tr.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-lg,
+  td.visible-lg {
+    display: table-cell !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg-block {
+    display: block !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg-inline {
+    display: inline !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (max-width: 767px) {
+  .hidden-xs {
+    display: none !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-sm {
+    display: none !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .hidden-md {
+    display: none !important;
+  }
+}
+@media (min-width: 1200px) {
+  .hidden-lg {
+    display: none !important;
+  }
+}
+.visible-print {
+  display: none !important;
+}
+@media print {
+  .visible-print {
+    display: block !important;
+  }
+  table.visible-print {
+    display: table !important;
+  }
+  tr.visible-print {
+    display: table-row !important;
+  }
+  th.visible-print,
+  td.visible-print {
+    display: table-cell !important;
+  }
+}
+.visible-print-block {
+  display: none !important;
+}
+@media print {
+  .visible-print-block {
+    display: block !important;
+  }
+}
+.visible-print-inline {
+  display: none !important;
+}
+@media print {
+  .visible-print-inline {
+    display: inline !important;
+  }
+}
+.visible-print-inline-block {
+  display: none !important;
+}
+@media print {
+  .visible-print-inline-block {
+    display: inline-block !important;
+  }
+}
+@media print {
+  .hidden-print {
+    display: none !important;
+  }
+}
+/*!
+*
+* Font Awesome
+*
+*/
+/*!
+ *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../components/font-awesome/fonts/fontawesome-webfont.eot?v=4.2.0');
+  src: url('../components/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../components/font-awesome/fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../components/font-awesome/fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../components/font-awesome/fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+.fa {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+/* makes the font 33% larger relative to the icon container */
+.fa-lg {
+  font-size: 1.33333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
+}
+.fa-2x {
+  font-size: 2em;
+}
+.fa-3x {
+  font-size: 3em;
+}
+.fa-4x {
+  font-size: 4em;
+}
+.fa-5x {
+  font-size: 5em;
+}
+.fa-fw {
+  width: 1.28571429em;
+  text-align: center;
+}
+.fa-ul {
+  padding-left: 0;
+  margin-left: 2.14285714em;
+  list-style-type: none;
+}
+.fa-ul > li {
+  position: relative;
+}
+.fa-li {
+  position: absolute;
+  left: -2.14285714em;
+  width: 2.14285714em;
+  top: 0.14285714em;
+  text-align: center;
+}
+.fa-li.fa-lg {
+  left: -1.85714286em;
+}
+.fa-border {
+  padding: .2em .25em .15em;
+  border: solid 0.08em #eee;
+  border-radius: .1em;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.fa.pull-left {
+  margin-right: .3em;
+}
+.fa.pull-right {
+  margin-left: .3em;
+}
+.fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+  animation: fa-spin 2s infinite linear;
+}
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+.fa-rotate-90 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -webkit-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+.fa-rotate-180 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -webkit-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+.fa-rotate-270 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -webkit-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  transform: rotate(270deg);
+}
+.fa-flip-horizontal {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -webkit-transform: scale(-1, 1);
+  -ms-transform: scale(-1, 1);
+  transform: scale(-1, 1);
+}
+.fa-flip-vertical {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -webkit-transform: scale(1, -1);
+  -ms-transform: scale(1, -1);
+  transform: scale(1, -1);
+}
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical {
+  filter: none;
+}
+.fa-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.fa-stack-1x {
+  line-height: inherit;
+}
+.fa-stack-2x {
+  font-size: 2em;
+}
+.fa-inverse {
+  color: #fff;
+}
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+.fa-glass:before {
+  content: "\f000";
+}
+.fa-music:before {
+  content: "\f001";
+}
+.fa-search:before {
+  content: "\f002";
+}
+.fa-envelope-o:before {
+  content: "\f003";
+}
+.fa-heart:before {
+  content: "\f004";
+}
+.fa-star:before {
+  content: "\f005";
+}
+.fa-star-o:before {
+  content: "\f006";
+}
+.fa-user:before {
+  content: "\f007";
+}
+.fa-film:before {
+  content: "\f008";
+}
+.fa-th-large:before {
+  content: "\f009";
+}
+.fa-th:before {
+  content: "\f00a";
+}
+.fa-th-list:before {
+  content: "\f00b";
+}
+.fa-check:before {
+  content: "\f00c";
+}
+.fa-remove:before,
+.fa-close:before,
+.fa-times:before {
+  content: "\f00d";
+}
+.fa-search-plus:before {
+  content: "\f00e";
+}
+.fa-search-minus:before {
+  content: "\f010";
+}
+.fa-power-off:before {
+  content: "\f011";
+}
+.fa-signal:before {
+  content: "\f012";
+}
+.fa-gear:before,
+.fa-cog:before {
+  content: "\f013";
+}
+.fa-trash-o:before {
+  content: "\f014";
+}
+.fa-home:before {
+  content: "\f015";
+}
+.fa-file-o:before {
+  content: "\f016";
+}
+.fa-clock-o:before {
+  content: "\f017";
+}
+.fa-road:before {
+  content: "\f018";
+}
+.fa-download:before {
+  content: "\f019";
+}
+.fa-arrow-circle-o-down:before {
+  content: "\f01a";
+}
+.fa-arrow-circle-o-up:before {
+  content: "\f01b";
+}
+.fa-inbox:before {
+  content: "\f01c";
+}
+.fa-play-circle-o:before {
+  content: "\f01d";
+}
+.fa-rotate-right:before,
+.fa-repeat:before {
+  content: "\f01e";
+}
+.fa-refresh:before {
+  content: "\f021";
+}
+.fa-list-alt:before {
+  content: "\f022";
+}
+.fa-lock:before {
+  content: "\f023";
+}
+.fa-flag:before {
+  content: "\f024";
+}
+.fa-headphones:before {
+  content: "\f025";
+}
+.fa-volume-off:before {
+  content: "\f026";
+}
+.fa-volume-down:before {
+  content: "\f027";
+}
+.fa-volume-up:before {
+  content: "\f028";
+}
+.fa-qrcode:before {
+  content: "\f029";
+}
+.fa-barcode:before {
+  content: "\f02a";
+}
+.fa-tag:before {
+  content: "\f02b";
+}
+.fa-tags:before {
+  content: "\f02c";
+}
+.fa-book:before {
+  content: "\f02d";
+}
+.fa-bookmark:before {
+  content: "\f02e";
+}
+.fa-print:before {
+  content: "\f02f";
+}
+.fa-camera:before {
+  content: "\f030";
+}
+.fa-font:before {
+  content: "\f031";
+}
+.fa-bold:before {
+  content: "\f032";
+}
+.fa-italic:before {
+  content: "\f033";
+}
+.fa-text-height:before {
+  content: "\f034";
+}
+.fa-text-width:before {
+  content: "\f035";
+}
+.fa-align-left:before {
+  content: "\f036";
+}
+.fa-align-center:before {
+  content: "\f037";
+}
+.fa-align-right:before {
+  content: "\f038";
+}
+.fa-align-justify:before {
+  content: "\f039";
+}
+.fa-list:before {
+  content: "\f03a";
+}
+.fa-dedent:before,
+.fa-outdent:before {
+  content: "\f03b";
+}
+.fa-indent:before {
+  content: "\f03c";
+}
+.fa-video-camera:before {
+  content: "\f03d";
+}
+.fa-photo:before,
+.fa-image:before,
+.fa-picture-o:before {
+  content: "\f03e";
+}
+.fa-pencil:before {
+  content: "\f040";
+}
+.fa-map-marker:before {
+  content: "\f041";
+}
+.fa-adjust:before {
+  content: "\f042";
+}
+.fa-tint:before {
+  content: "\f043";
+}
+.fa-edit:before,
+.fa-pencil-square-o:before {
+  content: "\f044";
+}
+.fa-share-square-o:before {
+  content: "\f045";
+}
+.fa-check-square-o:before {
+  content: "\f046";
+}
+.fa-arrows:before {
+  content: "\f047";
+}
+.fa-step-backward:before {
+  content: "\f048";
+}
+.fa-fast-backward:before {
+  content: "\f049";
+}
+.fa-backward:before {
+  content: "\f04a";
+}
+.fa-play:before {
+  content: "\f04b";
+}
+.fa-pause:before {
+  content: "\f04c";
+}
+.fa-stop:before {
+  content: "\f04d";
+}
+.fa-forward:before {
+  content: "\f04e";
+}
+.fa-fast-forward:before {
+  content: "\f050";
+}
+.fa-step-forward:before {
+  content: "\f051";
+}
+.fa-eject:before {
+  content: "\f052";
+}
+.fa-chevron-left:before {
+  content: "\f053";
+}
+.fa-chevron-right:before {
+  content: "\f054";
+}
+.fa-plus-circle:before {
+  content: "\f055";
+}
+.fa-minus-circle:before {
+  content: "\f056";
+}
+.fa-times-circle:before {
+  content: "\f057";
+}
+.fa-check-circle:before {
+  content: "\f058";
+}
+.fa-question-circle:before {
+  content: "\f059";
+}
+.fa-info-circle:before {
+  content: "\f05a";
+}
+.fa-crosshairs:before {
+  content: "\f05b";
+}
+.fa-times-circle-o:before {
+  content: "\f05c";
+}
+.fa-check-circle-o:before {
+  content: "\f05d";
+}
+.fa-ban:before {
+  content: "\f05e";
+}
+.fa-arrow-left:before {
+  content: "\f060";
+}
+.fa-arrow-right:before {
+  content: "\f061";
+}
+.fa-arrow-up:before {
+  content: "\f062";
+}
+.fa-arrow-down:before {
+  content: "\f063";
+}
+.fa-mail-forward:before,
+.fa-share:before {
+  content: "\f064";
+}
+.fa-expand:before {
+  content: "\f065";
+}
+.fa-compress:before {
+  content: "\f066";
+}
+.fa-plus:before {
+  content: "\f067";
+}
+.fa-minus:before {
+  content: "\f068";
+}
+.fa-asterisk:before {
+  content: "\f069";
+}
+.fa-exclamation-circle:before {
+  content: "\f06a";
+}
+.fa-gift:before {
+  content: "\f06b";
+}
+.fa-leaf:before {
+  content: "\f06c";
+}
+.fa-fire:before {
+  content: "\f06d";
+}
+.fa-eye:before {
+  content: "\f06e";
+}
+.fa-eye-slash:before {
+  content: "\f070";
+}
+.fa-warning:before,
+.fa-exclamation-triangle:before {
+  content: "\f071";
+}
+.fa-plane:before {
+  content: "\f072";
+}
+.fa-calendar:before {
+  content: "\f073";
+}
+.fa-random:before {
+  content: "\f074";
+}
+.fa-comment:before {
+  content: "\f075";
+}
+.fa-magnet:before {
+  content: "\f076";
+}
+.fa-chevron-up:before {
+  content: "\f077";
+}
+.fa-chevron-down:before {
+  content: "\f078";
+}
+.fa-retweet:before {
+  content: "\f079";
+}
+.fa-shopping-cart:before {
+  content: "\f07a";
+}
+.fa-folder:before {
+  content: "\f07b";
+}
+.fa-folder-open:before {
+  content: "\f07c";
+}
+.fa-arrows-v:before {
+  content: "\f07d";
+}
+.fa-arrows-h:before {
+  content: "\f07e";
+}
+.fa-bar-chart-o:before,
+.fa-bar-chart:before {
+  content: "\f080";
+}
+.fa-twitter-square:before {
+  content: "\f081";
+}
+.fa-facebook-square:before {
+  content: "\f082";
+}
+.fa-camera-retro:before {
+  content: "\f083";
+}
+.fa-key:before {
+  content: "\f084";
+}
+.fa-gears:before,
+.fa-cogs:before {
+  content: "\f085";
+}
+.fa-comments:before {
+  content: "\f086";
+}
+.fa-thumbs-o-up:before {
+  content: "\f087";
+}
+.fa-thumbs-o-down:before {
+  content: "\f088";
+}
+.fa-star-half:before {
+  content: "\f089";
+}
+.fa-heart-o:before {
+  content: "\f08a";
+}
+.fa-sign-out:before {
+  content: "\f08b";
+}
+.fa-linkedin-square:before {
+  content: "\f08c";
+}
+.fa-thumb-tack:before {
+  content: "\f08d";
+}
+.fa-external-link:before {
+  content: "\f08e";
+}
+.fa-sign-in:before {
+  content: "\f090";
+}
+.fa-trophy:before {
+  content: "\f091";
+}
+.fa-github-square:before {
+  content: "\f092";
+}
+.fa-upload:before {
+  content: "\f093";
+}
+.fa-lemon-o:before {
+  content: "\f094";
+}
+.fa-phone:before {
+  content: "\f095";
+}
+.fa-square-o:before {
+  content: "\f096";
+}
+.fa-bookmark-o:before {
+  content: "\f097";
+}
+.fa-phone-square:before {
+  content: "\f098";
+}
+.fa-twitter:before {
+  content: "\f099";
+}
+.fa-facebook:before {
+  content: "\f09a";
+}
+.fa-github:before {
+  content: "\f09b";
+}
+.fa-unlock:before {
+  content: "\f09c";
+}
+.fa-credit-card:before {
+  content: "\f09d";
+}
+.fa-rss:before {
+  content: "\f09e";
+}
+.fa-hdd-o:before {
+  content: "\f0a0";
+}
+.fa-bullhorn:before {
+  content: "\f0a1";
+}
+.fa-bell:before {
+  content: "\f0f3";
+}
+.fa-certificate:before {
+  content: "\f0a3";
+}
+.fa-hand-o-right:before {
+  content: "\f0a4";
+}
+.fa-hand-o-left:before {
+  content: "\f0a5";
+}
+.fa-hand-o-up:before {
+  content: "\f0a6";
+}
+.fa-hand-o-down:before {
+  content: "\f0a7";
+}
+.fa-arrow-circle-left:before {
+  content: "\f0a8";
+}
+.fa-arrow-circle-right:before {
+  content: "\f0a9";
+}
+.fa-arrow-circle-up:before {
+  content: "\f0aa";
+}
+.fa-arrow-circle-down:before {
+  content: "\f0ab";
+}
+.fa-globe:before {
+  content: "\f0ac";
+}
+.fa-wrench:before {
+  content: "\f0ad";
+}
+.fa-tasks:before {
+  content: "\f0ae";
+}
+.fa-filter:before {
+  content: "\f0b0";
+}
+.fa-briefcase:before {
+  content: "\f0b1";
+}
+.fa-arrows-alt:before {
+  content: "\f0b2";
+}
+.fa-group:before,
+.fa-users:before {
+  content: "\f0c0";
+}
+.fa-chain:before,
+.fa-link:before {
+  content: "\f0c1";
+}
+.fa-cloud:before {
+  content: "\f0c2";
+}
+.fa-flask:before {
+  content: "\f0c3";
+}
+.fa-cut:before,
+.fa-scissors:before {
+  content: "\f0c4";
+}
+.fa-copy:before,
+.fa-files-o:before {
+  content: "\f0c5";
+}
+.fa-paperclip:before {
+  content: "\f0c6";
+}
+.fa-save:before,
+.fa-floppy-o:before {
+  content: "\f0c7";
+}
+.fa-square:before {
+  content: "\f0c8";
+}
+.fa-navicon:before,
+.fa-reorder:before,
+.fa-bars:before {
+  content: "\f0c9";
+}
+.fa-list-ul:before {
+  content: "\f0ca";
+}
+.fa-list-ol:before {
+  content: "\f0cb";
+}
+.fa-strikethrough:before {
+  content: "\f0cc";
+}
+.fa-underline:before {
+  content: "\f0cd";
+}
+.fa-table:before {
+  content: "\f0ce";
+}
+.fa-magic:before {
+  content: "\f0d0";
+}
+.fa-truck:before {
+  content: "\f0d1";
+}
+.fa-pinterest:before {
+  content: "\f0d2";
+}
+.fa-pinterest-square:before {
+  content: "\f0d3";
+}
+.fa-google-plus-square:before {
+  content: "\f0d4";
+}
+.fa-google-plus:before {
+  content: "\f0d5";
+}
+.fa-money:before {
+  content: "\f0d6";
+}
+.fa-caret-down:before {
+  content: "\f0d7";
+}
+.fa-caret-up:before {
+  content: "\f0d8";
+}
+.fa-caret-left:before {
+  content: "\f0d9";
+}
+.fa-caret-right:before {
+  content: "\f0da";
+}
+.fa-columns:before {
+  content: "\f0db";
+}
+.fa-unsorted:before,
+.fa-sort:before {
+  content: "\f0dc";
+}
+.fa-sort-down:before,
+.fa-sort-desc:before {
+  content: "\f0dd";
+}
+.fa-sort-up:before,
+.fa-sort-asc:before {
+  content: "\f0de";
+}
+.fa-envelope:before {
+  content: "\f0e0";
+}
+.fa-linkedin:before {
+  content: "\f0e1";
+}
+.fa-rotate-left:before,
+.fa-undo:before {
+  content: "\f0e2";
+}
+.fa-legal:before,
+.fa-gavel:before {
+  content: "\f0e3";
+}
+.fa-dashboard:before,
+.fa-tachometer:before {
+  content: "\f0e4";
+}
+.fa-comment-o:before {
+  content: "\f0e5";
+}
+.fa-comments-o:before {
+  content: "\f0e6";
+}
+.fa-flash:before,
+.fa-bolt:before {
+  content: "\f0e7";
+}
+.fa-sitemap:before {
+  content: "\f0e8";
+}
+.fa-umbrella:before {
+  content: "\f0e9";
+}
+.fa-paste:before,
+.fa-clipboard:before {
+  content: "\f0ea";
+}
+.fa-lightbulb-o:before {
+  content: "\f0eb";
+}
+.fa-exchange:before {
+  content: "\f0ec";
+}
+.fa-cloud-download:before {
+  content: "\f0ed";
+}
+.fa-cloud-upload:before {
+  content: "\f0ee";
+}
+.fa-user-md:before {
+  content: "\f0f0";
+}
+.fa-stethoscope:before {
+  content: "\f0f1";
+}
+.fa-suitcase:before {
+  content: "\f0f2";
+}
+.fa-bell-o:before {
+  content: "\f0a2";
+}
+.fa-coffee:before {
+  content: "\f0f4";
+}
+.fa-cutlery:before {
+  content: "\f0f5";
+}
+.fa-file-text-o:before {
+  content: "\f0f6";
+}
+.fa-building-o:before {
+  content: "\f0f7";
+}
+.fa-hospital-o:before {
+  content: "\f0f8";
+}
+.fa-ambulance:before {
+  content: "\f0f9";
+}
+.fa-medkit:before {
+  content: "\f0fa";
+}
+.fa-fighter-jet:before {
+  content: "\f0fb";
+}
+.fa-beer:before {
+  content: "\f0fc";
+}
+.fa-h-square:before {
+  content: "\f0fd";
+}
+.fa-plus-square:before {
+  content: "\f0fe";
+}
+.fa-angle-double-left:before {
+  content: "\f100";
+}
+.fa-angle-double-right:before {
+  content: "\f101";
+}
+.fa-angle-double-up:before {
+  content: "\f102";
+}
+.fa-angle-double-down:before {
+  content: "\f103";
+}
+.fa-angle-left:before {
+  content: "\f104";
+}
+.fa-angle-right:before {
+  content: "\f105";
+}
+.fa-angle-up:before {
+  content: "\f106";
+}
+.fa-angle-down:before {
+  content: "\f107";
+}
+.fa-desktop:before {
+  content: "\f108";
+}
+.fa-laptop:before {
+  content: "\f109";
+}
+.fa-tablet:before {
+  content: "\f10a";
+}
+.fa-mobile-phone:before,
+.fa-mobile:before {
+  content: "\f10b";
+}
+.fa-circle-o:before {
+  content: "\f10c";
+}
+.fa-quote-left:before {
+  content: "\f10d";
+}
+.fa-quote-right:before {
+  content: "\f10e";
+}
+.fa-spinner:before {
+  content: "\f110";
+}
+.fa-circle:before {
+  content: "\f111";
+}
+.fa-mail-reply:before,
+.fa-reply:before {
+  content: "\f112";
+}
+.fa-github-alt:before {
+  content: "\f113";
+}
+.fa-folder-o:before {
+  content: "\f114";
+}
+.fa-folder-open-o:before {
+  content: "\f115";
+}
+.fa-smile-o:before {
+  content: "\f118";
+}
+.fa-frown-o:before {
+  content: "\f119";
+}
+.fa-meh-o:before {
+  content: "\f11a";
+}
+.fa-gamepad:before {
+  content: "\f11b";
+}
+.fa-keyboard-o:before {
+  content: "\f11c";
+}
+.fa-flag-o:before {
+  content: "\f11d";
+}
+.fa-flag-checkered:before {
+  content: "\f11e";
+}
+.fa-terminal:before {
+  content: "\f120";
+}
+.fa-code:before {
+  content: "\f121";
+}
+.fa-mail-reply-all:before,
+.fa-reply-all:before {
+  content: "\f122";
+}
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
+  content: "\f123";
+}
+.fa-location-arrow:before {
+  content: "\f124";
+}
+.fa-crop:before {
+  content: "\f125";
+}
+.fa-code-fork:before {
+  content: "\f126";
+}
+.fa-unlink:before,
+.fa-chain-broken:before {
+  content: "\f127";
+}
+.fa-question:before {
+  content: "\f128";
+}
+.fa-info:before {
+  content: "\f129";
+}
+.fa-exclamation:before {
+  content: "\f12a";
+}
+.fa-superscript:before {
+  content: "\f12b";
+}
+.fa-subscript:before {
+  content: "\f12c";
+}
+.fa-eraser:before {
+  content: "\f12d";
+}
+.fa-puzzle-piece:before {
+  content: "\f12e";
+}
+.fa-microphone:before {
+  content: "\f130";
+}
+.fa-microphone-slash:before {
+  content: "\f131";
+}
+.fa-shield:before {
+  content: "\f132";
+}
+.fa-calendar-o:before {
+  content: "\f133";
+}
+.fa-fire-extinguisher:before {
+  content: "\f134";
+}
+.fa-rocket:before {
+  content: "\f135";
+}
+.fa-maxcdn:before {
+  content: "\f136";
+}
+.fa-chevron-circle-left:before {
+  content: "\f137";
+}
+.fa-chevron-circle-right:before {
+  content: "\f138";
+}
+.fa-chevron-circle-up:before {
+  content: "\f139";
+}
+.fa-chevron-circle-down:before {
+  content: "\f13a";
+}
+.fa-html5:before {
+  content: "\f13b";
+}
+.fa-css3:before {
+  content: "\f13c";
+}
+.fa-anchor:before {
+  content: "\f13d";
+}
+.fa-unlock-alt:before {
+  content: "\f13e";
+}
+.fa-bullseye:before {
+  content: "\f140";
+}
+.fa-ellipsis-h:before {
+  content: "\f141";
+}
+.fa-ellipsis-v:before {
+  content: "\f142";
+}
+.fa-rss-square:before {
+  content: "\f143";
+}
+.fa-play-circle:before {
+  content: "\f144";
+}
+.fa-ticket:before {
+  content: "\f145";
+}
+.fa-minus-square:before {
+  content: "\f146";
+}
+.fa-minus-square-o:before {
+  content: "\f147";
+}
+.fa-level-up:before {
+  content: "\f148";
+}
+.fa-level-down:before {
+  content: "\f149";
+}
+.fa-check-square:before {
+  content: "\f14a";
+}
+.fa-pencil-square:before {
+  content: "\f14b";
+}
+.fa-external-link-square:before {
+  content: "\f14c";
+}
+.fa-share-square:before {
+  content: "\f14d";
+}
+.fa-compass:before {
+  content: "\f14e";
+}
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
+  content: "\f150";
+}
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
+  content: "\f151";
+}
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
+  content: "\f152";
+}
+.fa-euro:before,
+.fa-eur:before {
+  content: "\f153";
+}
+.fa-gbp:before {
+  content: "\f154";
+}
+.fa-dollar:before,
+.fa-usd:before {
+  content: "\f155";
+}
+.fa-rupee:before,
+.fa-inr:before {
+  content: "\f156";
+}
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
+  content: "\f157";
+}
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
+  content: "\f158";
+}
+.fa-won:before,
+.fa-krw:before {
+  content: "\f159";
+}
+.fa-bitcoin:before,
+.fa-btc:before {
+  content: "\f15a";
+}
+.fa-file:before {
+  content: "\f15b";
+}
+.fa-file-text:before {
+  content: "\f15c";
+}
+.fa-sort-alpha-asc:before {
+  content: "\f15d";
+}
+.fa-sort-alpha-desc:before {
+  content: "\f15e";
+}
+.fa-sort-amount-asc:before {
+  content: "\f160";
+}
+.fa-sort-amount-desc:before {
+  content: "\f161";
+}
+.fa-sort-numeric-asc:before {
+  content: "\f162";
+}
+.fa-sort-numeric-desc:before {
+  content: "\f163";
+}
+.fa-thumbs-up:before {
+  content: "\f164";
+}
+.fa-thumbs-down:before {
+  content: "\f165";
+}
+.fa-youtube-square:before {
+  content: "\f166";
+}
+.fa-youtube:before {
+  content: "\f167";
+}
+.fa-xing:before {
+  content: "\f168";
+}
+.fa-xing-square:before {
+  content: "\f169";
+}
+.fa-youtube-play:before {
+  content: "\f16a";
+}
+.fa-dropbox:before {
+  content: "\f16b";
+}
+.fa-stack-overflow:before {
+  content: "\f16c";
+}
+.fa-instagram:before {
+  content: "\f16d";
+}
+.fa-flickr:before {
+  content: "\f16e";
+}
+.fa-adn:before {
+  content: "\f170";
+}
+.fa-bitbucket:before {
+  content: "\f171";
+}
+.fa-bitbucket-square:before {
+  content: "\f172";
+}
+.fa-tumblr:before {
+  content: "\f173";
+}
+.fa-tumblr-square:before {
+  content: "\f174";
+}
+.fa-long-arrow-down:before {
+  content: "\f175";
+}
+.fa-long-arrow-up:before {
+  content: "\f176";
+}
+.fa-long-arrow-left:before {
+  content: "\f177";
+}
+.fa-long-arrow-right:before {
+  content: "\f178";
+}
+.fa-apple:before {
+  content: "\f179";
+}
+.fa-windows:before {
+  content: "\f17a";
+}
+.fa-android:before {
+  content: "\f17b";
+}
+.fa-linux:before {
+  content: "\f17c";
+}
+.fa-dribbble:before {
+  content: "\f17d";
+}
+.fa-skype:before {
+  content: "\f17e";
+}
+.fa-foursquare:before {
+  content: "\f180";
+}
+.fa-trello:before {
+  content: "\f181";
+}
+.fa-female:before {
+  content: "\f182";
+}
+.fa-male:before {
+  content: "\f183";
+}
+.fa-gittip:before {
+  content: "\f184";
+}
+.fa-sun-o:before {
+  content: "\f185";
+}
+.fa-moon-o:before {
+  content: "\f186";
+}
+.fa-archive:before {
+  content: "\f187";
+}
+.fa-bug:before {
+  content: "\f188";
+}
+.fa-vk:before {
+  content: "\f189";
+}
+.fa-weibo:before {
+  content: "\f18a";
+}
+.fa-renren:before {
+  content: "\f18b";
+}
+.fa-pagelines:before {
+  content: "\f18c";
+}
+.fa-stack-exchange:before {
+  content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+  content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+  content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+  content: "\f191";
+}
+.fa-dot-circle-o:before {
+  content: "\f192";
+}
+.fa-wheelchair:before {
+  content: "\f193";
+}
+.fa-vimeo-square:before {
+  content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+  content: "\f195";
+}
+.fa-plus-square-o:before {
+  content: "\f196";
+}
+.fa-space-shuttle:before {
+  content: "\f197";
+}
+.fa-slack:before {
+  content: "\f198";
+}
+.fa-envelope-square:before {
+  content: "\f199";
+}
+.fa-wordpress:before {
+  content: "\f19a";
+}
+.fa-openid:before {
+  content: "\f19b";
+}
+.fa-institution:before,
+.fa-bank:before,
+.fa-university:before {
+  content: "\f19c";
+}
+.fa-mortar-board:before,
+.fa-graduation-cap:before {
+  content: "\f19d";
+}
+.fa-yahoo:before {
+  content: "\f19e";
+}
+.fa-google:before {
+  content: "\f1a0";
+}
+.fa-reddit:before {
+  content: "\f1a1";
+}
+.fa-reddit-square:before {
+  content: "\f1a2";
+}
+.fa-stumbleupon-circle:before {
+  content: "\f1a3";
+}
+.fa-stumbleupon:before {
+  content: "\f1a4";
+}
+.fa-delicious:before {
+  content: "\f1a5";
+}
+.fa-digg:before {
+  content: "\f1a6";
+}
+.fa-pied-piper:before {
+  content: "\f1a7";
+}
+.fa-pied-piper-alt:before {
+  content: "\f1a8";
+}
+.fa-drupal:before {
+  content: "\f1a9";
+}
+.fa-joomla:before {
+  content: "\f1aa";
+}
+.fa-language:before {
+  content: "\f1ab";
+}
+.fa-fax:before {
+  content: "\f1ac";
+}
+.fa-building:before {
+  content: "\f1ad";
+}
+.fa-child:before {
+  content: "\f1ae";
+}
+.fa-paw:before {
+  content: "\f1b0";
+}
+.fa-spoon:before {
+  content: "\f1b1";
+}
+.fa-cube:before {
+  content: "\f1b2";
+}
+.fa-cubes:before {
+  content: "\f1b3";
+}
+.fa-behance:before {
+  content: "\f1b4";
+}
+.fa-behance-square:before {
+  content: "\f1b5";
+}
+.fa-steam:before {
+  content: "\f1b6";
+}
+.fa-steam-square:before {
+  content: "\f1b7";
+}
+.fa-recycle:before {
+  content: "\f1b8";
+}
+.fa-automobile:before,
+.fa-car:before {
+  content: "\f1b9";
+}
+.fa-cab:before,
+.fa-taxi:before {
+  content: "\f1ba";
+}
+.fa-tree:before {
+  content: "\f1bb";
+}
+.fa-spotify:before {
+  content: "\f1bc";
+}
+.fa-deviantart:before {
+  content: "\f1bd";
+}
+.fa-soundcloud:before {
+  content: "\f1be";
+}
+.fa-database:before {
+  content: "\f1c0";
+}
+.fa-file-pdf-o:before {
+  content: "\f1c1";
+}
+.fa-file-word-o:before {
+  content: "\f1c2";
+}
+.fa-file-excel-o:before {
+  content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+  content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+  content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+  content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+  content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+  content: "\f1c8";
+}
+.fa-file-code-o:before {
+  content: "\f1c9";
+}
+.fa-vine:before {
+  content: "\f1ca";
+}
+.fa-codepen:before {
+  content: "\f1cb";
+}
+.fa-jsfiddle:before {
+  content: "\f1cc";
+}
+.fa-life-bouy:before,
+.fa-life-buoy:before,
+.fa-life-saver:before,
+.fa-support:before,
+.fa-life-ring:before {
+  content: "\f1cd";
+}
+.fa-circle-o-notch:before {
+  content: "\f1ce";
+}
+.fa-ra:before,
+.fa-rebel:before {
+  content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+  content: "\f1d1";
+}
+.fa-git-square:before {
+  content: "\f1d2";
+}
+.fa-git:before {
+  content: "\f1d3";
+}
+.fa-hacker-news:before {
+  content: "\f1d4";
+}
+.fa-tencent-weibo:before {
+  content: "\f1d5";
+}
+.fa-qq:before {
+  content: "\f1d6";
+}
+.fa-wechat:before,
+.fa-weixin:before {
+  content: "\f1d7";
+}
+.fa-send:before,
+.fa-paper-plane:before {
+  content: "\f1d8";
+}
+.fa-send-o:before,
+.fa-paper-plane-o:before {
+  content: "\f1d9";
+}
+.fa-history:before {
+  content: "\f1da";
+}
+.fa-circle-thin:before {
+  content: "\f1db";
+}
+.fa-header:before {
+  content: "\f1dc";
+}
+.fa-paragraph:before {
+  content: "\f1dd";
+}
+.fa-sliders:before {
+  content: "\f1de";
+}
+.fa-share-alt:before {
+  content: "\f1e0";
+}
+.fa-share-alt-square:before {
+  content: "\f1e1";
+}
+.fa-bomb:before {
+  content: "\f1e2";
+}
+.fa-soccer-ball-o:before,
+.fa-futbol-o:before {
+  content: "\f1e3";
+}
+.fa-tty:before {
+  content: "\f1e4";
+}
+.fa-binoculars:before {
+  content: "\f1e5";
+}
+.fa-plug:before {
+  content: "\f1e6";
+}
+.fa-slideshare:before {
+  content: "\f1e7";
+}
+.fa-twitch:before {
+  content: "\f1e8";
+}
+.fa-yelp:before {
+  content: "\f1e9";
+}
+.fa-newspaper-o:before {
+  content: "\f1ea";
+}
+.fa-wifi:before {
+  content: "\f1eb";
+}
+.fa-calculator:before {
+  content: "\f1ec";
+}
+.fa-paypal:before {
+  content: "\f1ed";
+}
+.fa-google-wallet:before {
+  content: "\f1ee";
+}
+.fa-cc-visa:before {
+  content: "\f1f0";
+}
+.fa-cc-mastercard:before {
+  content: "\f1f1";
+}
+.fa-cc-discover:before {
+  content: "\f1f2";
+}
+.fa-cc-amex:before {
+  content: "\f1f3";
+}
+.fa-cc-paypal:before {
+  content: "\f1f4";
+}
+.fa-cc-stripe:before {
+  content: "\f1f5";
+}
+.fa-bell-slash:before {
+  content: "\f1f6";
+}
+.fa-bell-slash-o:before {
+  content: "\f1f7";
+}
+.fa-trash:before {
+  content: "\f1f8";
+}
+.fa-copyright:before {
+  content: "\f1f9";
+}
+.fa-at:before {
+  content: "\f1fa";
+}
+.fa-eyedropper:before {
+  content: "\f1fb";
+}
+.fa-paint-brush:before {
+  content: "\f1fc";
+}
+.fa-birthday-cake:before {
+  content: "\f1fd";
+}
+.fa-area-chart:before {
+  content: "\f1fe";
+}
+.fa-pie-chart:before {
+  content: "\f200";
+}
+.fa-line-chart:before {
+  content: "\f201";
+}
+.fa-lastfm:before {
+  content: "\f202";
+}
+.fa-lastfm-square:before {
+  content: "\f203";
+}
+.fa-toggle-off:before {
+  content: "\f204";
+}
+.fa-toggle-on:before {
+  content: "\f205";
+}
+.fa-bicycle:before {
+  content: "\f206";
+}
+.fa-bus:before {
+  content: "\f207";
+}
+.fa-ioxhost:before {
+  content: "\f208";
+}
+.fa-angellist:before {
+  content: "\f209";
+}
+.fa-cc:before {
+  content: "\f20a";
+}
+.fa-shekel:before,
+.fa-sheqel:before,
+.fa-ils:before {
+  content: "\f20b";
+}
+.fa-meanpath:before {
+  content: "\f20c";
+}
+/*!
+*
+* IPython base
+*
+*/
+.modal.fade .modal-dialog {
+  -webkit-transform: translate(0, 0);
+  -ms-transform: translate(0, 0);
+  -o-transform: translate(0, 0);
+  transform: translate(0, 0);
+}
+code {
+  color: #000;
+}
+pre {
+  font-size: inherit;
+  line-height: inherit;
+}
+label {
+  font-weight: normal;
+}
+/* Make the page background atleast 100% the height of the view port */
+/* Make the page itself atleast 70% the height of the view port */
+.border-box-sizing {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+.corner-all {
+  border-radius: 2px;
+}
+.no-padding {
+  padding: 0px;
+}
+/* Flexible box model classes */
+/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
+/* This file is a compatability layer.  It allows the usage of flexible box
+model layouts accross multiple browsers, including older browsers.  The newest,
+universal implementation of the flexible box model is used when available (see
+`Modern browsers` comments below).  Browsers that are known to implement this
+new spec completely include:
+
+    Firefox 28.0+
+    Chrome 29.0+
+    Internet Explorer 11+
+    Opera 17.0+
+
+Browsers not listed, including Safari, are supported via the styling under the
+`Old browsers` comments below.
+*/
+.hbox {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+.hbox > * {
+  /* Old browsers */
+  -webkit-box-flex: 0;
+  -moz-box-flex: 0;
+  box-flex: 0;
+  /* Modern browsers */
+  flex: none;
+}
+.vbox {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+}
+.vbox > * {
+  /* Old browsers */
+  -webkit-box-flex: 0;
+  -moz-box-flex: 0;
+  box-flex: 0;
+  /* Modern browsers */
+  flex: none;
+}
+.hbox.reverse,
+.vbox.reverse,
+.reverse {
+  /* Old browsers */
+  -webkit-box-direction: reverse;
+  -moz-box-direction: reverse;
+  box-direction: reverse;
+  /* Modern browsers */
+  flex-direction: row-reverse;
+}
+.hbox.box-flex0,
+.vbox.box-flex0,
+.box-flex0 {
+  /* Old browsers */
+  -webkit-box-flex: 0;
+  -moz-box-flex: 0;
+  box-flex: 0;
+  /* Modern browsers */
+  flex: none;
+  width: auto;
+}
+.hbox.box-flex1,
+.vbox.box-flex1,
+.box-flex1 {
+  /* Old browsers */
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  box-flex: 1;
+  /* Modern browsers */
+  flex: 1;
+}
+.hbox.box-flex,
+.vbox.box-flex,
+.box-flex {
+  /* Old browsers */
+  /* Old browsers */
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  box-flex: 1;
+  /* Modern browsers */
+  flex: 1;
+}
+.hbox.box-flex2,
+.vbox.box-flex2,
+.box-flex2 {
+  /* Old browsers */
+  -webkit-box-flex: 2;
+  -moz-box-flex: 2;
+  box-flex: 2;
+  /* Modern browsers */
+  flex: 2;
+}
+.box-group1 {
+  /*  Deprecated */
+  -webkit-box-flex-group: 1;
+  -moz-box-flex-group: 1;
+  box-flex-group: 1;
+}
+.box-group2 {
+  /* Deprecated */
+  -webkit-box-flex-group: 2;
+  -moz-box-flex-group: 2;
+  box-flex-group: 2;
+}
+.hbox.start,
+.vbox.start,
+.start {
+  /* Old browsers */
+  -webkit-box-pack: start;
+  -moz-box-pack: start;
+  box-pack: start;
+  /* Modern browsers */
+  justify-content: flex-start;
+}
+.hbox.end,
+.vbox.end,
+.end {
+  /* Old browsers */
+  -webkit-box-pack: end;
+  -moz-box-pack: end;
+  box-pack: end;
+  /* Modern browsers */
+  justify-content: flex-end;
+}
+.hbox.center,
+.vbox.center,
+.center {
+  /* Old browsers */
+  -webkit-box-pack: center;
+  -moz-box-pack: center;
+  box-pack: center;
+  /* Modern browsers */
+  justify-content: center;
+}
+.hbox.baseline,
+.vbox.baseline,
+.baseline {
+  /* Old browsers */
+  -webkit-box-pack: baseline;
+  -moz-box-pack: baseline;
+  box-pack: baseline;
+  /* Modern browsers */
+  justify-content: baseline;
+}
+.hbox.stretch,
+.vbox.stretch,
+.stretch {
+  /* Old browsers */
+  -webkit-box-pack: stretch;
+  -moz-box-pack: stretch;
+  box-pack: stretch;
+  /* Modern browsers */
+  justify-content: stretch;
+}
+.hbox.align-start,
+.vbox.align-start,
+.align-start {
+  /* Old browsers */
+  -webkit-box-align: start;
+  -moz-box-align: start;
+  box-align: start;
+  /* Modern browsers */
+  align-items: flex-start;
+}
+.hbox.align-end,
+.vbox.align-end,
+.align-end {
+  /* Old browsers */
+  -webkit-box-align: end;
+  -moz-box-align: end;
+  box-align: end;
+  /* Modern browsers */
+  align-items: flex-end;
+}
+.hbox.align-center,
+.vbox.align-center,
+.align-center {
+  /* Old browsers */
+  -webkit-box-align: center;
+  -moz-box-align: center;
+  box-align: center;
+  /* Modern browsers */
+  align-items: center;
+}
+.hbox.align-baseline,
+.vbox.align-baseline,
+.align-baseline {
+  /* Old browsers */
+  -webkit-box-align: baseline;
+  -moz-box-align: baseline;
+  box-align: baseline;
+  /* Modern browsers */
+  align-items: baseline;
+}
+.hbox.align-stretch,
+.vbox.align-stretch,
+.align-stretch {
+  /* Old browsers */
+  -webkit-box-align: stretch;
+  -moz-box-align: stretch;
+  box-align: stretch;
+  /* Modern browsers */
+  align-items: stretch;
+}
+div.error {
+  margin: 2em;
+  text-align: center;
+}
+div.error > h1 {
+  font-size: 500%;
+  line-height: normal;
+}
+div.error > p {
+  font-size: 200%;
+  line-height: normal;
+}
+div.traceback-wrapper {
+  text-align: left;
+  max-width: 800px;
+  margin: auto;
+}
+/**
+ * Primary styles
+ *
+ * Author: Jupyter Development Team
+ */
+body {
+  background-color: #fff;
+  /* This makes sure that the body covers the entire window and needs to
+       be in a different element than the display: box in wrapper below */
+  position: absolute;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px;
+  overflow: visible;
+}
+body > #header {
+  /* Initially hidden to prevent FLOUC */
+  display: none;
+  background-color: #fff;
+  /* Display over codemirror */
+  position: relative;
+  z-index: 100;
+}
+body > #header #header-container {
+  padding-bottom: 5px;
+  padding-top: 5px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+body > #header .header-bar {
+  width: 100%;
+  height: 1px;
+  background: #e7e7e7;
+  margin-bottom: -1px;
+}
+@media print {
+  body > #header {
+    display: none !important;
+  }
+}
+#header-spacer {
+  width: 100%;
+  visibility: hidden;
+}
+@media print {
+  #header-spacer {
+    display: none;
+  }
+}
+#ipython_notebook {
+  padding-left: 0px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+@media (max-width: 991px) {
+  #ipython_notebook {
+    margin-left: 10px;
+  }
+}
+[dir="rtl"] #ipython_notebook {
+  float: right !important;
+}
+#noscript {
+  width: auto;
+  padding-top: 16px;
+  padding-bottom: 16px;
+  text-align: center;
+  font-size: 22px;
+  color: red;
+  font-weight: bold;
+}
+#ipython_notebook img {
+  height: 28px;
+}
+#site {
+  width: 100%;
+  display: none;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  overflow: auto;
+}
+@media print {
+  #site {
+    height: auto !important;
+  }
+}
+/* Smaller buttons */
+.ui-button .ui-button-text {
+  padding: 0.2em 0.8em;
+  font-size: 77%;
+}
+input.ui-button {
+  padding: 0.3em 0.9em;
+}
+span#login_widget {
+  float: right;
+}
+span#login_widget > .button,
+#logout {
+  color: #333;
+  background-color: #fff;
+  border-color: #ccc;
+}
+span#login_widget > .button:focus,
+#logout:focus,
+span#login_widget > .button.focus,
+#logout.focus {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #8c8c8c;
+}
+span#login_widget > .button:hover,
+#logout:hover {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+span#login_widget > .button:active,
+#logout:active,
+span#login_widget > .button.active,
+#logout.active,
+.open > .dropdown-togglespan#login_widget > .button,
+.open > .dropdown-toggle#logout {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+span#login_widget > .button:active:hover,
+#logout:active:hover,
+span#login_widget > .button.active:hover,
+#logout.active:hover,
+.open > .dropdown-togglespan#login_widget > .button:hover,
+.open > .dropdown-toggle#logout:hover,
+span#login_widget > .button:active:focus,
+#logout:active:focus,
+span#login_widget > .button.active:focus,
+#logout.active:focus,
+.open > .dropdown-togglespan#login_widget > .button:focus,
+.open > .dropdown-toggle#logout:focus,
+span#login_widget > .button:active.focus,
+#logout:active.focus,
+span#login_widget > .button.active.focus,
+#logout.active.focus,
+.open > .dropdown-togglespan#login_widget > .button.focus,
+.open > .dropdown-toggle#logout.focus {
+  color: #333;
+  background-color: #d4d4d4;
+  border-color: #8c8c8c;
+}
+span#login_widget > .button:active,
+#logout:active,
+span#login_widget > .button.active,
+#logout.active,
+.open > .dropdown-togglespan#login_widget > .button,
+.open > .dropdown-toggle#logout {
+  background-image: none;
+}
+span#login_widget > .button.disabled:hover,
+#logout.disabled:hover,
+span#login_widget > .button[disabled]:hover,
+#logout[disabled]:hover,
+fieldset[disabled] span#login_widget > .button:hover,
+fieldset[disabled] #logout:hover,
+span#login_widget > .button.disabled:focus,
+#logout.disabled:focus,
+span#login_widget > .button[disabled]:focus,
+#logout[disabled]:focus,
+fieldset[disabled] span#login_widget > .button:focus,
+fieldset[disabled] #logout:focus,
+span#login_widget > .button.disabled.focus,
+#logout.disabled.focus,
+span#login_widget > .button[disabled].focus,
+#logout[disabled].focus,
+fieldset[disabled] span#login_widget > .button.focus,
+fieldset[disabled] #logout.focus {
+  background-color: #fff;
+  border-color: #ccc;
+}
+span#login_widget > .button .badge,
+#logout .badge {
+  color: #fff;
+  background-color: #333;
+}
+.nav-header {
+  text-transform: none;
+}
+#header > span {
+  margin-top: 10px;
+}
+.modal_stretch .modal-dialog {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  min-height: 80vh;
+}
+.modal_stretch .modal-dialog .modal-body {
+  max-height: calc(100vh - 200px);
+  overflow: auto;
+  flex: 1;
+}
+@media (min-width: 768px) {
+  .modal .modal-dialog {
+    width: 700px;
+  }
+}
+@media (min-width: 768px) {
+  select.form-control {
+    margin-left: 12px;
+    margin-right: 12px;
+  }
+}
+/*!
+*
+* IPython auth
+*
+*/
+.center-nav {
+  display: inline-block;
+  margin-bottom: -4px;
+}
+/*!
+*
+* IPython tree view
+*
+*/
+/* We need an invisible input field on top of the sentense*/
+/* "Drag file onto the list ..." */
+.alternate_upload {
+  background-color: none;
+  display: inline;
+}
+.alternate_upload.form {
+  padding: 0;
+  margin: 0;
+}
+.alternate_upload input.fileinput {
+  text-align: center;
+  vertical-align: middle;
+  display: inline;
+  opacity: 0;
+  z-index: 2;
+  width: 12ex;
+  margin-right: -12ex;
+}
+.alternate_upload .btn-upload {
+  height: 22px;
+}
+/**
+ * Primary styles
+ *
+ * Author: Jupyter Development Team
+ */
+[dir="rtl"] #tabs li {
+  float: right;
+}
+ul#tabs {
+  margin-bottom: 4px;
+}
+[dir="rtl"] ul#tabs {
+  margin-right: 0px;
+}
+ul#tabs a {
+  padding-top: 6px;
+  padding-bottom: 4px;
+}
+ul.breadcrumb a:focus,
+ul.breadcrumb a:hover {
+  text-decoration: none;
+}
+ul.breadcrumb i.icon-home {
+  font-size: 16px;
+  margin-right: 4px;
+}
+ul.breadcrumb span {
+  color: #5e5e5e;
+}
+.list_toolbar {
+  padding: 4px 0 4px 0;
+  vertical-align: middle;
+}
+.list_toolbar .tree-buttons {
+  padding-top: 1px;
+}
+[dir="rtl"] .list_toolbar .tree-buttons {
+  float: left !important;
+}
+[dir="rtl"] .list_toolbar .pull-right {
+  padding-top: 1px;
+  float: left !important;
+}
+[dir="rtl"] .list_toolbar .pull-left {
+  float: right !important;
+}
+.dynamic-buttons {
+  padding-top: 3px;
+  display: inline-block;
+}
+.list_toolbar [class*="span"] {
+  min-height: 24px;
+}
+.list_header {
+  font-weight: bold;
+  background-color: #EEE;
+}
+.list_placeholder {
+  font-weight: bold;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  padding-left: 7px;
+  padding-right: 7px;
+}
+.list_container {
+  margin-top: 4px;
+  margin-bottom: 20px;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+}
+.list_container > div {
+  border-bottom: 1px solid #ddd;
+}
+.list_container > div:hover .list-item {
+  background-color: red;
+}
+.list_container > div:last-child {
+  border: none;
+}
+.list_item:hover .list_item {
+  background-color: #ddd;
+}
+.list_item a {
+  text-decoration: none;
+}
+.list_item:hover {
+  background-color: #fafafa;
+}
+.list_header > div,
+.list_item > div {
+  padding-top: 4px;
+  padding-bottom: 4px;
+  padding-left: 7px;
+  padding-right: 7px;
+  line-height: 22px;
+}
+.list_header > div input,
+.list_item > div input {
+  margin-right: 7px;
+  margin-left: 14px;
+  vertical-align: baseline;
+  line-height: 22px;
+  position: relative;
+  top: -1px;
+}
+.list_header > div .item_link,
+.list_item > div .item_link {
+  margin-left: -1px;
+  vertical-align: baseline;
+  line-height: 22px;
+}
+.new-file input[type=checkbox] {
+  visibility: hidden;
+}
+.item_name {
+  line-height: 22px;
+  height: 24px;
+}
+.item_icon {
+  font-size: 14px;
+  color: #5e5e5e;
+  margin-right: 7px;
+  margin-left: 7px;
+  line-height: 22px;
+  vertical-align: baseline;
+}
+.item_buttons {
+  line-height: 1em;
+  margin-left: -5px;
+}
+.item_buttons .btn,
+.item_buttons .btn-group,
+.item_buttons .input-group {
+  float: left;
+}
+.item_buttons > .btn,
+.item_buttons > .btn-group,
+.item_buttons > .input-group {
+  margin-left: 5px;
+}
+.item_buttons .btn {
+  min-width: 13ex;
+}
+.item_buttons .running-indicator {
+  padding-top: 4px;
+  color: #5cb85c;
+}
+.item_buttons .kernel-name {
+  padding-top: 4px;
+  color: #5bc0de;
+  margin-right: 7px;
+  float: left;
+}
+.toolbar_info {
+  height: 24px;
+  line-height: 24px;
+}
+.list_item input:not([type=checkbox]) {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  height: 22px;
+  line-height: 14px;
+  margin: 0px;
+}
+.highlight_text {
+  color: blue;
+}
+#project_name {
+  display: inline-block;
+  padding-left: 7px;
+  margin-left: -2px;
+}
+#project_name > .breadcrumb {
+  padding: 0px;
+  margin-bottom: 0px;
+  background-color: transparent;
+  font-weight: bold;
+}
+#tree-selector {
+  padding-right: 0px;
+}
+[dir="rtl"] #tree-selector a {
+  float: right;
+}
+#button-select-all {
+  min-width: 50px;
+}
+#select-all {
+  margin-left: 7px;
+  margin-right: 2px;
+}
+.menu_icon {
+  margin-right: 2px;
+}
+.tab-content .row {
+  margin-left: 0px;
+  margin-right: 0px;
+}
+.folder_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f114";
+}
+.folder_icon:before.pull-left {
+  margin-right: .3em;
+}
+.folder_icon:before.pull-right {
+  margin-left: .3em;
+}
+.notebook_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f02d";
+  position: relative;
+  top: -1px;
+}
+.notebook_icon:before.pull-left {
+  margin-right: .3em;
+}
+.notebook_icon:before.pull-right {
+  margin-left: .3em;
+}
+.running_notebook_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f02d";
+  position: relative;
+  top: -1px;
+  color: #5cb85c;
+}
+.running_notebook_icon:before.pull-left {
+  margin-right: .3em;
+}
+.running_notebook_icon:before.pull-right {
+  margin-left: .3em;
+}
+.file_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f016";
+  position: relative;
+  top: -2px;
+}
+.file_icon:before.pull-left {
+  margin-right: .3em;
+}
+.file_icon:before.pull-right {
+  margin-left: .3em;
+}
+#notebook_toolbar .pull-right {
+  padding-top: 0px;
+  margin-right: -1px;
+}
+ul#new-menu {
+  left: auto;
+  right: 0;
+}
+[dir="rtl"] #new-menu {
+  text-align: right;
+}
+.kernel-menu-icon {
+  padding-right: 12px;
+  width: 24px;
+  content: "\f096";
+}
+.kernel-menu-icon:before {
+  content: "\f096";
+}
+.kernel-menu-icon-current:before {
+  content: "\f00c";
+}
+#tab_content {
+  padding-top: 20px;
+}
+#running .panel-group .panel {
+  margin-top: 3px;
+  margin-bottom: 1em;
+}
+#running .panel-group .panel .panel-heading {
+  background-color: #EEE;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  padding-left: 7px;
+  padding-right: 7px;
+  line-height: 22px;
+}
+#running .panel-group .panel .panel-heading a:focus,
+#running .panel-group .panel .panel-heading a:hover {
+  text-decoration: none;
+}
+#running .panel-group .panel .panel-body {
+  padding: 0px;
+}
+#running .panel-group .panel .panel-body .list_container {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  border: 0px;
+  border-radius: 0px;
+}
+#running .panel-group .panel .panel-body .list_container .list_item {
+  border-bottom: 1px solid #ddd;
+}
+#running .panel-group .panel .panel-body .list_container .list_item:last-child {
+  border-bottom: 0px;
+}
+[dir="rtl"] #running .col-sm-8 {
+  float: right !important;
+}
+.delete-button {
+  display: none;
+}
+.duplicate-button {
+  display: none;
+}
+.rename-button {
+  display: none;
+}
+.shutdown-button {
+  display: none;
+}
+.dynamic-instructions {
+  display: inline-block;
+  padding-top: 4px;
+}
+/*!
+*
+* IPython text editor webapp
+*
+*/
+.selected-keymap i.fa {
+  padding: 0px 5px;
+}
+.selected-keymap i.fa:before {
+  content: "\f00c";
+}
+#mode-menu {
+  overflow: auto;
+  max-height: 20em;
+}
+.edit_app #header {
+  -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+}
+.edit_app #menubar .navbar {
+  /* Use a negative 1 bottom margin, so the border overlaps the border of the
+    header */
+  margin-bottom: -1px;
+}
+.dirty-indicator {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  width: 20px;
+}
+.dirty-indicator.pull-left {
+  margin-right: .3em;
+}
+.dirty-indicator.pull-right {
+  margin-left: .3em;
+}
+.dirty-indicator-dirty {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  width: 20px;
+}
+.dirty-indicator-dirty.pull-left {
+  margin-right: .3em;
+}
+.dirty-indicator-dirty.pull-right {
+  margin-left: .3em;
+}
+.dirty-indicator-clean {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  width: 20px;
+}
+.dirty-indicator-clean.pull-left {
+  margin-right: .3em;
+}
+.dirty-indicator-clean.pull-right {
+  margin-left: .3em;
+}
+.dirty-indicator-clean:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f00c";
+}
+.dirty-indicator-clean:before.pull-left {
+  margin-right: .3em;
+}
+.dirty-indicator-clean:before.pull-right {
+  margin-left: .3em;
+}
+#filename {
+  font-size: 16pt;
+  display: table;
+  padding: 0px 5px;
+}
+#current-mode {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+#texteditor-backdrop {
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+@media not print {
+  #texteditor-backdrop {
+    background-color: #EEE;
+  }
+}
+@media print {
+  #texteditor-backdrop #texteditor-container .CodeMirror-gutter,
+  #texteditor-backdrop #texteditor-container .CodeMirror-gutters {
+    background-color: #fff;
+  }
+}
+@media not print {
+  #texteditor-backdrop #texteditor-container .CodeMirror-gutter,
+  #texteditor-backdrop #texteditor-container .CodeMirror-gutters {
+    background-color: #fff;
+  }
+}
+@media not print {
+  #texteditor-backdrop #texteditor-container {
+    padding: 0px;
+    background-color: #fff;
+    -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+    box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  }
+}
+/*!
+*
+* IPython notebook
+*
+*/
+/* CSS font colors for translated ANSI colors. */
+.ansibold {
+  font-weight: bold;
+}
+/* use dark versions for foreground, to improve visibility */
+.ansiblack {
+  color: black;
+}
+.ansired {
+  color: darkred;
+}
+.ansigreen {
+  color: darkgreen;
+}
+.ansiyellow {
+  color: #c4a000;
+}
+.ansiblue {
+  color: darkblue;
+}
+.ansipurple {
+  color: darkviolet;
+}
+.ansicyan {
+  color: steelblue;
+}
+.ansigray {
+  color: gray;
+}
+/* and light for background, for the same reason */
+.ansibgblack {
+  background-color: black;
+}
+.ansibgred {
+  background-color: red;
+}
+.ansibggreen {
+  background-color: green;
+}
+.ansibgyellow {
+  background-color: yellow;
+}
+.ansibgblue {
+  background-color: blue;
+}
+.ansibgpurple {
+  background-color: magenta;
+}
+.ansibgcyan {
+  background-color: cyan;
+}
+.ansibggray {
+  background-color: gray;
+}
+div.cell {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  border-radius: 2px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  border-width: 1px;
+  border-style: solid;
+  border-color: transparent;
+  width: 100%;
+  padding: 5px;
+  /* This acts as a spacer between cells, that is outside the border */
+  margin: 0px;
+  outline: none;
+  border-left-width: 1px;
+  padding-left: 5px;
+  background: linear-gradient(to right, transparent -40px, transparent 1px, transparent 1px, transparent 100%);
+}
+div.cell.jupyter-soft-selected {
+  border-left-color: #90CAF9;
+  border-left-color: #E3F2FD;
+  border-left-width: 1px;
+  padding-left: 5px;
+  border-right-color: #E3F2FD;
+  border-right-width: 1px;
+  background: #E3F2FD;
+}
+@media print {
+  div.cell.jupyter-soft-selected {
+    border-color: transparent;
+  }
+}
+div.cell.selected {
+  border-color: #ababab;
+  border-left-width: 0px;
+  padding-left: 6px;
+  background: linear-gradient(to right, #42A5F5 -40px, #42A5F5 5px, transparent 5px, transparent 100%);
+}
+@media print {
+  div.cell.selected {
+    border-color: transparent;
+  }
+}
+div.cell.selected.jupyter-soft-selected {
+  border-left-width: 0;
+  padding-left: 6px;
+  background: linear-gradient(to right, #42A5F5 -40px, #42A5F5 7px, #E3F2FD 7px, #E3F2FD 100%);
+}
+.edit_mode div.cell.selected {
+  border-color: #66BB6A;
+  border-left-width: 0px;
+  padding-left: 6px;
+  background: linear-gradient(to right, #66BB6A -40px, #66BB6A 5px, transparent 5px, transparent 100%);
+}
+@media print {
+  .edit_mode div.cell.selected {
+    border-color: transparent;
+  }
+}
+.prompt {
+  /* This needs to be wide enough for 3 digit prompt numbers: In[100]: */
+  min-width: 14ex;
+  /* This padding is tuned to match the padding on the CodeMirror editor. */
+  padding: 0.4em;
+  margin: 0px;
+  font-family: monospace;
+  text-align: right;
+  /* This has to match that of the the CodeMirror class line-height below */
+  line-height: 1.21429em;
+  /* Don't highlight prompt number selection */
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  /* Use default cursor */
+  cursor: default;
+}
+@media (max-width: 540px) {
+  .prompt {
+    text-align: left;
+  }
+}
+div.inner_cell {
+  min-width: 0;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  /* Old browsers */
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  box-flex: 1;
+  /* Modern browsers */
+  flex: 1;
+}
+/* input_area and input_prompt must match in top border and margin for alignment */
+div.input_area {
+  border: 1px solid #cfcfcf;
+  border-radius: 2px;
+  background: #f7f7f7;
+  line-height: 1.21429em;
+}
+/* This is needed so that empty prompt areas can collapse to zero height when there
+   is no content in the output_subarea and the prompt. The main purpose of this is
+   to make sure that empty JavaScript output_subareas have no height. */
+div.prompt:empty {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+div.unrecognized_cell {
+  padding: 5px 5px 5px 0px;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+div.unrecognized_cell .inner_cell {
+  border-radius: 2px;
+  padding: 5px;
+  font-weight: bold;
+  color: red;
+  border: 1px solid #cfcfcf;
+  background: #eaeaea;
+}
+div.unrecognized_cell .inner_cell a {
+  color: inherit;
+  text-decoration: none;
+}
+div.unrecognized_cell .inner_cell a:hover {
+  color: inherit;
+  text-decoration: none;
+}
+@media (max-width: 540px) {
+  div.unrecognized_cell > div.prompt {
+    display: none;
+  }
+}
+div.code_cell {
+  /* avoid page breaking on code cells when printing */
+}
+@media print {
+  div.code_cell {
+    page-break-inside: avoid;
+  }
+}
+/* any special styling for code cells that are currently running goes here */
+div.input {
+  page-break-inside: avoid;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+@media (max-width: 540px) {
+  div.input {
+    /* Old browsers */
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-align: stretch;
+    display: -moz-box;
+    -moz-box-orient: vertical;
+    -moz-box-align: stretch;
+    display: box;
+    box-orient: vertical;
+    box-align: stretch;
+    /* Modern browsers */
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+  }
+}
+/* input_area and input_prompt must match in top border and margin for alignment */
+div.input_prompt {
+  color: #303F9F;
+  border-top: 1px solid transparent;
+}
+div.input_area > div.highlight {
+  margin: 0.4em;
+  border: none;
+  padding: 0px;
+  background-color: transparent;
+}
+div.input_area > div.highlight > pre {
+  margin: 0px;
+  border: none;
+  padding: 0px;
+  background-color: transparent;
+}
+/* The following gets added to the <head> if it is detected that the user has a
+ * monospace font with inconsistent normal/bold/italic height.  See
+ * notebookmain.js.  Such fonts will have keywords vertically offset with
+ * respect to the rest of the text.  The user should select a better font.
+ * See: https://github.com/ipython/ipython/issues/1503
+ *
+ * .CodeMirror span {
+ *      vertical-align: bottom;
+ * }
+ */
+.CodeMirror {
+  line-height: 1.21429em;
+  /* Changed from 1em to our global default */
+  font-size: 14px;
+  height: auto;
+  /* Changed to auto to autogrow */
+  background: none;
+  /* Changed from white to allow our bg to show through */
+}
+.CodeMirror-scroll {
+  /*  The CodeMirror docs are a bit fuzzy on if overflow-y should be hidden or visible.*/
+  /*  We have found that if it is visible, vertical scrollbars appear with font size changes.*/
+  overflow-y: hidden;
+  overflow-x: auto;
+}
+.CodeMirror-lines {
+  /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */
+  /* we have set a different line-height and want this to scale with that. */
+  padding: 0.4em;
+}
+.CodeMirror-linenumber {
+  padding: 0 8px 0 4px;
+}
+.CodeMirror-gutters {
+  border-bottom-left-radius: 2px;
+  border-top-left-radius: 2px;
+}
+.CodeMirror pre {
+  /* In CM3 this went to 4px from 0 in CM2. We need the 0 value because of how we size */
+  /* .CodeMirror-lines */
+  padding: 0;
+  border: 0;
+  border-radius: 0;
+}
+/*
+
+Original style from softwaremaniacs.org (c) Ivan Sagalaev <[e-mail]>
+Adapted from GitHub theme
+
+*/
+.highlight-base {
+  color: #000;
+}
+.highlight-variable {
+  color: #000;
+}
+.highlight-variable-2 {
+  color: #1a1a1a;
+}
+.highlight-variable-3 {
+  color: #333333;
+}
+.highlight-string {
+  color: #BA2121;
+}
+.highlight-comment {
+  color: #408080;
+  font-style: italic;
+}
+.highlight-number {
+  color: #080;
+}
+.highlight-atom {
+  color: #88F;
+}
+.highlight-keyword {
+  color: #008000;
+  font-weight: bold;
+}
+.highlight-builtin {
+  color: #008000;
+}
+.highlight-error {
+  color: #f00;
+}
+.highlight-operator {
+  color: #AA22FF;
+  font-weight: bold;
+}
+.highlight-meta {
+  color: #AA22FF;
+}
+/* previously not defined, copying from default codemirror */
+.highlight-def {
+  color: #00f;
+}
+.highlight-string-2 {
+  color: #f50;
+}
+.highlight-qualifier {
+  color: #555;
+}
+.highlight-bracket {
+  color: #997;
+}
+.highlight-tag {
+  color: #170;
+}
+.highlight-attribute {
+  color: #00c;
+}
+.highlight-header {
+  color: blue;
+}
+.highlight-quote {
+  color: #090;
+}
+.highlight-link {
+  color: #00c;
+}
+/* apply the same style to codemirror */
+.cm-s-ipython span.cm-keyword {
+  color: #008000;
+  font-weight: bold;
+}
+.cm-s-ipython span.cm-atom {
+  color: #88F;
+}
+.cm-s-ipython span.cm-number {
+  color: #080;
+}
+.cm-s-ipython span.cm-def {
+  color: #00f;
+}
+.cm-s-ipython span.cm-variable {
+  color: #000;
+}
+.cm-s-ipython span.cm-operator {
+  color: #AA22FF;
+  font-weight: bold;
+}
+.cm-s-ipython span.cm-variable-2 {
+  color: #1a1a1a;
+}
+.cm-s-ipython span.cm-variable-3 {
+  color: #333333;
+}
+.cm-s-ipython span.cm-comment {
+  color: #408080;
+  font-style: italic;
+}
+.cm-s-ipython span.cm-string {
+  color: #BA2121;
+}
+.cm-s-ipython span.cm-string-2 {
+  color: #f50;
+}
+.cm-s-ipython span.cm-meta {
+  color: #AA22FF;
+}
+.cm-s-ipython span.cm-qualifier {
+  color: #555;
+}
+.cm-s-ipython span.cm-builtin {
+  color: #008000;
+}
+.cm-s-ipython span.cm-bracket {
+  color: #997;
+}
+.cm-s-ipython span.cm-tag {
+  color: #170;
+}
+.cm-s-ipython span.cm-attribute {
+  color: #00c;
+}
+.cm-s-ipython span.cm-header {
+  color: blue;
+}
+.cm-s-ipython span.cm-quote {
+  color: #090;
+}
+.cm-s-ipython span.cm-link {
+  color: #00c;
+}
+.cm-s-ipython span.cm-error {
+  color: #f00;
+}
+.cm-s-ipython span.cm-tab {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
+  background-position: right;
+  background-repeat: no-repeat;
+}
+div.output_wrapper {
+  /* this position must be relative to enable descendents to be absolute within it */
+  position: relative;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  z-index: 1;
+}
+/* class for the output area when it should be height-limited */
+div.output_scroll {
+  /* ideally, this would be max-height, but FF barfs all over that */
+  height: 24em;
+  /* FF needs this *and the wrapper* to specify full width, or it will shrinkwrap */
+  width: 100%;
+  overflow: auto;
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 2px 8px rgba(0, 0, 0, 0.8);
+  box-shadow: inset 0 2px 8px rgba(0, 0, 0, 0.8);
+  display: block;
+}
+/* output div while it is collapsed */
+div.output_collapsed {
+  margin: 0px;
+  padding: 0px;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+}
+div.out_prompt_overlay {
+  height: 100%;
+  padding: 0px 0.4em;
+  position: absolute;
+  border-radius: 2px;
+}
+div.out_prompt_overlay:hover {
+  /* use inner shadow to get border that is computed the same on WebKit/FF */
+  -webkit-box-shadow: inset 0 0 1px #000;
+  box-shadow: inset 0 0 1px #000;
+  background: rgba(240, 240, 240, 0.5);
+}
+div.output_prompt {
+  color: #D84315;
+}
+/* This class is the outer container of all output sections. */
+div.output_area {
+  padding: 0px;
+  page-break-inside: avoid;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+div.output_area .MathJax_Display {
+  text-align: left !important;
+}
+div.output_area .rendered_html table {
+  margin-left: 0;
+  margin-right: 0;
+}
+div.output_area .rendered_html img {
+  margin-left: 0;
+  margin-right: 0;
+}
+div.output_area img,
+div.output_area svg {
+  max-width: 100%;
+  height: auto;
+}
+div.output_area img.unconfined,
+div.output_area svg.unconfined {
+  max-width: none;
+}
+/* This is needed to protect the pre formating from global settings such
+   as that of bootstrap */
+.output {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: vertical;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+}
+@media (max-width: 540px) {
+  div.output_area {
+    /* Old browsers */
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-align: stretch;
+    display: -moz-box;
+    -moz-box-orient: vertical;
+    -moz-box-align: stretch;
+    display: box;
+    box-orient: vertical;
+    box-align: stretch;
+    /* Modern browsers */
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+  }
+}
+div.output_area pre {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  vertical-align: baseline;
+  color: black;
+  background-color: transparent;
+  border-radius: 0;
+}
+/* This class is for the output subarea inside the output_area and after
+   the prompt div. */
+div.output_subarea {
+  overflow-x: auto;
+  padding: 0.4em;
+  /* Old browsers */
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  box-flex: 1;
+  /* Modern browsers */
+  flex: 1;
+  max-width: calc(100% - 14ex);
+}
+div.output_scroll div.output_subarea {
+  overflow-x: visible;
+}
+/* The rest of the output_* classes are for special styling of the different
+   output types */
+/* all text output has this class: */
+div.output_text {
+  text-align: left;
+  color: #000;
+  /* This has to match that of the the CodeMirror class line-height below */
+  line-height: 1.21429em;
+}
+/* stdout/stderr are 'text' as well as 'stream', but execute_result/error are *not* streams */
+div.output_stderr {
+  background: #fdd;
+  /* very light red background for stderr */
+}
+div.output_latex {
+  text-align: left;
+}
+/* Empty output_javascript divs should have no height */
+div.output_javascript:empty {
+  padding: 0;
+}
+.js-error {
+  color: darkred;
+}
+/* raw_input styles */
+div.raw_input_container {
+  line-height: 1.21429em;
+  padding-top: 5px;
+}
+pre.raw_input_prompt {
+  /* nothing needed here. */
+}
+input.raw_input {
+  font-family: monospace;
+  font-size: inherit;
+  color: inherit;
+  width: auto;
+  /* make sure input baseline aligns with prompt */
+  vertical-align: baseline;
+  /* padding + margin = 0.5em between prompt and cursor */
+  padding: 0em 0.25em;
+  margin: 0em 0.25em;
+}
+input.raw_input:focus {
+  box-shadow: none;
+}
+p.p-space {
+  margin-bottom: 10px;
+}
+div.output_unrecognized {
+  padding: 5px;
+  font-weight: bold;
+  color: red;
+}
+div.output_unrecognized a {
+  color: inherit;
+  text-decoration: none;
+}
+div.output_unrecognized a:hover {
+  color: inherit;
+  text-decoration: none;
+}
+.rendered_html {
+  color: #000;
+  /* any extras will just be numbers: */
+}
+.rendered_html em {
+  font-style: italic;
+}
+.rendered_html strong {
+  font-weight: bold;
+}
+.rendered_html u {
+  text-decoration: underline;
+}
+.rendered_html :link {
+  text-decoration: underline;
+}
+.rendered_html :visited {
+  text-decoration: underline;
+}
+.rendered_html h1 {
+  font-size: 185.7%;
+  margin: 1.08em 0 0 0;
+  font-weight: bold;
+  line-height: 1.0;
+}
+.rendered_html h2 {
+  font-size: 157.1%;
+  margin: 1.27em 0 0 0;
+  font-weight: bold;
+  line-height: 1.0;
+}
+.rendered_html h3 {
+  font-size: 128.6%;
+  margin: 1.55em 0 0 0;
+  font-weight: bold;
+  line-height: 1.0;
+}
+.rendered_html h4 {
+  font-size: 100%;
+  margin: 2em 0 0 0;
+  font-weight: bold;
+  line-height: 1.0;
+}
+.rendered_html h5 {
+  font-size: 100%;
+  margin: 2em 0 0 0;
+  font-weight: bold;
+  line-height: 1.0;
+  font-style: italic;
+}
+.rendered_html h6 {
+  font-size: 100%;
+  margin: 2em 0 0 0;
+  font-weight: bold;
+  line-height: 1.0;
+  font-style: italic;
+}
+.rendered_html h1:first-child {
+  margin-top: 0.538em;
+}
+.rendered_html h2:first-child {
+  margin-top: 0.636em;
+}
+.rendered_html h3:first-child {
+  margin-top: 0.777em;
+}
+.rendered_html h4:first-child {
+  margin-top: 1em;
+}
+.rendered_html h5:first-child {
+  margin-top: 1em;
+}
+.rendered_html h6:first-child {
+  margin-top: 1em;
+}
+.rendered_html ul {
+  list-style: disc;
+  margin: 0em 2em;
+  padding-left: 0px;
+}
+.rendered_html ul ul {
+  list-style: square;
+  margin: 0em 2em;
+}
+.rendered_html ul ul ul {
+  list-style: circle;
+  margin: 0em 2em;
+}
+.rendered_html ol {
+  list-style: decimal;
+  margin: 0em 2em;
+  padding-left: 0px;
+}
+.rendered_html ol ol {
+  list-style: upper-alpha;
+  margin: 0em 2em;
+}
+.rendered_html ol ol ol {
+  list-style: lower-alpha;
+  margin: 0em 2em;
+}
+.rendered_html ol ol ol ol {
+  list-style: lower-roman;
+  margin: 0em 2em;
+}
+.rendered_html ol ol ol ol ol {
+  list-style: decimal;
+  margin: 0em 2em;
+}
+.rendered_html * + ul {
+  margin-top: 1em;
+}
+.rendered_html * + ol {
+  margin-top: 1em;
+}
+.rendered_html hr {
+  color: black;
+  background-color: black;
+}
+.rendered_html pre {
+  margin: 1em 2em;
+}
+.rendered_html pre,
+.rendered_html code {
+  border: 0;
+  background-color: #fff;
+  color: #000;
+  font-size: 100%;
+  padding: 0px;
+}
+.rendered_html blockquote {
+  margin: 1em 2em;
+}
+.rendered_html table {
+  margin-left: auto;
+  margin-right: auto;
+  border: 1px solid black;
+  border-collapse: collapse;
+}
+.rendered_html tr,
+.rendered_html th,
+.rendered_html td {
+  border: 1px solid black;
+  border-collapse: collapse;
+  margin: 1em 2em;
+}
+.rendered_html td,
+.rendered_html th {
+  text-align: left;
+  vertical-align: middle;
+  padding: 4px;
+}
+.rendered_html th {
+  font-weight: bold;
+}
+.rendered_html * + table {
+  margin-top: 1em;
+}
+.rendered_html p {
+  text-align: left;
+}
+.rendered_html * + p {
+  margin-top: 1em;
+}
+.rendered_html img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+.rendered_html * + img {
+  margin-top: 1em;
+}
+.rendered_html img,
+.rendered_html svg {
+  max-width: 100%;
+  height: auto;
+}
+.rendered_html img.unconfined,
+.rendered_html svg.unconfined {
+  max-width: none;
+}
+div.text_cell {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+}
+@media (max-width: 540px) {
+  div.text_cell > div.prompt {
+    display: none;
+  }
+}
+div.text_cell_render {
+  /*font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;*/
+  outline: none;
+  resize: none;
+  width: inherit;
+  border-style: none;
+  padding: 0.5em 0.5em 0.5em 0.4em;
+  color: #000;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+a.anchor-link:link {
+  text-decoration: none;
+  padding: 0px 20px;
+  visibility: hidden;
+}
+h1:hover .anchor-link,
+h2:hover .anchor-link,
+h3:hover .anchor-link,
+h4:hover .anchor-link,
+h5:hover .anchor-link,
+h6:hover .anchor-link {
+  visibility: visible;
+}
+.text_cell.rendered .input_area {
+  display: none;
+}
+.text_cell.rendered .rendered_html {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+.text_cell.unrendered .text_cell_render {
+  display: none;
+}
+.cm-header-1,
+.cm-header-2,
+.cm-header-3,
+.cm-header-4,
+.cm-header-5,
+.cm-header-6 {
+  font-weight: bold;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.cm-header-1 {
+  font-size: 185.7%;
+}
+.cm-header-2 {
+  font-size: 157.1%;
+}
+.cm-header-3 {
+  font-size: 128.6%;
+}
+.cm-header-4 {
+  font-size: 110%;
+}
+.cm-header-5 {
+  font-size: 100%;
+  font-style: italic;
+}
+.cm-header-6 {
+  font-size: 100%;
+  font-style: italic;
+}
+/*!
+*
+* IPython notebook webapp
+*
+*/
+@media (max-width: 767px) {
+  .notebook_app {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
+}
+#ipython-main-app {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  height: 100%;
+}
+div#notebook_panel {
+  margin: 0px;
+  padding: 0px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  height: 100%;
+}
+div#notebook {
+  font-size: 14px;
+  line-height: 20px;
+  overflow-y: hidden;
+  overflow-x: auto;
+  width: 100%;
+  /* This spaces the page away from the edge of the notebook area */
+  padding-top: 20px;
+  margin: 0px;
+  outline: none;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  min-height: 100%;
+}
+@media not print {
+  #notebook-container {
+    padding: 15px;
+    background-color: #fff;
+    min-height: 0;
+    -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+    box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  }
+}
+@media print {
+  #notebook-container {
+    width: 100%;
+  }
+}
+div.ui-widget-content {
+  border: 1px solid #ababab;
+  outline: none;
+}
+pre.dialog {
+  background-color: #f7f7f7;
+  border: 1px solid #ddd;
+  border-radius: 2px;
+  padding: 0.4em;
+  padding-left: 2em;
+}
+p.dialog {
+  padding: 0.2em;
+}
+/* Word-wrap output correctly.  This is the CSS3 spelling, though Firefox seems
+   to not honor it correctly.  Webkit browsers (Chrome, rekonq, Safari) do.
+ */
+pre,
+code,
+kbd,
+samp {
+  white-space: pre-wrap;
+}
+#fonttest {
+  font-family: monospace;
+}
+p {
+  margin-bottom: 0;
+}
+.end_space {
+  min-height: 100px;
+  transition: height .2s ease;
+}
+.notebook_app > #header {
+  -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+}
+@media not print {
+  .notebook_app {
+    background-color: #EEE;
+  }
+}
+kbd {
+  border-style: solid;
+  border-width: 1px;
+  box-shadow: none;
+  margin: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+/* CSS for the cell toolbar */
+.celltoolbar {
+  border: thin solid #CFCFCF;
+  border-bottom: none;
+  background: #EEE;
+  border-radius: 2px 2px 0px 0px;
+  width: 100%;
+  height: 29px;
+  padding-right: 4px;
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  /* Old browsers */
+  -webkit-box-pack: end;
+  -moz-box-pack: end;
+  box-pack: end;
+  /* Modern browsers */
+  justify-content: flex-end;
+  display: -webkit-flex;
+}
+@media print {
+  .celltoolbar {
+    display: none;
+  }
+}
+.ctb_hideshow {
+  display: none;
+  vertical-align: bottom;
+}
+/* ctb_show is added to the ctb_hideshow div to show the cell toolbar.
+   Cell toolbars are only shown when the ctb_global_show class is also set.
+*/
+.ctb_global_show .ctb_show.ctb_hideshow {
+  display: block;
+}
+.ctb_global_show .ctb_show + .input_area,
+.ctb_global_show .ctb_show + div.text_cell_input,
+.ctb_global_show .ctb_show ~ div.text_cell_render {
+  border-top-right-radius: 0px;
+  border-top-left-radius: 0px;
+}
+.ctb_global_show .ctb_show ~ div.text_cell_render {
+  border: 1px solid #cfcfcf;
+}
+.celltoolbar {
+  font-size: 87%;
+  padding-top: 3px;
+}
+.celltoolbar select {
+  display: block;
+  width: 100%;
+  height: 32px;
+  padding: 6px 12px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #555555;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+  width: inherit;
+  font-size: inherit;
+  height: 22px;
+  padding: 0px;
+  display: inline-block;
+}
+.celltoolbar select:focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.celltoolbar select::-moz-placeholder {
+  color: #999;
+  opacity: 1;
+}
+.celltoolbar select:-ms-input-placeholder {
+  color: #999;
+}
+.celltoolbar select::-webkit-input-placeholder {
+  color: #999;
+}
+.celltoolbar select::-ms-expand {
+  border: 0;
+  background-color: transparent;
+}
+.celltoolbar select[disabled],
+.celltoolbar select[readonly],
+fieldset[disabled] .celltoolbar select {
+  background-color: #eeeeee;
+  opacity: 1;
+}
+.celltoolbar select[disabled],
+fieldset[disabled] .celltoolbar select {
+  cursor: not-allowed;
+}
+textarea.celltoolbar select {
+  height: auto;
+}
+select.celltoolbar select {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.celltoolbar select,
+select[multiple].celltoolbar select {
+  height: auto;
+}
+.celltoolbar label {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+.completions {
+  position: absolute;
+  z-index: 110;
+  overflow: hidden;
+  border: 1px solid #ababab;
+  border-radius: 2px;
+  -webkit-box-shadow: 0px 6px 10px -1px #adadad;
+  box-shadow: 0px 6px 10px -1px #adadad;
+  line-height: 1;
+}
+.completions select {
+  background: white;
+  outline: none;
+  border: none;
+  padding: 0px;
+  margin: 0px;
+  overflow: auto;
+  font-family: monospace;
+  font-size: 110%;
+  color: #000;
+  width: auto;
+}
+.completions select option.context {
+  color: #286090;
+}
+#kernel_logo_widget {
+  float: right !important;
+  float: right;
+}
+#kernel_logo_widget .current_kernel_logo {
+  display: none;
+  margin-top: -1px;
+  margin-bottom: -1px;
+  width: 32px;
+  height: 32px;
+}
+#menubar {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  margin-top: 1px;
+}
+#menubar .navbar {
+  border-top: 1px;
+  border-radius: 0px 0px 2px 2px;
+  margin-bottom: 0px;
+}
+#menubar .navbar-toggle {
+  float: left;
+  padding-top: 7px;
+  padding-bottom: 7px;
+  border: none;
+}
+#menubar .navbar-collapse {
+  clear: left;
+}
+.nav-wrapper {
+  border-bottom: 1px solid #e7e7e7;
+}
+i.menu-icon {
+  padding-top: 4px;
+}
+ul#help_menu li a {
+  overflow: hidden;
+  padding-right: 2.2em;
+}
+ul#help_menu li a i {
+  margin-right: -1.2em;
+}
+.dropdown-submenu {
+  position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+}
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+.dropdown-submenu > a:after {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  display: block;
+  content: "\f0da";
+  float: right;
+  color: #333333;
+  margin-top: 2px;
+  margin-right: -10px;
+}
+.dropdown-submenu > a:after.pull-left {
+  margin-right: .3em;
+}
+.dropdown-submenu > a:after.pull-right {
+  margin-left: .3em;
+}
+.dropdown-submenu:hover > a:after {
+  color: #262626;
+}
+.dropdown-submenu.pull-left {
+  float: none;
+}
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+}
+#notification_area {
+  float: right !important;
+  float: right;
+  z-index: 10;
+}
+.indicator_area {
+  float: right !important;
+  float: right;
+  color: #777;
+  margin-left: 5px;
+  margin-right: 5px;
+  width: 11px;
+  z-index: 10;
+  text-align: center;
+  width: auto;
+}
+#kernel_indicator {
+  float: right !important;
+  float: right;
+  color: #777;
+  margin-left: 5px;
+  margin-right: 5px;
+  width: 11px;
+  z-index: 10;
+  text-align: center;
+  width: auto;
+  border-left: 1px solid;
+}
+#kernel_indicator .kernel_indicator_name {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+#modal_indicator {
+  float: right !important;
+  float: right;
+  color: #777;
+  margin-left: 5px;
+  margin-right: 5px;
+  width: 11px;
+  z-index: 10;
+  text-align: center;
+  width: auto;
+}
+#readonly-indicator {
+  float: right !important;
+  float: right;
+  color: #777;
+  margin-left: 5px;
+  margin-right: 5px;
+  width: 11px;
+  z-index: 10;
+  text-align: center;
+  width: auto;
+  margin-top: 2px;
+  margin-bottom: 0px;
+  margin-left: 0px;
+  margin-right: 0px;
+  display: none;
+}
+.modal_indicator:before {
+  width: 1.28571429em;
+  text-align: center;
+}
+.edit_mode .modal_indicator:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f040";
+}
+.edit_mode .modal_indicator:before.pull-left {
+  margin-right: .3em;
+}
+.edit_mode .modal_indicator:before.pull-right {
+  margin-left: .3em;
+}
+.command_mode .modal_indicator:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: ' ';
+}
+.command_mode .modal_indicator:before.pull-left {
+  margin-right: .3em;
+}
+.command_mode .modal_indicator:before.pull-right {
+  margin-left: .3em;
+}
+.kernel_idle_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f10c";
+}
+.kernel_idle_icon:before.pull-left {
+  margin-right: .3em;
+}
+.kernel_idle_icon:before.pull-right {
+  margin-left: .3em;
+}
+.kernel_busy_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f111";
+}
+.kernel_busy_icon:before.pull-left {
+  margin-right: .3em;
+}
+.kernel_busy_icon:before.pull-right {
+  margin-left: .3em;
+}
+.kernel_dead_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f1e2";
+}
+.kernel_dead_icon:before.pull-left {
+  margin-right: .3em;
+}
+.kernel_dead_icon:before.pull-right {
+  margin-left: .3em;
+}
+.kernel_disconnected_icon:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  content: "\f127";
+}
+.kernel_disconnected_icon:before.pull-left {
+  margin-right: .3em;
+}
+.kernel_disconnected_icon:before.pull-right {
+  margin-left: .3em;
+}
+.notification_widget {
+  color: #777;
+  z-index: 10;
+  background: rgba(240, 240, 240, 0.5);
+  margin-right: 4px;
+  color: #333;
+  background-color: #fff;
+  border-color: #ccc;
+}
+.notification_widget:focus,
+.notification_widget.focus {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #8c8c8c;
+}
+.notification_widget:hover {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+.notification_widget:active,
+.notification_widget.active,
+.open > .dropdown-toggle.notification_widget {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+.notification_widget:active:hover,
+.notification_widget.active:hover,
+.open > .dropdown-toggle.notification_widget:hover,
+.notification_widget:active:focus,
+.notification_widget.active:focus,
+.open > .dropdown-toggle.notification_widget:focus,
+.notification_widget:active.focus,
+.notification_widget.active.focus,
+.open > .dropdown-toggle.notification_widget.focus {
+  color: #333;
+  background-color: #d4d4d4;
+  border-color: #8c8c8c;
+}
+.notification_widget:active,
+.notification_widget.active,
+.open > .dropdown-toggle.notification_widget {
+  background-image: none;
+}
+.notification_widget.disabled:hover,
+.notification_widget[disabled]:hover,
+fieldset[disabled] .notification_widget:hover,
+.notification_widget.disabled:focus,
+.notification_widget[disabled]:focus,
+fieldset[disabled] .notification_widget:focus,
+.notification_widget.disabled.focus,
+.notification_widget[disabled].focus,
+fieldset[disabled] .notification_widget.focus {
+  background-color: #fff;
+  border-color: #ccc;
+}
+.notification_widget .badge {
+  color: #fff;
+  background-color: #333;
+}
+.notification_widget.warning {
+  color: #fff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.notification_widget.warning:focus,
+.notification_widget.warning.focus {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #985f0d;
+}
+.notification_widget.warning:hover {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #d58512;
+}
+.notification_widget.warning:active,
+.notification_widget.warning.active,
+.open > .dropdown-toggle.notification_widget.warning {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #d58512;
+}
+.notification_widget.warning:active:hover,
+.notification_widget.warning.active:hover,
+.open > .dropdown-toggle.notification_widget.warning:hover,
+.notification_widget.warning:active:focus,
+.notification_widget.warning.active:focus,
+.open > .dropdown-toggle.notification_widget.warning:focus,
+.notification_widget.warning:active.focus,
+.notification_widget.warning.active.focus,
+.open > .dropdown-toggle.notification_widget.warning.focus {
+  color: #fff;
+  background-color: #d58512;
+  border-color: #985f0d;
+}
+.notification_widget.warning:active,
+.notification_widget.warning.active,
+.open > .dropdown-toggle.notification_widget.warning {
+  background-image: none;
+}
+.notification_widget.warning.disabled:hover,
+.notification_widget.warning[disabled]:hover,
+fieldset[disabled] .notification_widget.warning:hover,
+.notification_widget.warning.disabled:focus,
+.notification_widget.warning[disabled]:focus,
+fieldset[disabled] .notification_widget.warning:focus,
+.notification_widget.warning.disabled.focus,
+.notification_widget.warning[disabled].focus,
+fieldset[disabled] .notification_widget.warning.focus {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.notification_widget.warning .badge {
+  color: #f0ad4e;
+  background-color: #fff;
+}
+.notification_widget.success {
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.notification_widget.success:focus,
+.notification_widget.success.focus {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #255625;
+}
+.notification_widget.success:hover {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+.notification_widget.success:active,
+.notification_widget.success.active,
+.open > .dropdown-toggle.notification_widget.success {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+.notification_widget.success:active:hover,
+.notification_widget.success.active:hover,
+.open > .dropdown-toggle.notification_widget.success:hover,
+.notification_widget.success:active:focus,
+.notification_widget.success.active:focus,
+.open > .dropdown-toggle.notification_widget.success:focus,
+.notification_widget.success:active.focus,
+.notification_widget.success.active.focus,
+.open > .dropdown-toggle.notification_widget.success.focus {
+  color: #fff;
+  background-color: #398439;
+  border-color: #255625;
+}
+.notification_widget.success:active,
+.notification_widget.success.active,
+.open > .dropdown-toggle.notification_widget.success {
+  background-image: none;
+}
+.notification_widget.success.disabled:hover,
+.notification_widget.success[disabled]:hover,
+fieldset[disabled] .notification_widget.success:hover,
+.notification_widget.success.disabled:focus,
+.notification_widget.success[disabled]:focus,
+fieldset[disabled] .notification_widget.success:focus,
+.notification_widget.success.disabled.focus,
+.notification_widget.success[disabled].focus,
+fieldset[disabled] .notification_widget.success.focus {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.notification_widget.success .badge {
+  color: #5cb85c;
+  background-color: #fff;
+}
+.notification_widget.info {
+  color: #fff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.notification_widget.info:focus,
+.notification_widget.info.focus {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #1b6d85;
+}
+.notification_widget.info:hover {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #269abc;
+}
+.notification_widget.info:active,
+.notification_widget.info.active,
+.open > .dropdown-toggle.notification_widget.info {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #269abc;
+}
+.notification_widget.info:active:hover,
+.notification_widget.info.active:hover,
+.open > .dropdown-toggle.notification_widget.info:hover,
+.notification_widget.info:active:focus,
+.notification_widget.info.active:focus,
+.open > .dropdown-toggle.notification_widget.info:focus,
+.notification_widget.info:active.focus,
+.notification_widget.info.active.focus,
+.open > .dropdown-toggle.notification_widget.info.focus {
+  color: #fff;
+  background-color: #269abc;
+  border-color: #1b6d85;
+}
+.notification_widget.info:active,
+.notification_widget.info.active,
+.open > .dropdown-toggle.notification_widget.info {
+  background-image: none;
+}
+.notification_widget.info.disabled:hover,
+.notification_widget.info[disabled]:hover,
+fieldset[disabled] .notification_widget.info:hover,
+.notification_widget.info.disabled:focus,
+.notification_widget.info[disabled]:focus,
+fieldset[disabled] .notification_widget.info:focus,
+.notification_widget.info.disabled.focus,
+.notification_widget.info[disabled].focus,
+fieldset[disabled] .notification_widget.info.focus {
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.notification_widget.info .badge {
+  color: #5bc0de;
+  background-color: #fff;
+}
+.notification_widget.danger {
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.notification_widget.danger:focus,
+.notification_widget.danger.focus {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #761c19;
+}
+.notification_widget.danger:hover {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.notification_widget.danger:active,
+.notification_widget.danger.active,
+.open > .dropdown-toggle.notification_widget.danger {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.notification_widget.danger:active:hover,
+.notification_widget.danger.active:hover,
+.open > .dropdown-toggle.notification_widget.danger:hover,
+.notification_widget.danger:active:focus,
+.notification_widget.danger.active:focus,
+.open > .dropdown-toggle.notification_widget.danger:focus,
+.notification_widget.danger:active.focus,
+.notification_widget.danger.active.focus,
+.open > .dropdown-toggle.notification_widget.danger.focus {
+  color: #fff;
+  background-color: #ac2925;
+  border-color: #761c19;
+}
+.notification_widget.danger:active,
+.notification_widget.danger.active,
+.open > .dropdown-toggle.notification_widget.danger {
+  background-image: none;
+}
+.notification_widget.danger.disabled:hover,
+.notification_widget.danger[disabled]:hover,
+fieldset[disabled] .notification_widget.danger:hover,
+.notification_widget.danger.disabled:focus,
+.notification_widget.danger[disabled]:focus,
+fieldset[disabled] .notification_widget.danger:focus,
+.notification_widget.danger.disabled.focus,
+.notification_widget.danger[disabled].focus,
+fieldset[disabled] .notification_widget.danger.focus {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.notification_widget.danger .badge {
+  color: #d9534f;
+  background-color: #fff;
+}
+div#pager {
+  background-color: #fff;
+  font-size: 14px;
+  line-height: 20px;
+  overflow: hidden;
+  display: none;
+  position: fixed;
+  bottom: 0px;
+  width: 100%;
+  max-height: 50%;
+  padding-top: 8px;
+  -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  /* Display over codemirror */
+  z-index: 100;
+  /* Hack which prevents jquery ui resizable from changing top. */
+  top: auto !important;
+}
+div#pager pre {
+  line-height: 1.21429em;
+  color: #000;
+  background-color: #f7f7f7;
+  padding: 0.4em;
+}
+div#pager #pager-button-area {
+  position: absolute;
+  top: 8px;
+  right: 20px;
+}
+div#pager #pager-contents {
+  position: relative;
+  overflow: auto;
+  width: 100%;
+  height: 100%;
+}
+div#pager #pager-contents #pager-container {
+  position: relative;
+  padding: 15px 0px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+div#pager .ui-resizable-handle {
+  top: 0px;
+  height: 8px;
+  background: #f7f7f7;
+  border-top: 1px solid #cfcfcf;
+  border-bottom: 1px solid #cfcfcf;
+  /* This injects handle bars (a short, wide = symbol) for
+        the resize handle. */
+}
+div#pager .ui-resizable-handle::after {
+  content: '';
+  top: 2px;
+  left: 50%;
+  height: 3px;
+  width: 30px;
+  margin-left: -15px;
+  position: absolute;
+  border-top: 1px solid #cfcfcf;
+}
+.quickhelp {
+  /* Old browsers */
+  display: -webkit-box;
+  -webkit-box-orient: horizontal;
+  -webkit-box-align: stretch;
+  display: -moz-box;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+  display: box;
+  box-orient: horizontal;
+  box-align: stretch;
+  /* Modern browsers */
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  line-height: 1.8em;
+}
+.shortcut_key {
+  display: inline-block;
+  width: 21ex;
+  text-align: right;
+  font-family: monospace;
+}
+.shortcut_descr {
+  display: inline-block;
+  /* Old browsers */
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  box-flex: 1;
+  /* Modern browsers */
+  flex: 1;
+}
+span.save_widget {
+  margin-top: 6px;
+}
+span.save_widget span.filename {
+  height: 1em;
+  line-height: 1em;
+  padding: 3px;
+  margin-left: 16px;
+  border: none;
+  font-size: 146.5%;
+  border-radius: 2px;
+}
+span.save_widget span.filename:hover {
+  background-color: #e6e6e6;
+}
+span.checkpoint_status,
+span.autosave_status {
+  font-size: small;
+}
+@media (max-width: 767px) {
+  span.save_widget {
+    font-size: small;
+  }
+  span.checkpoint_status,
+  span.autosave_status {
+    display: none;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  span.checkpoint_status {
+    display: none;
+  }
+  span.autosave_status {
+    font-size: x-small;
+  }
+}
+.toolbar {
+  padding: 0px;
+  margin-left: -5px;
+  margin-top: 2px;
+  margin-bottom: 5px;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+.toolbar select,
+.toolbar label {
+  width: auto;
+  vertical-align: middle;
+  margin-right: 2px;
+  margin-bottom: 0px;
+  display: inline;
+  font-size: 92%;
+  margin-left: 0.3em;
+  margin-right: 0.3em;
+  padding: 0px;
+  padding-top: 3px;
+}
+.toolbar .btn {
+  padding: 2px 8px;
+}
+.toolbar .btn-group {
+  margin-top: 0px;
+  margin-left: 5px;
+}
+#maintoolbar {
+  margin-bottom: -3px;
+  margin-top: -8px;
+  border: 0px;
+  min-height: 27px;
+  margin-left: 0px;
+  padding-top: 11px;
+  padding-bottom: 3px;
+}
+#maintoolbar .navbar-text {
+  float: none;
+  vertical-align: middle;
+  text-align: right;
+  margin-left: 5px;
+  margin-right: 0px;
+  margin-top: 0px;
+}
+.select-xs {
+  height: 24px;
+}
+.pulse,
+.dropdown-menu > li > a.pulse,
+li.pulse > a.dropdown-toggle,
+li.pulse.open > a.dropdown-toggle {
+  background-color: #F37626;
+  color: white;
+}
+/**
+ * Primary styles
+ *
+ * Author: Jupyter Development Team
+ */
+/** WARNING IF YOU ARE EDITTING THIS FILE, if this is a .css file, It has a lot
+ * of chance of beeing generated from the ../less/[samename].less file, you can
+ * try to get back the less file by reverting somme commit in history
+ **/
+/*
+ * We'll try to get something pretty, so we
+ * have some strange css to have the scroll bar on
+ * the left with fix button on the top right of the tooltip
+ */
+@-moz-keyframes fadeOut {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+@-webkit-keyframes fadeOut {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+@-moz-keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+@-webkit-keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+/*properties of tooltip after "expand"*/
+.bigtooltip {
+  overflow: auto;
+  height: 200px;
+  -webkit-transition-property: height;
+  -webkit-transition-duration: 500ms;
+  -moz-transition-property: height;
+  -moz-transition-duration: 500ms;
+  transition-property: height;
+  transition-duration: 500ms;
+}
+/*properties of tooltip before "expand"*/
+.smalltooltip {
+  -webkit-transition-property: height;
+  -webkit-transition-duration: 500ms;
+  -moz-transition-property: height;
+  -moz-transition-duration: 500ms;
+  transition-property: height;
+  transition-duration: 500ms;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  height: 80px;
+}
+.tooltipbuttons {
+  position: absolute;
+  padding-right: 15px;
+  top: 0px;
+  right: 0px;
+}
+.tooltiptext {
+  /*avoid the button to overlap on some docstring*/
+  padding-right: 30px;
+}
+.ipython_tooltip {
+  max-width: 700px;
+  /*fade-in animation when inserted*/
+  -webkit-animation: fadeOut 400ms;
+  -moz-animation: fadeOut 400ms;
+  animation: fadeOut 400ms;
+  -webkit-animation: fadeIn 400ms;
+  -moz-animation: fadeIn 400ms;
+  animation: fadeIn 400ms;
+  vertical-align: middle;
+  background-color: #f7f7f7;
+  overflow: visible;
+  border: #ababab 1px solid;
+  outline: none;
+  padding: 3px;
+  margin: 0px;
+  padding-left: 7px;
+  font-family: monospace;
+  min-height: 50px;
+  -moz-box-shadow: 0px 6px 10px -1px #adadad;
+  -webkit-box-shadow: 0px 6px 10px -1px #adadad;
+  box-shadow: 0px 6px 10px -1px #adadad;
+  border-radius: 2px;
+  position: absolute;
+  z-index: 1000;
+}
+.ipython_tooltip a {
+  float: right;
+}
+.ipython_tooltip .tooltiptext pre {
+  border: 0;
+  border-radius: 0;
+  font-size: 100%;
+  background-color: #f7f7f7;
+}
+.pretooltiparrow {
+  left: 0px;
+  margin: 0px;
+  top: -16px;
+  width: 40px;
+  height: 16px;
+  overflow: hidden;
+  position: absolute;
+}
+.pretooltiparrow:before {
+  background-color: #f7f7f7;
+  border: 1px #ababab solid;
+  z-index: 11;
+  content: "";
+  position: absolute;
+  left: 15px;
+  top: 10px;
+  width: 25px;
+  height: 25px;
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+}
+ul.typeahead-list i {
+  margin-left: -10px;
+  width: 18px;
+}
+ul.typeahead-list {
+  max-height: 80vh;
+  overflow: auto;
+}
+ul.typeahead-list > li > a {
+  /** Firefox bug **/
+  /* see https://github.com/jupyter/notebook/issues/559 */
+  white-space: normal;
+}
+.cmd-palette .modal-body {
+  padding: 7px;
+}
+.cmd-palette form {
+  background: white;
+}
+.cmd-palette input {
+  outline: none;
+}
+.no-shortcut {
+  display: none;
+}
+.command-shortcut:before {
+  content: "(command)";
+  padding-right: 3px;
+  color: #777777;
+}
+.edit-shortcut:before {
+  content: "(edit)";
+  padding-right: 3px;
+  color: #777777;
+}
+#find-and-replace #replace-preview .match,
+#find-and-replace #replace-preview .insert {
+  background-color: #BBDEFB;
+  border-color: #90CAF9;
+  border-style: solid;
+  border-width: 1px;
+  border-radius: 0px;
+}
+#find-and-replace #replace-preview .replace .match {
+  background-color: #FFCDD2;
+  border-color: #EF9A9A;
+  border-radius: 0px;
+}
+#find-and-replace #replace-preview .replace .insert {
+  background-color: #C8E6C9;
+  border-color: #A5D6A7;
+  border-radius: 0px;
+}
+#find-and-replace #replace-preview {
+  max-height: 60vh;
+  overflow: auto;
+}
+#find-and-replace #replace-preview pre {
+  padding: 5px 10px;
+}
+.terminal-app {
+  background: #EEE;
+}
+.terminal-app #header {
+  background: #fff;
+  -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+  box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
+}
+.terminal-app .terminal {
+  width: 100%;
+  float: left;
+  font-family: monospace;
+  color: white;
+  background: black;
+  padding: 0.4em;
+  border-radius: 2px;
+  -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.4);
+  box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.4);
+}
+.terminal-app .terminal,
+.terminal-app .terminal dummy-screen {
+  line-height: 1em;
+  font-size: 14px;
+}
+.terminal-app .terminal .xterm-rows {
+  padding: 10px;
+}
+.terminal-app .terminal-cursor {
+  color: black;
+  background: white;
+}
+.terminal-app #terminado-container {
+  margin-top: 20px;
+}
+/*# sourceMappingURL=style.min.css.map */
+    .c-ElasticMatch { background-color: #faffa6; padding: 0.2em;}
+    .hll { background-color: #ffffcc }
+    .c { color: #408080; font-style: italic } /* Comment */
+    .err, .codehilite .err { border: none } /* Error */
+    .k { color: #008000; font-weight: bold } /* Keyword */
+    .o { color: #666666 } /* Operator */
+    .ch { color: #408080; font-style: italic } /* Comment.Hashbang */
+    .cm { color: #408080; font-style: italic } /* Comment.Multiline */
+    .cp { color: #BC7A00 } /* Comment.Preproc */
+    .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
+    .c1 { color: #408080; font-style: italic } /* Comment.Single */
+    .cs { color: #408080; font-style: italic } /* Comment.Special */
+    .gd { color: #A00000 } /* Generic.Deleted */
+    .ge { font-style: italic } /* Generic.Emph */
+    .gr { color: #FF0000 } /* Generic.Error */
+    .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+    .gi { color: #00A000 } /* Generic.Inserted */
+    .go { color: #888888 } /* Generic.Output */
+    .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+    .gs { font-weight: bold } /* Generic.Strong */
+    .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+    .gt { color: #0044DD } /* Generic.Traceback */
+    .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
+    .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
+    .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
+    .kp { color: #008000 } /* Keyword.Pseudo */
+    .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
+    .kt { color: #B00040 } /* Keyword.Type */
+    .m { color: #666666 } /* Literal.Number */
+    .s { color: #BA2121 } /* Literal.String */
+    .na { color: #7D9029 } /* Name.Attribute */
+    .nb { color: #008000 } /* Name.Builtin */
+    .nc { color: #0000FF; font-weight: bold } /* Name.Class */
+    .no { color: #880000 } /* Name.Constant */
+    .nd { color: #AA22FF } /* Name.Decorator */
+    .ni { color: #999999; font-weight: bold } /* Name.Entity */
+    .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+    .nf { color: #0000FF } /* Name.Function */
+    .nl { color: #A0A000 } /* Name.Label */
+    .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+    .nt { color: #008000; font-weight: bold } /* Name.Tag */
+    .nv { color: #19177C } /* Name.Variable */
+    .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+    .w { color: #bbbbbb } /* Text.Whitespace */
+    .mb { color: #666666 } /* Literal.Number.Bin */
+    .mf { color: #666666 } /* Literal.Number.Float */
+    .mh { color: #666666 } /* Literal.Number.Hex */
+    .mi { color: #666666 } /* Literal.Number.Integer */
+    .mo { color: #666666 } /* Literal.Number.Oct */
+    .sa { color: #BA2121 } /* Literal.String.Affix */
+    .sb { color: #BA2121 } /* Literal.String.Backtick */
+    .sc { color: #BA2121 } /* Literal.String.Char */
+    .dl { color: #BA2121 } /* Literal.String.Delimiter */
+    .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
+    .s2 { color: #BA2121 } /* Literal.String.Double */
+    .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+    .sh { color: #BA2121 } /* Literal.String.Heredoc */
+    .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+    .sx { color: #008000 } /* Literal.String.Other */
+    .sr { color: #BB6688 } /* Literal.String.Regex */
+    .s1 { color: #BA2121 } /* Literal.String.Single */
+    .ss { color: #19177C } /* Literal.String.Symbol */
+    .bp { color: #008000 } /* Name.Builtin.Pseudo */
+    .fm { color: #0000FF } /* Name.Function.Magic */
+    .vc { color: #19177C } /* Name.Variable.Class */
+    .vg { color: #19177C } /* Name.Variable.Global */
+    .vi { color: #19177C } /* Name.Variable.Instance */
+    .vm { color: #19177C } /* Name.Variable.Magic */
+    .il { color: #666666 } /* Literal.Number.Integer.Long */
+}

  No newline at end of file

rhodecode/public/fonts/RCIcons/config.json

@@ -0,0 +1,623 b''
+{
+  "name": "rcicons",
+  "css_prefix_text": "icon-",
+  "css_use_suffix": false,
+  "hinting": true,
+  "units_per_em": 1000,
+  "ascent": 850,
+  "copyright": "RhodeCode GmbH",
+  "glyphs": [
+    {
+      "uid": "a5f9b6d4d795603e6e29a5b8007cc139",
+      "css": "bookmark",
+      "code": 59395,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M780 990L520 700C510 690 495 690 485 700L225 995C205 1015 180 1000 180 965V35C175 15 190 0 205 0H795C810 0 825 15 825 35V960C825 995 795 1010 780 990Z",
+        "width": 1000
+      },
+      "search": [
+        "bookmark"
+      ]
+    },
+    {
+      "uid": "fbc028d3a6a0df72f8f508ff5dfbab72",
+      "css": "tag",
+      "code": 59397,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M459.8 62.5L93.8 53.6C75.9 53.6 62.5 67 62.5 84.8L75.9 450.9C75.9 459.8 80.4 464.3 84.8 473.2L549.1 937.5C562.5 950.9 580.4 950.9 593.8 937.5L946.4 584.8C959.8 571.4 959.8 553.6 946.4 540.2L477.7 71.4C473.2 67 464.3 62.5 459.8 62.5ZM357.1 285.7C357.1 321.4 325.9 352.7 290.2 352.7 254.5 352.7 223.2 321.4 223.2 285.7 223.2 250 254.5 218.8 290.2 218.8S357.1 245.5 357.1 285.7Z",
+        "width": 1000
+      },
+      "search": [
+        "tag"
+      ]
+    },
+    {
+      "uid": "1c67c02366438b324c184ff9e356dca1",
+      "css": "branch",
+      "code": 59396,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M875 250C875 174.1 817 116.1 741.1 116.1S607.1 174.1 607.1 250C607.1 299.1 633.9 339.3 669.6 361.6 651.8 504.5 531.3 544.6 459.8 558V245.5C504.5 223.2 531.3 183 531.3 133.9 531.3 58 473.2 0 397.3 0S263.4 58 263.4 133.9C263.4 183 290.2 227.7 330.4 250V750C290.2 772.3 263.4 817 263.4 866.1 263.4 942 321.4 1000 397.3 1000S531.3 942 531.3 866.1C531.3 817 504.5 772.3 464.3 750V692C526.8 683 629.5 660.7 709.8 580.4 767.9 522.3 799.1 450.9 808 366.1 848.2 343.8 875 299.1 875 250ZM397.3 89.3C424.1 89.3 442 107.1 442 133.9S424.1 178.6 397.3 178.6 352.7 160.7 352.7 133.9 370.5 89.3 397.3 89.3ZM397.3 910.7C370.5 910.7 352.7 892.9 352.7 866.1S370.5 821.4 397.3 821.4 442 839.3 442 866.1 419.6 910.7 397.3 910.7ZM741.1 205.4C767.9 205.4 785.7 223.2 785.7 250S767.9 294.6 741.1 294.6 696.4 276.8 696.4 250 718.8 205.4 741.1 205.4Z",
+        "width": 1000
+      },
+      "search": [
+        "branch"
+      ]
+    },
+    {
+      "uid": "b75f7b47706aebd803ef370082e8e334",
+      "css": "group",
+      "code": 59407,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M961.5 630.8V646.2C961.5 650 957.7 657.7 950 657.7H788.5 784.6C769.2 638.5 746.2 619.2 707.7 615.4 673.1 607.7 653.8 600 638.5 592.3 646.2 584.6 657.7 580.8 669.2 576.9 715.4 569.2 726.9 553.8 734.6 542.3 742.3 530.8 742.3 519.2 734.6 503.8 726.9 488.5 703.8 461.5 703.8 423.1 703.8 384.6 703.8 319.2 776.9 319.2H784.6 792.3C865.4 323.1 869.2 384.6 865.4 423.1 865.4 461.5 842.3 492.3 834.6 503.8 826.9 519.2 826.9 530.8 834.6 542.3 842.3 553.8 857.7 569.2 900 576.9 953.8 580.8 961.5 623.1 961.5 630.8 961.5 630.8 961.5 630.8 961.5 630.8ZM253.8 646.2C269.2 630.8 292.3 615.4 323.1 611.5 361.5 603.8 384.6 596.2 396.2 584.6 388.5 576.9 376.9 569.2 361.5 565.4 315.4 557.7 303.8 542.3 296.2 530.8 288.5 519.2 288.5 507.7 296.2 492.3 303.8 476.9 326.9 450 326.9 411.5 326.9 373.1 326.9 307.7 253.8 307.7H246.2 234.6C161.5 311.5 157.7 373.1 161.5 411.5 161.5 450 184.6 480.8 192.3 492.3 200 507.7 200 519.2 192.3 530.8 184.6 542.3 169.2 557.7 126.9 565.4 80.8 573.1 73.1 615.4 73.1 619.2 73.1 619.2 73.1 619.2 73.1 619.2V634.6C73.1 638.5 76.9 646.2 84.6 646.2H246.2 253.8ZM707.7 634.6C634.6 623.1 611.5 600 600 580.8 588.5 561.5 588.5 542.3 600 519.2 611.5 496.2 650 450 653.8 388.5 657.7 326.9 653.8 223.1 534.6 219.2H519.2 503.8C384.6 223.1 380.8 323.1 384.6 384.6 388.5 446.2 423.1 492.3 438.5 515.4 450 538.5 450 557.7 438.5 576.9 426.9 596.2 403.8 619.2 330.8 630.8 257.7 642.3 246.2 711.5 246.2 719.2 246.2 719.2 246.2 719.2 246.2 719.2V742.3C246.2 750 253.8 757.7 261.5 757.7H519.2 776.9C784.6 757.7 792.3 750 792.3 742.3V719.2C792.3 719.2 792.3 719.2 792.3 719.2 788.5 715.4 780.8 646.2 707.7 634.6Z",
+        "width": 1000
+      },
+      "search": [
+        "group"
+      ]
+    },
+    {
+      "uid": "7ae0ef039bb0217d9581e44b09448905",
+      "css": "fork",
+      "code": 59409,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M792.3 196.2C792.3 138.5 746.2 96.2 692.3 96.2 634.6 96.2 592.3 142.3 592.3 196.2 592.3 230.8 611.5 261.5 638.5 280.8 626.9 365.4 569.2 403.8 511.5 423.1 453.8 407.7 396.2 369.2 384.6 280.8 411.5 261.5 430.8 230.8 430.8 196.2 430.8 138.5 384.6 96.2 330.8 96.2S223.1 138.5 223.1 196.2C223.1 234.6 246.2 269.2 276.9 284.6 288.5 392.3 353.8 473.1 457.7 511.5V673.1C426.9 692.3 407.7 723.1 407.7 761.5 407.7 819.2 453.8 861.5 507.7 861.5S607.7 815.4 607.7 761.5C607.7 723.1 588.5 692.3 557.7 673.1V511.5C661.5 473.1 726.9 392.3 738.5 284.6 769.2 265.4 792.3 234.6 792.3 196.2ZM326.9 161.5C346.2 161.5 361.5 176.9 361.5 196.2S346.2 226.9 326.9 226.9 292.3 215.4 292.3 196.2 307.7 161.5 326.9 161.5ZM507.7 796.2C488.5 796.2 473.1 780.8 473.1 761.5S488.5 726.9 507.7 726.9C526.9 726.9 542.3 742.3 542.3 761.5S526.9 796.2 507.7 796.2ZM692.3 161.5C711.5 161.5 726.9 176.9 726.9 196.2S711.5 226.9 692.3 226.9 657.7 211.5 657.7 192.3 673.1 161.5 692.3 161.5Z",
+        "width": 1000
+      },
+      "search": [
+        "fork"
+      ]
+    },
+    {
+      "uid": "65e66c3e7d74e2c345fb78fadd400d3f",
+      "css": "rhodecode",
+      "code": 59441,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M174.6 216.8C173.4 220.9 172.2 225 171 229.1 168.1 239.1 165.2 249.1 162.3 259.1 158.7 271.6 155 284.2 151.4 296.7 148 308.4 144.6 320.1 141.2 331.8 139 339.3 136.8 346.8 134.7 354.3 134.4 355.4 134.1 356.5 133.7 357.6 133.7 357.7 133.9 358.2 134 358.3 134.3 359 134.5 359.7 134.8 360.5 137.2 367.3 139.7 374.1 142.1 381 146 392 149.9 403 153.9 414.1 158.3 426.5 162.8 439 167.2 451.4 171.1 462.5 175.1 473.6 179 484.7 181.5 491.7 184 498.6 186.4 505.6 186.8 506.7 187.2 507.7 187.5 508.8 187.8 509.6 188.6 510.4 189 511.1 192.8 516.9 196.5 522.6 200.3 528.4 206.5 537.9 212.7 547.4 219 556.9 226.2 567.9 233.4 578.9 240.6 590 247.3 600.3 254.1 610.6 260.8 620.9 265.6 628.2 270.4 635.6 275.2 642.9 276.4 644.8 277.6 646.6 278.9 648.5 279.2 649 279.5 649.5 279.8 649.8 282.7 652.6 285.5 655.4 288.4 658.2 294.6 664.3 300.9 670.5 307.1 676.6 315.5 684.9 323.9 693.2 332.4 701.4 341.8 710.6 351.2 719.9 360.6 729.1 369.8 738.1 378.9 747.1 388.1 756.1 395.8 763.7 403.6 771.3 411.3 778.9 416.4 783.9 421.5 788.9 426.6 793.9 428.2 795.5 429.8 797.3 431.6 798.6 438.9 803.9 446.1 809.2 453.4 814.5 463.7 822 473.9 829.5 484.2 837 487.6 839.5 491.1 842 494.5 844.5 495.3 845.1 496.1 845.7 496.9 846.3 497.2 846.5 497.2 846.6 497.6 846.4 504.7 842.7 511.8 839.1 518.9 835.4 530.3 829.5 541.7 823.6 553.1 817.7 559.2 814.5 565.4 811.4 571.5 808.2 571.9 808 572.3 807.1 572.6 806.8 573.7 805.4 574.8 804 576 802.5 580.2 797.2 584.3 791.9 588.5 786.7 594.7 778.9 600.8 771.1 607 763.3 614.5 753.8 622 744.3 629.5 734.8 637.7 724.5 645.8 714.1 654 703.8 662.1 693.5 670.3 683.2 678.4 672.9 685.9 663.5 693.3 654 700.8 644.6 706.9 636.9 713 629.2 719.1 621.5 723.2 616.4 727.2 611.2 731.3 606.1 732.7 604.4 734 602.6 735.4 600.9 735.2 600.8 734.8 600.8 734.6 600.7 733.8 600.5 733 600.4 732.2 600.2 729.1 599.6 726 598.9 722.9 598.2 718 597.1 713 596 708.1 594.8 701.5 593.2 694.9 591.5 688.3 589.7 680.2 587.5 672.2 585.2 664.1 582.9 654.7 580.1 645.4 577.2 636.1 574.1 625.6 570.6 615.2 567 604.8 563.3 593.4 559.1 582 554.8 570.8 550.2 558.6 545.3 546.6 540.1 534.6 534.8 521.9 529.1 509.3 523.1 496.8 516.8 483.7 510.2 470.7 503.4 457.9 496.2 444.6 488.7 431.4 480.9 418.5 472.8 405.1 464.4 392 455.6 379.1 446.4 365.9 437 352.9 427.1 340.3 416.9 327.4 406.4 314.8 395.5 302.7 384.2 290.3 372.6 278.3 360.6 266.8 348.1 255.1 335.3 243.8 322.1 233.2 308.4 222.3 294.4 212 279.9 202.4 265 192.5 249.7 183.4 233.9 175 217.8 175 217.4 174.8 217.1 174.6 216.8ZM172.1 214.2C170.7 218.7 169.3 223.3 167.8 227.8 164.5 238.5 161.1 249.2 157.8 259.9 153.9 272.4 150 285 146.1 297.5 143 307.5 139.9 317.4 136.7 327.4 135.9 330.1 135 332.7 134.2 335.4 134 336.1 133.6 336.7 133.8 337.4 135.4 342.2 137 347.1 138.6 351.9 141.9 361.9 145.2 371.8 148.6 381.8 152.7 394.1 156.8 406.5 160.9 418.8 164.9 430.8 168.9 442.8 172.9 454.8 175.9 463.7 178.8 472.6 181.8 481.4 182.6 483.8 183.4 486.2 184.2 488.7 184.4 489.4 184.6 490.1 184.9 490.8 187.2 495 189.5 499.2 191.8 503.4 196.8 512.6 201.9 521.8 206.9 531 213.2 542.4 219.4 553.9 225.7 565.3 231.7 576.2 237.6 587.1 243.6 598 247.8 605.6 251.9 613.2 256.1 620.8 257.3 623 258.2 625.4 259.9 627.2 264.1 631.7 268.3 636.2 272.5 640.7 280.2 648.9 287.9 657.2 295.5 665.4 304.5 675 313.5 684.7 322.4 694.3 330.5 703 338.6 711.7 346.7 720.4 351.8 725.8 356.8 731.3 361.9 736.7 363.5 738.4 365 740 366.6 741.6 372.3 747.3 378 753 383.7 758.7 392.5 767.5 401.2 776.2 410 785 419.1 794.1 428.3 803.3 437.4 812.4 444.2 819.2 451.1 826.1 457.9 832.9 459.6 834.6 461.3 836.3 463 838 463.3 838.3 463.6 838.6 463.8 838.8 463.9 838.9 465.1 838.7 465.3 838.6 475.9 837.2 486.5 835.8 497 834.5 505.6 833.4 514.1 832.3 522.7 831.2 523 831.2 523.7 830.1 523.9 829.9 525.1 828.6 526.3 827.2 527.6 825.9 532.1 820.9 536.7 815.9 541.2 810.9 547.9 803.5 554.6 796.1 561.4 788.7 569.6 779.7 577.7 770.7 585.9 761.8 594.8 752 603.6 742.3 612.5 732.5 621.3 722.8 630.1 713.1 639 703.4 647 694.5 655.1 685.7 663.1 676.8 669.6 669.6 676.2 662.4 682.7 655.2 687 650.5 691.3 645.8 695.6 641 696.6 639.9 697.7 638.7 698.7 637.6 698.9 637.4 699.6 636.9 699.6 636.6 699.6 636.5 696.6 635.7 696.5 635.7 693.5 634.8 690.4 633.9 687.4 633 682.6 631.5 677.8 630 673 628.4 666.6 626.3 660.1 624.1 653.8 621.8 645.9 619 638.1 616.1 630.3 613.1 621.2 609.6 612.1 606 603.1 602.2 592.9 598 582.8 593.6 572.8 589 561.8 584 550.8 578.8 540 573.4 528.3 567.6 516.7 561.6 505.2 555.3 493 548.7 480.9 541.8 469 534.6 456.5 527.1 444.1 519.3 431.9 511.2 419.2 502.8 406.7 494 394.5 484.9 381.8 475.5 369.5 465.8 357.4 455.7 345 445.3 332.8 434.6 321.1 423.4 309.1 412 297.4 400.2 286.2 388 274.7 375.5 263.7 362.6 253.2 349.3 242.5 335.7 232.3 321.7 222.8 307.2 213 292.4 203.9 277.2 195.5 261.7 186.8 246.5 179 230.5 172.1 214.2ZM169.5 204C168.8 207.8 168.1 211.6 167.3 215.4 165.5 224.9 163.7 234.5 161.9 244 159.5 256.5 157.1 269 154.7 281.5 152.3 294.2 149.8 307 147.4 319.7 145.5 329.9 143.5 340.1 141.6 350.3 140.7 355.2 139.7 360.1 138.8 365 138.7 365.7 139.1 366.4 139.3 367 140.2 369.6 141.1 372.2 142 374.8 145.4 384.5 148.7 394.3 152.1 404 156.4 416.4 160.7 428.7 165 441.1 168.8 452.1 172.6 463 176.4 474 178.3 479.5 180.2 485 182.1 490.5 182.3 491.2 182.7 491.8 183 492.4 184.2 494.8 185.4 497.1 186.5 499.5 190.9 508.4 195.4 517.2 199.8 526.1 205.6 537.7 211.4 549.3 217.2 560.9 222.7 571.9 228.2 583 233.8 594 237.4 601.2 241 608.3 244.6 615.5 245.2 616.6 245.7 617.7 246.3 618.8 246.7 619.6 247.6 620.4 248.2 621.1 252.8 626.6 257.4 632.1 262 637.7 269.5 646.7 276.9 655.6 284.4 664.6 292.8 674.7 301.3 684.9 309.7 695 317.2 704 324.8 713.1 332.3 722.1 337 727.8 341.8 733.5 346.5 739.1 347.2 740 347.9 740.8 348.7 741.7 348.9 741.9 349.2 742 349.4 742.2 350.2 742.7 350.9 743.2 351.7 743.7 358.7 748.5 365.8 753.3 372.8 758.1 383.3 765.3 393.9 772.5 404.4 779.7 414.6 786.6 424.7 793.6 434.9 800.5 440.8 804.5 446.7 808.6 452.7 812.6 456.3 815.1 459.5 818.1 462.9 820.8 472.5 828.7 482.1 836.7 491.7 844.6 498.5 850.2 505.4 855.9 512.2 861.5 512.8 862 512.7 861.9 513.3 861.3 514.2 860.3 515.2 859.2 516.1 858.2 520 853.9 524 849.6 527.9 845.3 534 838.6 540.2 831.9 546.3 825.2 554 816.8 561.7 808.3 569.4 799.9 578.1 790.4 586.7 781 595.4 771.5 604.4 761.7 613.3 751.9 622.3 742.1 630.9 732.6 639.6 723.2 648.2 713.7 655.9 705.3 663.6 696.9 671.3 688.5 677.4 681.8 683.5 675.1 689.6 668.4 693.5 664.1 697.4 659.9 701.3 655.6 702.4 654.4 703.5 653.2 704.6 652 704.6 652 704.6 652 704.6 652 704.6 652 704.6 652 704.6 652 704.6 652.1 701.6 651.3 701.5 651.3 698.5 650.5 695.5 649.5 692.6 648.6 687.9 647.1 683.1 645.5 678.4 643.8 672.1 641.6 665.8 639.2 659.5 636.9 651.8 634 644.1 630.9 636.4 627.8 627.5 624.1 618.6 620.3 609.7 616.4 599.7 612 589.8 607.4 580 602.7 569.2 597.5 558.4 592.1 547.7 586.6 536.2 580.6 524.8 574.4 513.4 568 501.4 561.2 489.5 554.2 477.7 546.9 465.3 539.3 453.1 531.4 441.1 523.3 428.6 514.8 416.3 506.1 404.2 497 391.7 487.7 379.5 478 367.5 468 355.2 457.8 343.2 447.2 331.5 436.3 319.6 425.2 308 413.6 296.8 401.7 285.4 389.6 274.5 377.1 264 364.3 253.3 351.2 243.2 337.8 233.6 323.9 223.8 309.8 214.6 295.4 206.1 280.5 197.4 265.4 189.4 249.9 182.1 234 177.7 224.2 173.5 214.2 169.5 204ZM866 183.5C863.9 179.4 861.1 176.2 857.1 174 851.9 171.1 846.2 168.9 840.7 166.5 829.5 161.7 818.2 157.4 806.7 153.4 783.6 145.4 760 138.9 736.3 132.9 711.7 126.7 687.1 120.9 662.3 115.7 637.1 110.4 611.7 105.6 586.3 101.4 561.2 97.2 536 93.1 510.5 91.1 497.8 90.1 485 89.9 472.4 91.3 465.9 92 459.4 93.2 453 94.2 446.6 95.2 440.1 96.2 433.7 97.3 408.2 101.5 382.8 106 357.4 111 332.2 115.9 307.1 121.2 282.1 126.9 257.2 132.5 232.6 139.2 208.4 147.3 196.3 151.4 184.2 155.8 172.3 160.5 166.4 162.8 160.5 165.2 154.6 167.7 151.7 168.9 148.8 170.2 145.8 171.4 143.2 172.5 140.6 173.5 138.1 174.7 134 176.7 130.6 179.7 128.3 183.6 127 185.8 126.2 188.2 125.3 190.6 124.2 193.6 123.1 196.6 122.1 199.6 118.1 211.5 114.9 223.7 112.5 236 107.7 260.4 106 285.4 106.8 310.2 107.2 322.7 108.2 335.3 109.7 347.7 111.2 360.2 112.7 372.8 115.1 385.2 119.8 410.4 126.7 435.1 134.8 459.3 138.9 471.4 143.3 483.5 147.9 495.4 152.2 506.5 157.5 517.3 162.7 528 173 549.2 184.4 569.8 196.6 589.9 208.8 609.9 221.9 629.3 235.7 648.1 249.5 666.8 264.1 685 279.3 702.6 295.3 721.1 311.7 739.2 328.6 756.9 345.6 774.8 363 792.2 381 809 398.9 825.9 417.4 842.2 436.4 857.8 445.6 865.4 454.9 872.8 464.2 880.2 473.6 887.7 483.1 895.1 492 903.2 494.3 905.2 496.5 907.3 498.7 909.5 498.9 909.7 499.7 910.8 500 910.8 500.2 910.8 500.5 910.8 500.7 910.8 501.2 910.8 502 911 502.5 910.8 507.3 907.1 512 903.3 516.8 899.6 526.2 892.1 535.6 884.6 544.9 876.9 563.3 861.7 581.4 846.2 599.2 830.3 616.9 814.5 634.1 798.2 651 781.5 667.9 764.7 684.4 747.5 700.3 729.7 716.3 711.8 731.8 693.4 746.5 674.4 761 655.7 774.8 636.5 787.8 616.8 800.7 597.2 812.8 577 823.8 556.2 835 535.1 845.2 513.5 854.3 491.4 863.4 469.1 871.2 446.3 877.3 423 883.4 399.9 887.8 376.4 890.3 352.7 892.9 328.6 893.4 304.3 892 280 891.8 276.9 891 273.8 890.3 270.7 889.7 267.7 889 264.6 888.4 261.6 887.2 255.7 886 249.9 884.7 244 882.3 233 879.7 222 876.5 211.1 873.4 201.8 870.1 192.5 866 183.5 863.5 178.4 878.8 211.7 866 183.5ZM814.8 393.5C808.1 418.2 799.5 442.5 789.4 466 780 487.9 770 509.6 758.5 530.5 747.4 550.7 735.1 570.3 722 589.3 708.8 608.4 694.7 626.8 680 644.8 664.8 663.4 649 681.5 632.7 699.1 615.9 717.3 598.5 734.9 580.5 752 562.5 769.1 544.1 785.7 525.1 801.6 515.7 809.5 506.1 817.3 496.5 824.9 496.1 825.2 495.2 826.3 494.7 826.3 494 826.3 493.3 826.3 492.6 826.3 492 826.3 491.4 825.5 491 825.1 490.5 824.6 490 824.1 489.5 823.6 488.4 822.6 487.2 821.5 486.1 820.5 481.6 816.6 476.9 813.1 472.2 809.4 469.9 807.6 467.6 805.7 465.3 803.8 463.1 801.9 461 799.8 458.8 797.8 454.2 793.7 449.7 789.6 445.2 785.5 435.9 777 426.6 768.5 417.5 759.8 408.4 751.1 399.5 742.3 390.9 733.2 386.7 728.8 382.7 724.3 378.4 720 374.2 715.8 370 711.5 365.8 707.2 349.1 690 332.9 672.5 317.4 654.3 301.8 636 286.9 617 273.1 597.3 259.2 577.5 246.4 556.9 234.5 535.8 222.8 515 212.1 493.7 202.6 471.8 193.1 449.9 184.8 427.4 177.9 404.6 176.1 398.6 174.4 392.6 173.1 386.5 171.7 380.1 170.6 373.6 169.6 367.1 167.6 354.2 166.3 341.2 165.5 328.2 164.7 315.3 164.3 302.3 164.5 289.3 164.7 276.7 165.9 264.2 167.5 251.7 167.9 248.5 168.3 245.4 168.7 242.2 168.9 240.6 169.1 239.1 169.3 237.5 169.5 235.9 169.6 234.3 169.8 232.7 170.1 230.3 171.1 228.1 171.7 225.7 172 224.5 172.2 223.2 172.2 221.9 172.2 220.8 172.8 220.1 173.6 219.5 174.6 218.8 175.6 218.3 176.5 217.5 177.1 217 177.6 216.6 178.4 216.3 179.2 216 180.1 215.7 180.9 215.3 183.9 214.2 186.8 213 189.8 211.9 195.7 209.7 201.6 207.5 207.6 205.3 231.3 196.7 255.3 189 279.7 182.4 292 179.1 304.3 176.1 316.7 173.5 322.9 172.2 329.1 170.6 335.4 169.3 341.7 167.9 348 166.6 354.3 165.4 379.8 160.4 405.4 156.3 431.1 152.5 444 150.6 457 148.8 470 147 473.2 146.6 476.5 146.1 479.7 145.7 481.3 145.5 482.8 145.3 484.4 145.1 485.7 144.9 487.1 145 488.4 145.1 493.9 145.1 499.5 145.3 504.9 146.3 506.2 146.5 507.4 146.8 508.6 147.1 510.1 147.5 511.5 147.8 513 148 516.1 148.4 519.2 148.9 522.3 149.3 528.6 150.2 534.8 151.1 541.1 152 553.7 153.8 566.4 155.7 579 157.7 604.4 161.7 629.7 166 654.8 171.4 680 176.8 705 183.2 729.7 190.3 742.1 193.9 754.4 197.7 766.6 201.7 772.7 203.7 778.7 205.8 784.7 207.9 787.7 209 790.7 210 793.7 211.1 795.1 211.6 796.6 212.1 798 212.7 798.7 213 799.4 213.2 800.1 213.5 800.8 213.8 801.9 214 802.4 214.5 803.6 215.7 805.3 216.5 806.3 217.9 806.8 218.7 807.1 219.5 807.2 220.5 807.3 221.2 807.2 221.8 807.4 222.5 807.7 223.4 807.9 224.3 808.1 225.2 809.8 231.5 811.2 237.9 812.3 244.4 813.4 250.8 814.1 257.2 814.5 263.6 814.7 266.8 814.8 270 814.9 273.2 814.9 274 814.9 274.7 814.9 275.5 814.9 276.3 815.2 277.1 815.3 277.8 815.7 279.5 816 281.1 816.4 282.8 821.3 306.5 822.7 330.7 820.7 354.8 819.6 367.7 817.6 380.7 814.8 393.5 807.1 421.7 822.5 357.6 814.8 393.5ZM617.6 393.5C616.1 389 614.6 384.5 613.1 379.9 612.9 379.3 612.7 378.7 612.5 378.1 612.4 377.7 612.5 377.1 612.4 376.7 612.3 376.1 612.2 375.5 612.1 374.9 611.8 373.8 611.4 372.8 610.8 371.9 609.7 370.1 608.1 368.5 606.5 367 604.7 365.2 602.4 362.7 599.6 362.7 601.6 360.7 604.3 360 606.5 358.3 607.6 357.4 608.5 356.5 609.7 355.7 610.5 355.2 611.6 354.7 612.1 353.8 612.3 353.4 612.4 352.9 612.4 352.5 612.9 352 613.3 351.5 613.7 350.9 614.4 349.8 614.7 348.6 614.9 347.3 615.1 345.1 615 342.9 615 340.7 615 338.4 615 336.1 615 333.8 615 331.4 615 329 614.4 326.6 613.1 321.5 610 316.8 606.4 313.1 604.7 311.4 603 309.9 601 308.6 598.3 306.9 595.5 305.5 592.7 304.1 589.9 302.7 586.9 301.8 583.8 301.4 581.4 301.1 579 301.1 576.6 301.1 573.9 301.1 571.2 301.1 568.5 301.1 556.2 301.1 543.8 301.1 531.5 301.1 526.9 301.1 522.3 301.1 517.7 301.1 516.9 301.1 516.1 301.1 515.2 301.1 515.1 301.1 515.2 305.3 515.2 305.6 515.2 308.8 515.2 311.9 515.2 315.1 515.2 316.2 515.2 317.3 515.2 318.4 515.2 318.9 515 319.1 515.5 319.1 516.7 319.1 528 319 528 319.2 528 327.2 528 335.2 528 343.2 528 355.8 528 368.3 528 380.9 528 384.6 528 388.3 528 392 528 392.2 528.1 393.4 527.9 393.4 525.4 393.4 522.8 393.4 520.3 393.4 518.9 393.4 517.6 393.4 516.2 393.4 515.9 393.4 515.2 393.2 515.2 393.6 515.2 395.7 515.2 397.8 515.2 400 515.2 401 515.2 414 515.2 414 524.7 414 534.3 414 543.8 414 549.3 414 554.8 414 560.2 414 561.4 414 562.5 414 563.7 414 564 414 563.8 411.1 563.8 410.7 563.8 405.1 563.8 399.6 563.8 394 563.8 393.4 563.9 393.5 563.3 393.5 562 393.5 560.7 393.5 559.3 393.5 557.8 393.5 556.3 393.5 554.8 393.5 554.6 393.5 553.5 393.7 553.5 393.4 553.5 388.4 553.5 383.4 553.5 378.4 553.5 375.6 553.5 372.9 553.5 370.1 553.5 369.4 553.5 368.8 553.5 368.1 553.5 367.7 554.2 367.9 554.5 367.9 557.4 367.9 560.2 367.9 563.1 367.9 565 367.9 566.9 367.9 568.8 367.9 570.1 367.9 571.6 367.7 572.8 368.1 573.9 368.4 574.8 369 575.7 369.7 576.8 370.6 578.3 371.8 578.9 373.1 579.2 373.8 579.2 374.5 579.2 375.3 579.2 376.6 579.6 377.7 580.2 378.9 580.7 380 581.3 381 581.6 382.2 581.7 382.6 581.7 383 581.8 383.4 581.9 384 582 384.6 582.1 385.1 583.1 390.9 584.2 396.6 585.2 402.4 585.6 404.9 586.1 407.3 586.5 409.8 586.6 410.3 586.7 410.8 586.8 411.3 586.8 411.4 587.2 411.4 587.4 411.4 597.8 411.4 608.3 411.4 618.7 411.4 619.2 411.4 619.6 411.4 620.1 411.4 620.2 411.4 620.2 410.7 620.2 410.6 620.2 408.2 620.2 405.7 620.2 403.3 620.2 398.3 620.2 393.3 620.2 388.4 620.2 388.4 620.2 388.4 620.2 388.4 619.3 390.1 618.5 391.8 617.6 393.5ZM592 339.7C592 342 589.2 342.8 587.7 344.1 587.4 344.3 587.1 344.6 586.9 344.8 586.7 344.8 586.4 344.8 586.2 344.9 585.8 345 585.4 345.2 585.1 345.4 584.4 345.9 583.9 346.6 583.2 347 582.1 347.5 580.7 347.3 579.6 347.3 577.9 347.3 576.3 347.3 574.6 347.3 573.9 347.3 573.2 347.3 572.5 347.3 569.5 347.3 566.4 347.3 563.4 347.3 563 347.3 558.8 347.4 558.8 347.2 558.8 337.9 558.8 328.5 558.8 319.2 558.8 319.1 571.7 319.2 573 319.2 577 319.2 581 319.1 584.9 320.1 586.4 320.5 587.8 321 589.2 321.6 590.1 322.1 591 323.2 591.6 324 593.1 325.7 594.1 327.8 594.5 330 594.6 330.7 594.6 331.3 594.6 332 594.3 332.6 594 333.2 593.7 333.9 593.3 334.7 592.9 335.5 592.6 336.3 592.1 337.4 592 338.5 592 339.7ZM722.6 393.5C722.6 384.2 722.6 374.9 722.6 365.6 722.6 357.1 720.9 348 714.6 341.9 707.5 335.1 696.4 333.9 687 334.7 685.1 334.9 683.2 335.3 681.4 336.1 680.4 336.5 679.5 336.9 678.6 337.6 678 338.1 677.3 338.5 676.7 338.8 673.6 340.4 670.5 341.6 668.8 344.9 668.8 335.9 668.8 326.8 668.8 317.8 668.8 311.9 668.8 306 668.8 300.1 668.8 298.4 668.8 296.6 668.8 294.9 668.8 294.4 669.1 293.7 668.5 293.7 657.9 293.7 647.3 293.7 636.7 293.7 635.5 293.7 634.2 293.7 633 293.7 633 293.7 633 297.8 633 298.1 633 303.4 633 308.7 633 314 633 314.3 633.8 314.2 634 314.2 635.4 314.2 636.7 314.2 638.1 314.2 640.6 314.2 643.2 314.2 645.7 314.2 645.9 314.2 645.8 319.4 645.8 319.8 645.8 331.2 645.8 342.6 645.8 353.9 645.8 364.9 645.8 375.8 645.8 386.8 645.8 388 645.8 389.2 645.8 390.3 645.8 391.2 645.7 391 644.6 391 641.6 391 638.7 391 635.7 391 634.8 391 633.9 391 633 391 632.9 391 632.9 391.9 632.9 392 632.9 397.7 632.9 403.4 632.9 409 632.9 409.8 632.9 410.5 632.9 411.3 632.9 411.5 633 411.5 633.2 411.5 634.5 411.5 635.9 411.5 637.2 411.5 649.1 411.5 661 411.5 672.9 411.5 673.4 411.5 681.5 411.5 681.5 411.5 681.5 406.5 681.5 401.5 681.5 396.5 681.5 394.7 681.5 392.9 681.5 391.1 681.5 391.1 675.6 391.1 675.2 391.1 674.8 391.1 668.7 391.1 668.7 391.1 668.7 389.8 668.7 388.5 668.7 387.3 668.7 381.2 668.7 375 668.7 368.9 668.7 366.5 668.7 364.2 668.7 361.8 668.7 361.3 668.7 360.9 668.7 360.4 668.7 360 670.3 358.8 670.6 358.5 671.7 357.5 672.8 356.5 674.2 355.8 674.7 355.5 675.3 355.3 675.8 355.3 676.5 355.2 676.8 354.8 677.4 354.3 678.5 353.5 679.7 353 681 352.8 683.6 352.4 685.8 352.7 687.9 354.2 689.1 355.1 690.1 356.1 691.2 357.2 692 358 692.7 358.8 693.3 359.8 694.2 361.6 694.3 363.7 694.3 365.7 694.4 369.3 694.3 372.9 694.3 376.6 694.3 387.8 694.3 399 694.3 410.3 694.3 410.9 694 411.6 694.7 411.6 696.4 411.6 698.1 411.6 699.8 411.6 706 411.6 712.3 411.6 718.5 411.6 722.4 411.6 726.3 411.6 730.2 411.6 730.2 411.6 730.2 398.5 730.2 397.5 730.2 395.4 730.2 393.3 730.2 391.2 727.8 391.8 725.2 392.6 722.6 393.5ZM730.3 270.6C727.9 270.6 725.4 270.6 723 270.6 722 270.6 721.1 270.6 720.1 270.6 720 270.6 719.6 271.3 719.6 271.4 716.5 276 713.4 280.6 710.4 285.3 708.9 287.5 707.4 289.7 706 292 705.6 292.5 705.3 293.1 704.9 293.6 704.6 294.1 704.8 294.9 704.8 295.4 704.8 295.6 704.8 298.8 704.8 298.8 705.4 298.8 706 298.8 706.5 298.8 709.5 298.8 712.4 298.8 715.4 298.8 717.8 298.8 720.1 298.8 722.5 298.8 723 298.8 722.7 299.6 722.7 299.9 722.7 301.4 722.7 302.9 722.7 304.4 722.7 305.8 722.7 307.1 722.7 308.5 722.7 309.3 723 309.1 723.8 309.1 725.3 309.1 726.9 309.1 728.4 309.1 728.7 309.1 730.3 309.3 730.3 308.9 730.3 306.2 730.3 303.4 730.3 300.7 730.3 300.4 730.1 298.8 730.5 298.8 731.9 298.8 733.3 298.8 734.6 298.8 734.7 298.8 735.4 298.8 735.4 298.8 735.4 298.2 735.4 297.7 735.4 297.1 735.4 296.9 735.4 293.7 735.4 293.7 734.1 293.7 732.9 293.7 731.6 293.7 731.1 293.7 730.3 294 730.3 293.4 730.3 285.7 730.3 278.1 730.3 270.6ZM722.6 285.9C722.6 287.2 722.6 288.5 722.6 289.7 722.6 290.6 722.6 291.4 722.6 292.3 722.6 292.5 722.7 293.4 722.6 293.6 722.5 293.7 721.6 293.6 721.5 293.6 720.6 293.6 719.7 293.6 718.8 293.6 717.5 293.6 716.2 293.6 715 293.6 716.3 291.6 717.7 289.6 719 287.6 719.6 286.7 720.2 285.9 720.8 285.1 722.4 283.1 722.6 280.7 722.6 278.2 722.6 280.8 722.6 283.4 722.6 285.9ZM763.6 288.5C760.9 285.8 756.2 285.9 752.6 285.9 752 285.9 751.4 285.9 750.8 285.9 750.8 285.9 750.8 284.8 750.8 284.7 750.8 283.4 750.8 282.1 750.8 280.8 750.8 280.7 763.9 280.8 765.2 280.8 765.7 280.8 766.2 281 766.2 280.5 766.2 279.1 766.2 277.7 766.2 276.4 766.2 275.3 766.2 274.2 766.2 273.2 766.2 273.2 764.9 273.2 764.9 273.2 759.2 273.2 753.5 273.2 747.8 273.2 747.2 273.2 746.5 273.2 745.9 273.2 745.7 273.2 745.7 273.6 745.7 273.8 745.4 276 745.1 278.2 744.9 280.4 744.3 284.8 743.8 289.3 743.2 293.7 747 293.7 751.5 293.1 755.1 294.8 757.9 296.2 759 299.4 758.5 302.4 758 305.8 754.4 306.5 751.5 306.5 749.6 306.5 743.2 307 743.2 303.9 742.3 306.5 741.5 309 740.6 311.6 742.3 311.6 744 312.6 745.6 313.2 748 314.1 750.5 314.3 753 314.1 756.9 313.8 761 312.5 763.6 309.4 766.3 306.1 766.2 301.9 766.2 297.8 766.2 295.6 766.2 293.3 765.7 291.1 765.5 290.1 765 288.6 763.7 288.5 763.7 288.5 763.6 288.5 763.6 288.5 761 285.9 766.2 288.5 763.6 288.5Z",
+        "width": 1000
+      },
+      "search": [
+        "rhodecode"
+      ]
+    },
+    {
+      "uid": "e5ad8728e6d6290aff4b6ffcfcaa9167",
+      "css": "up",
+      "code": 59442,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M686.5 595.8L513.6 379.1C506.3 369.9 492.4 369.9 485.1 379.1L312.2 595.8C302.7 607.8 311.2 625.4 326.5 625.4H672.2C687.5 625.4 696 607.8 686.5 595.8Z",
+        "width": 1000
+      },
+      "search": [
+        "up"
+      ]
+    },
+    {
+      "uid": "6e459e39444c93a2c017f258186765d6",
+      "css": "unlock",
+      "code": 59399,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M780.8 434.6H396.2V342.3C396.2 284.6 438.5 238.5 492.3 226.9 492.3 226.9 492.3 226.9 496.2 226.9 503.8 226.9 507.7 226.9 515.4 226.9 515.4 226.9 519.2 226.9 519.2 226.9 519.2 226.9 519.2 226.9 523.1 226.9 530.8 226.9 538.5 226.9 546.2 230.8 546.2 230.8 546.2 230.8 546.2 230.8 553.8 230.8 557.7 234.6 565.4 238.5 565.4 238.5 569.2 238.5 569.2 242.3 573.1 246.2 580.8 246.2 584.6 250 584.6 250 584.6 250 584.6 250 588.5 253.8 596.2 257.7 600 261.5 600 261.5 603.8 265.4 603.8 265.4 607.7 269.2 611.5 273.1 615.4 276.9 615.4 276.9 615.4 276.9 619.2 280.8 623.1 284.6 626.9 292.3 630.8 300 630.8 300 630.8 303.8 630.8 303.8 634.6 307.7 634.6 315.4 634.6 319.2 634.6 319.2 634.6 323.1 634.6 323.1 634.6 323.1 634.6 323.1 634.6 326.9 638.5 338.5 646.2 346.2 657.7 346.2H715.4C730.8 346.2 742.3 334.6 738.5 319.2 738.5 319.2 738.5 319.2 738.5 319.2 738.5 319.2 738.5 315.4 738.5 315.4 738.5 307.7 734.6 303.8 734.6 296.2 734.6 292.3 734.6 292.3 730.8 288.5 730.8 273.1 730.8 269.2 726.9 261.5 726.9 261.5 726.9 257.7 723.1 257.7 719.2 250 715.4 242.3 711.5 234.6 711.5 234.6 707.7 230.8 707.7 230.8 703.8 223.1 700 219.2 696.2 215.4 696.2 211.5 692.3 211.5 692.3 207.7 688.5 203.8 684.6 196.2 680.8 192.3 680.8 192.3 676.9 188.5 676.9 188.5 669.2 180.8 665.4 176.9 657.7 169.2 657.7 169.2 653.8 169.2 653.8 165.4 650 161.5 642.3 157.7 634.6 153.8 630.8 153.8 630.8 150 626.9 150 623.1 146.2 615.4 142.3 611.5 142.3 607.7 142.3 607.7 138.5 603.8 138.5 596.2 134.6 588.5 130.8 580.8 130.8 580.8 130.8 580.8 130.8 580.8 130.8 573.1 126.9 565.4 126.9 553.8 123.1 550 123.1 550 123.1 546.2 123.1 538.5 123.1 534.6 123.1 526.9 119.2 523.1 119.2 519.2 119.2 519.2 119.2 511.5 119.2 503.8 119.2 496.2 119.2 496.2 119.2 492.3 119.2 492.3 119.2 484.6 119.2 476.9 123.1 465.4 123.1 461.5 123.1 453.8 126.9 450 126.9 450 126.9 446.2 126.9 446.2 126.9 353.8 153.8 288.5 242.3 288.5 342.3V434.6H246.2C230.8 434.6 223.1 446.2 223.1 457.7V857.7C223.1 873.1 234.6 880.8 246.2 880.8H780.8C796.2 880.8 803.8 869.2 803.8 857.7V457.7C807.7 446.2 796.2 434.6 780.8 434.6Z",
+        "width": 1000
+      },
+      "search": [
+        "unlock"
+      ]
+    },
+    {
+      "uid": "b077586592b9b69166b981325446c836",
+      "css": "delete",
+      "code": 59392,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M515.4 92.3C303.8 92.3 130.8 265.4 130.8 476.9 130.8 688.5 303.8 861.5 515.4 861.5S900 688.5 900 476.9C900 265.4 726.9 92.3 515.4 92.3ZM742.3 507.7C742.3 523.1 730.8 534.6 711.5 534.6H315.4C300 534.6 284.6 523.1 284.6 507.7V446.2C284.6 430.8 296.2 419.2 315.4 419.2H711.5C726.9 419.2 742.3 430.8 742.3 446.2V507.7Z",
+        "width": 1000
+      },
+      "search": [
+        "delete"
+      ]
+    },
+    {
+      "uid": "dca63ad885c0d6f1780a8d1d55bc2380",
+      "css": "ok",
+      "code": 59393,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M515.4 115.4C303.8 115.4 130.8 288.5 130.8 500 130.8 711.5 303.8 884.6 515.4 884.6S900 711.5 900 500C900 288.5 726.9 115.4 515.4 115.4ZM753.8 411.5L450 715.4C438.5 726.9 423.1 726.9 411.5 715.4L273.1 576.9C261.5 565.4 261.5 550 273.1 538.5L315.4 496.2C326.9 484.6 342.3 484.6 353.8 496.2L411.5 553.8C423.1 565.4 438.5 565.4 450 553.8L669.2 334.6C680.8 323.1 696.2 323.1 707.7 334.6L750 376.9C765.4 384.6 765.4 400 753.8 411.5Z",
+        "width": 1000
+      },
+      "search": [
+        "ok"
+      ]
+    },
+    {
+      "uid": "c158b3a004c055c6ad1471cd98932268",
+      "css": "down",
+      "code": 59403,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M703.8 396.2L530.8 615.4C523.1 623.1 507.7 623.1 503.8 615.4L330.8 396.2C323.1 384.6 330.8 365.4 346.2 365.4H692.3C703.8 365.4 711.5 384.6 703.8 396.2Z",
+        "width": 1000
+      },
+      "search": [
+        "arrow_down"
+      ]
+    },
+    {
+      "uid": "02f59f392ad28056845cfc04cb121f13",
+      "css": "comment",
+      "code": 59394,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M130.8 784.6V280.8C130.8 207.7 188.5 150 261.5 150H769.2C842.3 150 900 207.7 900 280.8V569.2C900 642.3 842.3 700 769.2 700H273.1C269.2 700 261.5 703.8 257.7 707.7L165.4 800C153.8 815.4 130.8 803.8 130.8 784.6ZM261.5 211.5C223.1 211.5 188.5 242.3 188.5 284.6V696.2L234.6 650C238.5 646.2 242.3 642.3 250 642.3H769.2C807.7 642.3 842.3 611.5 842.3 569.2V280.8C842.3 242.3 811.5 207.7 769.2 207.7H261.5Z",
+        "width": 1000
+      },
+      "search": [
+        "comment"
+      ]
+    },
+    {
+      "uid": "9a44b838872ca62b8aba7bbbbf67cc59",
+      "css": "feed",
+      "code": 59400,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M842.3 111.5H188.5C153.8 111.5 130.8 138.5 130.8 169.2V826.9C130.8 857.7 157.7 884.6 188.5 884.6H846.2C876.9 884.6 903.8 857.7 903.8 826.9V169.2C900 138.5 873.1 111.5 842.3 111.5ZM307.7 776.9C269.2 776.9 234.6 746.2 234.6 703.8S265.4 630.8 307.7 630.8C346.2 630.8 380.8 661.5 380.8 703.8S346.2 776.9 307.7 776.9ZM553.8 788.5C519.2 788.5 496.2 761.5 496.2 730.8 496.2 619.2 407.7 530.8 296.2 530.8 265.4 530.8 230.8 503.8 230.8 473.1 230.8 438.5 253.8 411.5 284.6 411.5L296.2 411.5C473.1 411.5 615.4 553.8 615.4 730.8 611.5 761.5 584.6 788.5 553.8 788.5ZM750 788.5C715.4 788.5 692.3 761.5 692.3 730.8 692.3 511.5 511.5 330.8 292.3 330.8 261.5 330.8 226.9 303.8 226.9 269.2 226.9 234.6 250 207.7 280.8 207.7L292.3 207.7C576.9 207.7 811.5 438.5 811.5 726.9 811.5 761.5 784.6 788.5 750 788.5Z",
+        "width": 1000
+      },
+      "search": [
+        "feed"
+      ]
+    },
+    {
+      "uid": "e0118d6f20b76d77317977ae8dc849d7",
+      "css": "left",
+      "code": 59401,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M692.3 76.9L761.5 146.2C773.1 157.7 773.1 173.1 761.5 184.6L473.1 473.1C461.5 484.6 461.5 500 473.1 511.5L769.2 807.7C780.8 819.2 780.8 834.6 769.2 846.2L700 915.4C688.5 926.9 673.1 926.9 661.5 915.4L257.7 511.5C246.2 500 246.2 484.6 257.7 473.1L653.8 76.9C665.4 65.4 680.8 65.4 692.3 76.9Z",
+        "width": 1000
+      },
+      "search": [
+        "left"
+      ]
+    },
+    {
+      "uid": "3cea97f90c8f2b0a90833855434f58de",
+      "css": "right",
+      "code": 59402,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M338.5 915.4L265.4 846.2C253.8 834.6 253.8 819.2 265.4 807.7L553.8 519.2C565.4 507.7 565.4 492.3 553.8 480.8L257.7 184.6C246.2 173.1 246.2 157.7 257.7 146.2L326.9 76.9C338.5 65.4 353.8 65.4 365.4 76.9L769.2 480.8C780.8 492.3 780.8 507.7 769.2 519.2L376.9 915.4C365.4 926.9 346.2 926.9 338.5 915.4Z",
+        "width": 1000
+      },
+      "search": [
+        "right"
+      ]
+    },
+    {
+      "uid": "820a44cb2e7fc1d0e28b1d2a8cd44cb9",
+      "css": "git",
+      "code": 59434,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M928.8 6.3H71.3C35 6.3 6.3 36.3 6.3 71.3V927.5C6.3 963.8 36.3 992.5 71.3 992.5H927.5C963.8 992.5 992.5 962.5 992.5 927.5V71.3C993.8 36.3 963.7 6.3 928.8 6.3ZM200 555C203.8 566.3 208.8 575 213.8 582.5 220 590 227.5 596.3 236.3 600 245 603.8 255 606.3 265 606.3 273.8 606.3 281.3 605 288.8 603.8 296.3 602.5 302.5 600 308.8 597.5L315 546.3H287.5C283.8 546.3 280 545 277.5 542.5 276.3 541.3 275 537.5 275 535L280 496.2H385L368.7 627.5C361.2 633.8 352.5 638.7 343.7 642.5 335 646.3 326.3 650 316.2 652.5 306.2 655 297.5 657.5 286.3 658.8 276.3 660 265 661.3 252.5 661.3 232.5 661.3 215 657.5 198.7 650 182.5 642.5 168.7 632.5 157.5 620 146.2 607.5 137.5 592.5 131.2 575 125 557.5 121.2 538.8 121.2 518.8 121.2 501.3 123.7 485 127.5 468.8 131.2 452.5 137.5 438.8 145 425 152.5 411.3 161.2 400 171.2 388.8 181.2 377.5 192.5 368.8 205 361.3 217.5 353.8 231.3 347.5 246.3 343.8 261.3 340 276.3 337.5 292.5 337.5 306.3 337.5 317.5 338.8 328.7 341.3 340 343.8 350 347.5 357.5 351.3 366.2 355 373.8 360 380 365 386.3 370 392.5 376.3 397.5 381.3L377.5 412.5C373.8 417.5 368.8 420 363.8 421.3 358.8 422.5 353.7 421.3 347.5 417.5 342.5 413.8 337.5 411.3 333.7 408.8 328.7 406.3 325 403.8 320 402.5 315 401.3 310 400 305 398.8 300 397.5 293.7 397.5 287.5 397.5 273.7 397.5 261.2 400 250 406.3 238.7 412.5 228.7 420 221.2 431.3 212.5 441.2 206.2 455 202.5 468.8 197.5 483.8 196.2 500 196.2 517.5 195 531.3 197.5 543.8 200 555ZM536.3 657.5H465L503.7 342.5H575L536.3 657.5ZM878.8 398.8H798.8L766.3 657.5H696.3L727.5 398.7H647.5L655 342.5H886.3L878.8 398.8Z",
+        "width": 1000
+      },
+      "search": [
+        "git"
+      ]
+    },
+    {
+      "uid": "ea152b092f5ad7d610de2c388553e188",
+      "css": "hg",
+      "code": 59437,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M926.6 9.2H73.9C37.9 9.2 8.7 38.5 8.7 74.4V927.1C8.7 963.1 38 992.3 73.9 992.3H926.6C962.6 992.3 991.8 963 991.8 927.1V74.4C991.8 38.4 962.6 9.2 926.6 9.2ZM444 657.4H373.5L389.8 524.1H276.7L260.4 657.4H189.9L228.6 344.2H299.1L282.8 476.4H395.9L412.2 344.2H482.7L444 657.4ZM621 555.8C624.3 566.8 629.1 576 635.3 583.5 641.5 591 648.8 596.8 657.5 600.8 666.1 604.8 675.6 606.8 686.1 606.8 694.7 606.8 702.4 606 709.3 604.5 716.2 603 722.8 600.8 729.1 598.1L735.1 546.9H708.4C704.1 546.9 700.8 545.8 698.6 543.6 696.4 541.4 695.5 538.5 695.9 534.9L700.6 496.2H805.1L788.8 627.1C780.8 633 772.5 638.1 763.9 642.3 755.3 646.6 746.3 650 736.9 652.7 727.5 655.5 717.6 657.5 707.2 658.7 696.8 660 685.7 660.6 674 660.6 654.6 660.6 637 657 621 650 605 642.9 591.3 633.1 579.9 620.7 568.5 608.2 559.7 593.5 553.5 576.4 547.2 559.3 544.1 540.9 544.1 520.9 544.1 503.6 546.1 487.1 550 471.3 554 455.6 559.6 441.1 566.9 427.8 574.2 414.5 583 402.4 593.2 391.7 603.4 381 614.9 371.8 627.4 364.2 639.9 356.6 653.5 350.7 667.9 346.6 682.4 342.6 697.6 340.5 713.5 340.5 726.8 340.5 738.9 341.7 749.7 344.2 760.5 346.6 770.2 349.9 778.8 353.9 787.4 358 795.1 362.8 801.8 368.1 808.6 373.5 814.5 379 819.7 384.8L797 413.2C793.3 418.2 788.8 421.3 783.7 422.3 778.6 423.4 773.2 422.2 767.8 418.8 762.8 415.4 758.1 412.4 753.6 409.9 749.2 407.4 744.7 405.3 740.1 403.7 735.5 402 730.7 400.8 725.6 400 720.5 399.2 714.8 398.8 708.5 398.8 694.9 398.8 682.4 401.7 671.1 407.5 659.8 413.3 650 421.5 641.9 432 633.7 442.5 627.4 455.2 622.9 469.9 618.4 484.7 616.1 501 616.1 518.7 615.9 532.5 617.6 544.8 621 555.8Z",
+        "width": 1000
+      },
+      "search": [
+        "hg"
+      ]
+    },
+    {
+      "uid": "4a842c0afb4c35dacd21da71f9fed3f1",
+      "css": "comment-add",
+      "code": 59439,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M952.4 591.9V274.9C952.4 268.4 952.3 261.9 951.8 255.4 950.7 242.9 948.2 230.6 944.1 218.8 936.5 196.6 923.8 176.2 907.3 159.6 890.8 143.1 870.6 130.4 848.5 122.7 836.6 118.6 824.2 115.9 811.6 114.8 805.3 114.2 798.9 114.2 792.6 114.2H216.9C204 114.2 191.3 114.1 178.5 116 166.3 117.9 154.4 121.2 143 125.9 121.4 134.8 101.9 148.7 86.4 166.2 70.8 183.8 59.3 205 53.1 227.7 49.7 240.1 47.9 252.8 47.6 265.6 47.3 278.7 47.6 291.8 47.6 304.9V861.8C47.6 870.7 52.5 878.6 60.5 882.5 67.3 885.9 75.6 886.2 82.4 882.7 84.8 881.5 86.9 879.7 88.8 877.8 91.1 875.5 93.4 873.2 95.6 871 100.3 866.3 105 861.6 109.7 856.9L137.9 828.6C147.3 819.2 156.6 809.9 166 800.5 175.2 791.3 184.6 782.1 193.7 772.7 197.7 768.5 201.9 764.4 207.6 762.7 210.4 761.9 213.2 761.8 216 761.8H782.7C795.5 761.8 808.3 762 821 760.1 844.8 756.5 867.7 747.3 887.3 733.3 906.2 719.9 922.1 702.1 933.2 681.8 945.1 660.2 951.5 636 952.2 611.4 952.5 604.9 952.4 598.4 952.4 591.9ZM883.4 285.1V602.5C883.4 608.8 883.4 615.1 882.5 621.4 881.7 627.5 880.2 633.6 878.1 639.4 874.4 649.4 868.8 658.7 861.7 666.7 846.6 683.6 825.1 693.8 802.5 695.1 796.3 695.4 790 695.2 783.8 695.2H207.8C201.2 695.2 194.7 695.2 188.1 695.2 185 695.2 181.8 695.2 178.8 696.1 176.2 696.9 173.9 698.2 171.8 699.9 169.6 701.7 167.6 703.7 165.6 705.7 163.3 708 161 710.3 158.7 712.6 154 717.3 149.4 721.9 144.7 726.6 135.3 736 126 745.3 116.6 754.7V270C116.6 257.8 118.8 245.7 123.7 234.6 128 224.9 134 215.9 141.5 208.4 157.5 192.4 179.6 183.3 202.2 183.3H791.5C797.6 183.3 803.7 183.3 809.7 184.2 832 187.4 852.4 199.4 866 217.4 872.8 226.4 877.7 236.7 880.5 247.6 882 253.5 882.9 259.6 883.1 265.8 883.6 272.2 883.4 278.7 883.4 285.1ZM668.8 402H538.2C534.4 402 526.7 394.3 526.7 390.5V263.7C526.7 256 519 248.3 515.2 248.3H465.3C457.6 248.3 449.9 256 449.9 259.8V390.4C449.9 394.2 442.2 401.9 438.4 401.9H311.7C304 401.9 296.3 409.6 296.3 413.4V463.3C296.3 471 304 478.7 307.8 478.7H434.5C442.2 478.7 449.9 486.4 449.9 490.2V617C449.9 624.7 457.6 632.4 461.4 632.4H511.3C519 632.4 526.7 624.7 526.7 620.9V494.1C526.7 486.4 534.4 478.7 538.2 478.7H665C672.7 478.7 680.4 471 680.4 467.2V417.3C680.3 409.6 672.6 402 668.8 402Z",
+        "width": 1000
+      },
+      "search": [
+        "comment-add"
+      ]
+    },
+    {
+      "uid": "2427f6b8d4379b9a0b41cf31780807cf",
+      "css": "comment-toggle",
+      "code": 59440,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M797.6 114.2H202.4C116.6 114.2 47.6 183.3 47.6 269V861.9C47.6 881.4 69.5 891.1 84.1 881.8 86.4 880.7 88.6 879.1 90.6 877.1L199.8 768C202.1 765.7 204.7 764 207.7 762.8 209.7 762.2 211.9 761.9 214.3 761.9H797.6C883.4 761.9 952.4 692.8 952.4 607.1V269C952.4 183.2 883.3 114.2 797.6 114.2ZM118.3 752.6V269.5C118.3 222.5 156.4 184.3 203.5 184.3H680.1C593.7 267.9 175.5 695.4 171.4 699.5L118.3 752.6Z",
+        "width": 1000
+      },
+      "search": [
+        "comment-toggle"
+      ]
+    },
+    {
+      "uid": "6533bdc16ab201eb3f3b27ce989cab33",
+      "css": "folder-open-empty",
+      "code": 61717,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d64b34fac1d9923b7d29d1550b628ecd",
+      "css": "lock",
+      "code": 59398,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M812.5 424.1H758.9V317C758.9 308 758.9 303.6 758.9 299.1 758.9 294.6 758.9 290.2 758.9 285.7 758.9 281.3 758.9 281.3 758.9 276.8 758.9 267.9 758.9 263.4 754.5 254.5 754.5 250 754.5 250 750 245.5 750 236.6 745.5 232.1 741.1 223.2 741.1 223.2 741.1 218.8 736.6 218.8 732.1 209.8 727.7 200.9 723.2 192 723.2 192 718.8 187.5 718.8 187.5 723.2 178.6 718.8 169.6 714.3 165.2 714.3 160.7 709.8 160.7 709.8 156.3 705.4 151.8 700.9 142.9 696.4 138.4 696.4 138.4 692 133.9 692 133.9 683 125 678.6 120.5 669.6 111.6 669.6 111.6 665.2 111.6 665.2 107.1 660.7 102.7 651.8 98.2 642.9 93.8 638.4 93.8 638.4 89.3 633.9 89.3 629.5 84.8 620.5 80.4 616.1 80.4 611.6 80.4 611.6 75.9 607.1 75.9 598.2 71.4 589.3 67 580.4 67 580.4 67 580.4 67 580.4 67 571.4 62.5 562.5 62.5 549.1 58 544.6 58 544.6 58 540.2 58 535.7 58 535.7 58 531.3 58 531.3 58 526.8 58 526.8 58 526.8 58 522.3 58 522.3 58 522.3 58 522.3 58 522.3 58 522.3 58 522.3 58 522.3 58 517.9 58 513.4 58 513.4 58 513.4 58 508.9 58 508.9 58 504.5 58 504.5 58 500 58 500 58 500 58 500 58 495.5 58 491.1 58 491.1 58 491.1 58 491.1 58 491.1 58 491.1 58 491.1 58 491.1 58 491.1 58 486.6 58 486.6 58 486.6 58 482.1 58 482.1 58 477.7 58 477.7 58 473.2 58 468.8 58 468.8 58 464.3 58 455.4 58 442 62.5 433 67 433 67 433 67 433 67 410.7 67 397.3 71.4 388.4 75.9 383.9 75.9 383.9 80.4 379.5 80.4 375 84.8 370.5 84.8 361.6 89.3 361.6 93.8 357.1 93.8 357.1 93.8 348.2 98.2 339.3 102.7 334.8 111.6 334.8 111.6 330.4 111.6 330.4 116.1 321.4 120.5 317 125 308 133.9 308 133.9 303.6 138.4 303.6 138.4 299.1 142.9 294.6 151.8 290.2 156.3 290.2 160.7 285.7 160.7 285.7 165.2 276.8 169.6 272.3 178.6 272.3 183 267.9 183 267.9 187.5 267.9 187.5 263.4 196.4 258.9 205.4 254.5 214.3 254.5 214.3 254.5 218.8 250 218.8 250 232.1 245.5 236.6 245.5 245.5 245.5 250 245.5 250 241.1 254.5 241.1 263.4 236.6 267.9 236.6 276.8 236.6 281.3 236.6 281.3 236.6 285.7 236.6 290.2 236.6 294.6 236.6 299.1 236.6 303.6 236.6 312.5 236.6 317V424.1H187.5C169.6 424.1 160.7 437.5 160.7 450.9V915.2C160.7 933 174.1 942 187.5 942H808C825.9 942 834.8 928.6 834.8 915.2V450.9C839.3 433 825.9 424.1 812.5 424.1ZM361.6 317C361.6 250 410.7 196.4 473.2 183 473.2 183 473.2 183 477.7 183 486.6 183 491.1 183 500 183 500 183 504.5 183 504.5 183 504.5 183 504.5 183 504.5 183 513.4 183 517.9 183 526.8 183 526.8 183 526.8 183 531.3 183 593.8 196.4 642.9 250 642.9 317V424.1H361.6V317Z",
+        "width": 1000
+      },
+      "search": [
+        "lock"
+      ]
+    },
+    {
+      "uid": "d95fde5e3bfeb3302efc47c90538a1c5",
+      "css": "more",
+      "code": 59410,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M546.2 415.4H446.2C430.8 415.4 419.2 426.9 419.2 442.3V542.3C419.2 557.7 430.8 569.2 446.2 569.2H546.2C561.5 569.2 573.1 557.7 573.1 542.3V442.3C573.1 426.9 561.5 415.4 546.2 415.4ZM546.2 107.7H446.2C430.8 107.7 419.2 119.2 419.2 134.6V234.6C419.2 250 430.8 261.5 446.2 261.5H546.2C561.5 261.5 573.1 250 573.1 234.6V134.6C573.1 119.2 561.5 107.7 546.2 107.7ZM546.2 723.1H446.2C430.8 723.1 419.2 734.6 419.2 750V850C419.2 865.4 430.8 876.9 446.2 876.9H546.2C561.5 876.9 573.1 865.4 573.1 850V750C573.1 734.6 561.5 723.1 546.2 723.1Z",
+        "width": 1000
+      },
+      "search": [
+        "more"
+      ]
+    },
+    {
+      "uid": "34e7772638ae3ca1bfb0a4eca2c39221",
+      "css": "merge",
+      "code": 59443,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M199.8 740.5C199.8 812.2 258.1 870.5 329.8 870.5S459.8 812.2 459.8 740.5C459.8 694.6 435.8 654.5 399.8 631.3 418.4 491.7 533.4 451.9 602.4 440.6V742.4C563.7 765 537.4 806.4 537.4 854.4 537.4 926.1 595.7 984.4 667.4 984.4S797.4 926.1 797.4 854.4C797.4 806.5 771.1 765 732.4 742.4V254.9C771.1 232.3 797.4 190.9 797.4 142.9 797.4 71.2 739.1 12.9 667.4 12.9S537.4 71.2 537.4 142.9C537.4 190.8 563.7 232.3 602.4 254.9V309.9C542.2 317.8 440.4 342.3 364.2 417.8 309.5 472.1 277.9 542.1 269.6 625.9 228.4 647.7 199.8 690.6 199.8 740.5ZM667.6 897.8C643.7 897.8 624.3 878.3 624.3 854.5S643.8 811.2 667.6 811.2C691.5 811.2 710.9 830.7 710.9 854.5S691.5 897.8 667.6 897.8ZM667.6 99.6C691.5 99.6 710.9 119 710.9 142.9S691.4 186.2 667.6 186.2C643.7 186.2 624.3 166.8 624.3 142.9S643.7 99.6 667.6 99.6ZM329.9 783.9C306 783.9 286.6 764.4 286.6 740.6S306.1 697.3 329.9 697.3C353.8 697.3 373.2 716.7 373.2 740.6S353.8 783.9 329.9 783.9Z",
+        "width": 1000
+      },
+      "search": [
+        "merge"
+      ]
+    },
+    {
+      "uid": "c95735c17a10af81448c7fed98a04546",
+      "css": "folder-open",
+      "code": 59405,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "865ac833a8efcfc24a6f573705ce56b1",
+      "css": "svn",
+      "code": 59438,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M933.4 9.2H80.7C44.7 9.2 15.5 38.5 15.5 74.4V927.1C15.5 963.1 44.8 992.3 80.7 992.3H933.4C969.4 992.3 998.6 963 998.6 927.1V74.4C998.7 38.4 969.4 9.2 933.4 9.2ZM167.9 447.1C171.1 451 175.4 454.4 180.8 457.3 186.2 460.2 192.2 463 199 465.4 205.7 467.8 212.7 470.5 219.8 473.3 226.9 476.2 233.9 479.5 240.7 483.2 247.5 486.9 253.6 491.6 259 497.2 264.4 502.8 268.7 509.6 271.9 517.4 275.1 525.3 276.8 534.8 276.8 545.8 276.8 561.6 274.1 576.4 268.6 590.3 263.1 604.3 255.3 616.4 245.1 626.8 234.9 637.2 222.5 645.4 208 651.5 193.4 657.6 177 660.7 158.8 660.7 149.7 660.7 140.7 659.7 131.5 657.7S113.6 652.8 105.2 649.2C96.8 645.5 89 641.2 81.8 636.2 74.6 631.2 68.5 625.6 63.5 619.5L88.5 586.7C90.5 584.3 93 582.3 95.9 580.7 98.8 579.1 101.8 578.3 104.8 578.3 108.8 578.3 112.7 579.7 116.5 582.5 120.3 585.3 124.5 588.4 129.1 591.8 133.7 595.2 139 598.2 145.1 601.1 151.2 603.9 158.7 605.3 167.6 605.3 180.7 605.3 190.7 601.7 197.8 594.7 204.9 587.6 208.4 577.1 208.4 563.2 208.4 556.8 206.8 551.4 203.5 547.3 200.3 543.1 196 539.7 190.8 536.8 185.6 533.9 179.6 531.4 172.8 529.1 166 526.9 159.2 524.5 152.1 521.9 145.1 519.3 138.2 516.2 131.4 512.8 124.6 509.3 118.6 504.7 113.4 499 108.2 493.3 103.9 486.4 100.7 478.2 97.5 469.9 95.9 459.8 95.9 447.7 95.9 433.8 98.5 420.4 103.7 407.6 108.9 394.8 116.4 383.4 126.2 373.5 136 363.6 147.8 355.7 161.7 349.8 175.6 343.9 191.3 341 208.6 341 217.5 341 226.1 341.9 234.5 343.8S250.8 348.2 258.1 351.6C265.4 354.9 272.1 358.8 278.1 363.3 284.1 367.8 289.2 372.8 293.4 378.1L272.3 407C269.7 410.3 267.2 412.8 264.8 414.4 262.4 416 259.4 416.8 256 416.8 252.7 416.8 249.4 415.8 246.1 413.6 242.8 411.4 239.1 409.1 235 406.5 230.9 403.9 226.2 401.6 220.9 399.4 215.6 397.2 209.3 396.2 202.2 396.2 195.6 396.2 189.8 397.1 184.9 399 179.9 400.9 175.8 403.4 172.5 406.8 169.2 410.1 166.7 414 165.1 418.4 163.5 422.9 162.6 427.8 162.6 433 163.1 438.4 164.7 443.2 167.9 447.1ZM480 657.4H416.3L339.2 343.7H395.6C401.6 343.7 406.4 345.1 410 348 413.6 350.8 415.8 354.5 416.7 359L449.4 531.8C451.3 538.7 453 546.3 454.6 554.8 456.2 563.2 457.5 571.9 458.7 581 461.7 572 464.9 563.2 468.4 554.8 471.8 546.4 475.4 538.8 479.2 531.8L552.3 359C553.2 357.1 554.4 355.2 556.1 353.4 557.7 351.5 559.6 349.8 561.8 348.4 564 347 566.4 345.8 569 345 571.6 344.2 574.4 343.7 577.3 343.7H634.1L480 657.4ZM902.6 657.4H866C860.5 657.4 856.1 656.5 852.8 654.7 849.4 652.9 846.2 649.9 843.2 645.8L733.6 452.2C733.3 456.2 733 460.1 732.7 463.8 732.3 467.6 732 471.1 731.7 474.4L710.2 657.4H648.2L686.9 343.7H723.9C726.9 343.7 729.5 343.8 731.6 344 733.7 344.2 735.5 344.7 737.1 345.5 738.7 346.3 740.1 347.4 741.4 348.8S744.1 352.1 745.5 354.4L855.5 548.1C855.8 543.1 856.2 538.3 856.7 533.7 857.2 529.2 857.8 524.8 858.3 520.8L879.4 343.6H941.4L902.6 657.4Z",
+        "width": 1000
+      },
+      "search": [
+        "svn"
+      ]
+    },
+    {
+      "uid": "bbfb51903f40597f0b70fd75bc7b5cac",
+      "css": "trash",
+      "code": 61944,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
+      "css": "trash-empty",
+      "code": 59406,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f8aa663c489bcbd6e68ec8147dca841e",
+      "css": "folder",
+      "code": 59404,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c8585e1e5b0467f28b70bce765d5840c",
+      "css": "docs",
+      "code": 61637,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "1b5a5d7b7e3c71437f5a26befdd045ed",
+      "css": "doc",
+      "code": 59414,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5408be43f7c42bccee419c6be53fdef5",
+      "css": "doc-text",
+      "code": 61686,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "b091a8bd0fdade174951f17d936f51e4",
+      "css": "folder-empty",
+      "code": 61716,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c08a1cde48d96cba21d8c05fa7d7feb1",
+      "css": "doc-text-inv",
+      "code": 61788,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "178053298e3e5b03551d754d4b9acd8b",
+      "css": "doc-inv",
+      "code": 61787,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "e99461abfef3923546da8d745372c995",
+      "css": "cog",
+      "code": 59415,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "98687378abd1faf8f6af97c254eb6cd6",
+      "css": "cog-alt",
+      "code": 59416,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "21b42d3c3e6be44c3cc3d73042faa216",
+      "css": "sliders",
+      "code": 61918,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "559647a6f430b3aeadbecd67194451dd",
+      "css": "menu",
+      "code": 61641,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c5fd349cbd3d23e4ade333789c29c729",
+      "css": "eye",
+      "code": 59417,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "7fd683b2c518ceb9e5fa6757f2276faa",
+      "css": "eye-off",
+      "code": 59418,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "2e2dba0307a502a8507c1729084c7ab5",
+      "css": "cancel-circled2",
+      "code": 59419,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "0f4cae16f34ae243a6144c18a003f2d8",
+      "css": "cancel-circled",
+      "code": 59420,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "26613a2e6bc41593c54bead46f8c8ee3",
+      "css": "file-code",
+      "code": 61897,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5211af474d3a9848f67f945e2ccaf143",
+      "css": "remove",
+      "code": 59408,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "44e04715aecbca7f266a17d5a7863c68",
+      "css": "plus",
+      "code": 59421,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "4ba33d2607902cf690dd45df09774cb0",
+      "css": "plus-circled",
+      "code": 59422,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "1a5cfa186647e8c929c2b17b9fc4dac1",
+      "css": "plus-squared",
+      "code": 61694,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "2d3be3e856fc1e4ac067590d2ded1b07",
+      "css": "plus-squared-alt",
+      "code": 61846,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "eeadb020bb75d089b25d8424aabe19e0",
+      "css": "minus-circled",
+      "code": 59423,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f755a58fb985eeb70bd47d9b31892a34",
+      "css": "minus-squared",
+      "code": 61766,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "18ef25350258541e8e54148ed79845c0",
+      "css": "minus-squared-alt",
+      "code": 61767,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "861ab06e455e2de3232ebef67d60d708",
+      "css": "minus",
+      "code": 59424,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "e82cedfa1d5f15b00c5a81c9bd731ea2",
+      "css": "info-circled",
+      "code": 59425,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
+      "css": "search",
+      "code": 59411,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "b429436ec5a518c78479d44ef18dbd60",
+      "css": "paste",
+      "code": 61674,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "8772331a9fec983cdb5d72902a6f9e0e",
+      "css": "scissors",
+      "code": 59412,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "9a76bc135eac17d2c8b8ad4a5774fc87",
+      "css": "download",
+      "code": 59413,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "eeec3208c90b7b48e804919d0d2d4a41",
+      "css": "upload",
+      "code": 59426,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5d2d07f112b8de19f2c0dbfec3e42c05",
+      "css": "spin",
+      "code": 59448,
+      "src": "fontelico"
+    },
+    {
+      "uid": "9bd60140934a1eb9236fd7a8ab1ff6ba",
+      "css": "spin-alt",
+      "code": 59444,
+      "src": "fontelico"
+    },
+    {
+      "uid": "513ac180ff85bd275f2b736720cbbf5e",
+      "css": "home",
+      "code": 59427,
+      "src": "entypo"
+    },
+    {
+      "uid": "d4816c0845aa43767213d45574b3b145",
+      "css": "history",
+      "code": 61914,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "c43db6645e7515889fc2193294f50767",
+      "css": "plus",
+      "code": 59411,
+      "src": "custom_icons",
+      "selected": false,
+      "svg": {
+        "path": "M873.1 446.2H619.2C603.8 446.2 592.3 434.6 592.3 419.2V165.4C592.3 150 580.8 138.5 565.4 138.5H465.4C450 138.5 438.5 150 438.5 165.4V419.2C438.5 434.6 426.9 446.2 411.5 446.2H157.7C142.3 446.2 130.8 457.7 130.8 473.1V573.1C130.8 588.5 142.3 600 157.7 600H411.5C426.9 600 438.5 611.5 438.5 626.9V880.8C438.5 896.2 450 907.7 465.4 907.7H565.4C580.8 907.7 592.3 896.2 592.3 880.8V626.9C592.3 611.5 603.8 600 619.2 600H873.1C888.5 600 900 588.5 900 573.1V473.1C900 457.7 888.5 446.2 873.1 446.2Z",
+        "width": 1000
+      },
+      "search": [
+        "plus"
+      ]
+    },
+    {
+      "uid": "7d7f338d90203f20c0d8d5c26091cc69",
+      "css": "minus",
+      "code": 59412,
+      "src": "custom_icons",
+      "selected": false,
+      "svg": {
+        "path": "M980 560H20C10 560 0 550 0 540V380C0 370 10 360 20 360H985C995 360 1005 370 1005 380V545C1000 550 990 560 980 560Z",
+        "width": 1000
+      },
+      "search": [
+        "minus"
+      ]
+    },
+    {
+      "uid": "4ccc61480001600f2e7e3c7dd0546c6e",
+      "css": "remove",
+      "code": 59413,
+      "src": "custom_icons",
+      "selected": false,
+      "svg": {
+        "path": "M975 140L860 25C845 10 825 10 810 25L525 310C510 325 490 325 475 310L190 25C175 10 155 10 140 25L25 140C10 155 10 175 25 190L310 475C325 490 325 510 310 525L25 810C10 825 10 845 25 860L140 975C155 990 175 990 190 975L475 690C490 675 510 675 525 690L810 975C825 990 845 990 860 975L975 860C990 845 990 825 975 810L690 525C675 510 675 490 690 475L975 190C990 180 990 155 975 140Z",
+        "width": 1000
+      },
+      "search": [
+        "remove"
+      ]
+    },
+    {
+      "uid": "b1afcccc053ecb95fbcacf06e5c0d554",
+      "css": "history",
+      "code": 59418,
+      "src": "custom_icons",
+      "selected": false,
+      "svg": {
+        "path": "",
+        "width": 1143
+      },
+      "search": [
+        "history"
+      ]
+    }
+  ]
+}
  No newline at end of file

rhodecode/public/fonts/RCIcons/readme.rst

@@ -0,0 +1,78 b''
+
+How To Build A New Icon Font
+============================
+
+Welcome. Contained in this repo is everything you need to build a new custom
+RhodeCode icon font for RhodeCode Community and Enterprise Editions. While the
+files are here, this document references what needs to be done in the actual
+Community Edition repository.
+
+Creating New Icons
+------------------
+
+Presumably, you're reading this because you'd like to update the icon font with
+new icons. To create new icons, you'll want to use Illustrator. Start with an
+empty 1000px x 1000px artboard, or use an existing .svg file if you'd like to
+use an existing icon as a guide.
+
+You'll need to make sure that your outlines are paths. This can be done using
+the Shape Modes in the Pathfinder tool; see Window > Pathfinder in Illustrator
+to build a compound image. It may happen that your image is rasterized, in which
+case it will need to be converted to vector; check the results carefully.
+
+    .. note::
+        When adding to the existing icon collection, please maintain our
+        existing icon style.
+
+
+Creating The Font
+-----------------
+
+*Fontello*
+
+We use fontello.com to generate the font files. On the main page, there is a
+section for clicking and dragging icons to add to a font. If you would like to
+use the existing font icons, here you will need to drag the .json file from the
+current fontello folder. Once it has preloaded all of the existing fonts, drag
+any new .svg icons into this same section to add them.
+
+Any icons which appear blank or incorrect will need to be rebuilt in Illustrator.
+This likely means that the paths have not been generated correctly; check the
+settings in the Pathfinder tool.
+
+After all of the icons are loaded into fontello, resist the temptation to click
+the big red button; there's another task to do. Each icon has a pencil button;
+click *every* icon - including the pre-existing ones - and check the settings.
+Each current icon should have the same hex code as that which is listed in
+rcicons.less. The "default css name" should be its simplified name; this is what
+will be prepended with "icon-" for the CSS classes. Also remove any unnecessary
+information from the keywords.
+
+Once you have checked the icons, click the button in fontello which downloads a
+zip file of the new font.
+
+
+Preparing The LESS Files
+------------------------
+
+    .. note::
+        It's a good idea to have `grunt watch` running in the background for this.
+
+First, obviously the font files located in the unzipped folder under "font"
+should replace the existing files in rhodecode/public/fonts/RCIcons/. While
+doing this, check the permissions of the files that they have not changed; they
+should be set to `chmod 644` but fontello's files may be different.
+
+Next, you'll need to open the rcicons.css file which comes in the fontello .zip
+and match the @font-face declaration to the one at the top of
+rhodecode/public/css/rcicons.less, making sure to adjust the paths to
+/fonts/RCIcons/.
+
+In the same file, you will see the CSS for each icon. Take a quick look to make
+sure that the existing icons haven't changed; if they have, you'll need to
+adjust the content. Add any new icons to rcicons.less (note that similar ones
+have been grouped together).
+
+If you haven't yet, you'll need to run grunt to compile the LESS files; see the
+developer documentation for instructions.
+

rhodecode/templates/admin/integrations/global.mako

@@ -0,0 +1,52 b''
+## -*- coding: utf-8 -*-
+<%inherit file="/base/base.mako"/>
+
+<%def name="title()">
+    ${_('Integrations administration')}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="breadcrumbs_links()">
+    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
+    &raquo;
+    ${_('Integrations')}
+</%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='admin')}
+</%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='integrations')}
+</%def>
+
+<%def name="side_bar_nav()">
+    <li class="active">
+      <a href="${h.route_path('global_integrations_home')}">Global</a>
+    </li>
+</%def>
+
+<%def name="main_content()">
+  <%include file="/admin/settings/settings_${c.active}.mako"/>
+</%def>
+
+<%def name="main()">
+<div class="box">
+
+    ##main
+    <div class='sidebar-col-wrapper'>
+      <div class="sidebar">
+          <ul class="nav nav-pills nav-stacked">
+            ${self.side_bar_nav()}
+          </ul>
+      </div>
+
+      <div class="main-content-auto-width">
+        ${self.main_content()}
+      </div>
+    </div>
+</div>
+
+</%def>

rhodecode/templates/admin/main.mako

@@ -0,0 +1,68 b''
+## -*- coding: utf-8 -*-
+<%inherit file="/base/base.mako"/>
+
+<%def name="title()">
+    ${_('Settings administration')}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="breadcrumbs_links()"></%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='admin')}
+</%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu()}
+</%def>
+
+<%def name="side_bar_nav()">
+
+</%def>
+
+<%def name="main_content()">
+  <h2>${_('Administration area')}</h2>
+
+  <table class="rctable">
+  <tr>
+    <td>${_('Repositories under administration')}</td>
+    <td class="delegated-admin-repos">${len(c.auth_user.repositories_admin)}</td>
+    <td>
+        % if c.can_create_repo:
+            <a href="${h.route_path('repo_new')}" class="">${_('Add Repository')}</a>
+        % endif
+    </td>
+  </tr>
+  <tr>
+    <td>${_('Repository groups under administration')}</td>
+    <td class="delegated-admin-repo-groups">${len(c.auth_user.repository_groups_admin)}</td>
+    <td>
+        % if c.can_create_repo_group:
+            <a href="${h.route_path('repo_group_new')}" class="">${_(u'Add Repository Group')}</a>
+        % endif
+    </td>
+  </tr>
+  <tr>
+    <td>${_('User groups under administration')}</td>
+    <td class="delegated-admin-user-groups">${len(c.auth_user.user_groups_admin)}</td>
+    <td>
+        % if c.can_create_user_group:
+            <a href="${h.route_path('user_groups_new')}" class="">${_(u'Add User Group')}</a>
+        % endif
+    </td>
+  </tr>
+  </table>
+</%def>
+
+<%def name="main()">
+<div class="box">
+
+    ##main
+    <div class="main-content-auto-width">
+        ${self.main_content()}
+    </div>
+</div>
+
+</%def>
  No newline at end of file

rhodecode/templates/artifacts/artifact_list.mako

@@ -0,0 +1,28 b''
+## -*- coding: utf-8 -*-
+<%inherit file="/base/base.mako"/>
+
+<%def name="title()">
+    ${_('{} Artifacts').format(c.repo_name)}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="breadcrumbs_links()"></%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='repositories')}
+</%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.repo_menu(active='artifacts')}
+</%def>
+
+<%def name="main()">
+    <div class="box">
+
+    <h4>${_('This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license.').format(sales_email='<a href="mailto:[e-mail]">[e-mail]</a>')|n}</h4>
+    ##<img style="width: 100%; height: 100%" src="${h.asset('images/ee_features/repo_artifacts.png')}"/>
+    </div>
+
+</%def>

rhodecode/templates/files/file_content.mako

@@ -0,0 +1,9 b''
+<%namespace name="sourceblock" file="/codeblocks/source.mako"/>
+
+<%def name="render_lines(lines)">
+<table class="cb codehilite">
+    %for line_num, tokens in enumerate(lines, 1):
+        ${sourceblock.render_line(line_num, tokens)}
+    %endfor
+</table>
+</%def>

rhodecode/templates/files/files_upload.mako

@@ -0,0 +1,211 b''
+<%inherit file="/base/base.mako"/>
+
+<%def name="title()">
+    ${_('{} Files Upload').format(c.repo_name)}
+    %if c.rhodecode_name:
+        &middot; ${h.branding(c.rhodecode_name)}
+    %endif
+</%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='repositories')}
+</%def>
+
+<%def name="breadcrumbs_links()"></%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.repo_menu(active='files')}
+</%def>
+
+<%def name="main()">
+
+<div class="box">
+    ## Template for uploads
+    <div style="display: none" id="tpl-dropzone">
+        <div class="dz-preview dz-file-preview">
+            <div class="dz-details">
+
+                <div class="dz-filename">
+                    <span data-dz-name></span>
+                </div>
+                <div class="dz-filename-size">
+                    <span class="dz-size" data-dz-size></span>
+
+                </div>
+
+                <div class="dz-sending" style="display: none">${_('Uploading...')}</div>
+                <div class="dz-response" style="display: none">
+                    ${_('Uploaded')} 100%
+                </div>
+
+            </div>
+            <div class="dz-progress">
+                <span class="dz-upload" data-dz-uploadprogress></span>
+            </div>
+
+            <div class="dz-error-message">
+            </div>
+        </div>
+    </div>
+
+    <div class="edit-file-title">
+        <span class="title-heading">${_('Upload new file')} @ <code>${h.show_id(c.commit)}</code></span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
+    </div>
+
+    <% form_url = h.route_path('repo_files_upload_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path) %>
+    ##${h.secure_form(form_url, id='eform', enctype="multipart/form-data", request=request)}
+    <div class="edit-file-fieldset">
+        <div class="path-items">
+            <ul>
+            <li class="breadcrumb-path">
+                <div>
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
+                </div>
+            </li>
+            <li class="location-path">
+
+            </li>
+            </ul>
+        </div>
+
+    </div>
+
+    <div class="upload-form table">
+        <div id="files_data">
+
+            <div class="dropzone-wrapper" id="file-uploader">
+                <div class="dropzone-pure">
+                    <div class="dz-message">
+                    <i class="icon-upload" style="font-size:36px"></i></br>
+                    ${_("Drag'n Drop files here or")} <span class="link">${_('Choose your files')}</span>.<br>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+
+    <div class="upload-form edit-file-fieldset">
+        <div class="fieldset">
+            <div class="message">
+                <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
+            </div>
+        </div>
+        <div class="pull-left">
+            ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
+        </div>
+    </div>
+    ##${h.end_form()}
+
+    <div class="file-upload-transaction-wrapper" style="display: none">
+    <div class="file-upload-transaction">
+        <h3>${_('Commiting...')}</h3>
+        <p>${_('Please wait while the files are being uploaded')}</p>
+        <p class="error" style="display: none">
+
+        </p>
+        <i class="icon-spin animate-spin"></i>
+        <p></p>
+    </div>
+    </div>
+
+</div>
+
+<script type="text/javascript">
+
+    $(document).ready(function () {
+
+        //see: https://www.dropzonejs.com/#configuration
+        myDropzone = new Dropzone("div#file-uploader", {
+            url: "${form_url}",
+            headers: {"X-CSRF-Token": CSRF_TOKEN},
+            paramName: function () {
+                return "files_upload"
+            }, // The name that will be used to transfer the file
+            parallelUploads: 20,
+            maxFiles: 20,
+            uploadMultiple: true,
+            //chunking: true, // use chunking transfer, not supported at the moment
+            //maxFilesize: 2, // in MBs
+            autoProcessQueue: false, // if false queue will not be processed automatically.
+            createImageThumbnails: false,
+            previewTemplate: document.querySelector('#tpl-dropzone').innerHTML,
+            accept: function (file, done) {
+                done();
+            },
+            init: function () {
+                this.on("addedfile", function (file) {
+
+                });
+
+                this.on("sending", function (file, xhr, formData) {
+                    formData.append("message", $('#commit').val());
+                    $(file.previewElement).find('.dz-sending').show();
+                });
+
+                this.on("success", function (file, response) {
+                    $(file.previewElement).find('.dz-sending').hide();
+                    $(file.previewElement).find('.dz-response').show();
+
+                    if (response.error !== null) {
+                        $('.file-upload-transaction-wrapper .error').html('ERROR: {0}'.format(response.error));
+                        $('.file-upload-transaction-wrapper .error').show();
+                        $('.file-upload-transaction-wrapper i').hide()
+                    }
+
+                    var redirect_url = response.redirect_url || '/';
+                    window.location = redirect_url
+
+                });
+
+                this.on("error", function (file, errorMessage, xhr) {
+                    var error = null;
+
+                    if (xhr !== undefined){
+                        var httpStatus = xhr.status + " " + xhr.statusText;
+                        if (xhr.status >= 500) {
+                            error = httpStatus;
+                        }
+                    }
+
+                    if (error === null) {
+                        error = errorMessage.error || errorMessage || httpStatus;
+                    }
+
+                    $(file.previewElement).find('.dz-error-message').html('ERROR: {0}'.format(error));
+                });
+            }
+            });
+
+        $('#commit_btn').on('click', function(e) {
+            e.preventDefault();
+            var button = $(this);
+            if (button.hasClass('clicked')) {
+                button.attr('disabled', true);
+            } else {
+                button.addClass('clicked');
+            }
+
+            var files = myDropzone.getQueuedFiles();
+            if (files.length === 0) {
+                alert("Missing files");
+                e.preventDefault();
+            }
+
+            $('.upload-form').hide();
+            $('.file-upload-transaction-wrapper').show();
+            myDropzone.processQueue();
+
+        });
+
+    });
+
+</script>
+</%def>

.bumpversion.cfg

@@ -1,5 +1,5 b''
 [bumpversion]
-current_version = 4.16.2
+current_version = 4.17.0
 message = release: Bump version {current_version} to {new_version}
 
 [bumpversion:file:rhodecode/VERSION]

.release.cfg

@@ -5,25 +5,20 b' done = false'
 done = true
 
 [task:rc_tools_pinned]
-done = true
 
 [task:fixes_on_stable]
-done = true
 
 [task:pip2nix_generated]
-done = true
 
 [task:changelog_updated]
-done = true
 
 [task:generate_api_docs]
-done = true
+
+[task:updated_translation]
 
 [release]
-state = prepared
-version = 4.16.2
-
-[task:updated_translation]
+state = in_progress
+version = 4.17.0
 
 [task:generate_js_routes]
 

Makefile

@@ -53,3 +53,12 b' web-build:'
 
 generate-pkgs:
 	nix-shell pkgs/shell-generate.nix --command "pip2nix generate --licenses"
+
+generate-js-pkgs:
+	rm -rf node_modules && \
+	nix-shell pkgs/shell-generate.nix --command "node2nix --input package.json -o pkgs/node-packages.nix -e pkgs/node-env.nix -c pkgs/node-default.nix -d --flatten --nodejs-8" && \
+	sed -i -e 's/http:\/\//https:\/\//g' pkgs/node-packages.nix
+
+generate-license-meta:
+	nix-build pkgs/license-generate.nix -o result-license && \
+	cat result-license/licenses.json | python -m json.tool > rhodecode/config/licenses.json
  No newline at end of file

configs/development.ini

@@ -133,6 +133,11 b' rhodecode.api.url = /_admin/api'
 ## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
 #rhodecode.encrypted_values.strict = false
 
+## Pick algorithm for encryption. Either fernet (more secure) or aes (default)
+## fernet is safer, and we strongly recommend switching to it.
+## Due to backward compatibility aes is used as default.
+#rhodecode.encrypted_values.algorithm = fernet
+
 ## return gzipped responses from RhodeCode (static files/application)
 gzip_responses = false
 
@@ -374,6 +379,10 b' rc_cache.cache_repo_longterm.max_size = '
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions
 
+## redis sessions
+#beaker.session.type = ext:redis
+#beaker.session.url = redis://127.0.0.1:6379/2
+
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session

configs/gunicorn_config.py

@@ -30,10 +30,12 b" loglevel = 'debug'"
 # SECURITY
 
 # The maximum size of HTTP request line in bytes.
-limit_request_line = 4094
+# 0 for unlimited
+limit_request_line = 0
 
 # Limit the number of HTTP headers fields in a request.
-limit_request_fields = 1024
+# By default this value is 100 and can’t be larger than 32768.
+limit_request_fields = 10240
 
 # Limit the allowed size of an HTTP request header field.
 # Value is a positive number or 0.

configs/production.ini

@@ -108,6 +108,11 b' use = egg:rhodecode-enterprise-ce'
 ## `SignatureVerificationError` in case of wrong key, or damaged encryption data.
 #rhodecode.encrypted_values.strict = false
 
+## Pick algorithm for encryption. Either fernet (more secure) or aes (default)
+## fernet is safer, and we strongly recommend switching to it.
+## Due to backward compatibility aes is used as default.
+#rhodecode.encrypted_values.algorithm = fernet
+
 ## return gzipped responses from RhodeCode (static files/application)
 gzip_responses = false
 
@@ -349,6 +354,10 b' rc_cache.cache_repo_longterm.max_size = '
 beaker.session.type = file
 beaker.session.data_dir = %(here)s/data/sessions
 
+## redis sessions
+#beaker.session.type = ext:redis
+#beaker.session.url = redis://127.0.0.1:6379/2
+
 ## db based session, fast, and allows easy management over logged in users
 #beaker.session.type = ext:database
 #beaker.session.table_name = db_session

default.nix

@@ -191,7 +191,7 b' let'
         # check required files
         STATIC_CHECK="/robots.txt /502.html
                       /js/scripts.js /js/rhodecode-components.js
-                      /css/style.css /css/style-polymer.css"
+                      /css/style.css /css/style-polymer.css /css/style-ipython.css"
 
         for file in $STATIC_CHECK;
         do

docs/admin/repo_admin/repo-extra-fields.rst

@@ -29,7 +29,7 b' 1. Go to :menuselection:`Admin --> Repos'
    beside the |repo| to which you wish to add extra fields.
 2. On the |repo| settings page, select the :guilabel:`Extra fields` tab.
 
-.. image:: ../images/extra-repo-fields.png
+.. image:: ../../images/extra-repo-fields.png
 
 The most important is the `New field key` variable which under the value will
 be stored. It needs to be unique for each repository. The label and description

docs/admin/system-admin.rst

@@ -16,19 +16,17 b' The following are the most common system'
 
 .. toctree::
 
-    config-files-overview
-    vcs-server
-    svn-http
-    svn-path-permissions
-    gunicorn-ssl-support
-    apache-config
-    nginx-config
-    backup-restore
-    tuning-rhodecode
-    indexing
-    reset-information
-    enable-debug
-    admin-tricks
-    cleanup-cmds
-    restore-deleted-repositories
-
+    system_admin/config-files-overview
+    system_admin/vcs-server
+    system_admin/svn-http
+    system_admin/svn-path-permissions
+    system_admin/gunicorn-ssl-support
+    system_admin/apache-config
+    system_admin/nginx-config
+    system_admin/backup-restore
+    system_admin/tuning-rhodecode
+    system_admin/indexing
+    system_admin/reset-information
+    system_admin/enable-debug
+    system_admin/admin-tricks
+    system_admin/cleanup-cmds

docs/admin/system_admin/admin-tricks.rst

@@ -57,7 +57,7 b' 2. To add a message that will be display'
 3. Select :guilabel:`Save`, and you will see the message once your page
    refreshes.
 
-.. image:: ../images/server-wide-announcement.png
+.. image:: ../../images/server-wide-announcement.png
    :alt: Server Wide Announcement
 
 .. _md-rst:
@@ -207,7 +207,7 b' 2. Restart the |RCE| instance and check '
    Instance "enterprise-2" successfully stopped.
    Instance "enterprise-2" successfully started.
 
-.. image:: ../images/language.png
+.. image:: ../../images/language.png
 
 .. _set-repo-pub:
 
@@ -239,3 +239,26 b' following URL: ``{instance-URL}/_admin/p'
 
 .. _Markdown: http://daringfireball.net/projects/markdown/
 .. _reStructured Text: http://docutils.sourceforge.net/docs/index.html
+
+
+Unarchiving a repository
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Archive operation for the repository is similar as delete. Archive keeps the data for future references
+but makes the repository read-only. After archiving the repository it shouldn't be modified in any way.
+This is why repository settings are disabled for an archived repository.
+
+If there's a need for unarchiving a repository for some reasons, the interactive
+ishell interface should be used.
+
+.. code-block:: bash
+
+  # Open iShell from the terminal
+  $ rccontrol ishell enterprise-1/community-1
+
+.. code-block:: python
+
+  # Set repository as un-archived
+  In [1]: repo = Repository.get_by_repo_name('SOME_REPO_NAME')
+  In [2]: repo.archived = False
+  In [3]: Session().add(repo);Session().commit()

docs/admin/system_admin/apache-config.rst

@@ -8,7 +8,7 b' the information in the following section'
 
 .. toctree::
 
-   apache-conf-example
-   apache-diffie-hellman
-   apache-subdirectory
-   apache-wsgi-coding
+   apache/apache-conf-example
+   apache/apache-diffie-hellman
+   apache/apache-subdirectory
+   apache/apache-wsgi-coding

docs/admin/system_admin/apache/apache-conf-example.rst

@@ -66,14 +66,18 b' Below config if for an Apache Reverse Pr'
         # Directive to properly generate url (clone url) for RhodeCode
         ProxyPreserveHost On
 
+        # It allows request bodies to be sent to the backend using chunked transfer encoding.
+        SetEnv proxy-sendchunked 1
+
+        # Increase headers size for large Mercurial headers sent with many branches
+        LimitRequestLine 16380
+
         # Url to running RhodeCode instance. This is shown as `- URL:` when
         # running rccontrol status.
+
         ProxyPass / http://127.0.0.1:10002/ timeout=7200 Keepalive=On
         ProxyPassReverse / http://127.0.0.1:10002/
 
-        # Increase headers for large Mercurial headers
-        LimitRequestLine 16380
-
         # strict http prevents from https -> http downgrade
         Header always set Strict-Transport-Security "max-age=63072000; includeSubdomains; preload"
 

docs/admin/system_admin/nginx-config.rst

@@ -8,7 +8,7 b' the information in the following section'
 
 .. toctree::
 
-   nginx-config-example
-   nginx-diffie-hellman
-   nginx-proxy-conf
-   nginx-url-prefix
+   nginx/nginx-config-example
+   nginx/nginx-diffie-hellman
+   nginx/nginx-proxy-conf
+   nginx/nginx-url-prefix

docs/admin/system_admin/tuning-rhodecode.rst

@@ -8,14 +8,14 b' may find some of the following methods u'
 
 .. toctree::
 
-   tuning-gunicorn
-   tuning-vcs-memory-cache
-   tuning-user-sessions-performance
-   tuning-increase-db-performance
-   tuning-scale-horizontally-cluster
-   tuning-mount-cache-memory
-   tuning-change-encoding
-   tuning-change-large-file-dir
-   tuning-change-lfs-dir
-   tuning-hg-auth-loop
+   tuning/tuning-gunicorn
+   tuning/tuning-vcs-memory-cache
+   tuning/tuning-user-sessions-performance
+   tuning/tuning-increase-db-performance
+   tuning/tuning-scale-horizontally-cluster
+   tuning/tuning-mount-cache-memory
+   tuning/tuning-change-encoding
+   tuning/tuning-change-large-file-dir
+   tuning/tuning-change-lfs-dir
+   tuning/tuning-hg-auth-loop
 

docs/admin/system_admin/tuning/tuning-gunicorn.rst

@@ -42,7 +42,7 b' 2. In the ``[server:main]`` section, cha'
     ## restarted, could prevent memory leaks
     max_requests = 1000
     max_requests_jitter = 30
-    ## amount of time a worker can spend with handling a request before it
+    ## amount of time a worker can spend with handling a request tuning-change-lfs-dir.before it
     ## gets killed and restarted. Set to 6hrs
     timeout = 21600
 

docs/admin/user-admin.rst

@@ -13,11 +13,12 b' permissions applied to it; |perm|.'
 
 .. toctree::
 
-    public-access
-    default-user-perms
-    adding-anonymous-user
-    adding-new-user
-    setting-default-permissions
-    setting-usergroup-permissions
+    user_admin/public-access
+    user_admin/default-user-perms
+    user_admin/adding-anonymous-user
+    user_admin/adding-new-user
+    user_admin/setting-default-permissions
+    user_admin/setting-usergroup-permissions
+    user_admin/user-admin-tasks
 
-.. |perm| replace:: **None**, **Read**, **Write**, or **Admin**
  No newline at end of file
+.. |perm| replace:: **None**, **Read**, **Write**, or **Admin**

docs/api/api.rst

@@ -204,6 +204,7 b' are not required in args.'
    methods/pull-request-methods
    methods/repo-methods
    methods/repo-group-methods
+   methods/search-methods
    methods/server-methods
    methods/user-methods
    methods/user-group-methods

docs/api/methods/repo-methods.rst

@@ -462,6 +462,7 b' get_repo_file'
    :param cache: Use internal caches for fetching files. If disabled fetching
        files is slower but more memory efficient
    :type cache: Optional(bool)
+
    Example output:
 
    .. code-block:: bash
@@ -532,9 +533,7 b' get_repo_nodes'
            result: [
                        {
                          "binary": false,
-                         "content": "File line
-   Line2
-   ",
+                     "content": "File line",
                          "extension": "md",
                          "lines": 2,
                          "md5": "059fa5d29b19c0657e384749480f6422",

docs/auth/auth-saml-bulk-enroll-users.rst

@@ -32,9 +32,9 b' The most important this id needs to be u'
 
     In [1]: saml2user = {
        ...: # OneLogin, uses externalID available to read from in the UI
-       ...: 123: {'id: '48253211'},
+       ...: 123: {'id': '48253211'},
        ...: # for Google/DuoSecurity email is also an option for unique ID
-       ...: 124: {'id: '[e-mail]'},
+       ...: 124: {'id': '[e-mail]'},
        ...: }
 
 
@@ -70,7 +70,7 b' Enter in the ishell prompt'
        ...:         new_external_identity.external_id = external_id
        ...:         new_external_identity.external_username = '{}-saml-{}'.format(user.username, user.user_id)
        ...:         new_external_identity.provider_name = provider
-       ...:         new_external_identity.local_user_id = user_id
+       ...:         new_external_identity.local_user_id = user.user_id
        ...:         new_external_identity.access_token = ''
        ...:         new_external_identity.token_secret = ''
        ...:         new_external_identity.alt_token = ''

docs/index.rst

@@ -46,7 +46,7 b' and commit files and |repos| while manag'
    nix/default-env
    admin/system-admin
    admin/user-admin
-   admin/setting-repo-perms
+   admin/repo-admin
    admin/security-tips
    auth/auth
    issue-trackers/issue-trackers
@@ -64,6 +64,13 b' and commit files and |repos| while manag'
 
 .. toctree::
    :maxdepth: 1
+   :caption: User Documentation
+
+   usage/basic-usage
+   tutorials/tutorials
+
+.. toctree::
+   :maxdepth: 1
    :caption: Developer Documentation
 
    api/api
@@ -73,13 +80,6 b' and commit files and |repos| while manag'
 
 .. toctree::
    :maxdepth: 1
-   :caption: User Documentation
-
-   usage/basic-usage
-   tutorials/tutorials
-
-.. toctree::
-   :maxdepth: 1
    :caption: About
 
    known-issues/known-issues

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.17.0.rst
    release-notes-4.16.2.rst
    release-notes-4.16.1.rst
    release-notes-4.16.0.rst

grunt_config.json

@@ -35,6 +35,7 b''
         "<%= dirs.js.node_modules %>/moment/min/moment.min.js",
         "<%= dirs.js.node_modules %>/clipboard/dist/clipboard.min.js",
         "<%= dirs.js.node_modules %>/favico.js/favico-0.3.10.min.js",
+        "<%= dirs.js.node_modules %>/dropzone/dist/dropzone.js",
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/jquery.sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/waypoints/lib/noframework.waypoints.min.js",
@@ -107,7 +108,8 b''
       },
       "files": {
         "<%= dirs.css.dest %>/style.css": "<%= dirs.css.src %>/main.less",
-        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less"
+        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less",
+        "<%= dirs.css.dest %>/style-ipython.css": "<%= dirs.css.src %>/ipython.less"
       }
     },
     "production": {
@@ -118,7 +120,8 b''
       },
       "files": {
         "<%= dirs.css.dest %>/style.css": "<%= dirs.css.src %>/main.less",
-        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less"
+        "<%= dirs.css.dest %>/style-polymer.css": "<%= dirs.css.src %>/polymer.less",
+        "<%= dirs.css.dest %>/style-ipython.css": "<%= dirs.css.src %>/ipython.less"
       }
     },
     "components": {

package.json

@@ -13,6 +13,7 b''
     "clipboard": "^2.0.1",
     "exports-loader": "^0.6.4",
     "favico.js": "^0.3.10",
+    "dropzone": "^5.5.0",
     "grunt": "^0.4.5",
     "grunt-cli": "^1.3.1",
     "grunt-contrib-concat": "^0.5.1",

pip2nix.ini

@@ -1,3 +1,3 b''
 [pip2nix]
-requirements = ., -r ./requirements.txt
+requirements = ., -r ./requirements.txt, -r ./requirements_pinned.txt
 output = ./pkgs/python-packages.nix

pkgs/node-packages.nix

@@ -166,13 +166,13 b' let'
         sha512 = "dgOe12GyCF1VZBLUQqnzGWlf3xb255FajNCVB1VFj/AtskYtoamnafa7m3a+1vs+C8qbg4Benn5KwgxVDSW4cg==";
       };
     };
-    "@polymer/paper-spinner-3.0.1" = {
+    "@polymer/paper-spinner-3.0.2" = {
       name = "_at_polymer_slash_paper-spinner";
       packageName = "@polymer/paper-spinner";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/paper-spinner/-/paper-spinner-3.0.1.tgz";
-        sha512 = "MYIU6qWZnhZ5yNFOBzROPgBteGfxKEnDZ6bCgjrvUtJkBuQEz0MQZzSE/zmZc0oaJ9u5QK5xAFuYdudsGv7+sQ==";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/paper-spinner/-/paper-spinner-3.0.2.tgz";
+        sha512 = "XUzu8/4NH+pnNZUTI2MxtOKFAr0EOsW7eGhTg3VBhTh7DDW/q3ewzwYRWnqNJokX9BEnxKMiXXaIeTEBq4k2dw==";
       };
     };
     "@polymer/paper-styles-3.0.1" = {
@@ -211,13 +211,13 b' let'
         sha512 = "yiUk09opTEnE1lK+tb501ENb+yQBi4p++Ep0eGJAHesVYKVMPNgPphVKkIizkDaU+n0SE+zXfTsRbYyOMDYXSg==";
       };
     };
-    "@polymer/polymer-3.1.0" = {
+    "@polymer/polymer-3.2.0" = {
       name = "_at_polymer_slash_polymer";
       packageName = "@polymer/polymer";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.1.0.tgz";
-        sha512 = "hwN8IMERsFATz/9dSMxYHL+84J9uBkPuuarxJWlTsppZ4CAYTZKnepBfNrKoyNsafBmA3yXBiiKPPf+fJtza7A==";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.2.0.tgz";
+        sha512 = "L6uV1oM6T6xbwbVx6t3biG5T2VSSB03LxnIrUd9M2pr6RkHVPFHJ37pC5MUwBAEhkGFJif7eks7fdMMSGZTeEQ==";
       };
     };
     "@types/clone-0.1.30" = {
@@ -229,13 +229,13 b' let'
         sha1 = "e7365648c1b42136a59c7d5040637b3b5c83b614";
       };
     };
-    "@types/node-6.14.2" = {
+    "@types/node-6.14.6" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.14.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.14.2.tgz";
-        sha512 = "JWB3xaVfsfnFY8Ofc9rTB/op0fqqTSqy4vBcVk1LuRJvta7KTX+D//fCkiTMeLGhdr2EbFZzQjC97gvmPilk9Q==";
+      version = "6.14.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-6.14.6.tgz";
+        sha512 = "rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w==";
       };
     };
     "@types/parse5-2.2.34" = {
@@ -409,22 +409,22 b' let'
         sha512 = "mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==";
       };
     };
-    "@webcomponents/shadycss-1.7.1" = {
+    "@webcomponents/shadycss-1.9.1" = {
       name = "_at_webcomponents_slash_shadycss";
       packageName = "@webcomponents/shadycss";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.7.1.tgz";
-        sha512 = "6SZqLajRPWL0rrKDZOGF8PCBq5B9JqgFmE5rX5psk6i8WrqiMkSCuO8+rnirzViTsU5CqnjQPFC3OvG4YJdMrQ==";
-      };
-    };
-    "@webcomponents/webcomponentsjs-2.2.1" = {
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/shadycss/-/shadycss-1.9.1.tgz";
+        sha512 = "IaZOnWOKXHghqk/WfPNDRIgDBi3RsVPY2IFAw6tYiL9UBGvQRy5R6uC+Fk7qTZsReTJ0xh5MTT8yAcb3MUR4mQ==";
+      };
+    };
+    "@webcomponents/webcomponentsjs-2.2.10" = {
       name = "_at_webcomponents_slash_webcomponentsjs";
       packageName = "@webcomponents/webcomponentsjs";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.1.tgz";
-        sha512 = "lZZ+Lkke6JhsJcQQqSVk1Pny6/8y4qhJ98LO7a/MwBSRO8WqHqK1X2vscfeL8vOnYGFnmBUyVG95lwYv/AXyLQ==";
+      version = "2.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.10.tgz";
+        sha512 = "5dzhUhP+h0qMiK0IWb7VNb0OGBoXO3AuI6Qi8t9PoKT50s5L1jv0xnwnLq+cFgPuTB8FLTNP8xIDmyoOsKBy9Q==";
       };
     };
     "@xtuc/ieee754-1.2.0" = {
@@ -499,22 +499,22 b' let'
         sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
       };
     };
-    "ajv-6.6.2" = {
+    "ajv-6.10.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz";
-        sha512 = "FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==";
-      };
-    };
-    "ajv-keywords-3.2.0" = {
+      version = "6.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
+        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
+      };
+    };
+    "ajv-keywords-3.4.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
-        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz";
+        sha512 = "aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==";
       };
     };
     "align-text-0.1.4" = {
@@ -716,15 +716,6 b' let'
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     };
-    "arrify-1.0.1" = {
-      name = "arrify";
-      packageName = "arrify";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
-        sha1 = "898508da2226f380df904728456849c1501a4b0d";
-      };
-    };
     "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
@@ -752,13 +743,13 b' let'
         sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
-    "assert-1.4.1" = {
+    "assert-1.5.0" = {
       name = "assert";
       packageName = "assert";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
-        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
+        sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
       };
     };
     "assert-plus-0.2.0" = {
@@ -815,22 +806,22 b' let'
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "async-2.6.1" = {
+    "async-2.6.2" = {
       name = "async";
       packageName = "async";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
-        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
-      };
-    };
-    "async-each-1.0.1" = {
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz";
+        sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==";
+      };
+    };
+    "async-each-1.0.3" = {
       name = "async-each";
       packageName = "async-each";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz";
-        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz";
+        sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
       };
     };
     "asynckit-0.4.0" = {
@@ -1445,22 +1436,22 b' let'
         sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
       };
     };
-    "binary-extensions-1.12.0" = {
+    "binary-extensions-1.13.1" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz";
-        sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==";
-      };
-    };
-    "bluebird-3.5.3" = {
+      version = "1.13.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz";
+        sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
+      };
+    };
+    "bluebird-3.5.4" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz";
-        sha512 = "/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz";
+        sha512 = "FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==";
       };
     };
     "bn.js-4.11.8" = {
@@ -1661,13 +1652,13 b' let'
         sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
       };
     };
-    "camelcase-5.0.0" = {
+    "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz";
-        sha512 = "faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==";
+      version = "5.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
     "caniuse-api-1.6.1" = {
@@ -1679,22 +1670,22 b' let'
         sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c";
       };
     };
-    "caniuse-db-1.0.30000927" = {
+    "caniuse-db-1.0.30000967" = {
       name = "caniuse-db";
       packageName = "caniuse-db";
-      version = "1.0.30000927";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000927.tgz";
-        sha512 = "CX/QvLA8oh7kQ9cHCCzFm0UZW4KwSyQSRJ5A1XtH42HaMJQ0yh+9fEVWagMqv9I1vSCtaqA5Mb8k0uKfv7jhDw==";
-      };
-    };
-    "caniuse-lite-1.0.30000927" = {
+      version = "1.0.30000967";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000967.tgz";
+        sha512 = "70gk6cLSD5rItxnZ7WUxyCpM9LAjEb1tVzlENQfXQXZS/IiGnfAC6u32G5cZFlDBKjNPBIta/QSx5CZLZepxRA==";
+      };
+    };
+    "caniuse-lite-1.0.30000967" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000927";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000927.tgz";
-        sha512 = "ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g==";
+      version = "1.0.30000967";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz";
+        sha512 = "rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==";
       };
     };
     "caseless-0.12.0" = {
@@ -1742,13 +1733,13 b' let'
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
-    "chokidar-2.0.4" = {
+    "chokidar-2.1.5" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz";
-        sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz";
+        sha512 = "i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==";
       };
     };
     "chownr-1.1.1" = {
@@ -1976,13 +1967,13 b' let'
         sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
       };
     };
-    "combined-stream-1.0.7" = {
+    "combined-stream-1.0.8" = {
       name = "combined-stream";
       packageName = "combined-stream";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
-        sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
+        sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
     "commander-2.14.1" = {
@@ -2003,6 +1994,15 b' let'
         sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
       };
     };
+    "commander-2.19.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz";
+        sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==";
+      };
+    };
     "commondir-1.0.1" = {
       name = "commondir";
       packageName = "commondir";
@@ -2012,13 +2012,13 b' let'
         sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
       };
     };
-    "component-emitter-1.2.1" = {
+    "component-emitter-1.3.0" = {
       name = "component-emitter";
       packageName = "component-emitter";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
+        sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
     "concat-map-0.0.1" = {
@@ -2093,13 +2093,13 b' let'
         sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.1" = {
+    "core-js-2.6.5" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz";
-        sha512 = "L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==";
+      version = "2.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz";
+        sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2201,13 +2201,13 b' let'
         sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==";
       };
     };
-    "css-what-2.1.2" = {
+    "css-what-2.1.3" = {
       name = "css-what";
       packageName = "css-what";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.2.tgz";
-        sha512 = "wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+        sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
       };
     };
     "cssesc-0.1.0" = {
@@ -2417,13 +2417,13 b' let'
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
-    "dir-glob-2.0.0" = {
+    "dir-glob-2.2.2" = {
       name = "dir-glob";
       packageName = "dir-glob";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz";
-        sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
+        sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
       };
     };
     "dom-converter-0.2.0" = {
@@ -2435,13 +2435,13 b' let'
         sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
       };
     };
-    "dom-serializer-0.1.0" = {
+    "dom-serializer-0.1.1" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
-        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz";
+        sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
       };
     };
     "dom5-2.3.0" = {
@@ -2462,15 +2462,6 b' let'
         sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
       };
     };
-    "domelementtype-1.1.3" = {
-      name = "domelementtype";
-      packageName = "domelementtype";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
-        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
-      };
-    };
     "domelementtype-1.3.1" = {
       name = "domelementtype";
       packageName = "domelementtype";
@@ -2480,15 +2471,6 b' let'
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
-    "domhandler-2.1.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
-        sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594";
-      };
-    };
     "domhandler-2.3.0" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -2498,15 +2480,6 b' let'
         sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
       };
     };
-    "domutils-1.1.6" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz";
-        sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485";
-      };
-    };
     "domutils-1.5.1" = {
       name = "domutils";
       packageName = "domutils";
@@ -2516,13 +2489,22 b' let'
         sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
       };
     };
-    "duplexify-3.6.1" = {
+    "dropzone-5.5.1" = {
+      name = "dropzone";
+      packageName = "dropzone";
+      version = "5.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dropzone/-/dropzone-5.5.1.tgz";
+        sha512 = "3VduRWLxx9hbVr42QieQN25mx/I61/mRdUSuxAmDGdDqZIN8qtP7tcKMa3KfpJjuGjOJGYYUzzeq6eGDnkzesA==";
+      };
+    };
+    "duplexify-3.7.1" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz";
-        sha512 = "vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==";
+      version = "3.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";
+        sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -2534,13 +2516,13 b' let'
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
-    "electron-to-chromium-1.3.98" = {
+    "electron-to-chromium-1.3.133" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.98";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.98.tgz";
-        sha512 = "WIZdNuvE3dFr6kkPgv4d/cfswNZD6XbeLBM8baOIQTsnbf4xWrVEaLvp7oNnbnMWWXDqq7Tbv+H5JfciLTJm4Q==";
+      version = "1.3.133";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz";
+        sha512 = "lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==";
       };
     };
     "elliptic-6.4.1" = {
@@ -2651,13 +2633,13 b' let'
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "eslint-scope-4.0.0" = {
+    "eslint-scope-4.0.3" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz";
-        sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
+        sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
       };
     };
     "espree-3.5.4" = {
@@ -2732,13 +2714,13 b' let'
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "events-1.1.1" = {
+    "events-3.0.0" = {
       name = "events";
       packageName = "events";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz";
-        sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
+        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
       };
     };
     "evp_bytestokey-1.0.3" = {
@@ -2948,13 +2930,13 b' let'
         sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
       };
     };
-    "fined-1.1.1" = {
+    "fined-1.2.0" = {
       name = "fined";
       packageName = "fined";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fined/-/fined-1.1.1.tgz";
-        sha512 = "jQp949ZmEbiYHk3gkbdtpJ0G1+kgtLQBNdP5edFP7Fh+WAYceLQz6yO1SBj72Xkg8GVyTB3bBzAYrHJVh5Xd5g==";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz";
+        sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==";
       };
     };
     "flagged-respawn-1.0.1" = {
@@ -2975,13 +2957,13 b' let'
         sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782";
       };
     };
-    "flush-write-stream-1.0.3" = {
+    "flush-write-stream-1.1.1" = {
       name = "flush-write-stream";
       packageName = "flush-write-stream";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz";
-        sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
+        sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==";
       };
     };
     "for-in-1.0.2" = {
@@ -3056,13 +3038,13 b' let'
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.4" = {
+    "fsevents-1.2.9" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
-        sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
+        sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -3146,13 +3128,13 b' let'
         sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
       };
     };
-    "glob-7.1.3" = {
+    "glob-7.1.4" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
-        sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
+      version = "7.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
       };
     };
     "glob-parent-3.1.0" = {
@@ -3524,13 +3506,13 b' let'
         sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
       };
     };
-    "homedir-polyfill-1.0.1" = {
+    "homedir-polyfill-1.0.3" = {
       name = "homedir-polyfill";
       packageName = "homedir-polyfill";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
-        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
+        sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
       };
     };
     "hooker-0.2.3" = {
@@ -3587,15 +3569,6 b' let'
         sha1 = "b01abbd723acaaa7b37b6af4492ebda03d9dd37b";
       };
     };
-    "htmlparser2-3.3.0" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
-        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
-      };
-    };
     "htmlparser2-3.8.3" = {
       name = "htmlparser2";
       packageName = "htmlparser2";
@@ -3650,13 +3623,13 b' let'
         sha1 = "83f0a0ec378bf3246178b6c2ad9136f135b1c962";
       };
     };
-    "ieee754-1.1.12" = {
+    "ieee754-1.1.13" = {
       name = "ieee754";
       packageName = "ieee754";
-      version = "1.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
-        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
+      version = "1.1.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
+        sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
     "iferr-0.1.5" = {
@@ -3974,13 +3947,13 b' let'
         sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
       };
     };
-    "is-glob-4.0.0" = {
+    "is-glob-4.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz";
-        sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
       };
     };
     "is-number-3.0.0" = {
@@ -4145,13 +4118,13 b' let'
         sha1 = "dd8b74278b27102d29df63eae28308a8cfa1b583";
       };
     };
-    "js-base64-2.5.0" = {
+    "js-base64-2.5.1" = {
       name = "js-base64";
       packageName = "js-base64";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz";
-        sha512 = "wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz";
+        sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==";
       };
     };
     "js-tokens-3.0.2" = {
@@ -4208,6 +4181,15 b' let'
         sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     };
+    "jshint-2.10.2" = {
+      name = "jshint";
+      packageName = "jshint";
+      version = "2.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz";
+        sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==";
+      };
+    };
     "jshint-2.9.7" = {
       name = "jshint";
       packageName = "jshint";
@@ -4370,13 +4352,13 b' let'
         sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec";
       };
     };
-    "loader-runner-2.3.1" = {
+    "loader-runner-2.4.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz";
-        sha512 = "By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz";
+        sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
       };
     };
     "loader-utils-0.2.17" = {
@@ -4460,15 +4442,6 b' let'
         sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
       };
     };
-    "lodash.debounce-4.0.8" = {
-      name = "lodash.debounce";
-      packageName = "lodash.debounce";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz";
-        sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af";
-      };
-    };
     "lodash.isplainobject-4.0.6" = {
       name = "lodash.isplainobject";
       packageName = "lodash.isplainobject";
@@ -4613,13 +4586,13 b' let'
         sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
-    "mem-4.0.0" = {
+    "mem-4.3.0" = {
       name = "mem";
       packageName = "mem";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz";
-        sha512 = "WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
+        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
       };
     };
     "memory-fs-0.4.1" = {
@@ -4658,31 +4631,31 b' let'
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.37.0" = {
+    "mime-db-1.40.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.37.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz";
-        sha512 = "R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==";
-      };
-    };
-    "mime-types-2.1.21" = {
+      version = "1.40.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+      };
+    };
+    "mime-types-2.1.24" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz";
-        sha512 = "3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==";
-      };
-    };
-    "mimic-fn-1.2.0" = {
+      version = "2.1.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+      };
+    };
+    "mimic-fn-2.1.0" = {
       name = "mimic-fn";
       packageName = "mimic-fn";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -4775,22 +4748,22 b' let'
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "moment-2.23.0" = {
+    "moment-2.24.0" = {
       name = "moment";
       packageName = "moment";
-      version = "2.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz";
-        sha512 = "3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==";
-      };
-    };
-    "mousetrap-1.6.2" = {
+      version = "2.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
+        sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
+      };
+    };
+    "mousetrap-1.6.3" = {
       name = "mousetrap";
       packageName = "mousetrap";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz";
-        sha512 = "jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==";
+      version = "1.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.3.tgz";
+        sha512 = "bd+nzwhhs9ifsUrC2tWaSgm24/oo2c83zaRyZQF06hYA6sANfsXHtnZ19AbbbDXCDzeH5nZBSQ4NvCjgD62tJA==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -4811,13 +4784,13 b' let'
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
-    "nan-2.12.1" = {
+    "nan-2.13.2" = {
       name = "nan";
       packageName = "nan";
-      version = "2.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz";
-        sha512 = "JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==";
+      version = "2.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz";
+        sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==";
       };
     };
     "nanomatch-1.2.13" = {
@@ -4829,13 +4802,13 b' let'
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
-    "neo-async-2.6.0" = {
+    "neo-async-2.6.1" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz";
-        sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz";
+        sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==";
       };
     };
     "nice-try-1.0.5" = {
@@ -4856,13 +4829,13 b' let'
         sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
       };
     };
-    "node-libs-browser-2.1.0" = {
+    "node-libs-browser-2.2.0" = {
       name = "node-libs-browser";
       packageName = "node-libs-browser";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz";
-        sha512 = "5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz";
+        sha512 = "5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==";
       };
     };
     "nopt-1.0.10" = {
@@ -4910,6 +4883,15 b' let'
         sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
       };
     };
+    "normalize-path-3.0.0" = {
+      name = "normalize-path";
+      packageName = "normalize-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+      };
+    };
     "normalize-range-0.1.2" = {
       name = "normalize-range";
       packageName = "normalize-range";
@@ -4991,13 +4973,13 b' let'
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     };
-    "object-keys-1.0.12" = {
+    "object-keys-1.1.1" = {
       name = "object-keys";
       packageName = "object-keys";
-      version = "1.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz";
-        sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
+        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
     "object-visit-1.0.1" = {
@@ -5117,13 +5099,13 b' let'
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-is-promise-1.1.0" = {
+    "p-is-promise-2.1.0" = {
       name = "p-is-promise";
       packageName = "p-is-promise";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
-        sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
+        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
       };
     };
     "p-limit-1.3.0" = {
@@ -5135,13 +5117,13 b' let'
         sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.1.0" = {
+    "p-limit-2.2.0" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz";
-        sha512 = "NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz";
+        sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==";
       };
     };
     "p-locate-2.0.0" = {
@@ -5171,22 +5153,22 b' let'
         sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
       };
     };
-    "p-try-2.0.0" = {
+    "p-try-2.2.0" = {
       name = "p-try";
       packageName = "p-try";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz";
-        sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==";
-      };
-    };
-    "pako-1.0.7" = {
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+      };
+    };
+    "pako-1.0.10" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.7.tgz";
-        sha512 = "3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
+        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
       };
     };
     "parallel-transform-1.1.0" = {
@@ -5207,13 +5189,13 b' let'
         sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
       };
     };
-    "parse-asn1-5.1.1" = {
+    "parse-asn1-5.1.4" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
-        sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
+      version = "5.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
+        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -5927,13 +5909,13 b' let'
         sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
       };
     };
-    "randombytes-2.0.6" = {
+    "randombytes-2.1.0" = {
       name = "randombytes";
       packageName = "randombytes";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz";
-        sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
+        sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
       };
     };
     "randomfill-1.0.4" = {
@@ -5954,15 +5936,6 b' let'
         sha512 = "guh4ZNAf96f+CDwfnPbFeFiO5YcfPllUmZrgcoOmx6iqZPq+DcKbnyjPuBxEAtQ3tqqd++qChsQfQB+VBzFT0Q==";
       };
     };
-    "readable-stream-1.0.34" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.0.34";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
-        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
-      };
-    };
     "readable-stream-1.1.14" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -6116,13 +6089,13 b' let'
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "renderkid-2.0.2" = {
+    "renderkid-2.0.3" = {
       name = "renderkid";
       packageName = "renderkid";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.2.tgz";
-        sha512 = "FsygIxevi1jSiPY9h7vZmBFUbAOcbYm9UwyiLNdVsLRs/5We9Ob5NMPbGYUTWiLq5L+ezlVdE0A8bbME5CWTpg==";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz";
+        sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==";
       };
     };
     "repeat-element-1.1.3" = {
@@ -6179,13 +6152,13 b' let'
         sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "resolve-1.9.0" = {
+    "resolve-1.10.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz";
-        sha512 = "TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==";
+      version = "1.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz";
+        sha512 = "KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -6332,22 +6305,22 b' let'
         sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
       };
     };
-    "semver-5.6.0" = {
+    "semver-5.7.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
-        sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
-      };
-    };
-    "serialize-javascript-1.6.1" = {
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
+        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+      };
+    };
+    "serialize-javascript-1.7.0" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz";
-        sha512 = "A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz";
+        sha512 = "ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -6593,13 +6566,13 b' let'
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "sshpk-1.16.0" = {
+    "sshpk-1.16.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.16.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz";
-        sha512 = "Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==";
+      version = "1.16.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+        sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
     "ssri-5.3.0" = {
@@ -6629,13 +6602,13 b' let'
         sha1 = "142bf6b64c2b416e4b707ebf8f09b8b5a5043877";
       };
     };
-    "stream-browserify-2.0.1" = {
+    "stream-browserify-2.0.2" = {
       name = "stream-browserify";
       packageName = "stream-browserify";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
-        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
+        sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==";
       };
     };
     "stream-each-1.2.3" = {
@@ -6836,13 +6809,13 b' let'
         sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==";
       };
     };
-    "tapable-1.1.1" = {
+    "tapable-1.1.3" = {
       name = "tapable";
       packageName = "tapable";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz";
-        sha512 = "9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
+        sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
       };
     };
     "through-2.3.8" = {
@@ -6872,13 +6845,13 b' let'
         sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
       };
     };
-    "tiny-emitter-2.0.2" = {
+    "tiny-emitter-2.1.0" = {
       name = "tiny-emitter";
       packageName = "tiny-emitter";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
-        sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
+        sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
       };
     };
     "tiny-lr-fork-0.0.5" = {
@@ -7034,13 +7007,13 b' let'
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.4.9" = {
+    "uglify-js-3.4.10" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz";
-        sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==";
+      version = "3.4.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz";
+        sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -7160,13 +7133,13 b' let'
         sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
       };
     };
-    "upath-1.1.0" = {
+    "upath-1.1.2" = {
       name = "upath";
       packageName = "upath";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz";
-        sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz";
+        sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==";
       };
     };
     "upper-case-1.1.3" = {
@@ -7223,13 +7196,13 b' let'
         sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
       };
     };
-    "util-0.10.4" = {
+    "util-0.11.1" = {
       name = "util";
       packageName = "util";
-      version = "0.10.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
-        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz";
+        sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -7268,31 +7241,31 b' let'
         sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
       };
     };
-    "v8-compile-cache-2.0.2" = {
+    "v8-compile-cache-2.0.3" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz";
-        sha512 = "1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==";
-      };
-    };
-    "v8flags-3.1.2" = {
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
+        sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==";
+      };
+    };
+    "v8flags-3.1.3" = {
       name = "v8flags";
       packageName = "v8flags";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.2.tgz";
-        sha512 = "MtivA7GF24yMPte9Rp/BWGCYQNaUj86zeYxV/x2RRJMKagImbbv3u8iJC57lNhWLPcGLJmHcHmFWkNsplbbLWw==";
-      };
-    };
-    "vendors-1.0.2" = {
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz";
+        sha512 = "amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==";
+      };
+    };
+    "vendors-1.0.3" = {
       name = "vendors";
       packageName = "vendors";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz";
-        sha512 = "w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz";
+        sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==";
       };
     };
     "verror-1.10.0" = {
@@ -7430,13 +7403,13 b' let'
         sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
-    "worker-farm-1.6.0" = {
+    "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz";
-        sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz";
+        sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
       };
     };
     "wrap-ansi-2.1.0" = {
@@ -7536,14 +7509,14 b' let'
       sources."@polymer/paper-behaviors-3.0.1"
       sources."@polymer/paper-button-3.0.1"
       sources."@polymer/paper-ripple-3.0.1"
-      sources."@polymer/paper-spinner-3.0.1"
+      sources."@polymer/paper-spinner-3.0.2"
       sources."@polymer/paper-styles-3.0.1"
       sources."@polymer/paper-toast-3.0.1"
       sources."@polymer/paper-toggle-button-3.0.1"
       sources."@polymer/paper-tooltip-3.0.1"
-      sources."@polymer/polymer-3.1.0"
+      sources."@polymer/polymer-3.2.0"
       sources."@types/clone-0.1.30"
-      sources."@types/node-6.14.2"
+      sources."@types/node-6.14.6"
       sources."@types/parse5-2.2.34"
       sources."@webassemblyjs/ast-1.7.10"
       sources."@webassemblyjs/floating-point-hex-parser-1.7.10"
@@ -7563,8 +7536,8 b' let'
       sources."@webassemblyjs/wasm-parser-1.7.10"
       sources."@webassemblyjs/wast-parser-1.7.10"
       sources."@webassemblyjs/wast-printer-1.7.10"
-      sources."@webcomponents/shadycss-1.7.1"
-      sources."@webcomponents/webcomponentsjs-2.2.1"
+      sources."@webcomponents/shadycss-1.9.1"
+      sources."@webcomponents/webcomponentsjs-2.2.10"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.1"
       sources."abbrev-1.1.1"
@@ -7576,7 +7549,7 b' let'
         ];
       })
       sources."ajv-4.11.8"
-      sources."ajv-keywords-3.2.0"
+      sources."ajv-keywords-3.4.0"
       (sources."align-text-0.1.4" // {
         dependencies = [
           sources."kind-of-3.2.2"
@@ -7586,7 +7559,11 b' let'
       sources."amdefine-1.0.1"
       sources."ansi-regex-0.2.1"
       sources."ansi-styles-1.1.0"
-      sources."anymatch-2.0.0"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          sources."normalize-path-2.1.1"
+        ];
+      })
       sources."appenlight-client-git+https://[e-mail]/AppEnlight/appenlight-client-js.git#0.5.1"
       sources."aproba-1.2.0"
       (sources."argparse-0.1.16" // {
@@ -7602,11 +7579,10 b' let'
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
-      sources."arrify-1.0.1"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."asn1.js-4.10.1"
-      (sources."assert-1.4.1" // {
+      (sources."assert-1.5.0" // {
         dependencies = [
           sources."inherits-2.0.1"
           sources."util-0.10.3"
@@ -7616,7 +7592,7 b' let'
       sources."assign-symbols-1.0.0"
       sources."ast-types-0.9.6"
       sources."async-0.1.22"
-      sources."async-each-1.0.1"
+      sources."async-each-1.0.3"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       (sources."autoprefixer-6.7.7" // {
@@ -7738,8 +7714,8 b' let'
       sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
-      sources."binary-extensions-1.12.0"
-      sources."bluebird-3.5.3"
+      sources."binary-extensions-1.13.1"
+      sources."bluebird-3.5.4"
       sources."bn.js-4.11.8"
       sources."boolbase-1.0.0"
       sources."boom-2.10.1"
@@ -7763,7 +7739,7 b' let'
       sources."builtin-status-codes-3.0.0"
       (sources."cacache-10.0.4" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."graceful-fs-4.1.15"
           sources."lru-cache-4.1.5"
           sources."minimatch-3.0.4"
@@ -7772,20 +7748,20 b' let'
       })
       sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
-      sources."camelcase-5.0.0"
+      sources."camelcase-5.3.1"
       (sources."caniuse-api-1.6.1" // {
         dependencies = [
           sources."browserslist-1.7.7"
         ];
       })
-      sources."caniuse-db-1.0.30000927"
-      sources."caniuse-lite-1.0.30000927"
+      sources."caniuse-db-1.0.30000967"
+      sources."caniuse-lite-1.0.30000967"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."chalk-0.5.1"
-      (sources."chokidar-2.0.4" // {
-        dependencies = [
-          sources."is-glob-4.0.0"
+      (sources."chokidar-2.1.5" // {
+        dependencies = [
+          sources."is-glob-4.0.1"
         ];
       })
       sources."chownr-1.1.1"
@@ -7825,7 +7801,7 b' let'
       })
       (sources."cli-1.0.1" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
         ];
       })
@@ -7848,10 +7824,10 b' let'
       sources."color-string-0.3.0"
       sources."colormin-1.1.2"
       sources."colors-0.6.2"
-      sources."combined-stream-1.0.7"
+      sources."combined-stream-1.0.8"
       sources."commander-2.14.1"
       sources."commondir-1.0.1"
-      sources."component-emitter-1.2.1"
+      sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
         dependencies = [
@@ -7864,7 +7840,7 b' let'
       sources."convert-source-map-1.6.0"
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
           sources."rimraf-2.6.3"
         ];
@@ -7872,11 +7848,11 b' let'
       sources."copy-descriptor-0.1.1"
       (sources."copy-webpack-plugin-4.6.0" // {
         dependencies = [
-          sources."is-glob-4.0.0"
+          sources."is-glob-4.0.1"
           sources."minimatch-3.0.4"
         ];
       })
-      sources."core-js-2.6.1"
+      sources."core-js-2.6.5"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
@@ -7896,7 +7872,7 b' let'
           sources."regexpu-core-1.0.0"
         ];
       })
-      sources."css-what-2.1.2"
+      sources."css-what-2.1.3"
       sources."cssesc-0.1.0"
       sources."cssnano-3.10.0"
       sources."csso-2.3.2"
@@ -7921,11 +7897,10 b' let'
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
       sources."diffie-hellman-5.0.3"
-      sources."dir-glob-2.0.0"
+      sources."dir-glob-2.2.2"
       sources."dom-converter-0.2.0"
-      (sources."dom-serializer-0.1.0" // {
-        dependencies = [
-          sources."domelementtype-1.1.3"
+      (sources."dom-serializer-0.1.1" // {
+        dependencies = [
           sources."entities-1.1.2"
         ];
       })
@@ -7939,14 +7914,15 b' let'
       sources."domelementtype-1.3.1"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
-      (sources."duplexify-3.6.1" // {
+      sources."dropzone-5.5.1"
+      (sources."duplexify-3.7.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.98"
+      sources."electron-to-chromium-1.3.133"
       sources."elliptic-6.4.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -7961,14 +7937,14 b' let'
       sources."es-to-primitive-1.2.0"
       sources."es6-templates-0.2.3"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-4.0.0"
+      sources."eslint-scope-4.0.3"
       sources."espree-3.5.4"
       sources."esprima-1.0.4"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."eventemitter2-0.4.14"
-      sources."events-1.1.1"
+      sources."events-3.0.0"
       sources."evp_bytestokey-1.0.3"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
@@ -8025,10 +8001,10 b' let'
           sources."minimatch-0.3.0"
         ];
       })
-      sources."fined-1.1.1"
+      sources."fined-1.2.0"
       sources."flagged-respawn-1.0.1"
       sources."flatten-1.0.2"
-      (sources."flush-write-stream-1.0.3" // {
+      (sources."flush-write-stream-1.1.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -8051,7 +8027,7 b' let'
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.4"
+      sources."fsevents-1.2.9"
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-caller-file-1.0.3"
@@ -8083,7 +8059,7 b' let'
       sources."globals-9.18.0"
       (sources."globby-7.1.1" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
         ];
       })
@@ -8115,12 +8091,18 b' let'
           sources."supports-color-2.0.0"
         ];
       })
-      sources."grunt-contrib-jshint-0.12.0"
+      (sources."grunt-contrib-jshint-0.12.0" // {
+        dependencies = [
+          sources."jshint-2.9.7"
+          sources."lodash-4.17.11"
+          sources."minimatch-3.0.4"
+        ];
+      })
       (sources."grunt-contrib-less-1.4.1" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
           sources."ansi-styles-2.2.1"
-          sources."async-2.6.1"
+          sources."async-2.6.2"
           sources."chalk-1.1.3"
           sources."has-ansi-2.0.0"
           sources."lodash-4.17.11"
@@ -8172,7 +8154,7 b' let'
       sources."hmac-drbg-1.0.1"
       sources."hoek-2.16.3"
       sources."home-or-tmp-2.0.0"
-      sources."homedir-polyfill-1.0.1"
+      sources."homedir-polyfill-1.0.3"
       sources."hooker-0.2.3"
       sources."html-comment-regex-1.1.2"
       sources."html-loader-0.4.5"
@@ -8203,7 +8185,7 b' let'
           sources."supports-color-5.5.0"
         ];
       })
-      sources."ieee754-1.1.12"
+      sources."ieee754-1.1.13"
       sources."iferr-0.1.5"
       sources."ignore-3.3.10"
       sources."image-size-0.5.5"
@@ -8211,9 +8193,9 b' let'
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.1.0"
+          sources."p-limit-2.2.0"
           sources."p-locate-3.0.0"
-          sources."p-try-2.0.0"
+          sources."p-try-2.2.0"
           sources."pkg-dir-3.0.0"
         ];
       })
@@ -8261,12 +8243,12 b' let'
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."jquery-1.11.3"
-      sources."js-base64-2.5.0"
+      sources."js-base64-2.5.1"
       sources."js-tokens-3.0.2"
       sources."js-yaml-2.0.5"
       sources."jsbn-0.1.1"
       sources."jsesc-1.3.0"
-      (sources."jshint-2.9.7" // {
+      (sources."jshint-2.10.2" // {
         dependencies = [
           sources."lodash-4.17.11"
           sources."minimatch-3.0.4"
@@ -8297,12 +8279,11 b' let'
           sources."findup-sync-2.0.0"
         ];
       })
-      sources."loader-runner-2.3.1"
+      sources."loader-runner-2.4.0"
       sources."loader-utils-1.2.3"
       sources."locate-path-2.0.0"
       sources."lodash-0.9.2"
       sources."lodash.camelcase-4.3.0"
-      sources."lodash.debounce-4.0.8"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.memoize-4.1.2"
       sources."lodash.uniq-4.5.0"
@@ -8318,7 +8299,7 b' let'
       sources."mark.js-8.11.1"
       sources."math-expression-evaluator-1.2.17"
       sources."md5.js-1.3.5"
-      sources."mem-4.0.0"
+      sources."mem-4.3.0"
       (sources."memory-fs-0.4.1" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8328,9 +8309,9 b' let'
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.37.0"
-      sources."mime-types-2.1.21"
-      sources."mimic-fn-1.2.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-0.2.14"
@@ -8346,22 +8327,22 b' let'
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.23.0"
-      sources."mousetrap-1.6.2"
+      sources."moment-2.24.0"
+      sources."mousetrap-1.6.3"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
-          sources."glob-7.1.3"
+          sources."glob-7.1.4"
           sources."minimatch-3.0.4"
           sources."rimraf-2.6.3"
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.12.1"
+      sources."nan-2.13.2"
       sources."nanomatch-1.2.13"
-      sources."neo-async-2.6.0"
+      sources."neo-async-2.6.1"
       sources."nice-try-1.0.5"
       sources."no-case-2.3.2"
-      (sources."node-libs-browser-2.1.0" // {
+      (sources."node-libs-browser-2.2.0" // {
         dependencies = [
           (sources."readable-stream-2.3.6" // {
             dependencies = [
@@ -8377,7 +8358,7 b' let'
           sources."nopt-2.0.0"
         ];
       })
-      sources."normalize-path-2.1.1"
+      sources."normalize-path-3.0.0"
       sources."normalize-range-0.1.2"
       sources."normalize-url-1.9.1"
       sources."npm-run-path-2.0.2"
@@ -8399,7 +8380,7 b' let'
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-keys-1.0.12"
+      sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.defaults-1.1.0"
       sources."object.getownpropertydescriptors-2.0.3"
@@ -8413,11 +8394,11 b' let'
       sources."osenv-0.1.5"
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-1.1.0"
+      sources."p-is-promise-2.1.0"
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."pako-1.0.7"
+      sources."pako-1.0.10"
       (sources."parallel-transform-1.1.0" // {
         dependencies = [
           sources."readable-stream-2.3.6"
@@ -8425,7 +8406,7 b' let'
         ];
       })
       sources."param-case-2.1.1"
-      sources."parse-asn1-5.1.1"
+      sources."parse-asn1-5.1.4"
       sources."parse-filepath-1.0.2"
       sources."parse-passwd-1.0.0"
       sources."parse5-3.0.3"
@@ -8564,7 +8545,7 b' let'
       sources."query-string-4.3.4"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      sources."randombytes-2.0.6"
+      sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."raw-loader-1.0.0-beta.0"
       (sources."readable-stream-1.1.14" // {
@@ -8608,14 +8589,9 b' let'
       })
       sources."relateurl-0.2.7"
       sources."remove-trailing-separator-1.1.0"
-      (sources."renderkid-2.0.2" // {
+      (sources."renderkid-2.0.3" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
-          sources."domhandler-2.1.0"
-          sources."domutils-1.1.6"
-          sources."htmlparser2-3.3.0"
-          sources."isarray-0.0.1"
-          sources."readable-stream-1.0.34"
           sources."strip-ansi-3.0.1"
         ];
       })
@@ -8625,7 +8601,7 b' let'
       sources."request-2.81.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."resolve-1.9.0"
+      sources."resolve-1.10.1"
       sources."resolve-cwd-2.0.0"
       sources."resolve-dir-1.0.1"
       sources."resolve-from-3.0.0"
@@ -8641,12 +8617,12 b' let'
       sources."sax-1.2.4"
       (sources."schema-utils-0.4.7" // {
         dependencies = [
-          sources."ajv-6.6.2"
+          sources."ajv-6.10.0"
         ];
       })
       sources."select-1.1.2"
-      sources."semver-5.6.0"
-      sources."serialize-javascript-1.6.1"
+      sources."semver-5.7.0"
+      sources."serialize-javascript-1.7.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.0" // {
         dependencies = [
@@ -8698,7 +8674,7 b' let'
       sources."source-map-url-0.4.0"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      (sources."sshpk-1.16.0" // {
+      (sources."sshpk-1.16.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -8722,7 +8698,7 b' let'
         ];
       })
       sources."sticky-sidebar-3.3.1"
-      (sources."stream-browserify-2.0.1" // {
+      (sources."stream-browserify-2.0.2" // {
         dependencies = [
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
@@ -8759,7 +8735,7 b' let'
           sources."js-yaml-3.7.0"
         ];
       })
-      sources."tapable-1.1.1"
+      sources."tapable-1.1.3"
       sources."through-2.3.8"
       (sources."through2-2.0.5" // {
         dependencies = [
@@ -8768,7 +8744,7 b' let'
         ];
       })
       sources."timers-browserify-2.0.10"
-      sources."tiny-emitter-2.0.2"
+      sources."tiny-emitter-2.1.0"
       (sources."tiny-lr-fork-0.0.5" // {
         dependencies = [
           sources."debug-0.7.4"
@@ -8808,9 +8784,9 b' let'
           sources."source-map-0.6.1"
         ];
       })
-      (sources."uglify-js-3.4.9" // {
-        dependencies = [
-          sources."commander-2.17.1"
+      (sources."uglify-js-3.4.10" // {
+        dependencies = [
+          sources."commander-2.19.0"
           sources."source-map-0.6.1"
         ];
       })
@@ -8843,7 +8819,7 b' let'
           sources."has-values-0.1.4"
         ];
       })
-      sources."upath-1.1.0"
+      sources."upath-1.1.2"
       sources."upper-case-1.1.3"
       (sources."uri-js-4.2.2" // {
         dependencies = [
@@ -8857,14 +8833,14 b' let'
         ];
       })
       sources."use-3.1.1"
-      sources."util-0.10.4"
+      sources."util-0.11.1"
       sources."util-deprecate-1.0.2"
       sources."util.promisify-1.0.0"
       sources."utila-0.4.0"
       sources."uuid-3.3.2"
-      sources."v8-compile-cache-2.0.2"
-      sources."v8flags-3.1.2"
-      sources."vendors-1.0.2"
+      sources."v8-compile-cache-2.0.3"
+      sources."v8flags-3.1.3"
+      sources."vendors-1.0.3"
       (sources."verror-1.10.0" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -8879,7 +8855,7 b' let'
       sources."waypoints-4.0.1"
       (sources."webpack-4.23.1" // {
         dependencies = [
-          sources."ajv-6.6.2"
+          sources."ajv-6.10.0"
         ];
       })
       (sources."webpack-cli-3.1.2" // {
@@ -8919,7 +8895,7 b' let'
       sources."which-module-2.0.0"
       sources."window-size-0.1.0"
       sources."wordwrap-0.0.2"
-      sources."worker-farm-1.6.0"
+      sources."worker-farm-1.7.0"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -8935,9 +8911,9 b' let'
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.1.0"
+          sources."p-limit-2.2.0"
           sources."p-locate-3.0.0"
-          sources."p-try-2.0.0"
+          sources."p-try-2.2.0"
         ];
       })
       sources."yargs-parser-11.1.1"

pkgs/python-packages-overrides.nix

@@ -35,6 +35,18 b' self: super: {'
     ];
   });
 
+  "cffi" = super."cffi".override (attrs: {
+    buildInputs = [
+      pkgs.libffi
+    ];
+  });
+
+  "cryptography" = super."cryptography".override (attrs: {
+    buildInputs = [
+      pkgs.openssl
+    ];
+  });
+
   "gevent" = super."gevent".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       # NOTE: (marcink) odd requirements from gevent aren't set properly,
@@ -152,12 +164,6 b' self: super: {'
     };
   });
 
-  "pytest-runner" = super."pytest-runner".override (attrs: {
-    propagatedBuildInputs = [
-      self."setuptools-scm"
-    ];
-  });
-
   "python-ldap" = super."python-ldap".override (attrs: {
     propagatedBuildInputs = attrs.propagatedBuildInputs ++ [
       pkgs.openldap

pkgs/python-packages.nix

@@ -5,7 +5,7 b''
 
 self: super: {
   "alembic" = super.buildPythonPackage {
-    name = "alembic-1.0.5";
+    name = "alembic-1.0.10";
     doCheck = false;
     propagatedBuildInputs = [
       self."sqlalchemy"
@@ -14,8 +14,8 b' self: super: {'
       self."python-dateutil"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/1c/65/b8e4f5b2f345bb13b5e0a3fddd892b0b3f0e8ad4880e954fdc6a50d00d84/alembic-1.0.5.tar.gz";
-      sha256 = "0rpjqp2iq6p49x1nli18ivak1izz547nnjxi110mzrgc1v7dxzz9";
+      url = "https://files.pythonhosted.org/packages/6e/8b/fa3bd058cccd5e9177fea4efa26bfb769228fdd3178436ad5e05830ef6ef/alembic-1.0.10.tar.gz";
+      sha256 = "1dwl0264r6ri2jyrjr68am04x538ab26xwy4crqjnnhm4alwm3c2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -51,6 +51,17 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "asn1crypto" = super.buildPythonPackage {
+    name = "asn1crypto-0.24.0";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/fc/f1/8db7daa71f414ddabfa056c4ef792e1461ff655c2ae2928a2b675bfed6b4/asn1crypto-0.24.0.tar.gz";
+      sha256 = "0jaf8rf9dx1lf23xfv2cdd5h52f1qr3w8k63985bc35g3d220p4x";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   "atomicwrites" = super.buildPythonPackage {
     name = "atomicwrites-1.2.1";
     doCheck = false;
@@ -77,8 +88,8 b' self: super: {'
     name = "authomatic-0.1.0.post1";
     doCheck = false;
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801";
-      sha256 = "1cgk0a86sbsjbri06gf5z5l4npwkjdxw6fdnwl4vvfmxs2sx9yxw";
+      url = "https://code.rhodecode.com/upstream/authomatic/artifacts/download/0-4fe9c041-a567-4f84-be4c-7efa2a606d3c.tar.gz?md5=f6bdc3c769688212db68233e8d2b0383";
+      sha256 = "0pc716mva0ym6xd8jwzjbjp8dqxy9069wwwv2aqwb8lyhl4757ab";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -146,15 +157,15 b' self: super: {'
     };
   };
   "bleach" = super.buildPythonPackage {
-    name = "bleach-3.0.2";
+    name = "bleach-3.1.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."webencodings"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ae/31/680afc7d44040004296a2d8f0584983c2f2386448cd9d0964197e6c1160e/bleach-3.0.2.tar.gz";
-      sha256 = "06474zg7f73hv8h1xw2wcsmvn2ygj73zxgxxqg8zcx8ap1srdls8";
+      url = "https://files.pythonhosted.org/packages/78/5a/0df03e8735cd9c75167528299c738702437589b9c71a849489d00ffa82e8/bleach-3.1.0.tar.gz";
+      sha256 = "1yhrgrhkln8bd6gn3imj69g1h4xqah9gaz9q26crqr6gmmvpzprz";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
@@ -187,6 +198,20 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "cffi" = super.buildPythonPackage {
+    name = "cffi-1.12.2";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pycparser"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac/cffi-1.12.2.tar.gz";
+      sha256 = "19qfks2djya8vix95bmg3xzipjb8w9b8mbj4j5k2hqkc8j58f4z1";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.mit ];
+    };
+  };
   "chameleon" = super.buildPythonPackage {
     name = "chameleon-2.24";
     doCheck = false;
@@ -230,7 +255,7 b' self: super: {'
     };
   };
   "colander" = super.buildPythonPackage {
-    name = "colander-1.5.1";
+    name = "colander-1.7.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."translationstring"
@@ -238,8 +263,8 b' self: super: {'
       self."enum34"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ec/d1/fcca811a0a692c69d27e36b4d11a73acb98b4bab48323442642b6fd4386d/colander-1.5.1.tar.gz";
-      sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq";
+      url = "https://files.pythonhosted.org/packages/db/e4/74ab06f54211917b41865cafc987ce511e35503de48da9bfe9358a1bdc3e/colander-1.7.0.tar.gz";
+      sha256 = "1wl1bqab307lbbcjx81i28s3yl6dlm4rf15fxawkjb6j48x1cn6p";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -252,19 +277,19 b' self: super: {'
       self."six"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c";
-      sha256 = "1hhcxirwvg58grlfr177b3awhbq8hlx1l3lh69ifl1ki7lfd1s1x";
+      url = "https://code.rhodecode.com/upstream/configobj/artifacts/download/0-012de99a-b1e1-4f64-a5c0-07a98a41b324.tar.gz?md5=6a513f51fe04b2c18cf84c1395a7c626";
+      sha256 = "0kqfrdfr14mw8yd8qwq14dv2xghpkjmd3yjsy8dfcbvpcc17xnxp";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "configparser" = super.buildPythonPackage {
-    name = "configparser-3.7.1";
+    name = "configparser-3.7.4";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b6/a6/eceea7c5a5dbcf56815bed411c38cabd8a879386be10717b160e7362b5a2/configparser-3.7.1.tar.gz";
-      sha256 = "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav";
+      url = "https://files.pythonhosted.org/packages/e2/1c/83fd53748d8245cb9a3399f705c251d3fc0ce7df04450aac1cfc49dd6a0f/configparser-3.7.4.tar.gz";
+      sha256 = "0xac32886ihs2xg7w1gppcq2sgin5qsm8lqwijs5xifq9w0x0q6s";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -285,16 +310,34 b' self: super: {'
     };
   };
   "coverage" = super.buildPythonPackage {
-    name = "coverage-4.5.1";
+    name = "coverage-4.5.3";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-4.5.1.tar.gz";
-      sha256 = "1wbrzpxka3xd4nmmkc6q0ir343d91kymwsm8pbmwa0d2a7q4ir2n";
+      url = "https://files.pythonhosted.org/packages/82/70/2280b5b29a0352519bb95ab0ef1ea942d40466ca71c53a2085bdeff7b0eb/coverage-4.5.3.tar.gz";
+      sha256 = "02f6m073qdispn96rc616hg0rnmw1pgqzw3bgxwiwza4zf9hirlx";
     };
     meta = {
       license = [ pkgs.lib.licenses.asl20 ];
     };
   };
+  "cryptography" = super.buildPythonPackage {
+    name = "cryptography-2.6.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."asn1crypto"
+      self."six"
+      self."cffi"
+      self."enum34"
+      self."ipaddress"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff92f3563476c3b00d0a9157d9c0217449/cryptography-2.6.1.tar.gz";
+      sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal { fullName = "BSD or Apache License, Version 2.0"; } pkgs.lib.licenses.asl20 ];
+    };
+  };
   "cssselect" = super.buildPythonPackage {
     name = "cssselect-1.0.3";
     doCheck = false;
@@ -337,11 +380,11 b' self: super: {'
     };
   };
   "defusedxml" = super.buildPythonPackage {
-    name = "defusedxml-0.5.0";
+    name = "defusedxml-0.6.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/74/ba/4ba4e89e21b5a2e267d80736ea674609a0a33cc4435a6d748ef04f1f9374/defusedxml-0.5.0.tar.gz";
-      sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4";
+      url = "https://files.pythonhosted.org/packages/a4/5f/f8aa58ca0cf01cbcee728abc9d88bfeb74e95e6cb4334cfd5bed5673ea77/defusedxml-0.6.0.tar.gz";
+      sha256 = "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
@@ -399,11 +442,11 b' self: super: {'
     };
   };
   "ecdsa" = super.buildPythonPackage {
-    name = "ecdsa-0.13";
+    name = "ecdsa-0.13.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/f9/e5/99ebb176e47f150ac115ffeda5fedb6a3dbb3c00c74a59fd84ddf12f5857/ecdsa-0.13.tar.gz";
-      sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
+      url = "https://files.pythonhosted.org/packages/51/76/139bf6e9b7b6684d5891212cdbd9e0739f2bfc03f380a1a6ffa700f392ac/ecdsa-0.13.2.tar.gz";
+      sha256 = "116qaq7bh4lcynzi613960jhsnn19v0kmsqwahiwjfj14gx4y0sw";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -491,8 +534,8 b' self: super: {'
       self."configparser"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313";
-      sha256 = "0bihrdp8ahsys437kxdhk52gz6kib8rxjv71i93wkw7594fcaxll";
+      url = "https://code.rhodecode.com/upstream/entrypoints/artifacts/download/0-8e9ee9e4-c4db-409c-b07e-81568fd1832d.tar.gz?md5=3a027b8ff1d257b91fe257de6c43357d";
+      sha256 = "0qih72n2myclanplqipqxpgpj9d2yhff1pz5d02zq1cfqyd173w5";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -623,11 +666,11 b' self: super: {'
     };
   };
   "hupper" = super.buildPythonPackage {
-    name = "hupper-1.4.2";
+    name = "hupper-1.6.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/f1/75/1915dc7650b4867fa3049256e24ca8eddb5989998fcec788cf52b9812dfc/hupper-1.4.2.tar.gz";
-      sha256 = "16vb9fkiaakdpcp6pn56h3w0dwvm67bxq2k2dv4i382qhqwphdzb";
+      url = "https://files.pythonhosted.org/packages/85/d9/e005d357b11249c5d70ddf5b7adab2e4c0da4e8b0531ff146917a04fe6c0/hupper-1.6.1.tar.gz";
+      sha256 = "0d3cvkc8ssgwk54wvhbifj56ry97qi10pfzwfk8vwzzcikbfp3zy";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -671,15 +714,15 b' self: super: {'
     };
   };
   "ipdb" = super.buildPythonPackage {
-    name = "ipdb-0.11";
+    name = "ipdb-0.12";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
       self."ipython"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/80/fe/4564de08f174f3846364b3add8426d14cebee228f741c27e702b2877e85b/ipdb-0.11.tar.gz";
-      sha256 = "02m0l8wrhhd3z7dg3czn5ys1g5pxib516hpshdzp7rxzsxgcd0bh";
+      url = "https://files.pythonhosted.org/packages/6d/43/c3c2e866a8803e196d6209595020a4a6db1a3c5d07c01455669497ae23d0/ipdb-0.12.tar.gz";
+      sha256 = "1khr2n7xfy8hg65kj1bsrjq9g7656pp0ybfa8abpbzpdawji3qnw";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -802,14 +845,14 b' self: super: {'
     };
   };
   "jupyter-core" = super.buildPythonPackage {
-    name = "jupyter-core-4.4.0";
+    name = "jupyter-core-4.5.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."traitlets"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b6/2d/2804f4de3a95583f65e5dcb4d7c8c7183124882323758996e867f47e72af/jupyter_core-4.4.0.tar.gz";
-      sha256 = "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s";
+      url = "https://files.pythonhosted.org/packages/4a/de/ff4ca734656d17ebe0450807b59d728f45277e2e7f4b82bc9aae6cb82961/jupyter_core-4.5.0.tar.gz";
+      sha256 = "1xr4pbghwk5hayn5wwnhb7z95380r45p79gf5if5pi1akwg7qvic";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1008,14 +1051,14 b' self: super: {'
     };
   };
   "paste" = super.buildPythonPackage {
-    name = "paste-3.0.5";
+    name = "paste-3.0.8";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/d4/41/91bde422400786b1b06357c1e6e3a5379f54dc3002aeb337cb767233304e/Paste-3.0.5.tar.gz";
-      sha256 = "1a6i8fh1fg8r4x800fvy9r82m15clwjim6yf2g9r4dff0y40dchv";
+      url = "https://files.pythonhosted.org/packages/66/65/e3acf1663438483c1f6ced0b6c6f3b90da9f0faacb0a6e2aa0f3f9f4b235/Paste-3.0.8.tar.gz";
+      sha256 = "05w1sh6ky4d7pmdb8nv82n13w22jcn3qsagg5ih3hjmbws9kkwf4";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1033,7 +1076,7 b' self: super: {'
     };
   };
   "pastescript" = super.buildPythonPackage {
-    name = "pastescript-3.0.0";
+    name = "pastescript-3.1.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."paste"
@@ -1041,23 +1084,23 b' self: super: {'
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/08/2a/3797377a884ab9a064ad4d564ed612e54d26d7997caa8229c9c9df4eac31/PasteScript-3.0.0.tar.gz";
-      sha256 = "1hvmyz1sbn7ws1syw567ph7km9fi0wi75r3vlyzx6sk0z26xkm6r";
+      url = "https://files.pythonhosted.org/packages/9e/1d/14db1c283eb21a5d36b6ba1114c13b709629711e64acab653d9994fe346f/PasteScript-3.1.0.tar.gz";
+      sha256 = "02qcxjjr32ks7a6d4f533wl34ysc7yhwlrfcyqwqbzr52250v4fs";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pathlib2" = super.buildPythonPackage {
-    name = "pathlib2-2.3.3";
+    name = "pathlib2-2.3.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."scandir"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bf/d7/a2568f4596b75d2c6e2b4094a7e64f620decc7887f69a1f2811931ea15b9/pathlib2-2.3.3.tar.gz";
-      sha256 = "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695";
+      url = "https://files.pythonhosted.org/packages/b5/f4/9c7cc726ece2498b6c8b62d3262aa43f59039b953fe23c9964ac5e18d40b/pathlib2-2.3.4.tar.gz";
+      sha256 = "1y0f9rkm1924zrc5dn4bwxlhgdkbml82lkcc28l5rgmr7d918q24";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1075,14 +1118,14 b' self: super: {'
     };
   };
   "pexpect" = super.buildPythonPackage {
-    name = "pexpect-4.6.0";
+    name = "pexpect-4.7.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."ptyprocess"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-4.6.0.tar.gz";
-      sha256 = "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia";
+      url = "https://files.pythonhosted.org/packages/1c/b1/362a0d4235496cb42c33d1d8732b5e2c607b0129ad5fdd76f5a583b9fcb3/pexpect-4.7.0.tar.gz";
+      sha256 = "1sv2rri15zwhds85a4kamwh9pj49qcxv7m4miyr4jfpfwv81yb4y";
     };
     meta = {
       license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ];
@@ -1117,63 +1160,63 b' self: super: {'
     };
   };
   "plaster-pastedeploy" = super.buildPythonPackage {
-    name = "plaster-pastedeploy-0.6";
+    name = "plaster-pastedeploy-0.7";
     doCheck = false;
     propagatedBuildInputs = [
       self."pastedeploy"
       self."plaster"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3f/e7/6a6833158d2038ec40085433308a1e164fd1dac595513f6dd556d5669bb8/plaster_pastedeploy-0.6.tar.gz";
-      sha256 = "1bkggk18f4z2bmsmxyxabvf62znvjwbivzh880419r3ap0616cf2";
+      url = "https://files.pythonhosted.org/packages/99/69/2d3bc33091249266a1bd3cf24499e40ab31d54dffb4a7d76fe647950b98c/plaster_pastedeploy-0.7.tar.gz";
+      sha256 = "1zg7gcsvc1kzay1ry5p699rg2qavfsxqwl17mqxzr0gzw6j9679r";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "pluggy" = super.buildPythonPackage {
-    name = "pluggy-0.8.1";
+    name = "pluggy-0.11.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/38/e1/83b10c17688af7b2998fa5342fec58ecbd2a5a7499f31e606ae6640b71ac/pluggy-0.8.1.tar.gz";
-      sha256 = "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d";
+      url = "https://files.pythonhosted.org/packages/0d/a1/862ab336e8128fde20981d2c1aa8506693412daf5083b1911d539412676b/pluggy-0.11.0.tar.gz";
+      sha256 = "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "prompt-toolkit" = super.buildPythonPackage {
-    name = "prompt-toolkit-1.0.15";
+    name = "prompt-toolkit-1.0.16";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
       self."wcwidth"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/8a/ad/cf6b128866e78ad6d7f1dc5b7f99885fb813393d9860778b2984582e81b5/prompt_toolkit-1.0.15.tar.gz";
-      sha256 = "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5";
+      url = "https://files.pythonhosted.org/packages/f1/03/bb36771dc9fa7553ac4bdc639a9ecdf6fda0ff4176faf940d97e3c16e41d/prompt_toolkit-1.0.16.tar.gz";
+      sha256 = "1d65hm6nf0cbq0q0121m60zzy4s1fpg9fn761s1yxf08dridvkn1";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "psutil" = super.buildPythonPackage {
-    name = "psutil-5.4.8";
+    name = "psutil-5.5.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e3/58/0eae6e4466e5abf779d7e2b71fac7fba5f59e00ea36ddb3ed690419ccb0f/psutil-5.4.8.tar.gz";
-      sha256 = "1hyna338sml2cl1mfb2gs89np18z27mvyhmq4ifh22x07n7mq9kf";
+      url = "https://files.pythonhosted.org/packages/c7/01/7c30b247cdc5ba29623faa5c8cf1f1bbf7e041783c340414b0ed7e067c64/psutil-5.5.1.tar.gz";
+      sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "psycopg2" = super.buildPythonPackage {
-    name = "psycopg2-2.7.5";
+    name = "psycopg2-2.8.3";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/b2/c1/7bf6c464e903ffc4f3f5907c389e5a4199666bf57f6cd6bf46c17912a1f9/psycopg2-2.7.5.tar.gz";
-      sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
+      url = "https://files.pythonhosted.org/packages/5c/1c/6997288da181277a0c29bc39a5f9143ff20b8c99f2a7d059cfb55163e165/psycopg2-2.8.3.tar.gz";
+      sha256 = "0ms4kx0p5n281l89awccix4d05ybmdngnjjpi9jbzd0rhf1nwyl9";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 { fullName = "GNU Library or Lesser General Public License (LGPL)"; } { fullName = "LGPL with exceptions or ZPL"; } ];
@@ -1239,14 +1282,25 b' self: super: {'
     };
   };
   "pyasn1-modules" = super.buildPythonPackage {
-    name = "pyasn1-modules-0.2.4";
+    name = "pyasn1-modules-0.2.5";
     doCheck = false;
     propagatedBuildInputs = [
       self."pyasn1"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/bd/a5/ef7bf693e8a8f015386c9167483199f54f8a8ec01d1c737e05524f16e792/pyasn1-modules-0.2.4.tar.gz";
-      sha256 = "0z3w5dqrrvdplg9ma45j8n23xvyrj9ki8mg4ibqbn7l4qpl90855";
+      url = "https://files.pythonhosted.org/packages/ec/0b/69620cb04a016e4a1e8e352e8a42717862129b574b3479adb2358a1f12f7/pyasn1-modules-0.2.5.tar.gz";
+      sha256 = "15nvfx0vnl8akdlv3k6s0n80vqvryj82bm040jdsn7wmyxl1ywpg";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
+  "pycparser" = super.buildPythonPackage {
+    name = "pycparser-2.19";
+    doCheck = false;
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7fdeab8567783e83e1b9ab5585e6206a/pycparser-2.19.tar.gz";
+      sha256 = "1cr5dcj9628lkz1qlwq3fv97c25363qppkmcayqvd05dpy573259";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1274,23 +1328,12 b' self: super: {'
       license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
     };
   };
-  "pyflakes" = super.buildPythonPackage {
-    name = "pyflakes-0.8.1";
+  "pygments" = super.buildPythonPackage {
+    name = "pygments-2.4.2";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/75/22/a90ec0252f4f87f3ffb6336504de71fe16a49d69c4538dae2f12b9360a38/pyflakes-0.8.1.tar.gz";
-      sha256 = "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  "pygments" = super.buildPythonPackage {
-    name = "pygments-2.3.1";
-    doCheck = false;
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/64/69/413708eaf3a64a6abb8972644e0f20891a55e621c6759e2c3f3891e05d63/Pygments-2.3.1.tar.gz";
-      sha256 = "0ji87g09jph8jqcvclgb02qvxasdnr9pzvk90rl66d90yqcxmyjz";
+      url = "https://files.pythonhosted.org/packages/7e/ae/26808275fc76bf2832deb10d3a3ed3107bc4de01b85dcccbe525f2cd6d1e/Pygments-2.4.2.tar.gz";
+      sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
@@ -1330,7 +1373,7 b' self: super: {'
     };
   };
   "pyramid" = super.buildPythonPackage {
-    name = "pyramid-1.10.1";
+    name = "pyramid-1.10.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."hupper"
@@ -1345,28 +1388,13 b' self: super: {'
       self."repoze.lru"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/0a/3e/22e3ac9be1b70a01139adba8906ee4b8f628bb469fea3c52f6c97b73063c/pyramid-1.10.1.tar.gz";
-      sha256 = "1h5105nfh6rsrfjiyw20aavyibj36la3hajy6vh1fa77xb4y3hrp";
+      url = "https://files.pythonhosted.org/packages/c2/43/1ae701c9c6bb3a434358e678a5e72c96e8aa55cf4cb1d2fa2041b5dd38b7/pyramid-1.10.4.tar.gz";
+      sha256 = "0rkxs1ajycg2zh1c94xlmls56mx5m161sn8112skj0amza6cn36q";
     };
     meta = {
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
-  "pyramid-beaker" = super.buildPythonPackage {
-    name = "pyramid-beaker-0.8";
-    doCheck = false;
-    propagatedBuildInputs = [
-      self."pyramid"
-      self."beaker"
-    ];
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/d9/6e/b85426e00fd3d57f4545f74e1c3828552d8700f13ededeef9233f7bca8be/pyramid_beaker-0.8.tar.gz";
-      sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
-    };
-    meta = {
-      license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
-    };
-  };
   "pyramid-debugtoolbar" = super.buildPythonPackage {
     name = "pyramid-debugtoolbar-4.5";
     doCheck = false;
@@ -1538,14 +1566,14 b' self: super: {'
     };
   };
   "python-dateutil" = super.buildPythonPackage {
-    name = "python-dateutil-2.7.5";
+    name = "python-dateutil-2.8.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0/python-dateutil-2.7.5.tar.gz";
-      sha256 = "00ngwcdw36w5b37b51mdwn3qxid9zdf3kpffv2q6n9kl05y2iyc8";
+      url = "https://files.pythonhosted.org/packages/ad/99/5b2e99737edeb28c71bcbec5b5dda19d0d9ef3ca3e92e3e925e7c0bb364c/python-dateutil-2.8.0.tar.gz";
+      sha256 = "17nsfhy4xdz1khrfxa61vd7pmvd5z0wa3zb6v4gb4kfnykv0b668";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.asl20 { fullName = "Dual License"; } ];
@@ -1690,7 +1718,7 b' self: super: {'
     };
   };
   "rhodecode-enterprise-ce" = super.buildPythonPackage {
-    name = "rhodecode-enterprise-ce-4.16.2";
+    name = "rhodecode-enterprise-ce-4.17.0";
     buildInputs = [
       self."pytest"
       self."py"
@@ -1709,36 +1737,29 b' self: super: {'
     ];
     doCheck = true;
     propagatedBuildInputs = [
-      self."setuptools-scm"
       self."amqp"
       self."authomatic"
-      self."atomicwrites"
-      self."attrs"
       self."babel"
       self."beaker"
       self."bleach"
       self."celery"
-      self."chameleon"
       self."channelstream"
       self."click"
       self."colander"
       self."configobj"
       self."cssselect"
+      self."cryptography"
       self."decorator"
       self."deform"
       self."docutils"
       self."dogpile.cache"
       self."dogpile.core"
-      self."ecdsa"
       self."formencode"
       self."future"
       self."futures"
-      self."gnureadline"
       self."infrae.cache"
       self."iso8601"
       self."itsdangerous"
-      self."jinja2"
-      self."billiard"
       self."kombu"
       self."lxml"
       self."mako"
@@ -1747,21 +1768,18 b' self: super: {'
       self."msgpack-python"
       self."pyotp"
       self."packaging"
+      self."pathlib2"
       self."paste"
       self."pastedeploy"
       self."pastescript"
-      self."pathlib2"
       self."peppercorn"
       self."psutil"
       self."py-bcrypt"
+      self."pycurl"
       self."pycrypto"
-      self."pycurl"
-      self."pyflakes"
       self."pygments"
       self."pyparsing"
-      self."pyramid-beaker"
       self."pyramid-debugtoolbar"
-      self."pyramid-jinja2"
       self."pyramid-mako"
       self."pyramid"
       self."pyramid-mailer"
@@ -1784,7 +1802,6 b' self: super: {'
       self."sshpubkeys"
       self."subprocess32"
       self."supervisor"
-      self."tempita"
       self."translationstring"
       self."urllib3"
       self."urlobject"
@@ -1813,7 +1830,6 b' self: super: {'
       self."greenlet"
       self."gunicorn"
       self."waitress"
-      self."setproctitle"
       self."ipdb"
       self."ipython"
       self."rhodecode-tools"
@@ -1855,8 +1871,8 b' self: super: {'
       self."elasticsearch1-dsl"
     ];
     src = fetchurl {
-      url = "https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.2.1.tar.gz?md5=25bc2f7de1da318e547236d3fb463d28";
-      sha256 = "1k8l3s4mvshza1zay6dfxprq54fyb5dc85dqdva9wa3f466y0adk";
+      url = "https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-10ac93f4-bb7d-4b97-baea-68110743dd5a.tar.gz?md5=962dc77c06aceee62282b98d33149661";
+      sha256 = "1vfhgf46inbx7jvlfx4fdzh3vz7lh37r291gzb5hx447pfm3qllg";
     };
     meta = {
       license = [ { fullName = "Apache 2.0 and Proprietary"; } ];
@@ -1878,11 +1894,11 b' self: super: {'
     };
   };
   "scandir" = super.buildPythonPackage {
-    name = "scandir-1.9.0";
+    name = "scandir-1.10.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/16/2a/557af1181e6b4e30254d5a6163b18f5053791ca66e251e77ab08887e8fe3/scandir-1.9.0.tar.gz";
-      sha256 = "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4";
+      url = "https://files.pythonhosted.org/packages/df/f5/9c052db7bd54d0cbf1bc0bb6554362bba1012d03e5888950a4f5c5dadc4e/scandir-1.10.0.tar.gz";
+      sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal { fullName = "New BSD License"; } ];
@@ -1900,22 +1916,11 b' self: super: {'
     };
   };
   "setuptools" = super.buildPythonPackage {
-    name = "setuptools-40.8.0";
+    name = "setuptools-41.0.1";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/c2/f7/c7b501b783e5a74cf1768bc174ee4fb0a8a6ee5af6afa92274ff964703e0/setuptools-40.8.0.zip";
-      sha256 = "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
-  "setuptools-scm" = super.buildPythonPackage {
-    name = "setuptools-scm-2.1.0";
-    doCheck = false;
-    src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e5/62/f9e1ac314464eb5945c97542acb6bf6f3381dfa5d7a658de7730c36f31a1/setuptools_scm-2.1.0.tar.gz";
-      sha256 = "0yb364cgk15sfw3x8ln4ssh98z1dj6n8iiz4r2rw1cfsxhgi8rx7";
+      url = "https://files.pythonhosted.org/packages/1d/64/a18a487b4391a05b9c7f938b94a16d80305bf0369c6b0b9509e86165e1d3/setuptools-41.0.1.zip";
+      sha256 = "04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1966,40 +1971,40 b' self: super: {'
     };
   };
   "sshpubkeys" = super.buildPythonPackage {
-    name = "sshpubkeys-2.2.0";
+    name = "sshpubkeys-3.1.0";
     doCheck = false;
     propagatedBuildInputs = [
-      self."pycrypto"
+      self."cryptography"
       self."ecdsa"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/27/da/337fabeb3dca6b62039a93ceaa636f25065e0ae92b575b1235342076cf0a/sshpubkeys-2.2.0.tar.gz";
-      sha256 = "0r4kpwzmg96a2x56pllik7dmc3fnqk189v3sfgsi07q2ryrhr6xm";
+      url = "https://files.pythonhosted.org/packages/00/23/f7508a12007c96861c3da811992f14283d79c819d71a217b3e12d5196649/sshpubkeys-3.1.0.tar.gz";
+      sha256 = "105g2li04nm1hb15a2y6hm9m9k7fbrkd5l3gy12w3kgcmsf3k25k";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "subprocess32" = super.buildPythonPackage {
-    name = "subprocess32-3.5.3";
+    name = "subprocess32-3.5.4";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/be/2b/beeba583e9877e64db10b52a96915afc0feabf7144dcbf2a0d0ea68bf73d/subprocess32-3.5.3.tar.gz";
-      sha256 = "1hr5fan8i719hmlmz73hf8rhq74014w07d8ryg7krvvf6692kj3b";
+      url = "https://files.pythonhosted.org/packages/32/c8/564be4d12629b912ea431f1a50eb8b3b9d00f1a0b1ceff17f266be190007/subprocess32-3.5.4.tar.gz";
+      sha256 = "17f7mvwx2271s1wrl0qac3wjqqnrqag866zs3qc8v5wp0k43fagb";
     };
     meta = {
       license = [ pkgs.lib.licenses.psfl ];
     };
   };
   "supervisor" = super.buildPythonPackage {
-    name = "supervisor-3.3.5";
+    name = "supervisor-4.0.3";
     doCheck = false;
     propagatedBuildInputs = [
       self."meld3"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ba/65/92575a8757ed576beaee59251f64a3287bde82bdc03964b89df9e1d29e1b/supervisor-3.3.5.tar.gz";
-      sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
+      url = "https://files.pythonhosted.org/packages/97/48/f38bf70bd9282d1a18d591616557cc1a77a1c627d57dff66ead65c891dc8/supervisor-4.0.3.tar.gz";
+      sha256 = "17hla7mx6w5m5jzkkjxgqa8wpswqmfhbhf49f692hw78fg0ans7p";
     };
     meta = {
       license = [ { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
@@ -2128,22 +2133,22 b' self: super: {'
     };
   };
   "vine" = super.buildPythonPackage {
-    name = "vine-1.2.0";
+    name = "vine-1.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/46/1a/c94317efa98040c5d50fe3cf9080cafb0372ff5afb0283dc018c751c6746/vine-1.2.0.tar.gz";
-      sha256 = "0xjz2sjbr5jrpjk411b7alkghdskhphgsqqrbi7abqfh2pli6j7f";
+      url = "https://files.pythonhosted.org/packages/1c/e1/79fb8046e607dd6c2ad05c9b8ebac9d0bd31d086a08f02699e96fc5b3046/vine-1.3.0.tar.gz";
+      sha256 = "11ydsbhl1vabndc2r979dv61s6j2b0giq6dgvryifvq1m7bycghk";
     };
     meta = {
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
   "waitress" = super.buildPythonPackage {
-    name = "waitress-1.1.0";
+    name = "waitress-1.3.0";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/3c/68/1c10dd5c556872ceebe88483b0436140048d39de83a84a06a8baa8136f4f/waitress-1.1.0.tar.gz";
-      sha256 = "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k";
+      url = "https://files.pythonhosted.org/packages/43/50/9890471320d5ad22761ae46661cf745f487b1c8c4ec49352b99e1078b970/waitress-1.3.0.tar.gz";
+      sha256 = "09j5dzbbcxib7vdskhx39s1qsydlr4n2p2png71d7mjnr9pnwajf";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];
@@ -2218,18 +2223,18 b' self: super: {'
     };
   };
   "webob" = super.buildPythonPackage {
-    name = "webob-1.8.4";
+    name = "webob-1.8.5";
     doCheck = false;
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/e4/6c/99e322c3d4cc11d9060a67a9bf2f7c9c581f40988c11fffe89bb8c36bc5e/WebOb-1.8.4.tar.gz";
-      sha256 = "16cfg5y4n6sihz59vsmns2yqbfm0gfsn3l5xgz2g0pdhilaib0x4";
+      url = "https://files.pythonhosted.org/packages/9d/1a/0c89c070ee2829c934cb6c7082287c822e28236a4fcf90063e6be7c35532/WebOb-1.8.5.tar.gz";
+      sha256 = "11khpzaxc88q31v25ic330gsf56fwmbdc9b30br8mvp0fmwspah5";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   "webtest" = super.buildPythonPackage {
-    name = "webtest-2.0.32";
+    name = "webtest-2.0.33";
     doCheck = false;
     propagatedBuildInputs = [
       self."six"
@@ -2238,8 +2243,8 b' self: super: {'
       self."beautifulsoup4"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/27/9f/9e74449d272ffbef4fb3012e6dbc53c0b24822d545e7a33a342f80131e59/WebTest-2.0.32.tar.gz";
-      sha256 = "0qp0nnbazzm4ibjiyqfcn6f230svk09i4g58zg2i9x1ga06h48a2";
+      url = "https://files.pythonhosted.org/packages/a8/b0/ffc9413b637dbe26e291429bb0f6ed731e518d0cd03da28524a8fe2e8a8f/WebTest-2.0.33.tar.gz";
+      sha256 = "1l3z0cwqslsf4rcrhi2gr8kdfh74wn2dw76376i4g9i38gz8wd21";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -2293,42 +2298,42 b' self: super: {'
     };
   };
   "zope.deprecation" = super.buildPythonPackage {
-    name = "zope.deprecation-4.3.0";
+    name = "zope.deprecation-4.4.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/a1/18/2dc5e6bfe64fdc3b79411b67464c55bb0b43b127051a20f7f492ab767758/zope.deprecation-4.3.0.tar.gz";
-      sha256 = "095jas41wbxgmw95kwdxqhbc3bgihw2hzj9b3qpdg85apcsf2lkx";
+      url = "https://files.pythonhosted.org/packages/34/da/46e92d32d545dd067b9436279d84c339e8b16de2ca393d7b892bc1e1e9fd/zope.deprecation-4.4.0.tar.gz";
+      sha256 = "1pz2cv7gv9y1r3m0bdv7ks1alagmrn5msm5spwdzkb2by0w36i8d";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
   "zope.event" = super.buildPythonPackage {
-    name = "zope.event-4.3.0";
+    name = "zope.event-4.4";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/9e/d0/54ba59f19a0635f6591b74be259cf6fbf67e73f4edda27b5cd0cf4d26efa/zope.event-4.3.0.tar.gz";
-      sha256 = "1rrkyx42bcq8dkpj23c2v99kczlrg8d39c06q5qpr0vs4hjfmv70";
+      url = "https://files.pythonhosted.org/packages/4c/b2/51c0369adcf5be2334280eed230192ab3b03f81f8efda9ddea6f65cc7b32/zope.event-4.4.tar.gz";
+      sha256 = "1ksbc726av9xacml6jhcfyn828hlhb9xlddpx6fcvnlvmpmpvhk9";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];
     };
   };
   "zope.interface" = super.buildPythonPackage {
-    name = "zope.interface-4.5.0";
+    name = "zope.interface-4.6.0";
     doCheck = false;
     propagatedBuildInputs = [
       self."setuptools"
     ];
     src = fetchurl {
-      url = "https://files.pythonhosted.org/packages/ac/8a/657532df378c2cd2a1fe6b12be3b4097521570769d4852ec02c24bd3594e/zope.interface-4.5.0.tar.gz";
-      sha256 = "0k67m60ij06wkg82n15qgyn96waf4pmrkhv0njpkfzpmv5q89hsp";
+      url = "https://files.pythonhosted.org/packages/4e/d0/c9d16bd5b38de44a20c6dc5d5ed80a49626fafcb3db9f9efdc2a19026db6/zope.interface-4.6.0.tar.gz";
+      sha256 = "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v";
     };
     meta = {
       license = [ pkgs.lib.licenses.zpl21 ];

requirements.txt

@@ -1,37 +1,31 b''
 ## dependencies
 
-setuptools-scm==2.1.0
 amqp==2.3.1
 # not released authomatic that has updated some oauth providers
-https://code.rhodecode.com/upstream/authomatic/archive/90a9ce60cc405ae8a2bf5c3713acd5d78579a04e.tar.gz?md5=3c68720a1322b25254009518d1ff6801#egg=authomatic==0.1.0.post1
-atomicwrites==1.2.1
-attrs==18.2.0
+https://code.rhodecode.com/upstream/authomatic/artifacts/download/0-4fe9c041-a567-4f84-be4c-7efa2a606d3c.tar.gz?md5=f6bdc3c769688212db68233e8d2b0383#egg=authomatic==0.1.0.post1
+
 babel==1.3
 beaker==1.9.1
-bleach==3.0.2
+bleach==3.1.0
 celery==4.1.1
-chameleon==2.24
 channelstream==0.5.2
 click==7.0
-colander==1.5.1
+colander==1.7.0
 # our custom configobj
-https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6
+https://code.rhodecode.com/upstream/configobj/artifacts/download/0-012de99a-b1e1-4f64-a5c0-07a98a41b324.tar.gz?md5=6a513f51fe04b2c18cf84c1395a7c626#egg=configobj==5.0.6
 cssselect==1.0.3
+cryptography==2.6.1
 decorator==4.1.2
 deform==2.0.7
 docutils==0.14.0
 dogpile.cache==0.7.1
 dogpile.core==0.4.1
-ecdsa==0.13
 formencode==1.2.4
 future==0.14.3
 futures==3.0.2
-gnureadline==6.3.8
 infrae.cache==1.0.1
 iso8601==0.1.12
 itsdangerous==0.24
-jinja2==2.9.6
-billiard==3.5.0.3
 kombu==4.2.1
 lxml==4.2.5
 mako==1.0.7
@@ -40,23 +34,20 b' markupsafe==1.1.0'
 msgpack-python==0.5.6
 pyotp==2.2.7
 packaging==15.2
-paste==3.0.5
+pathlib2==2.3.4
+paste==3.0.8
 pastedeploy==2.0.1
-pastescript==3.0.0
-pathlib2==2.3.3
+pastescript==3.1.0
 peppercorn==0.6
-psutil==5.4.8
+psutil==5.5.1
 py-bcrypt==0.4
-pycrypto==2.6.1
 pycurl==7.43.0.2
-pyflakes==0.8.1
-pygments==2.3.1
+pycrypto==2.6.1
+pygments==2.4.2
 pyparsing==2.3.0
-pyramid-beaker==0.8
 pyramid-debugtoolbar==4.5.0
-pyramid-jinja2==2.7
 pyramid-mako==1.0.2
-pyramid==1.10.1
+pyramid==1.10.4
 pyramid_mailer==0.15.1
 python-dateutil
 python-ldap==3.1.0
@@ -74,10 +65,9 b' routes==2.4.1'
 simplejson==3.16.0
 six==1.11.0
 sqlalchemy==1.1.18
-sshpubkeys==2.2.0
-subprocess32==3.5.3
-supervisor==3.3.5
-tempita==0.5.2
+sshpubkeys==3.1.0
+subprocess32==3.5.4
+supervisor==4.0.3
 translationstring==1.3
 urllib3==1.24.1
 urlobject==2.4.3
@@ -85,29 +75,29 b' venusian==1.2.0'
 weberror==0.10.3
 webhelpers2==2.0
 webhelpers==1.3
-webob==1.8.4
+webob==1.8.5
 whoosh==2.7.4
 wsgiref==0.1.2
 zope.cachedescriptors==4.3.1
-zope.deprecation==4.3.0
-zope.event==4.3.0
-zope.interface==4.5.0
+zope.deprecation==4.4.0
+zope.event==4.4.0
+zope.interface==4.6.0
 
 # DB drivers
 mysql-python==1.2.5
 pymysql==0.8.1
 pysqlite==2.8.3
-psycopg2==2.7.5
+psycopg2==2.8.3
 
 # IPYTHON RENDERING
 # entrypoints backport, pypi version doesn't support egg installs
-https://code.rhodecode.com/upstream/entrypoints/archive/96e6d645684e1af3d7df5b5272f3fe85a546b233.tar.gz?md5=7db37771aea9ac9fefe093e5d6987313#egg=entrypoints==0.2.2.rhodecode-upstream1
+https://code.rhodecode.com/upstream/entrypoints/artifacts/download/0-8e9ee9e4-c4db-409c-b07e-81568fd1832d.tar.gz?md5=3a027b8ff1d257b91fe257de6c43357d#egg=entrypoints==0.2.2.rhodecode-upstream1
 nbconvert==5.3.1
 nbformat==4.4.0
 jupyter_client==5.0.0
 
 ## cli tools
-alembic==1.0.5
+alembic==1.0.10
 invoke==0.13.0
 bumpversion==0.5.3
 
@@ -115,15 +105,14 b' bumpversion==0.5.3'
 gevent==1.4.0
 greenlet==0.4.15
 gunicorn==19.9.0
-waitress==1.1.0
-setproctitle==1.1.10
+waitress==1.3.0
 
 ## debug
-ipdb==0.11.0
+ipdb==0.12.0
 ipython==5.1.0
 
 ## rhodecode-tools, special case
-https://code.rhodecode.com/rhodecode-tools-ce/archive/v1.2.1.tar.gz?md5=25bc2f7de1da318e547236d3fb463d28#egg=rhodecode-tools==1.2.1
+https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-10ac93f4-bb7d-4b97-baea-68110743dd5a.tar.gz?md5=962dc77c06aceee62282b98d33149661#egg=rhodecode-tools==1.2.1
 
 ## appenlight
 appenlight-client==0.6.26

requirements_test.txt

@@ -10,7 +10,7 b' gprof2dot==2017.9.19'
 
 mock==1.0.1
 cov-core==1.15.0
-coverage==4.5.1
+coverage==4.5.3
 
-webtest==2.0.32
+webtest==2.0.33
 beautifulsoup4==4.6.3

rhodecode/VERSION

@@ -1,1 +1,1 b''
-4.16.2
  No newline at end of file
+4.17.0
  No newline at end of file

rhodecode/__init__.py

@@ -45,7 +45,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 95  # defines current db version for migrations
+__dbversion__ = 98  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/tests/test_comment_commit.py

@@ -37,11 +37,11 b' class TestCommentCommit(object):'
         assert_error(id_, expected, given=response.body)
 
     @pytest.mark.parametrize("commit_id, expected_err", [
-        ('abcabca', {'hg': 'Commit {commit} does not exist for {repo}',
-                     'git': 'Commit {commit} does not exist for {repo}',
+        ('abcabca', {'hg': 'Commit {commit} does not exist for `{repo}`',
+                     'git': 'Commit {commit} does not exist for `{repo}`',
                      'svn': 'Commit id {commit} not understood.'}),
-        ('idontexist', {'hg': 'Commit {commit} does not exist for {repo}',
-                        'git': 'Commit {commit} does not exist for {repo}',
+        ('idontexist', {'hg': 'Commit {commit} does not exist for `{repo}`',
+                        'git': 'Commit {commit} does not exist for `{repo}`',
                         'svn': 'Commit id {commit} not understood.'}),
     ])
     def test_api_comment_commit_wrong_hash(self, backend, commit_id, expected_err):
@@ -53,7 +53,7 b' class TestCommentCommit(object):'
 
         expected_err = expected_err[backend.alias]
         expected_err = expected_err.format(
-            repo=backend.repo.scm_instance(), commit=commit_id)
+            repo=backend.repo.scm_instance().name, commit=commit_id)
         assert_error(id_, expected_err, given=response.body)
 
     @pytest.mark.parametrize("status_change, message, commit_id", [

rhodecode/api/tests/test_get_repo.py

@@ -44,6 +44,7 b' class TestGetRepo(object):'
             self, apikey_attr, expect_secrets, cache_param, backend,
             user_util):
         repo = backend.create_repo()
+        repo_id = repo.repo_id
         usr = UserModel().get_by_username(TEST_USER_ADMIN_LOGIN)
         group = user_util.create_user_group(members=[usr])
         user_util.grant_user_group_permission_to_repo(
@@ -64,6 +65,8 b' class TestGetRepo(object):'
         permissions = expected_permissions(repo)
 
         followers = []
+
+        repo = RepoModel().get(repo_id)
         for user in repo.followers:
             followers.append(user.user.get_api_data(
                 include_secrets=expect_secrets))
@@ -84,6 +87,7 b' class TestGetRepo(object):'
         # TODO: Depending on which tests are running before this one, we
         # start with a different number of permissions in the database.
         repo = RepoModel().get_by_repo_name(backend.repo_name)
+        repo_id = repo.repo_id
         permission_count = len(repo.repo_to_perm)
 
         RepoModel().grant_user_permission(repo=backend.repo_name,
@@ -102,6 +106,8 b' class TestGetRepo(object):'
         permissions = expected_permissions(repo)
 
         followers = []
+
+        repo = RepoModel().get(repo_id)
         for user in repo.followers:
             followers.append(user.user.get_api_data())
 

rhodecode/api/views/repo_api.py

@@ -444,7 +444,7 b' def get_repo_nodes(request, apiuser, rep'
         result: [
                     {
                       "binary": false,
-                      "content": "File line\nLine2\n",
+                      "content": "File line",
                       "extension": "md",
                       "lines": 2,
                       "md5": "059fa5d29b19c0657e384749480f6422",
@@ -529,6 +529,7 b' def get_repo_file(request, apiuser, repo'
     :param cache: Use internal caches for fetching files. If disabled fetching
         files is slower but more memory efficient
     :type cache: Optional(bool)
+
     Example output:
 
     .. code-block:: bash

rhodecode/apps/_base/__init__.py

@@ -168,6 +168,28 b' class BaseAppView(object):'
             from rhodecode.lib.base import attach_context_attributes
             attach_context_attributes(c, self.request, self.request.user.user_id)
 
+        c.is_super_admin = c.auth_user.is_admin
+
+        c.can_create_repo = c.is_super_admin
+        c.can_create_repo_group = c.is_super_admin
+        c.can_create_user_group = c.is_super_admin
+
+        c.is_delegated_admin = False
+
+        if not c.auth_user.is_default and not c.is_super_admin:
+            c.can_create_repo = h.HasPermissionAny('hg.create.repository')(
+                user=self.request.user)
+            repositories = c.auth_user.repositories_admin or c.can_create_repo
+
+            c.can_create_repo_group = h.HasPermissionAny('hg.repogroup.create.true')(
+                user=self.request.user)
+            repository_groups = c.auth_user.repository_groups_admin or c.can_create_repo_group
+
+            c.can_create_user_group = h.HasPermissionAny('hg.usergroup.create.true')(
+                user=self.request.user)
+            user_groups = c.auth_user.user_groups_admin or c.can_create_user_group
+            # delegated admin can create, or manage some objects
+            c.is_delegated_admin = repositories or repository_groups or user_groups
         return c
 
     def _get_template_context(self, tmpl_args, **kwargs):
@@ -215,12 +237,17 b' class RepoAppView(BaseAppView):'
         c.rhodecode_db_repo = self.db_repo
         c.repo_name = self.db_repo_name
         c.repository_pull_requests = self.db_repo_pull_requests
+        c.repository_is_user_following = ScmModel().is_following_repo(
+            self.db_repo_name, self._rhodecode_user.user_id)
         self.path_filter = PathFilter(None)
 
         c.repository_requirements_missing = {}
         try:
             self.rhodecode_vcs_repo = self.db_repo.scm_instance()
-            if self.rhodecode_vcs_repo:
+            # NOTE(marcink):
+            # comparison to None since if it's an object __bool__ is expensive to
+            # calculate
+            if self.rhodecode_vcs_repo is not None:
                 path_perms = self.rhodecode_vcs_repo.get_path_permissions(
                     c.auth_user.username)
                 self.path_filter = PathFilter(path_perms)

rhodecode/apps/_base/navigation.py

@@ -85,8 +85,6 b' class NavigationRegistry(object):'
                  'admin_settings_hooks'),
         NavEntry('search', _('Full Text Search'),
                  'admin_settings_search'),
-        NavEntry('integrations', _('Integrations'),
-                 'global_integrations_home'),
         NavEntry('system', _('System Info'),
                  'admin_settings_system'),
         NavEntry('exceptions', _('Exceptions Tracker'),

rhodecode/apps/admin/__init__.py

@@ -424,6 +424,10 b' def admin_routes(config):'
         pattern='/repo_groups')
 
     config.add_route(
+        name='repo_groups_data',
+        pattern='/repo_groups_data')
+
+    config.add_route(
         name='repo_group_new',
         pattern='/repo_group/new')
 

rhodecode/apps/admin/tests/test_admin_main_views.py

@@ -46,10 +46,10 b' def route_path(name, params=None, **kwar'
 
 class TestAdminMainView(TestController):
 
-    def test_redirect_admin_home(self):
+    def test_access_admin_home(self):
         self.log_user()
-        response = self.app.get(route_path('admin_home'), status=302)
-        assert response.location.endswith('/audit_logs')
+        response = self.app.get(route_path('admin_home'), status=200)
+        response.mustcontain("Administration area")
 
     def test_redirect_pull_request_view(self, view):
         self.log_user()

rhodecode/apps/admin/tests/test_admin_repository_groups.py

@@ -23,11 +23,11 b' import pytest'
 
 from rhodecode.apps._base import ADMIN_PREFIX
 from rhodecode.lib import helpers as h
-from rhodecode.model.db import Repository, UserRepoToPerm, User
+from rhodecode.model.db import Repository, UserRepoToPerm, User, RepoGroup
 from rhodecode.model.meta import Session
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.tests import (
-    assert_session_flash, TEST_USER_REGULAR_LOGIN, TESTS_TMP_PATH, TestController)
+    assert_session_flash, TEST_USER_REGULAR_LOGIN, TESTS_TMP_PATH)
 from rhodecode.tests.fixture import Fixture
 
 fixture = Fixture()
@@ -38,6 +38,7 b' def route_path(name, params=None, **kwar'
 
     base_url = {
         'repo_groups': ADMIN_PREFIX + '/repo_groups',
+        'repo_groups_data': ADMIN_PREFIX + '/repo_groups_data',
         'repo_group_new': ADMIN_PREFIX + '/repo_group/new',
         'repo_group_create': ADMIN_PREFIX + '/repo_group/create',
 
@@ -59,13 +60,30 b' def _get_permission_for_user(user, repo)'
 
 @pytest.mark.usefixtures("app")
 class TestAdminRepositoryGroups(object):
+
     def test_show_repo_groups(self, autologin_user):
-        response = self.app.get(route_path('repo_groups'))
-        response.mustcontain('data: []')
+        self.app.get(route_path('repo_groups'))
+
+    def test_show_repo_groups_data(self, autologin_user, xhr_header):
+        response = self.app.get(route_path(
+            'repo_groups_data'), extra_environ=xhr_header)
+
+        all_repo_groups = RepoGroup.query().count()
+        assert response.json['recordsTotal'] == all_repo_groups
 
-    def test_show_repo_groups_after_creating_group(self, autologin_user):
+    def test_show_repo_groups_data_filtered(self, autologin_user, xhr_header):
+        response = self.app.get(route_path(
+            'repo_groups_data', params={'search[value]': 'empty_search'}),
+            extra_environ=xhr_header)
+
+        all_repo_groups = RepoGroup.query().count()
+        assert response.json['recordsTotal'] == all_repo_groups
+        assert response.json['recordsFiltered'] == 0
+
+    def test_show_repo_groups_after_creating_group(self, autologin_user, xhr_header):
         fixture.create_repo_group('test_repo_group')
-        response = self.app.get(route_path('repo_groups'))
+        response = self.app.get(route_path(
+            'repo_groups_data'), extra_environ=xhr_header)
         response.mustcontain('"name_raw": "test_repo_group"')
         fixture.destroy_repo_group('test_repo_group')
 

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -214,8 +214,7 b' class TestAdminSettingsGlobal(object):'
             })
 
             response = response.follow()
-            response.mustcontain(
-                """<div class="branding">- %s</div>""" % new_title)
+            response.mustcontain(new_title)
 
     def post_and_verify_settings(self, settings):
         old_title = 'RhodeCode'

rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py

@@ -173,4 +173,4 b' class TestAdminUsersSshKeysView(TestCont'
 
         response.mustcontain('Private key')
         response.mustcontain('Public key')
-        response.mustcontain('-----BEGIN RSA PRIVATE KEY-----')
+        response.mustcontain('-----BEGIN PRIVATE KEY-----')

rhodecode/apps/admin/views/exception_tracker.py

@@ -50,7 +50,7 b' class ExceptionsTrackerView(BaseAppView)'
             count +=1
         return count
 
-    def get_all_exceptions(self, read_metadata=False, limit=None):
+    def get_all_exceptions(self, read_metadata=False, limit=None, type_filter=None):
         exc_store_path = exc_tracking.get_exc_store()
         exception_list = []
 
@@ -59,7 +59,7 b' class ExceptionsTrackerView(BaseAppView)'
                 return val.split('_')[-1]
             except Exception:
                 return 0
-        count = 0
+
         for fname in reversed(sorted(os.listdir(exc_store_path), key=key_sorter)):
 
             parts = fname.split('_', 2)
@@ -83,13 +83,17 b' class ExceptionsTrackerView(BaseAppView)'
                 except Exception:
                     log.exception('Failed to read exc data from:{}'.format(full_path))
                     pass
-
             # convert our timestamp to a date obj, for nicer representation
             exc['exc_utc_date'] = time_to_utcdatetime(exc['exc_timestamp'])
+
+            type_present = exc.get('exc_type')
+            if type_filter:
+                if type_present and type_present == type_filter:
+                    exception_list.append(exc)
+            else:
             exception_list.append(exc)
 
-            count += 1
-            if limit and count >= limit:
+            if limit and len(exception_list) >= limit:
                 break
         return exception_list
 
@@ -103,8 +107,10 b' class ExceptionsTrackerView(BaseAppView)'
         c = self.load_default_context()
         c.active = 'exceptions_browse'
         c.limit = safe_int(self.request.GET.get('limit')) or 50
+        c.type_filter = self.request.GET.get('type_filter')
         c.next_limit = c.limit + 50
-        c.exception_list = self.get_all_exceptions(read_metadata=True, limit=c.limit)
+        c.exception_list = self.get_all_exceptions(
+            read_metadata=True, limit=c.limit, type_filter=c.type_filter)
         c.exception_list_count = self.count_all_exceptions()
         c.exception_store_dir = exc_tracking.get_exc_store()
         return self._get_template_context(c)
@@ -132,12 +138,20 b' class ExceptionsTrackerView(BaseAppView)'
     def exception_delete_all(self):
         _ = self.request.translate
         c = self.load_default_context()
+        type_filter = self.request.POST.get('type_filter')
 
         c.active = 'exceptions'
-        all_exc = self.get_all_exceptions()
-        exc_count = len(all_exc)
+        all_exc = self.get_all_exceptions(read_metadata=bool(type_filter), type_filter=type_filter)
+        exc_count = 0
+
         for exc in all_exc:
+            if type_filter:
+                if exc.get('exc_type') == type_filter:
             exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+                    exc_count += 1
+            else:
+                exc_tracking.delete_exception(exc['exc_id'], prefix=None)
+                exc_count += 1
 
         h.flash(_('Removed {} Exceptions').format(exc_count), category='success')
         raise HTTPFound(h.route_path('admin_settings_exception_tracker'))

rhodecode/apps/admin/views/main_views.py

@@ -20,12 +20,12 b''
 
 import logging
 
-from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
-from rhodecode.lib.auth import (LoginRequired, HasPermissionAllDecorator)
+from rhodecode.lib.auth import (LoginRequired, NotAnonymous)
 from rhodecode.model.db import PullRequest
 
 
@@ -33,14 +33,23 b' log = logging.getLogger(__name__)'
 
 
 class AdminMainView(BaseAppView):
+    def load_default_context(self):
+        c = self._get_local_tmpl_context()
+        return c
 
     @LoginRequired()
-    @HasPermissionAllDecorator('hg.admin')
+    @NotAnonymous()
     @view_config(
-        route_name='admin_home', request_method='GET')
+        route_name='admin_home', request_method='GET',
+        renderer='rhodecode:templates/admin/main.mako')
     def admin_main(self):
-        # redirect _admin to audit logs...
-        raise HTTPFound(h.route_path('admin_audit_logs'))
+        c = self.load_default_context()
+        c.active = 'admin'
+
+        if not (c.is_super_admin or c.is_delegated_admin):
+            raise HTTPNotFound()
+
+        return self._get_template_context(c)
 
     @LoginRequired()
     @view_config(route_name='pull_requests_global_0', request_method='GET')
@@ -49,8 +58,7 b' class AdminMainView(BaseAppView):'
     def pull_requests(self):
         """
         Global redirect for Pull Requests
-
-        :param pull_request_id: id of pull requests in the system
+        pull_request_id: id of pull requests in the system
         """
 
         pull_request = PullRequest.get_or_404(

rhodecode/apps/admin/views/repo_groups.py

@@ -17,7 +17,7 b''
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
-
+import datetime
 import logging
 import formencode
 import formencode.htmlfill
@@ -30,16 +30,16 b' from pyramid.response import Response'
 from rhodecode import events
 from rhodecode.apps._base import BaseAppView, DataGridAppView
 
-from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, CSRFRequired, NotAnonymous,
     HasPermissionAny, HasRepoGroupPermissionAny)
 from rhodecode.lib import helpers as h, audit_logger
-from rhodecode.lib.utils2 import safe_int, safe_unicode
+from rhodecode.lib.utils2 import safe_int, safe_unicode, datetime_to_time
 from rhodecode.model.forms import RepoGroupForm
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList
-from rhodecode.model.db import Session, RepoGroup
+from rhodecode.model.db import (
+    or_, count, func, in_filter_generator, Session, RepoGroup, User, Repository)
 
 log = logging.getLogger(__name__)
 
@@ -88,22 +88,168 b' class AdminRepoGroupsView(BaseAppView, D'
                 return False
         return False
 
+    # permission check in data loading of
+    # `repo_group_list_data` via RepoGroupList
     @LoginRequired()
     @NotAnonymous()
-    # perms check inside
     @view_config(
         route_name='repo_groups', request_method='GET',
         renderer='rhodecode:templates/admin/repo_groups/repo_groups.mako')
     def repo_group_list(self):
         c = self.load_default_context()
+        return self._get_template_context(c)
 
-        repo_group_list = RepoGroup.get_all_repo_groups()
-        repo_group_list_acl = RepoGroupList(
-            repo_group_list, perm_set=['group.admin'])
-        repo_group_data = RepoGroupModel().get_repo_groups_as_dict(
-            repo_group_list=repo_group_list_acl, admin=True)
-        c.data = json.dumps(repo_group_data)
-        return self._get_template_context(c)
+    # permission check inside
+    @LoginRequired()
+    @NotAnonymous()
+    @view_config(
+        route_name='repo_groups_data', request_method='GET',
+        renderer='json_ext', xhr=True)
+    def repo_group_list_data(self):
+        self.load_default_context()
+        column_map = {
+            'name_raw': 'group_name_hash',
+            'desc': 'group_description',
+            'last_change_raw': 'updated_on',
+            'top_level_repos': 'repos_total',
+            'owner': 'user_username',
+        }
+        draw, start, limit = self._extract_chunk(self.request)
+        search_q, order_by, order_dir = self._extract_ordering(
+            self.request, column_map=column_map)
+
+        _render = self.request.get_partial_renderer(
+            'rhodecode:templates/data_table/_dt_elements.mako')
+        c = _render.get_call_context()
+
+        def quick_menu(repo_group_name):
+            return _render('quick_repo_group_menu', repo_group_name)
+
+        def repo_group_lnk(repo_group_name):
+            return _render('repo_group_name', repo_group_name)
+
+        def last_change(last_change):
+            if isinstance(last_change, datetime.datetime) and not last_change.tzinfo:
+                delta = datetime.timedelta(
+                    seconds=(datetime.datetime.now() - datetime.datetime.utcnow()).seconds)
+                last_change = last_change + delta
+            return _render("last_change", last_change)
+
+        def desc(desc, personal):
+            return _render(
+                'repo_group_desc', desc, personal, c.visual.stylify_metatags)
+
+        def repo_group_actions(repo_group_id, repo_group_name, gr_count):
+            return _render(
+                'repo_group_actions', repo_group_id, repo_group_name, gr_count)
+
+        def user_profile(username):
+            return _render('user_profile', username)
+
+        auth_repo_group_list = RepoGroupList(
+            RepoGroup.query().all(), perm_set=['group.admin'])
+
+        allowed_ids = [-1]
+        for repo_group in auth_repo_group_list:
+                allowed_ids.append(repo_group.group_id)
+
+        repo_groups_data_total_count = RepoGroup.query()\
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(RepoGroup.group_id, allowed_ids)
+            )) \
+            .count()
+
+        repo_groups_data_total_inactive_count = RepoGroup.query()\
+            .filter(RepoGroup.group_id.in_(allowed_ids))\
+            .count()
+
+        repo_count = count(Repository.repo_id)
+        base_q = Session.query(
+            RepoGroup.group_name,
+            RepoGroup.group_name_hash,
+            RepoGroup.group_description,
+            RepoGroup.group_id,
+            RepoGroup.personal,
+            RepoGroup.updated_on,
+            User,
+            repo_count.label('repos_count')
+            ) \
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(RepoGroup.group_id, allowed_ids)
+            )) \
+            .outerjoin(Repository) \
+            .join(User, User.user_id == RepoGroup.user_id) \
+            .group_by(RepoGroup, User)
+
+        if search_q:
+            like_expression = u'%{}%'.format(safe_unicode(search_q))
+            base_q = base_q.filter(or_(
+                RepoGroup.group_name.ilike(like_expression),
+            ))
+
+        repo_groups_data_total_filtered_count = base_q.count()
+        # the inactive isn't really used, but we still make it same as other data grids
+        # which use inactive (users,user groups)
+        repo_groups_data_total_filtered_inactive_count = repo_groups_data_total_filtered_count
+
+        sort_defined = False
+        if order_by == 'group_name':
+            sort_col = func.lower(RepoGroup.group_name)
+            sort_defined = True
+        elif order_by == 'repos_total':
+            sort_col = repo_count
+            sort_defined = True
+        elif order_by == 'user_username':
+            sort_col = User.username
+        else:
+            sort_col = getattr(RepoGroup, order_by, None)
+
+        if sort_defined or sort_col:
+            if order_dir == 'asc':
+                sort_col = sort_col.asc()
+            else:
+                sort_col = sort_col.desc()
+
+        base_q = base_q.order_by(sort_col)
+        base_q = base_q.offset(start).limit(limit)
+
+        # authenticated access to user groups
+        auth_repo_group_list = base_q.all()
+
+        repo_groups_data = []
+        for repo_gr in auth_repo_group_list:
+            row = {
+                "menu": quick_menu(repo_gr.group_name),
+                "name": repo_group_lnk(repo_gr.group_name),
+                "name_raw": repo_gr.group_name,
+                "last_change": last_change(repo_gr.updated_on),
+                "last_change_raw": datetime_to_time(repo_gr.updated_on),
+
+                "last_changeset": "",
+                "last_changeset_raw": "",
+
+                "desc": desc(repo_gr.group_description, repo_gr.personal),
+                "owner": user_profile(repo_gr.User.username),
+                "top_level_repos": repo_gr.repos_count,
+                "action": repo_group_actions(
+                    repo_gr.group_id, repo_gr.group_name, repo_gr.repos_count),
+
+            }
+
+            repo_groups_data.append(row)
+
+        data = ({
+            'draw': draw,
+            'data': repo_groups_data,
+            'recordsTotal': repo_groups_data_total_count,
+            'recordsTotalInactive': repo_groups_data_total_inactive_count,
+            'recordsFiltered': repo_groups_data_total_filtered_count,
+            'recordsFilteredInactive': repo_groups_data_total_filtered_inactive_count,
+        })
+
+        return data
 
     @LoginRequired()
     @NotAnonymous()

rhodecode/apps/admin/views/user_groups.py

@@ -39,7 +39,7 b' from rhodecode.model.forms import UserGr'
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.scm import UserGroupList
 from rhodecode.model.db import (
-    or_, count, User, UserGroup, UserGroupMember)
+    or_, count, User, UserGroup, UserGroupMember, in_filter_generator)
 from rhodecode.model.meta import Session
 from rhodecode.model.user_group import UserGroupModel
 from rhodecode.model.db import true
@@ -107,11 +107,17 b' class AdminUserGroupsView(BaseAppView, D'
                 allowed_ids.append(user_group.users_group_id)
 
         user_groups_data_total_count = UserGroup.query()\
-            .filter(UserGroup.users_group_id.in_(allowed_ids))\
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(UserGroup.users_group_id, allowed_ids)
+            ))\
             .count()
 
         user_groups_data_total_inactive_count = UserGroup.query()\
-            .filter(UserGroup.users_group_id.in_(allowed_ids))\
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(UserGroup.users_group_id, allowed_ids)
+            ))\
             .filter(UserGroup.users_group_active != true()).count()
 
         member_count = count(UserGroupMember.user_id)
@@ -124,7 +130,10 b' class AdminUserGroupsView(BaseAppView, D'
             User,
             member_count.label('member_count')
         ) \
-        .filter(UserGroup.users_group_id.in_(allowed_ids)) \
+            .filter(or_(
+                # generate multiple IN to fix limitation problems
+                *in_filter_generator(UserGroup.users_group_id, allowed_ids)
+            )) \
         .outerjoin(UserGroupMember) \
         .join(User, User.user_id == UserGroup.user_id) \
         .group_by(UserGroup, User)
@@ -141,14 +150,16 b' class AdminUserGroupsView(BaseAppView, D'
         user_groups_data_total_filtered_count = base_q.count()
         user_groups_data_total_filtered_inactive_count = base_q_inactive.count()
 
+        sort_defined = False
         if order_by == 'members_total':
             sort_col = member_count
+            sort_defined = True
         elif order_by == 'user_username':
             sort_col = User.username
         else:
             sort_col = getattr(UserGroup, order_by, None)
 
-        if isinstance(sort_col, count) or sort_col:
+        if sort_defined or sort_col:
             if order_dir == 'asc':
                 sort_col = sort_col.asc()
             else:
@@ -162,7 +173,7 b' class AdminUserGroupsView(BaseAppView, D'
 
         user_groups_data = []
         for user_gr in auth_user_group_list:
-            user_groups_data.append({
+            row = {
                 "users_group_name": user_group_name(user_gr.users_group_name),
                 "name_raw": h.escape(user_gr.users_group_name),
                 "description": h.escape(user_gr.user_group_description),
@@ -175,7 +186,8 b' class AdminUserGroupsView(BaseAppView, D'
                 "owner": user_profile(user_gr.User.username),
                 "action": user_group_actions(
                     user_gr.users_group_id, user_gr.users_group_name)
-            })
+            }
+            user_groups_data.append(row)
 
         data = ({
             'draw': draw,

rhodecode/apps/admin/views/users.py

@@ -682,8 +682,7 b' class UsersView(UserAppView):'
         if personal_repo_group:
             raise HTTPFound(h.route_path('user_edit_advanced', user_id=user_id))
 
-        personal_repo_group_name = RepoGroupModel().get_personal_group_name(
-            c.user)
+        personal_repo_group_name = RepoGroupModel().get_personal_group_name(c.user)
         named_personal_group = RepoGroup.get_by_group_name(
             personal_repo_group_name)
         try:

rhodecode/apps/file_store/local_store.py

@@ -38,19 +38,18 b' class LocalFileStorage(object):'
         """
         Resolves a unique name and the correct path. If a filename
         for that path already exists then a numeric prefix with values > 0 will be
-        added, for example test.jpg -> test-1.jpg etc. initially file would have 0 prefix.
+        added, for example test.jpg -> 1-test.jpg etc. initially file would have 0 prefix.
 
         :param name: base name of file
         :param directory: absolute directory path
         """
 
-        basename, ext = os.path.splitext(name)
         counter = 0
         while True:
-            name = '%s-%d%s' % (basename, counter, ext)
+            name = '%d-%s' % (counter, name)
 
             # sub_store prefix to optimize disk usage, e.g some_path/ab/final_file
-            sub_store = cls._sub_store_from_filename(basename)
+            sub_store = cls._sub_store_from_filename(name)
             sub_store_path = os.path.join(directory, sub_store)
             if not os.path.exists(sub_store_path):
                 os.makedirs(sub_store_path)
@@ -209,3 +208,16 b' class LocalFileStorage(object):'
             filename = os.path.join(directory, filename)
 
         return filename, metadata
+
+    def get_metadata(self, filename):
+        """
+        Reads JSON stored metadata for a file
+
+        :param filename:
+        :return:
+        """
+        filename = self.store_path(filename)
+        filename_meta = filename + '.meta'
+
+        with open(filename_meta, "rb") as source_meta:
+            return json.loads(source_meta.read())

rhodecode/apps/file_store/tests/test_upload_file.py

@@ -21,6 +21,7 b' import os'
 import pytest
 
 from rhodecode.lib.ext_json import json
+from rhodecode.model.db import Session, FileStore
 from rhodecode.tests import TestController
 from rhodecode.apps.file_store import utils, config_keys
 
@@ -46,9 +47,12 b' class TestFileStoreViews(TestController)'
         ('abcde-0.exe', "1234567", True),
         ('abcde-0.jpg', "xxxxx", False),
     ])
-    def test_get_files_from_store(self, fid, content, exists, tmpdir):
-        self.log_user()
+    def test_get_files_from_store(self, fid, content, exists, tmpdir, user_util):
+        user = self.log_user()
+        user_id = user['user_id']
+        repo_id = user_util.create_repo().repo_id
         store_path = self.app._pyramid_settings[config_keys.store_path]
+        store_uid = fid
 
         if exists:
             status = 200
@@ -58,17 +62,28 b' class TestFileStoreViews(TestController)'
                 f.write(content)
 
             with open(filesystem_file, 'rb') as f:
-                fid, metadata = store.save_file(f, fid, extra_metadata={'filename': fid})
+                store_uid, metadata = store.save_file(f, fid, extra_metadata={'filename': fid})
+
+            entry = FileStore.create(
+                file_uid=store_uid, filename=metadata["filename"],
+                file_hash=metadata["sha256"], file_size=metadata["size"],
+                file_display_name='file_display_name',
+                file_description='repo artifact `{}`'.format(metadata["filename"]),
+                check_acl=True, user_id=user_id,
+                scope_repo_id=repo_id
+            )
+            Session().add(entry)
+            Session().commit()
 
         else:
             status = 404
 
-        response = self.app.get(route_path('download_file', fid=fid), status=status)
+        response = self.app.get(route_path('download_file', fid=store_uid), status=status)
 
         if exists:
             assert response.text == content
-            file_store_path = os.path.dirname(store.resolve_name(fid, store_path)[1])
-            metadata_file = os.path.join(file_store_path, fid + '.meta')
+            file_store_path = os.path.dirname(store.resolve_name(store_uid, store_path)[1])
+            metadata_file = os.path.join(file_store_path, store_uid + '.meta')
             assert os.path.exists(metadata_file)
             with open(metadata_file, 'rb') as f:
                 json_data = json.loads(f.read())

rhodecode/apps/file_store/utils.py

@@ -19,9 +19,10 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
-import os
 import uuid
 
+import pathlib2
+
 
 def get_file_storage(settings):
     from rhodecode.apps.file_store.local_store import LocalFileStorage
@@ -30,6 +31,11 b' def get_file_storage(settings):'
     return LocalFileStorage(base_path=store_path)
 
 
+def splitext(filename):
+    ext = ''.join(pathlib2.Path(filename).suffixes)
+    return filename, ext
+
+
 def uid_filename(filename, randomized=True):
     """
     Generates a randomized or stable (uuid) filename,
@@ -38,7 +44,8 b' def uid_filename(filename, randomized=Tr'
     :param filename: the original filename
     :param randomized: define if filename should be stable (sha1 based) or randomized
     """
-    _, ext = os.path.splitext(filename)
+
+    _, ext = splitext(filename)
     if randomized:
         uid = uuid.uuid4()
     else:

rhodecode/apps/file_store/views.py

@@ -30,7 +30,7 b' from rhodecode.apps.file_store.exception'
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
-from rhodecode.lib.auth import (CSRFRequired, NotAnonymous)
+from rhodecode.lib.auth import (CSRFRequired, NotAnonymous, HasRepoPermissionAny, HasRepoGroupPermissionAny)
 from rhodecode.model.db import Session, FileStore
 
 log = logging.getLogger(__name__)
@@ -68,7 +68,7 b' class FileStoreView(BaseAppView):'
                               'user_id': self._rhodecode_user.user_id,
                               'ip': self._rhodecode_user.ip_addr}}
         try:
-            store_fid, metadata = self.storage.save_file(
+            store_uid, metadata = self.storage.save_file(
                 file_obj.file, filename, extra_metadata=metadata)
         except FileNotAllowedException:
             return {'store_fid': None,
@@ -82,7 +82,7 b' class FileStoreView(BaseAppView):'
 
         try:
             entry = FileStore.create(
-                file_uid=store_fid, filename=metadata["filename"],
+                file_uid=store_uid, filename=metadata["filename"],
                 file_hash=metadata["sha256"], file_size=metadata["size"],
                 file_description='upload attachment',
                 check_acl=False, user_id=self._rhodecode_user.user_id
@@ -96,8 +96,8 b' class FileStoreView(BaseAppView):'
                     'access_path': None,
                     'error': 'File {} failed to store in DB.'.format(filename)}
 
-        return {'store_fid': store_fid,
-                'access_path': h.route_path('download_file', fid=store_fid)}
+        return {'store_fid': store_uid,
+                'access_path': h.route_path('download_file', fid=store_uid)}
 
     @view_config(route_name='download_file')
     def download_file(self):
@@ -109,6 +109,35 b' class FileStoreView(BaseAppView):'
             log.debug('File with FID:%s not found in the store', file_uid)
             raise HTTPNotFound()
 
+        db_obj = FileStore().query().filter(FileStore.file_uid == file_uid).scalar()
+        if not db_obj:
+            raise HTTPNotFound()
+
+        # private upload for user
+        if db_obj.check_acl and db_obj.scope_user_id:
+            user = db_obj.user
+            if self._rhodecode_db_user.user_id != user.user_id:
+                log.warning('Access to file store object forbidden')
+                raise HTTPNotFound()
+
+        # scoped to repository permissions
+        if db_obj.check_acl and db_obj.scope_repo_id:
+            repo = db_obj.repo
+            perm_set = ['repository.read', 'repository.write', 'repository.admin']
+            has_perm = HasRepoPermissionAny(*perm_set)(repo.repo_name, 'FileStore check')
+            if not has_perm:
+                log.warning('Access to file store object forbidden')
+                raise HTTPNotFound()
+
+        # scoped to repository group permissions
+        if db_obj.check_acl and db_obj.scope_repo_group_id:
+            repo_group = db_obj.repo_group
+            perm_set = ['group.read', 'group.write', 'group.admin']
+            has_perm = HasRepoGroupPermissionAny(*perm_set)(repo_group.group_name, 'FileStore check')
+            if not has_perm:
+                log.warning('Access to file store object forbidden')
+                raise HTTPNotFound()
+
         FileStore.bump_access_counter(file_uid)
 
         file_path = self.storage.store_path(file_uid)

rhodecode/apps/gist/views.py

@@ -25,7 +25,7 b' import formencode'
 import formencode.htmlfill
 import peppercorn
 
-from pyramid.httpexceptions import HTTPNotFound, HTTPFound
+from pyramid.httpexceptions import HTTPNotFound, HTTPFound, HTTPBadRequest
 from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
@@ -67,7 +67,6 b' class GistView(BaseAppView):'
             (Gist.ACL_LEVEL_PUBLIC, _("Can be accessed by anonymous users"))
         ]
 
-
         return c
 
     @LoginRequired()
@@ -296,6 +295,8 b' class GistView(BaseAppView):'
             response = Response(content)
             response.content_type = 'text/plain'
             return response
+        elif return_format:
+            raise HTTPBadRequest()
 
         return self._get_template_context(c)
 

rhodecode/apps/home/__init__.py

@@ -68,6 +68,10 b' def includeme(config):'
         pattern='/_markup_preview')
 
     config.add_route(
+        name='file_preview',
+        pattern='/_file_preview')
+
+    config.add_route(
         name='store_user_session_value',
         pattern='/_store_session_attr')
 

rhodecode/apps/home/views.py

@@ -27,13 +27,14 b' from pyramid.view import view_config'
 from rhodecode.apps._base import BaseAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import (
-    LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator,
-    CSRFRequired)
+    LoginRequired, NotAnonymous, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
+from rhodecode.lib.codeblocks import filenode_as_lines_tokens
 from rhodecode.lib.index import searcher_from_config
 from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int
 from rhodecode.lib.ext_json import json
+from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.model.db import (
-    func, true, or_, in_filter_generator, Repository, RepoGroup, User, UserGroup)
+    func, true, or_, case, in_filter_generator, Repository, RepoGroup, User, UserGroup)
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.scm import RepoGroupList, RepoList
@@ -105,21 +106,27 b' class HomeView(BaseAppView):'
 
         return {'suggestions': _user_groups}
 
-    def _get_repo_list(self, name_contains=None, repo_type=None, limit=20):
+    def _get_repo_list(self, name_contains=None, repo_type=None, repo_group_name='', limit=20):
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_acl_ids(
             ['repository.read', 'repository.write', 'repository.admin'],
             cache=False, name_filter=name_contains) or [-1]
 
         query = Repository.query()\
-            .order_by(func.length(Repository.repo_name))\
-            .order_by(Repository.repo_name)\
             .filter(Repository.archived.isnot(true()))\
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(Repository.repo_id, allowed_ids)
             ))
 
+        query = query.order_by(case(
+            [
+                (Repository.repo_name.startswith(repo_group_name), repo_group_name+'/'),
+            ],
+        ))
+        query = query.order_by(func.length(Repository.repo_name))
+        query = query.order_by(Repository.repo_name)
+
         if repo_type:
             query = query.filter(Repository.repo_type == repo_type)
 
@@ -145,20 +152,26 b' class HomeView(BaseAppView):'
             }
             for obj in acl_iter]
 
-    def _get_repo_group_list(self, name_contains=None, limit=20):
+    def _get_repo_group_list(self, name_contains=None, repo_group_name='', limit=20):
         org_query = name_contains
         allowed_ids = self._rhodecode_user.repo_group_acl_ids(
             ['group.read', 'group.write', 'group.admin'],
             cache=False, name_filter=name_contains) or [-1]
 
         query = RepoGroup.query()\
-            .order_by(func.length(RepoGroup.group_name))\
-            .order_by(RepoGroup.group_name) \
             .filter(or_(
                 # generate multiple IN to fix limitation problems
                 *in_filter_generator(RepoGroup.group_id, allowed_ids)
             ))
 
+        query = query.order_by(case(
+            [
+                (RepoGroup.group_name.startswith(repo_group_name), repo_group_name+'/'),
+            ],
+        ))
+        query = query.order_by(func.length(RepoGroup.group_name))
+        query = query.order_by(RepoGroup.group_name)
+
         if name_contains:
             ilike_expression = u'%{}%'.format(safe_unicode(name_contains))
             query = query.filter(
@@ -183,11 +196,17 b' class HomeView(BaseAppView):'
     def _get_user_list(self, name_contains=None, limit=20):
         org_query = name_contains
         if not name_contains:
-            return []
+            return [], False
 
-        name_contains = re.compile('(?:user:)(.+)').findall(name_contains)
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:user:[ ]?)(.+)').findall(name_contains)
         if len(name_contains) != 1:
-            return []
+            return [], False
+
         name_contains = name_contains[0]
 
         query = User.query()\
@@ -207,22 +226,28 b' class HomeView(BaseAppView):'
             {
                 'id': obj.user_id,
                 'value': org_query,
-                'value_display': obj.username,
+                'value_display': 'user: `{}`'.format(obj.username),
                 'type': 'user',
                 'icon_link': h.gravatar_url(obj.email, 30),
                 'url': h.route_path(
                     'user_profile', username=obj.username)
             }
-            for obj in acl_iter]
+            for obj in acl_iter], True
 
     def _get_user_groups_list(self, name_contains=None, limit=20):
         org_query = name_contains
         if not name_contains:
-            return []
+            return [], False
 
-        name_contains = re.compile('(?:user_group:)(.+)').findall(name_contains)
+        # TODO(marcink): should all logged in users be allowed to search others?
+        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
+        if not allowed_user_search:
+            return [], False
+
+        name_contains = re.compile('(?:user_group:[ ]?)(.+)').findall(name_contains)
         if len(name_contains) != 1:
-            return []
+            return [], False
+
         name_contains = name_contains[0]
 
         query = UserGroup.query()\
@@ -241,27 +266,34 b' class HomeView(BaseAppView):'
             {
                 'id': obj.users_group_id,
                 'value': org_query,
-                'value_display': obj.users_group_name,
+                'value_display': 'user_group: `{}`'.format(obj.users_group_name),
                 'type': 'user_group',
                 'url': h.route_path(
                     'user_group_profile', user_group_name=obj.users_group_name)
             }
-            for obj in acl_iter]
+            for obj in acl_iter], True
 
-    def _get_hash_commit_list(self, auth_user, searcher, query):
+    def _get_hash_commit_list(self, auth_user, searcher, query, repo=None, repo_group=None):
+        repo_name = repo_group_name = None
+        if repo:
+            repo_name = repo.repo_name
+        if repo_group:
+            repo_group_name = repo_group.group_name
+
         org_query = query
         if not query or len(query) < 3 or not searcher:
-            return []
+            return [], False
 
-        commit_hashes = re.compile('(?:commit:)([0-9a-f]{2,40})').findall(query)
+        commit_hashes = re.compile('(?:commit:[ ]?)([0-9a-f]{2,40})').findall(query)
 
         if len(commit_hashes) != 1:
-            return []
+            return [], False
+
         commit_hash = commit_hashes[0]
 
         result = searcher.search(
             'commit_id:{}*'.format(commit_hash), 'commit', auth_user,
-            raise_on_exc=False)
+            repo_name, repo_group_name, raise_on_exc=False)
 
         commits = []
         for entry in result['results']:
@@ -286,7 +318,55 b' class HomeView(BaseAppView):'
             }
 
             commits.append(commit_entry)
-        return commits
+        return commits, True
+
+    def _get_path_list(self, auth_user, searcher, query, repo=None, repo_group=None):
+        repo_name = repo_group_name = None
+        if repo:
+            repo_name = repo.repo_name
+        if repo_group:
+            repo_group_name = repo_group.group_name
+
+        org_query = query
+        if not query or len(query) < 3 or not searcher:
+            return [], False
+
+        paths_re = re.compile('(?:file:[ ]?)(.+)').findall(query)
+        if len(paths_re) != 1:
+            return [], False
+
+        file_path = paths_re[0]
+
+        search_path = searcher.escape_specials(file_path)
+        result = searcher.search(
+            'file.raw:*{}*'.format(search_path), 'path', auth_user,
+            repo_name, repo_group_name, raise_on_exc=False)
+
+        files = []
+        for entry in result['results']:
+            repo_data = {
+                'repository_id': entry.get('repository_id'),
+                'repository_type': entry.get('repo_type'),
+                'repository_name': entry.get('repository'),
+            }
+
+            file_entry = {
+                'id': entry['commit_id'],
+                'value': org_query,
+                'value_display': '`{}` file: {}'.format(
+                    entry['repository'], entry['file']),
+                'type': 'file',
+                'repo': entry['repository'],
+                'repo_data': repo_data,
+
+                'url': h.route_path(
+                    'repo_files',
+                    repo_name=entry['repository'], commit_id=entry['commit_id'],
+                    f_path=entry['file'])
+            }
+
+            files.append(file_entry)
+        return files, True
 
     @LoginRequired()
     @view_config(
@@ -363,36 +443,42 b' class HomeView(BaseAppView):'
             def query_modifier():
                 qry = query
                 return {'q': qry, 'type': 'content'}
-            label = u'File search for `{}` in this repository.'.format(query)
-            queries.append(
-                {
+
+            label = u'File search for `{}`'.format(h.escape(query))
+            file_qry = {
                     'id': -10,
                     'value': query,
                     'value_display': label,
                     'type': 'search',
+                'subtype': 'repo',
                     'url': h.route_path('search_repo',
                                         repo_name=repo_name,
                                         _query=query_modifier())
                 }
-            )
 
             # commits
             def query_modifier():
                 qry = query
                 return {'q': qry, 'type': 'commit'}
 
-            label = u'Commit search for `{}` in this repository.'.format(query)
-            queries.append(
-                {
+            label = u'Commit search for `{}`'.format(h.escape(query))
+            commit_qry = {
                     'id': -20,
                     'value': query,
                     'value_display': label,
                     'type': 'search',
+                'subtype': 'repo',
                     'url': h.route_path('search_repo',
                                         repo_name=repo_name,
                                         _query=query_modifier())
                 }
-            )
+
+            if repo_context in ['commit', 'commits']:
+                queries.extend([commit_qry, file_qry])
+            elif repo_context in ['files', 'summary']:
+                queries.extend([file_qry, commit_qry])
+            else:
+                queries.extend([commit_qry, file_qry])
 
         elif is_es_6 and repo_group_name:
             # files
@@ -400,37 +486,43 b' class HomeView(BaseAppView):'
                 qry = query
                 return {'q': qry, 'type': 'content'}
 
-            label = u'File search for `{}` in this repository group'.format(query)
-            queries.append(
-                {
+            label = u'File search for `{}`'.format(query)
+            file_qry = {
                     'id': -30,
                     'value': query,
                     'value_display': label,
                     'type': 'search',
+                'subtype': 'repo_group',
                     'url': h.route_path('search_repo_group',
                                         repo_group_name=repo_group_name,
                                         _query=query_modifier())
                 }
-            )
 
             # commits
             def query_modifier():
                 qry = query
                 return {'q': qry, 'type': 'commit'}
 
-            label = u'Commit search for `{}` in this repository group'.format(query)
-            queries.append(
-                {
+            label = u'Commit search for `{}`'.format(query)
+            commit_qry = {
                     'id': -40,
                     'value': query,
                     'value_display': label,
                     'type': 'search',
+                'subtype': 'repo_group',
                     'url': h.route_path('search_repo_group',
                                         repo_group_name=repo_group_name,
                                         _query=query_modifier())
                 }
-            )
 
+            if repo_context in ['commit', 'commits']:
+                queries.extend([commit_qry, file_qry])
+            elif repo_context in ['files', 'summary']:
+                queries.extend([file_qry, commit_qry])
+            else:
+                queries.extend([commit_qry, file_qry])
+
+        # Global, not scoped
         if not queries:
             queries.append(
                 {
@@ -438,6 +530,7 b' class HomeView(BaseAppView):'
                     'value': query,
                     'value_display': u'File search for: `{}`'.format(query),
                     'type': 'search',
+                    'subtype': 'global',
                     'url': h.route_path('search',
                                         _query={'q': query, 'type': 'content'})
                 })
@@ -447,6 +540,7 b' class HomeView(BaseAppView):'
                     'value': query,
                     'value_display': u'Commit search for: `{}`'.format(query),
                     'type': 'search',
+                    'subtype': 'global',
                     'url': h.route_path('search',
                                         _query={'q': query, 'type': 'commit'})
                 })
@@ -469,54 +563,107 b' class HomeView(BaseAppView):'
         if not query:
             return {'suggestions': res}
 
+        def no_match(name):
+            return {
+                'id': -1,
+                'value': "",
+                'value_display': name,
+                'type': 'text',
+                'url': ""
+            }
         searcher = searcher_from_config(self.request.registry.settings)
-        for _q in self._get_default_search_queries(self.request.GET, searcher, query):
-            res.append(_q)
+        has_specialized_search = False
 
+        # set repo context
+        repo = None
+        repo_id = safe_int(self.request.GET.get('search_context[repo_id]'))
+        if repo_id:
+            repo = Repository.get(repo_id)
+
+        # set group context
+        repo_group = None
         repo_group_id = safe_int(self.request.GET.get('search_context[repo_group_id]'))
         if repo_group_id:
             repo_group = RepoGroup.get(repo_group_id)
-            composed_hint = '{}/{}'.format(repo_group.group_name, query)
-            show_hint = not query.startswith(repo_group.group_name)
-            if repo_group and show_hint:
-                hint = u'Repository search inside: `{}`'.format(composed_hint)
-                res.append({
-                    'id': -1,
-                    'value': composed_hint,
-                    'value_display': hint,
-                    'type': 'hint',
-                    'url': ""
-                })
+        prefix_match = False
 
-        repo_groups = self._get_repo_group_list(query)
-        for serialized_repo_group in repo_groups:
-            res.append(serialized_repo_group)
-
-        repos = self._get_repo_list(query)
-        for serialized_repo in repos:
-            res.append(serialized_repo)
-
-        # TODO(marcink): should all logged in users be allowed to search others?
-        allowed_user_search = self._rhodecode_user.username != User.DEFAULT_USER
-        if allowed_user_search:
-            users = self._get_user_list(query)
+        # user: type search
+        if not prefix_match:
+            users, prefix_match = self._get_user_list(query)
+            if users:
+                has_specialized_search = True
             for serialized_user in users:
                 res.append(serialized_user)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching users found'))
 
-            user_groups = self._get_user_groups_list(query)
+        # user_group: type search
+        if not prefix_match:
+            user_groups, prefix_match = self._get_user_groups_list(query)
+            if user_groups:
+                has_specialized_search = True
             for serialized_user_group in user_groups:
                 res.append(serialized_user_group)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching user groups found'))
 
-        commits = self._get_hash_commit_list(c.auth_user, searcher, query)
+        # FTS commit: type search
+        if not prefix_match:
+            commits, prefix_match = self._get_hash_commit_list(
+                c.auth_user, searcher, query, repo, repo_group)
         if commits:
+                has_specialized_search = True
             unique_repos = collections.OrderedDict()
             for commit in commits:
                 repo_name = commit['repo']
                 unique_repos.setdefault(repo_name, []).append(commit)
 
-            for repo, commits in unique_repos.items():
+                for _repo, commits in unique_repos.items():
                 for commit in commits:
                     res.append(commit)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching commits found'))
+
+        # FTS file: type search
+        if not prefix_match:
+            paths, prefix_match = self._get_path_list(
+                c.auth_user, searcher, query, repo, repo_group)
+            if paths:
+                has_specialized_search = True
+                unique_repos = collections.OrderedDict()
+                for path in paths:
+                    repo_name = path['repo']
+                    unique_repos.setdefault(repo_name, []).append(path)
+
+                for repo, paths in unique_repos.items():
+                    for path in paths:
+                        res.append(path)
+            elif prefix_match:
+                has_specialized_search = True
+                res.append(no_match('No matching files found'))
+
+        # main suggestions
+        if not has_specialized_search:
+            repo_group_name = ''
+            if repo_group:
+                repo_group_name = repo_group.group_name
+
+            for _q in self._get_default_search_queries(self.request.GET, searcher, query):
+                res.append(_q)
+
+            repo_groups = self._get_repo_group_list(query, repo_group_name=repo_group_name)
+            for serialized_repo_group in repo_groups:
+                res.append(serialized_repo_group)
+
+            repos = self._get_repo_list(query, repo_group_name=repo_group_name)
+            for serialized_repo in repos:
+                res.append(serialized_repo)
+
+            if not repos and not repo_groups:
+                res.append(no_match('No matches found'))
 
         return {'suggestions': res}
 
@@ -564,8 +711,11 b' class HomeView(BaseAppView):'
     def repo_group_main_page(self):
         c = self.load_default_context()
         c.repo_group = self.request.db_repo_group
-        repo_data, repo_group_data = self._get_groups_and_repos(
-            c.repo_group.group_id)
+        repo_data, repo_group_data = self._get_groups_and_repos(c.repo_group.group_id)
+
+        # update every 5 min
+        if self.request.db_repo_group.last_commit_cache_update_diff > 60 * 5:
+            self.request.db_repo_group.update_commit_cache()
 
         # json used to render the grids
         c.repos_data = json.dumps(repo_data)
@@ -594,6 +744,34 b' class HomeView(BaseAppView):'
     @LoginRequired()
     @CSRFRequired()
     @view_config(
+        route_name='file_preview', request_method='POST',
+        renderer='string', xhr=True)
+    def file_preview(self):
+        # Technically a CSRF token is not needed as no state changes with this
+        # call. However, as this is a POST is better to have it, so automated
+        # tools don't flag it as potential CSRF.
+        # Post is required because the payload could be bigger than the maximum
+        # allowed by GET.
+
+        text = self.request.POST.get('text')
+        file_path = self.request.POST.get('file_path')
+
+        renderer = h.renderer_from_filename(file_path)
+
+        if renderer:
+            return h.render(text, renderer=renderer, mentions=True)
+        else:
+            self.load_default_context()
+            _render = self.request.get_partial_renderer(
+                'rhodecode:templates/files/file_content.mako')
+
+            lines = filenode_as_lines_tokens(FileNode(file_path, text))
+
+            return _render('render_lines', lines)
+
+    @LoginRequired()
+    @CSRFRequired()
+    @view_config(
         route_name='store_user_session_value', request_method='POST',
         renderer='string', xhr=True)
     def store_user_session_attr(self):
@@ -604,4 +782,4 b' class HomeView(BaseAppView):'
         if existing_value != val:
             self.request.session[key] = val
 
-        return 'stored:{}'.format(key)
+        return 'stored:{}:{}'.format(key, val)

rhodecode/apps/journal/views.py

@@ -31,12 +31,12 b' from pyramid.renderers import render'
 
 from rhodecode.apps._base import BaseAppView
 from rhodecode.model.db import (
-    or_, joinedload, UserLog, UserFollowing, User, UserApiKeys)
+    or_, joinedload, Repository, UserLog, UserFollowing, User, UserApiKeys)
 from rhodecode.model.meta import Session
 import rhodecode.lib.helpers as h
 from rhodecode.lib.helpers import Page
 from rhodecode.lib.user_log_filter import user_log_filter
-from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
+from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired, HasRepoPermissionAny
 from rhodecode.lib.utils2 import safe_int, AttributeDict, md5_safe
 from rhodecode.model.scm import ScmModel
 
@@ -153,7 +153,7 b' class JournalView(BaseAppView):'
             desc = action_extra()
             _url = h.route_url('home')
             if entry.repository is not None:
-                _url = h.route_url('repo_changelog',
+                _url = h.route_url('repo_commits',
                                    repo_name=entry.repository.repo_name)
 
             feed.add_item(
@@ -199,7 +199,7 b' class JournalView(BaseAppView):'
             desc = action_extra()
             _url = h.route_url('home')
             if entry.repository is not None:
-                _url = h.route_url('repo_changelog',
+                _url = h.route_url('repo_commits',
                                    repo_name=entry.repository.repo_name)
 
             feed.add_item(
@@ -297,18 +297,19 b' class JournalView(BaseAppView):'
         user_id = self.request.POST.get('follows_user_id')
         if user_id:
             try:
-                ScmModel().toggle_following_user(
-                    user_id, self._rhodecode_user.user_id)
+                ScmModel().toggle_following_user(user_id, self._rhodecode_user.user_id)
                 Session().commit()
                 return 'ok'
             except Exception:
                 raise HTTPBadRequest()
 
         repo_id = self.request.POST.get('follows_repo_id')
-        if repo_id:
+        repo = Repository.get_or_404(repo_id)
+        perm_set = ['repository.read', 'repository.write', 'repository.admin']
+        has_perm = HasRepoPermissionAny(*perm_set)(repo.repo_name, 'RepoWatch check')
+        if repo and has_perm:
             try:
-                ScmModel().toggle_following_repo(
-                    repo_id, self._rhodecode_user.user_id)
+                ScmModel().toggle_following_repo(repo_id, self._rhodecode_user.user_id)
                 Session().commit()
                 return 'ok'
             except Exception:

rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py

@@ -160,4 +160,4 b' class TestMyAccountSshKeysView(TestContr'
 
         response.mustcontain('Private key')
         response.mustcontain('Public key')
-        response.mustcontain('-----BEGIN RSA PRIVATE KEY-----')
+        response.mustcontain('-----BEGIN PRIVATE KEY-----')

rhodecode/apps/my_account/views/my_account.py

@@ -360,7 +360,7 b' class MyAccountView(BaseAppView, DataGri'
                 'repository.read', 'repository.write', 'repository.admin'])
 
         repos_data = RepoModel().get_repos_as_dict(
-            repo_list=repo_list, admin=admin)
+            repo_list=repo_list, admin=admin, short_name=False)
         # json used to render the grid
         return json.dumps(repos_data)
 
@@ -423,7 +423,7 b' class MyAccountView(BaseAppView, DataGri'
         default_redirect_url = ''
 
         # save repo
-        if entry.get('bookmark_repo'):
+        if entry.get('bookmark_repo') and safe_int(entry.get('bookmark_repo')):
             repo = Repository.get(entry['bookmark_repo'])
             perm_check = HasRepoPermissionAny(
                 'repository.read', 'repository.write', 'repository.admin')
@@ -432,7 +432,7 b' class MyAccountView(BaseAppView, DataGri'
                 should_save = True
                 default_redirect_url = '${repo_url}'
         # save repo group
-        elif entry.get('bookmark_repo_group'):
+        elif entry.get('bookmark_repo_group') and safe_int(entry.get('bookmark_repo_group')):
             repo_group = RepoGroup.get(entry['bookmark_repo_group'])
             perm_check = HasRepoGroupPermissionAny(
                 'group.read', 'group.write', 'group.admin')
@@ -496,6 +496,7 b' class MyAccountView(BaseAppView, DataGri'
         if not user_bookmark:
             raise HTTPFound(redirect_url)
 
+        # repository set
         if user_bookmark.repository:
             repo_name = user_bookmark.repository.repo_name
             base_redirect_url = h.route_path(
@@ -506,7 +507,7 b' class MyAccountView(BaseAppView, DataGri'
                     .safe_substitute({'repo_url': base_redirect_url})
             else:
                 redirect_url = base_redirect_url
-
+        # repository group set
         elif user_bookmark.repository_group:
             repo_group_name = user_bookmark.repository_group.group_name
             base_redirect_url = h.route_path(
@@ -517,9 +518,11 b' class MyAccountView(BaseAppView, DataGri'
                     .safe_substitute({'repo_group_url': base_redirect_url})
             else:
                 redirect_url = base_redirect_url
-
+        # custom URL set
         elif user_bookmark.redirect_url:
-            redirect_url = user_bookmark.redirect_url
+            server_url = h.route_url('home').rstrip('/')
+            redirect_url = string.Template(user_bookmark.redirect_url) \
+                .safe_substitute({'server_url': server_url})
 
         log.debug('Redirecting bookmark %s to %s', user_bookmark, redirect_url)
         raise HTTPFound(redirect_url)

rhodecode/apps/repository/__init__.py

@@ -90,7 +90,7 b' def includeme(config):'
     # Files
     config.add_route(
         name='repo_archivefile',
-        pattern='/{repo_name:.*?[^/]}/archive/{fname}', repo_route=True)
+        pattern='/{repo_name:.*?[^/]}/archive/{fname:.*}', repo_route=True)
 
     config.add_route(
         name='repo_files_diff',
@@ -172,6 +172,10 b' def includeme(config):'
         pattern='/{repo_name:.*?[^/]}/add_file/{commit_id}/{f_path:.*}',
         repo_route=True)
     config.add_route(
+        name='repo_files_upload_file',
+        pattern='/{repo_name:.*?[^/]}/upload_file/{commit_id}/{f_path:.*}',
+        repo_route=True)
+    config.add_route(
         name='repo_files_create_file',
         pattern='/{repo_name:.*?[^/]}/create_file/{commit_id}/{f_path:.*}',
         repo_route=True)
@@ -189,19 +193,27 b' def includeme(config):'
         name='repo_stats',
         pattern='/{repo_name:.*?[^/]}/repo_stats/{commit_id}', repo_route=True)
 
-    # Changelog
+    # Commits
+    config.add_route(
+        name='repo_commits',
+        pattern='/{repo_name:.*?[^/]}/commits', repo_route=True)
+    config.add_route(
+        name='repo_commits_file',
+        pattern='/{repo_name:.*?[^/]}/commits/{commit_id}/{f_path:.*}', repo_route=True)
+    config.add_route(
+        name='repo_commits_elements',
+        pattern='/{repo_name:.*?[^/]}/commits_elements', repo_route=True)
+    config.add_route(
+        name='repo_commits_elements_file',
+        pattern='/{repo_name:.*?[^/]}/commits_elements/{commit_id}/{f_path:.*}', repo_route=True)
+
+    # Changelog (old deprecated name for commits page)
     config.add_route(
         name='repo_changelog',
         pattern='/{repo_name:.*?[^/]}/changelog', repo_route=True)
     config.add_route(
         name='repo_changelog_file',
         pattern='/{repo_name:.*?[^/]}/changelog/{commit_id}/{f_path:.*}', repo_route=True)
-    config.add_route(
-        name='repo_changelog_elements',
-        pattern='/{repo_name:.*?[^/]}/changelog_elements', repo_route=True)
-    config.add_route(
-        name='repo_changelog_elements_file',
-        pattern='/{repo_name:.*?[^/]}/changelog_elements/{commit_id}/{f_path:.*}', repo_route=True)
 
     # Compare
     config.add_route(
@@ -312,6 +324,11 b' def includeme(config):'
         pattern='/{repo_name:.*?[^/]}/pull-request/{pull_request_id:\d+}/comment/{comment_id}/delete',
         repo_route=True, repo_accepted_types=['hg', 'git'])
 
+    # Artifacts, (EE feature)
+    config.add_route(
+        name='repo_artifacts_list',
+        pattern='/{repo_name:.*?[^/]}/artifacts', repo_route=True)
+
     # Settings
     config.add_route(
         name='edit_repo',

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -40,11 +40,11 b' def route_path(name, params=None, **kwar'
 class TestPullRequestList(object):
 
     @pytest.mark.parametrize('params, expected_title', [
-        ({'source': 0, 'closed': 1}, 'Closed Pull Requests'),
-        ({'source': 0, 'my': 1}, 'opened by me'),
-        ({'source': 0, 'awaiting_review': 1}, 'awaiting review'),
-        ({'source': 0, 'awaiting_my_review': 1}, 'awaiting my review'),
-        ({'source': 1}, 'Pull Requests from'),
+        ({'source': 0, 'closed': 1}, 'Closed'),
+        ({'source': 0, 'my': 1}, 'Opened by me'),
+        ({'source': 0, 'awaiting_review': 1}, 'Awaiting review'),
+        ({'source': 0, 'awaiting_my_review': 1}, 'Awaiting my review'),
+        ({'source': 1}, 'From this repo'),
     ])
     def test_showing_list_page(self, backend, pr_util, params, expected_title):
         pull_request = pr_util.create_pull_request()
@@ -55,9 +55,10 b' class TestPullRequestList(object):'
                        params=params))
 
         assert_response = response.assert_response()
-        assert_response.element_equals_to('.panel-title', expected_title)
-        element = assert_response.get_element('.panel-title')
-        element_text = assert_response._element_to_string(element)
+
+        element = assert_response.get_element('.title .active')
+        element_text = element.text_content()
+        assert expected_title == element_text
 
     def test_showing_list_page_data(self, backend, pr_util, xhr_header):
         pull_request = pr_util.create_pull_request()

rhodecode/apps/repository/tests/test_repo_changelog.py

@@ -33,8 +33,9 b' def route_path(name, params=None, **kwar'
 
     base_url = {
         'repo_changelog':'/{repo_name}/changelog',
-        'repo_changelog_file':'/{repo_name}/changelog/{commit_id}/{f_path}',
-        'repo_changelog_elements':'/{repo_name}/changelog_elements',
+        'repo_commits': '/{repo_name}/commits',
+        'repo_commits_file': '/{repo_name}/commits/{commit_id}/{f_path}',
+        'repo_commits_elements': '/{repo_name}/commits_elements',
     }[name].format(**kwargs)
 
     if params:
@@ -42,8 +43,22 b' def route_path(name, params=None, **kwar'
     return base_url
 
 
+def assert_commits_on_page(response, indexes):
+    found_indexes = [int(idx) for idx in MATCH_HASH.findall(response.body)]
+    assert found_indexes == indexes
+
+
 class TestChangelogController(TestController):
 
+    def test_commits_page(self, backend):
+        self.log_user()
+        response = self.app.get(
+            route_path('repo_commits', repo_name=backend.repo_name))
+
+        first_idx = -1
+        last_idx = -DEFAULT_CHANGELOG_SIZE
+        self.assert_commit_range_on_page(response, first_idx, last_idx, backend)
+
     def test_changelog(self, backend):
         self.log_user()
         response = self.app.get(
@@ -62,6 +77,14 b' class TestChangelogController(TestContro'
                        params=dict(branch=backend.default_branch_name)),
             status=200)
 
+    @pytest.mark.backends("hg", "git")
+    def test_commits_filtered_by_branch(self, backend):
+        self.log_user()
+        self.app.get(
+            route_path('repo_commits', repo_name=backend.repo_name,
+                       params=dict(branch=backend.default_branch_name)),
+            status=200)
+
     @pytest.mark.backends("svn")
     def test_changelog_filtered_by_branch_svn(self, autologin_user, backend):
         repo = backend['svn-simple-layout']
@@ -70,27 +93,22 b' class TestChangelogController(TestContro'
                        params=dict(branch='trunk')),
             status=200)
 
-        self.assert_commits_on_page(
-            response, indexes=[15, 12, 7, 3, 2, 1])
+        assert_commits_on_page(response, indexes=[15, 12, 7, 3, 2, 1])
 
-    def test_changelog_filtered_by_wrong_branch(self, backend):
+    def test_commits_filtered_by_wrong_branch(self, backend):
         self.log_user()
         branch = 'wrong-branch-name'
         response = self.app.get(
-            route_path('repo_changelog', repo_name=backend.repo_name,
+            route_path('repo_commits', repo_name=backend.repo_name,
                        params=dict(branch=branch)),
             status=302)
-        expected_url = '/{repo}/changelog/{branch}'.format(
+        expected_url = '/{repo}/commits/{branch}'.format(
             repo=backend.repo_name, branch=branch)
         assert expected_url in response.location
         response = response.follow()
         expected_warning = 'Branch {} is not found.'.format(branch)
         assert expected_warning in response.body
 
-    def assert_commits_on_page(self, response, indexes):
-        found_indexes = [int(idx) for idx in MATCH_HASH.findall(response.body)]
-        assert found_indexes == indexes
-
     @pytest.mark.xfail_backends("svn", reason="Depends on branch support")
     def test_changelog_filtered_by_branch_with_merges(
             self, autologin_user, backend):
@@ -112,21 +130,20 b' class TestChangelogController(TestContro'
             status=200)
 
     @pytest.mark.backends("hg")
-    def test_changelog_closed_branches(self, autologin_user, backend):
+    def test_commits_closed_branches(self, autologin_user, backend):
         repo = backend['closed_branch']
         response = self.app.get(
-            route_path('repo_changelog', repo_name=repo.repo_name,
+            route_path('repo_commits', repo_name=repo.repo_name,
                        params=dict(branch='experimental')),
             status=200)
 
-        self.assert_commits_on_page(
-            response, indexes=[3, 1])
+        assert_commits_on_page(response, indexes=[3, 1])
 
     def test_changelog_pagination(self, backend):
         self.log_user()
         # pagination, walk up to page 6
         changelog_url = route_path(
-            'repo_changelog', repo_name=backend.repo_name)
+            'repo_commits', repo_name=backend.repo_name)
 
         for page in range(1, 7):
             response = self.app.get(changelog_url, {'page': page})
@@ -138,22 +155,30 b' class TestChangelogController(TestContro'
     def assert_commit_range_on_page(
             self, response, first_idx, last_idx, backend):
         input_template = (
-            """<input class="commit-range" id="%(raw_id)s" """
+            """<input class="commit-range" """ 
+            """data-commit-id="%(raw_id)s" data-commit-idx="%(idx)s" """ 
+            """data-short-id="%(short_id)s" id="%(raw_id)s" """
             """name="%(raw_id)s" type="checkbox" value="1" />"""
         )
+
         commit_span_template = """<span class="commit_hash">r%s:%s</span>"""
         repo = backend.repo
 
         first_commit_on_page = repo.get_commit(commit_idx=first_idx)
         response.mustcontain(
-            input_template % {'raw_id': first_commit_on_page.raw_id})
+            input_template % {'raw_id': first_commit_on_page.raw_id,
+                              'idx': first_commit_on_page.idx,
+                              'short_id': first_commit_on_page.short_id})
+
         response.mustcontain(commit_span_template % (
             first_commit_on_page.idx, first_commit_on_page.short_id)
         )
 
         last_commit_on_page = repo.get_commit(commit_idx=last_idx)
         response.mustcontain(
-            input_template % {'raw_id': last_commit_on_page.raw_id})
+            input_template % {'raw_id': last_commit_on_page.raw_id,
+                              'idx': last_commit_on_page.idx,
+                              'short_id': last_commit_on_page.short_id})
         response.mustcontain(commit_span_template % (
             last_commit_on_page.idx, last_commit_on_page.short_id)
         )
@@ -168,10 +193,10 b' class TestChangelogController(TestContro'
         '/vcs/exceptions.py',
         '//vcs/exceptions.py'
     ])
-    def test_changelog_with_filenode(self, backend, test_path):
+    def test_commits_with_filenode(self, backend, test_path):
         self.log_user()
         response = self.app.get(
-            route_path('repo_changelog_file', repo_name=backend.repo_name,
+            route_path('repo_commits_file', repo_name=backend.repo_name,
                        commit_id='tip', f_path=test_path),
             )
 
@@ -180,16 +205,16 b' class TestChangelogController(TestContro'
         response.mustcontain('Added not implemented hg backend test case')
         response.mustcontain('Added BaseChangeset class')
 
-    def test_changelog_with_filenode_that_is_dirnode(self, backend):
+    def test_commits_with_filenode_that_is_dirnode(self, backend):
         self.log_user()
         self.app.get(
-            route_path('repo_changelog_file', repo_name=backend.repo_name,
+            route_path('repo_commits_file', repo_name=backend.repo_name,
                        commit_id='tip', f_path='/tests'),
             status=302)
 
-    def test_changelog_with_filenode_not_existing(self, backend):
+    def test_commits_with_filenode_not_existing(self, backend):
         self.log_user()
         self.app.get(
-            route_path('repo_changelog_file', repo_name=backend.repo_name,
+            route_path('repo_commits_file', repo_name=backend.repo_name,
                        commit_id='tip', f_path='wrong_path'),
             status=302)

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -94,6 +94,7 b' class TestCompareView(object):'
         origin_repo = origin.scm_instance(cache=False)
         origin_repo.config.clear_section('hooks')
         origin_repo.pull(fork.repo_full_path, commit_ids=[commit3.raw_id])
+        origin_repo = origin.scm_instance(cache=False)  # cache rebuild
 
         # Verify test fixture setup
         # This does not work for git
@@ -162,8 +163,7 b' class TestCompareView(object):'
         compare_page.target_source_are_disabled()
 
     @pytest.mark.xfail_backends("svn", reason="Depends on branch support")
-    def test_compare_forks_on_branch_extra_commits_origin_has_incomming(
-            self, backend):
+    def test_compare_forks_on_branch_extra_commits_origin_has_incomming(self, backend):
         repo1 = backend.create_repo()
 
         # commit something !

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -21,6 +21,7 b''
 import pytest
 
 from rhodecode.lib.vcs import nodes
+from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import commit_change
 
@@ -43,70 +44,7 b' def route_path(name, params=None, **kwar'
 @pytest.mark.usefixtures("autologin_user", "app")
 class TestSideBySideDiff(object):
 
-    def test_diff_side_by_side(self, app, backend, backend_stub):
-        f_path = 'test_sidebyside_file.py'
-        commit1_content = 'content-25d7e49c18b159446c\n'
-        commit2_content = 'content-603d6c72c46d953420\n'
-        repo = backend.create_repo()
-
-        commit1 = commit_change(
-            repo.repo_name, filename=f_path, content=commit1_content,
-            message='A', vcs_type=backend.alias, parent=None, newfile=True)
-
-        commit2 = commit_change(
-            repo.repo_name, filename=f_path, content=commit2_content,
-            message='B, child of A', vcs_type=backend.alias, parent=commit1)
-
-        response = self.app.get(route_path(
-            'repo_compare',
-            repo_name=repo.repo_name,
-            source_ref_type='rev',
-            source_ref=commit1.raw_id,
-            target_ref_type='rev',
-            target_ref=commit2.raw_id,
-            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
-        ))
-
-        response.mustcontain('Expand 1 commit')
-        response.mustcontain('1 file changed')
-
-        response.mustcontain(
-            'r%s:%s...r%s:%s' % (
-            commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
-
-        response.mustcontain('<strong>{}</strong>'.format(f_path))
-
-    def test_diff_side_by_side_with_empty_file(self, app, backend, backend_stub):
-        commits = [
-            {'message': 'First commit'},
-            {'message': 'Commit with binary',
-             'added': [nodes.FileNode('file.empty', content='')]},
-        ]
-        f_path = 'file.empty'
-        repo = backend.create_repo(commits=commits)
-        commit1 = repo.get_commit(commit_idx=0)
-        commit2 = repo.get_commit(commit_idx=1)
-
-        response = self.app.get(route_path(
-            'repo_compare',
-            repo_name=repo.repo_name,
-            source_ref_type='rev',
-            source_ref=commit1.raw_id,
-            target_ref_type='rev',
-            target_ref=commit2.raw_id,
-            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
-        ))
-
-        response.mustcontain('Expand 1 commit')
-        response.mustcontain('1 file changed')
-
-        response.mustcontain(
-            'r%s:%s...r%s:%s' % (
-            commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
-
-        response.mustcontain('<strong>{}</strong>'.format(f_path))
-
-    def test_diff_sidebyside_two_commits(self, app, backend):
+    def test_diff_sidebyside_single_commit(self, app, backend):
         commit_id_range = {
             'hg': {
                 'commits': ['25d7e49c18b159446cadfa506a5cf8ad1cb04067',
@@ -141,26 +79,164 b' class TestSideBySideDiff(object):'
             params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
+        response.mustcontain(file_changes)
         response.mustcontain('Expand 1 commit')
-        response.mustcontain(file_changes)
 
-    def test_diff_sidebyside_two_commits_single_file(self, app, backend):
+    def test_diff_sidebyside_two_commits(self, app, backend):
         commit_id_range = {
             'hg': {
-                'commits': ['25d7e49c18b159446cadfa506a5cf8ad1cb04067',
+                'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
                             '603d6c72c46d953420c89d36372f08d9f305f5dd'],
-                'changes': '1 file changed: 1 inserted, 1 deleted'
+                'changes': '32 files changed: 1165 inserted, 308 deleted'
             },
             'git': {
-                'commits': ['6fc9270775aaf5544c1deb014f4ddd60c952fcbb',
+                'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
                             '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
-                'changes': '1 file changed: 1 inserted, 1 deleted'
+                'changes': '32 files changed: 1165 inserted, 308 deleted'
             },
 
             'svn': {
-                'commits': ['336',
+                'commits': ['335',
                             '337'],
-                'changes': '1 file changed: 1 inserted, 1 deleted'
+                'changes': '32 files changed: 1179 inserted, 310 deleted'
+            },
+        }
+
+        commit_info = commit_id_range[backend.alias]
+        commit2, commit1 = commit_info['commits']
+        file_changes = commit_info['changes']
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=backend.repo_name,
+            source_ref_type='rev',
+            source_ref=commit2,
+            target_repo=backend.repo_name,
+            target_ref_type='rev',
+            target_ref=commit1,
+            params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
+        ))
+
+        response.mustcontain(file_changes)
+        response.mustcontain('Expand 2 commits')
+
+    @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
+    def test_diff_side_by_side_from_0_commit(self, app, backend, backend_stub):
+        f_path = 'test_sidebyside_file.py'
+        commit1_content = 'content-25d7e49c18b159446c\n'
+        commit2_content = 'content-603d6c72c46d953420\n'
+        repo = backend.create_repo()
+
+        commit1 = commit_change(
+            repo.repo_name, filename=f_path, content=commit1_content,
+            message='A', vcs_type=backend.alias, parent=None, newfile=True)
+
+        commit2 = commit_change(
+            repo.repo_name, filename=f_path, content=commit2_content,
+            message='B, child of A', vcs_type=backend.alias, parent=commit1)
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=repo.repo_name,
+            source_ref_type='rev',
+            source_ref=EmptyCommit().raw_id,
+            target_ref_type='rev',
+            target_ref=commit2.raw_id,
+            params=dict(diffmode='sidebyside')
+        ))
+
+        response.mustcontain('Expand 2 commits')
+        response.mustcontain('123 file changed')
+
+        response.mustcontain(
+            'r%s:%s...r%s:%s' % (
+                commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
+
+        response.mustcontain('<strong>{}</strong>'.format(f_path))
+
+    @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
+    def test_diff_side_by_side_from_0_commit_with_file_filter(self, app, backend, backend_stub):
+        f_path = 'test_sidebyside_file.py'
+        commit1_content = 'content-25d7e49c18b159446c\n'
+        commit2_content = 'content-603d6c72c46d953420\n'
+        repo = backend.create_repo()
+
+        commit1 = commit_change(
+            repo.repo_name, filename=f_path, content=commit1_content,
+            message='A', vcs_type=backend.alias, parent=None, newfile=True)
+
+        commit2 = commit_change(
+            repo.repo_name, filename=f_path, content=commit2_content,
+            message='B, child of A', vcs_type=backend.alias, parent=commit1)
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=repo.repo_name,
+            source_ref_type='rev',
+            source_ref=EmptyCommit().raw_id,
+            target_ref_type='rev',
+            target_ref=commit2.raw_id,
+            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
+        ))
+
+        response.mustcontain('Expand 2 commits')
+        response.mustcontain('1 file changed')
+
+        response.mustcontain(
+            'r%s:%s...r%s:%s' % (
+                commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
+
+        response.mustcontain('<strong>{}</strong>'.format(f_path))
+
+    def test_diff_side_by_side_with_empty_file(self, app, backend, backend_stub):
+        commits = [
+            {'message': 'First commit'},
+            {'message': 'Second commit'},
+            {'message': 'Commit with binary',
+             'added': [nodes.FileNode('file.empty', content='')]},
+        ]
+        f_path = 'file.empty'
+        repo = backend.create_repo(commits=commits)
+        commit1 = repo.get_commit(commit_idx=0)
+        commit2 = repo.get_commit(commit_idx=1)
+        commit3 = repo.get_commit(commit_idx=2)
+
+        response = self.app.get(route_path(
+            'repo_compare',
+            repo_name=repo.repo_name,
+            source_ref_type='rev',
+            source_ref=commit1.raw_id,
+            target_ref_type='rev',
+            target_ref=commit3.raw_id,
+            params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
+        ))
+
+        response.mustcontain('Expand 2 commits')
+        response.mustcontain('1 file changed')
+
+        response.mustcontain(
+            'r%s:%s...r%s:%s' % (
+                commit2.idx, commit2.short_id, commit3.idx, commit3.short_id))
+
+        response.mustcontain('<strong>{}</strong>'.format(f_path))
+
+    def test_diff_sidebyside_two_commits_with_file_filter(self, app, backend):
+        commit_id_range = {
+            'hg': {
+                'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
+                            '603d6c72c46d953420c89d36372f08d9f305f5dd'],
+                'changes': '1 file changed: 3 inserted, 3 deleted'
+            },
+            'git': {
+                'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
+                            '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
+                'changes': '1 file changed: 3 inserted, 3 deleted'
+            },
+
+            'svn': {
+                'commits': ['335',
+                            '337'],
+                'changes': '1 file changed: 3 inserted, 3 deleted'
             },
         }
         f_path = 'docs/conf.py'
@@ -179,5 +255,5 b' class TestSideBySideDiff(object):'
             params=dict(f_path=f_path, target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
-        response.mustcontain('Expand 1 commit')
+        response.mustcontain('Expand 2 commits')
         response.mustcontain(file_changes)

rhodecode/apps/repository/tests/test_repo_files.py

@@ -243,7 +243,7 b' class TestFilesViews(object):'
                        repo_name=backend.repo_name,
                        commit_id=commit.raw_id, f_path='vcs/nodes.py'))
 
-        msgbox = """<div class="commit right-content">%s</div>"""
+        msgbox = """<div class="commit">%s</div>"""
         response.mustcontain(msgbox % (commit.message, ))
 
         assert_response = response.assert_response()
@@ -313,6 +313,7 b' class TestFilesViews(object):'
 
         expected_data = json.loads(
             fixture.load_resource('svn_node_history_branches.json'))
+
         assert expected_data == response.json
 
     def test_file_source_history_with_annotation(self, backend, xhr_header):
@@ -521,10 +522,10 b' class TestRepositoryArchival(object):'
     def test_archival(self, backend):
         backend.enable_downloads()
         commit = backend.repo.get_commit(commit_idx=173)
-        for archive, info in settings.ARCHIVE_SPECS.items():
-            mime_type, arch_ext = info
-            short = commit.short_id + arch_ext
-            fname = commit.raw_id + arch_ext
+        for a_type, content_type, extension in settings.ARCHIVE_SPECS:
+
+            short = commit.short_id + extension
+            fname = commit.raw_id + extension
             filename = '%s-%s' % (backend.repo_name, short)
             response = self.app.get(
                 route_path('repo_archivefile',
@@ -534,7 +535,7 b' class TestRepositoryArchival(object):'
             assert response.status == '200 OK'
             headers = [
                 ('Content-Disposition', 'attachment; filename=%s' % filename),
-                ('Content-Type', '%s' % mime_type),
+                ('Content-Type', '%s' % content_type),
             ]
 
             for header in headers:
@@ -761,7 +762,7 b' class TestModifyFilesWithWebInterface(ob'
 
     @pytest.mark.xfail_backends("svn", reason="Depends on online editing")
     def test_add_file_into_repo_missing_content(self, backend, csrf_token):
-        repo = backend.create_repo()
+        backend.create_repo()
         filename = 'init.py'
         response = self.app.post(
             route_path('repo_files_create_file',
@@ -770,26 +771,25 b' class TestModifyFilesWithWebInterface(ob'
             params={
                 'content': "",
                 'filename': filename,
-                'location': "",
                 'csrf_token': csrf_token,
             },
             status=302)
-        assert_session_flash(response,
-            'Successfully committed new file `{}`'.format(
-                os.path.join(filename)))
+        expected_msg = 'Successfully committed new file `{}`'.format(os.path.join(filename))
+        assert_session_flash(response, expected_msg)
 
     def test_add_file_into_repo_missing_filename(self, backend, csrf_token):
+        commit_id = backend.repo.get_commit().raw_id
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
+                       commit_id=commit_id, f_path='/'),
             params={
                 'content': "foo",
                 'csrf_token': csrf_token,
             },
             status=302)
 
-        assert_session_flash(response, 'No filename')
+        assert_session_flash(response, 'No filename specified')
 
     def test_add_file_into_repo_errors_and_no_commits(
             self, backend, csrf_token):
@@ -806,7 +806,7 b' class TestModifyFilesWithWebInterface(ob'
             },
             status=302)
 
-        assert_session_flash(response, 'No filename')
+        assert_session_flash(response, 'No filename specified')
 
         # Not allowed, redirect to the summary
         redirected = response.follow()
@@ -817,52 +817,51 b' class TestModifyFilesWithWebInterface(ob'
 
         assert redirected.request.path == summary_url
 
-    @pytest.mark.parametrize("location, filename", [
-        ('/abs', 'foo'),
-        ('../rel', 'foo'),
-        ('file/../foo', 'foo'),
+    @pytest.mark.parametrize("filename, clean_filename", [
+        ('/abs/foo', 'abs/foo'),
+        ('../rel/foo', 'rel/foo'),
+        ('file/../foo/foo', 'file/foo/foo'),
     ])
-    def test_add_file_into_repo_bad_filenames(
-            self, location, filename, backend, csrf_token):
+    def test_add_file_into_repo_bad_filenames(self, filename, clean_filename, backend, csrf_token):
+        repo = backend.create_repo()
+        commit_id = repo.get_commit().raw_id
+
         response = self.app.post(
             route_path('repo_files_create_file',
-                       repo_name=backend.repo_name,
-                       commit_id='tip', f_path='/'),
+                       repo_name=repo.repo_name,
+                       commit_id=commit_id, f_path='/'),
             params={
                 'content': "foo",
                 'filename': filename,
-                'location': location,
                 'csrf_token': csrf_token,
             },
             status=302)
 
-        assert_session_flash(
-            response,
-            'The location specified must be a relative path and must not '
-            'contain .. in the path')
+        expected_msg = 'Successfully committed new file `{}`'.format(clean_filename)
+        assert_session_flash(response, expected_msg)
 
-    @pytest.mark.parametrize("cnt, location, filename", [
-        (1, '', 'foo.txt'),
-        (2, 'dir', 'foo.rst'),
-        (3, 'rel/dir', 'foo.bar'),
+    @pytest.mark.parametrize("cnt, filename, content", [
+        (1, 'foo.txt', "Content"),
+        (2, 'dir/foo.rst', "Content"),
+        (3, 'dir/foo-second.rst', "Content"),
+        (4, 'rel/dir/foo.bar', "Content"),
     ])
-    def test_add_file_into_repo(self, cnt, location, filename, backend,
-                                csrf_token):
+    def test_add_file_into_empty_repo(self, cnt, filename, content, backend, csrf_token):
         repo = backend.create_repo()
+        commit_id = repo.get_commit().raw_id
         response = self.app.post(
             route_path('repo_files_create_file',
                        repo_name=repo.repo_name,
-                       commit_id='tip', f_path='/'),
+                       commit_id=commit_id, f_path='/'),
             params={
-                'content': "foo",
+                'content': content,
                 'filename': filename,
-                'location': location,
                 'csrf_token': csrf_token,
             },
             status=302)
-        assert_session_flash(response,
-            'Successfully committed new file `{}`'.format(
-                os.path.join(location, filename)))
+
+        expected_msg = 'Successfully committed new file `{}`'.format(filename)
+        assert_session_flash(response, expected_msg)
 
     def test_edit_file_view(self, backend):
         response = self.app.get(
@@ -884,8 +883,7 b' class TestModifyFilesWithWebInterface(ob'
                        f_path='vcs/nodes.py'),
             status=302)
         assert_session_flash(
-            response,
-            'You can only edit files with commit being a valid branch')
+            response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
 
     def test_edit_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
@@ -953,8 +951,7 b' class TestModifyFilesWithWebInterface(ob'
                        f_path='vcs/nodes.py'),
             status=302)
         assert_session_flash(
-            response,
-            'You can only delete files with commit being a valid branch')
+            response, 'Cannot modify file. Given commit `tip` is not head of a branch.')
 
     def test_delete_file_view_commit_changes(self, backend, csrf_token):
         repo = backend.create_repo()
@@ -992,7 +989,7 b' class TestFilesViewOtherCases(object):'
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,
-            commit_id=0, f_path='') + '#edit'
+            commit_id=0, f_path='')
 
         assert_session_flash(
             response,
@@ -1009,7 +1006,7 b' class TestFilesViewOtherCases(object):'
         repo_file_add_url = route_path(
             'repo_files_add_file',
             repo_name=repo.repo_name,
-            commit_id=0, f_path='') + '#edit'
+            commit_id=0, f_path='')
 
         response = self.app.get(
             route_path('repo_files',

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -40,6 +40,8 b' def route_path(name, params=None, **kwar'
     base_url = {
         'repo_changelog': '/{repo_name}/changelog',
         'repo_changelog_file': '/{repo_name}/changelog/{commit_id}/{f_path}',
+        'repo_commits': '/{repo_name}/commits',
+        'repo_commits_file': '/{repo_name}/commits/{commit_id}/{f_path}',
         'pullrequest_show': '/{repo_name}/pull-request/{pull_request_id}',
         'pullrequest_show_all': '/{repo_name}/pull-request',
         'pullrequest_show_all_data': '/{repo_name}/pull-request-data',
@@ -998,11 +1000,11 b' class TestPullrequestsView(object):'
         assert len(target_children) == 1
 
         expected_origin_link = route_path(
-            'repo_changelog',
+            'repo_commits',
             repo_name=pull_request.source_repo.scm_instance().name,
             params=dict(branch='origin'))
         expected_target_link = route_path(
-            'repo_changelog',
+            'repo_commits',
             repo_name=pull_request.target_repo.scm_instance().name,
             params=dict(branch='target'))
         assert origin_children[0].attrib['href'] == expected_origin_link

rhodecode/apps/repository/tests/test_repo_summary.py

@@ -350,11 +350,11 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'a', 'raw_id': 'a_id', 'text': 'a', 'type': 't1',
+                        'id': 'a', 'idx': 0, 'raw_id': 'a_id', 'text': 'a', 'type': 't1',
                         'files_url': expected_files_url + 'a/?at=a',
                     },
                     {
-                        'id': 'b', 'raw_id': 'b_id', 'text': 'b', 'type': 't1',
+                        'id': 'b', 'idx': 0, 'raw_id': 'b_id', 'text': 'b', 'type': 't1',
                         'files_url': expected_files_url + 'b/?at=b',
                     }
                 ],
@@ -363,7 +363,7 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'c', 'raw_id': 'c_id', 'text': 'c', 'type': 't2',
+                        'id': 'c', 'idx': 0, 'raw_id': 'c_id', 'text': 'c', 'type': 't2',
                         'files_url': expected_files_url + 'c/?at=c',
                     }
                 ],
@@ -385,12 +385,12 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'a@a_id', 'raw_id': 'a_id',
+                        'id': 'a@a_id', 'idx': 0, 'raw_id': 'a_id',
                         'text': 'a', 'type': 't1',
                         'files_url': expected_files_url + 'a_id/a?at=a',
                     },
                     {
-                        'id': 'b@b_id', 'raw_id': 'b_id',
+                        'id': 'b@b_id', 'idx': 0, 'raw_id': 'b_id',
                         'text': 'b', 'type': 't1',
                         'files_url': expected_files_url + 'b_id/b?at=b',
                     }
@@ -400,7 +400,7 b' class TestCreateReferenceData(object):'
             {
                 'children': [
                     {
-                        'id': 'c@c_id', 'raw_id': 'c_id',
+                        'id': 'c@c_id', 'idx': 0, 'raw_id': 'c_id',
                         'text': 'c', 'type': 't2',
                         'files_url': expected_files_url + 'c_id/c?at=c',
                     }
@@ -516,6 +516,7 b' class TestReferenceItems(object):'
                 'text': ref_name,
                 'id': self._format_function(ref_name, ref_id),
                 'raw_id': ref_id,
+                'idx': 0,
                 'type': self.ref_type,
                 'files_url': self.fake_url
             }

rhodecode/apps/repository/views/repo_changelog.py

@@ -113,7 +113,7 b' class RepoChangelogView(RepoAppView):'
             h.flash('Branch {} is not found.'.format(h.escape(branch_name)),
                     category='warning')
             redirect_url = h.route_path(
-                'repo_changelog_file', repo_name=repo_name,
+                'repo_commits_file', repo_name=repo_name,
                 commit_id=branch_name, f_path=f_path or '')
             raise HTTPFound(redirect_url)
 
@@ -127,13 +127,13 b' class RepoChangelogView(RepoAppView):'
             if f_path:
                 # changelog for file
                 return h.route_path(
-                    'repo_changelog_file',
+                    'repo_commits_file',
                     repo_name=c.rhodecode_db_repo.repo_name,
                     commit_id=commit_id, f_path=f_path,
                     _query=query_params)
             else:
                 return h.route_path(
-                    'repo_changelog',
+                    'repo_commits',
                     repo_name=c.rhodecode_db_repo.repo_name, _query=query_params)
 
         c.total_cs = len(collection)
@@ -171,11 +171,18 b' class RepoChangelogView(RepoAppView):'
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
+        route_name='repo_commits', request_method='GET',
+        renderer='rhodecode:templates/commits/changelog.mako')
+    @view_config(
+        route_name='repo_commits_file', request_method='GET',
+        renderer='rhodecode:templates/commits/changelog.mako')
+    # old routes for backward compat
+    @view_config(
         route_name='repo_changelog', request_method='GET',
-        renderer='rhodecode:templates/changelog/changelog.mako')
+        renderer='rhodecode:templates/commits/changelog.mako')
     @view_config(
         route_name='repo_changelog_file', request_method='GET',
-        renderer='rhodecode:templates/changelog/changelog.mako')
+        renderer='rhodecode:templates/commits/changelog.mako')
     def repo_changelog(self):
         c = self.load_default_context()
 
@@ -224,7 +231,7 b' class RepoChangelogView(RepoAppView):'
                     except RepositoryError as e:
                         h.flash(safe_str(e), category='warning')
                         redirect_url = h.route_path(
-                            'repo_changelog', repo_name=self.db_repo_name)
+                            'repo_commits', repo_name=self.db_repo_name)
                         raise HTTPFound(redirect_url)
                 collection = list(reversed(collection))
             else:
@@ -246,14 +253,14 b' class RepoChangelogView(RepoAppView):'
             log.exception(safe_str(e))
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPFound(
-                h.route_path('repo_changelog', repo_name=self.db_repo_name))
+                h.route_path('repo_commits', repo_name=self.db_repo_name))
 
         if partial_xhr or self.request.environ.get('HTTP_X_PJAX'):
             # case when loading dynamic file history in file view
             # loading from ajax, we don't want the first result, it's popped
             # in the code above
             html = render(
-                'rhodecode:templates/changelog/changelog_file_history.mako',
+                'rhodecode:templates/commits/changelog_file_history.mako',
                 self._get_template_context(c), self.request)
             return Response(html)
 
@@ -271,14 +278,14 b' class RepoChangelogView(RepoAppView):'
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
-        route_name='repo_changelog_elements', request_method=('GET', 'POST'),
-        renderer='rhodecode:templates/changelog/changelog_elements.mako',
+        route_name='repo_commits_elements', request_method=('GET', 'POST'),
+        renderer='rhodecode:templates/commits/changelog_elements.mako',
         xhr=True)
     @view_config(
-        route_name='repo_changelog_elements_file', request_method=('GET', 'POST'),
-        renderer='rhodecode:templates/changelog/changelog_elements.mako',
+        route_name='repo_commits_elements_file', request_method=('GET', 'POST'),
+        renderer='rhodecode:templates/commits/changelog_elements.mako',
         xhr=True)
-    def repo_changelog_elements(self):
+    def repo_commits_elements(self):
         c = self.load_default_context()
         commit_id = self.request.matchdict.get('commit_id')
         f_path = self._get_f_path(self.request.matchdict)
@@ -312,7 +319,7 b' class RepoChangelogView(RepoAppView):'
             except (RepositoryError, CommitDoesNotExistError, Exception) as e:
                 log.exception(safe_str(e))
                 raise HTTPFound(
-                    h.route_path('repo_changelog', repo_name=self.db_repo_name))
+                    h.route_path('repo_commits', repo_name=self.db_repo_name))
 
             collection = base_commit.get_path_history(
                 f_path, limit=hist_limit, pre_load=pre_load)

rhodecode/apps/repository/views/repo_commits.py

@@ -105,10 +105,9 b' class RepoCommitsView(RepoAppView):'
 
             c.commit_ranges = commits
             if not c.commit_ranges:
-                raise RepositoryError(
-                    'The commit range returned an empty result')
-        except CommitDoesNotExistError:
-            msg = _('No such commit exists for this repository')
+                raise RepositoryError('The commit range returned an empty result')
+        except CommitDoesNotExistError as e:
+            msg = _('No such commit exists. Org exception: `{}`').format(e)
             h.flash(msg, category='error')
             raise HTTPNotFound()
         except Exception:

rhodecode/apps/repository/views/repo_compare.py

@@ -214,16 +214,10 b' class RepoCompareView(RepoAppView):'
         pre_load = ["author", "branch", "date", "message"]
         c.ancestor = None
 
-        if c.file_path:
-            if source_commit == target_commit:
-                c.commit_ranges = []
-            else:
-                c.commit_ranges = [target_commit]
-        else:
             try:
                 c.commit_ranges = source_scm.compare(
                     source_commit.raw_id, target_commit.raw_id,
-                    target_scm, merge, pre_load=pre_load)
+                target_scm, merge, pre_load=pre_load) or []
                 if merge:
                     c.ancestor = source_scm.get_common_ancestor(
                         source_commit.raw_id, target_commit.raw_id, target_scm)

rhodecode/apps/repository/views/repo_files.py

@@ -25,6 +25,7 b' import shutil'
 import tempfile
 import collections
 import urllib
+import pathlib2
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
 from pyramid.view import view_config
@@ -42,7 +43,7 b' from rhodecode.lib.exceptions import Non'
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
 from rhodecode.lib.utils2 import (
-    convert_line_endings, detect_mode, safe_str, str2bool, safe_int)
+    convert_line_endings, detect_mode, safe_str, str2bool, safe_int, sha1, safe_unicode)
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.vcs import path as vcspath
@@ -87,7 +88,7 b' class RepoFilesView(RepoAppView):'
         c.enable_downloads = self.db_repo.enable_downloads
         return c
 
-    def _ensure_not_locked(self):
+    def _ensure_not_locked(self, commit_id='tip'):
         _ = self.request.translate
 
         repo = self.db_repo
@@ -98,21 +99,41 b' class RepoFilesView(RepoAppView):'
                     'warning')
             files_url = h.route_path(
                 'repo_files:default_path',
-                repo_name=self.db_repo_name, commit_id='tip')
+                repo_name=self.db_repo_name, commit_id=commit_id)
             raise HTTPFound(files_url)
 
-    def check_branch_permission(self, branch_name):
+    def forbid_non_head(self, is_head, f_path, commit_id='tip', json_mode=False):
+        _ = self.request.translate
+
+        if not is_head:
+            message = _('Cannot modify file. '
+                        'Given commit `{}` is not head of a branch.').format(commit_id)
+            h.flash(message, category='warning')
+
+            if json_mode:
+                return message
+
+            files_url = h.route_path(
+                'repo_files', repo_name=self.db_repo_name, commit_id=commit_id,
+                f_path=f_path)
+            raise HTTPFound(files_url)
+
+    def check_branch_permission(self, branch_name, commit_id='tip', json_mode=False):
         _ = self.request.translate
 
         rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
             self.db_repo_name, branch_name)
         if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']:
-            h.flash(
-                _('Branch `{}` changes forbidden by rule {}.').format(branch_name, rule),
-                'warning')
+            message = _('Branch `{}` changes forbidden by rule {}.').format(
+                branch_name, rule)
+            h.flash(message, 'warning')
+
+            if json_mode:
+                return message
+
             files_url = h.route_path(
-                'repo_files:default_path',
-                repo_name=self.db_repo_name, commit_id='tip')
+                'repo_files:default_path', repo_name=self.db_repo_name, commit_id=commit_id)
+
             raise HTTPFound(files_url)
 
     def _get_commit_and_path(self):
@@ -146,8 +167,7 b' class RepoFilesView(RepoAppView):'
 
             _url = h.route_path(
                 'repo_files_add_file',
-                repo_name=self.db_repo_name, commit_id=0, f_path='',
-                _anchor='edit')
+                repo_name=self.db_repo_name, commit_id=0, f_path='')
 
             if h.HasRepoPermissionAny(
                     'repository.write', 'repository.admin')(self.db_repo_name):
@@ -185,8 +205,7 b' class RepoFilesView(RepoAppView):'
             h.flash(_('No such commit exists for this repository'), category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
-            log.warning('Repository error while fetching '
-                        'filenode `%s`. Err:%s', path, e)
+            log.warning('Repository error while fetching filenode `%s`. Err:%s', path, e)
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
@@ -195,12 +214,7 b' class RepoFilesView(RepoAppView):'
     def _is_valid_head(self, commit_id, repo):
         branch_name = sha_commit_id = ''
         is_head = False
-
-        if h.is_svn(repo) and not repo.is_empty():
-            # Note: Subversion only has one head.
-            if commit_id == repo.get_commit(commit_idx=-1).raw_id:
-                is_head = True
-                return branch_name, sha_commit_id, is_head
+        log.debug('Checking if commit_id `%s` is a head for %s.', commit_id, repo)
 
         for _branch_name, branch_commit_id in repo.branches.items():
             # simple case we pass in branch name, it's a HEAD
@@ -216,8 +230,14 b' class RepoFilesView(RepoAppView):'
                 sha_commit_id = branch_commit_id
                 break
 
+        if h.is_svn(repo) and not repo.is_empty():
+            # Note: Subversion only has one head.
+            if commit_id == repo.get_commit(commit_idx=-1).raw_id:
+                is_head = True
+                return branch_name, sha_commit_id, is_head
+
         # checked branches, means we only need to try to get the branch/commit_sha
-        if not repo.is_empty:
+        if not repo.is_empty():
             commit = repo.get_commit(commit_id=commit_id)
             if commit:
                 branch_name = commit.branch
@@ -225,8 +245,7 b' class RepoFilesView(RepoAppView):'
 
         return branch_name, sha_commit_id, is_head
 
-    def _get_tree_at_commit(
-            self, c, commit_id, f_path, full_load=False):
+    def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False):
 
         repo_id = self.db_repo.repo_id
         force_recache = self.get_recache_flag()
@@ -244,16 +263,16 b' class RepoFilesView(RepoAppView):'
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid,
                                                condition=cache_on)
-        def compute_file_tree(repo_id, commit_id, f_path, full_load):
-            log.debug('Generating cached file tree for repo_id: %s, %s, %s',
-                      repo_id, commit_id, f_path)
+        def compute_file_tree(ver, repo_id, commit_id, f_path, full_load):
+            log.debug('Generating cached file tree at ver:%s for repo_id: %s, %s, %s',
+                      ver, repo_id, commit_id, f_path)
 
             c.full_load = full_load
             return render(
                 'rhodecode:templates/files/files_browser_tree.mako',
                 self._get_template_context(c), self.request)
 
-        return compute_file_tree(self.db_repo.repo_id, commit_id, f_path, full_load)
+        return compute_file_tree('v1', self.db_repo.repo_id, commit_id, f_path, full_load)
 
     def _get_archive_spec(self, fname):
         log.debug('Detecting archive spec for: `%s`', fname)
@@ -261,8 +280,7 b' class RepoFilesView(RepoAppView):'
         fileformat = None
         ext = None
         content_type = None
-        for a_type, ext_data in settings.ARCHIVE_SPECS.items():
-            content_type, extension = ext_data
+        for a_type, content_type, extension in settings.ARCHIVE_SPECS:
 
             if fname.endswith(extension):
                 fileformat = a_type
@@ -278,6 +296,15 b' class RepoFilesView(RepoAppView):'
 
         return commit_id, ext, fileformat, content_type
 
+    def create_pure_path(self, *parts):
+        # Split paths and sanitize them, removing any ../ etc
+        sanitized_path = [
+            x for x in pathlib2.PurePath(*parts).parts
+            if x not in ['.', '..']]
+
+        pure_path = pathlib2.PurePath(*sanitized_path)
+        return pure_path
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -289,9 +316,10 b' class RepoFilesView(RepoAppView):'
         from rhodecode import CONFIG
         _ = self.request.translate
         self.load_default_context()
-
+        default_at_path = '/'
         fname = self.request.matchdict['fname']
         subrepos = self.request.GET.get('subrepos') == 'true'
+        at_path = self.request.GET.get('at_path') or default_at_path
 
         if not self.db_repo.enable_downloads:
             return Response(_('Downloads disabled'))
@@ -311,10 +339,31 b' class RepoFilesView(RepoAppView):'
         except EmptyRepositoryError:
             return Response(_('Empty repository'))
 
-        archive_name = '%s-%s%s%s' % (
-            safe_str(self.db_repo_name.replace('/', '_')),
+        try:
+            at_path = commit.get_node(at_path).path or default_at_path
+        except Exception:
+            return Response(_('No node at path {} for this repository').format(at_path))
+
+        path_sha = sha1(at_path)[:8]
+
+        # original backward compat name of archive
+        clean_name = safe_str(self.db_repo_name.replace('/', '_'))
+        short_sha = safe_str(commit.short_id)
+
+        if at_path == default_at_path:
+            archive_name = '{}-{}{}{}'.format(
+                clean_name,
             '-sub' if subrepos else '',
-            safe_str(commit.short_id), ext)
+                short_sha,
+                ext)
+        # custom path and new name
+        else:
+            archive_name = '{}-{}{}-{}{}'.format(
+                clean_name,
+                '-sub' if subrepos else '',
+                short_sha,
+                path_sha,
+                ext)
 
         use_cached_archive = False
         archive_cache_enabled = CONFIG.get(
@@ -339,7 +388,8 b' class RepoFilesView(RepoAppView):'
             fd, archive = tempfile.mkstemp()
             log.debug('Creating new temp archive in %s', archive)
             try:
-                commit.archive_repo(archive, kind=fileformat, subrepos=subrepos)
+                commit.archive_repo(archive, kind=fileformat, subrepos=subrepos,
+                                    archive_at_path=at_path)
             except ImproperArchiveTypeError:
                 return _('Unknown archive type')
             if archive_cache_enabled:
@@ -632,8 +682,7 b' class RepoFilesView(RepoAppView):'
                 c.authors = []
                 # this loads a simple tree without metadata to speed things up
                 # later via ajax we call repo_nodetree_full and fetch whole
-                c.file_tree = self._get_tree_at_commit(
-                    c, c.commit.raw_id, f_path)
+                c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path)
 
         except RepositoryError as e:
             h.flash(safe_str(h.escape(e)), category='error')
@@ -875,18 +924,17 b' class RepoFilesView(RepoAppView):'
             self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
         return {'nodes': metadata}
 
-    def _create_references(
-            self, branches_or_tags, symbolic_reference, f_path):
+    def _create_references(self, branches_or_tags, symbolic_reference, f_path, ref_type):
         items = []
         for name, commit_id in branches_or_tags.items():
-            sym_ref = symbolic_reference(commit_id, name, f_path)
-            items.append((sym_ref, name))
+            sym_ref = symbolic_reference(commit_id, name, f_path, ref_type)
+            items.append((sym_ref, name, ref_type))
         return items
 
-    def _symbolic_reference(self, commit_id, name, f_path):
+    def _symbolic_reference(self, commit_id, name, f_path, ref_type):
         return commit_id
 
-    def _symbolic_reference_svn(self, commit_id, name, f_path):
+    def _symbolic_reference_svn(self, commit_id, name, f_path, ref_type):
         new_f_path = vcspath.join(name, f_path)
         return u'%s@%s' % (new_f_path, commit_id)
 
@@ -916,7 +964,7 b' class RepoFilesView(RepoAppView):'
         for commit in commits:
             branch = ' (%s)' % commit.branch if commit.branch else ''
             n_desc = 'r%s:%s%s' % (commit.idx, commit.short_id, branch)
-            commits_group[0].append((commit.raw_id, n_desc,))
+            commits_group[0].append((commit.raw_id, n_desc, 'sha'))
         history.append(commits_group)
 
         symbolic_reference = self._symbolic_reference
@@ -932,11 +980,11 b' class RepoFilesView(RepoAppView):'
                 symbolic_reference = self._symbolic_reference_svn
 
         branches = self._create_references(
-            self.rhodecode_vcs_repo.branches, symbolic_reference, f_path)
+            self.rhodecode_vcs_repo.branches, symbolic_reference, f_path, 'branch')
         branches_group = (branches, _("Branches"))
 
         tags = self._create_references(
-            self.rhodecode_vcs_repo.tags, symbolic_reference, f_path)
+            self.rhodecode_vcs_repo.tags, symbolic_reference, f_path, 'tag')
         tags_group = (tags, _("Tags"))
 
         history.append(branches_group)
@@ -964,7 +1012,7 b' class RepoFilesView(RepoAppView):'
             for obj in file_history:
                 res.append({
                     'text': obj[1],
-                    'children': [{'id': o[0], 'text': o[1]} for o in obj[0]]
+                    'children': [{'id': o[0], 'text': o[1], 'type': o[2]} for o in obj[0]]
                 })
 
             data = {
@@ -1035,15 +1083,9 b' class RepoFilesView(RepoAppView):'
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only delete files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
+        self.forbid_non_head(is_head, f_path)
+        self.check_branch_permission(_branch_name)
 
-        self.check_branch_permission(_branch_name)
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
@@ -1069,13 +1111,7 b' class RepoFilesView(RepoAppView):'
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only delete files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
+        self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
@@ -1125,14 +1161,8 b' class RepoFilesView(RepoAppView):'
         _branch_name, _sha_commit_id, is_head = \
             self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only edit files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
-        self.check_branch_permission(_branch_name)
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
@@ -1144,8 +1174,7 b' class RepoFilesView(RepoAppView):'
                 commit_id=c.commit.raw_id, f_path=f_path)
             raise HTTPFound(files_url)
 
-        c.default_message = _(
-            'Edited file {} via RhodeCode Enterprise').format(f_path)
+        c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
@@ -1162,32 +1191,23 b' class RepoFilesView(RepoAppView):'
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
-        _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-
-        if not is_head:
-            h.flash(_('You can only edit files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
-
-        self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         if c.file.is_binary:
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name,
-                             commit_id=c.commit.raw_id,
-                             f_path=f_path))
+            raise HTTPFound(h.route_path('repo_files', repo_name=self.db_repo_name,
+                                         commit_id=c.commit.raw_id, f_path=f_path))
+
+        _branch_name, _sha_commit_id, is_head = \
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        c.default_message = _(
-            'Edited file {} via RhodeCode Enterprise').format(f_path)
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
+
+        c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
+
         old_content = c.file.content
         sl = old_content.splitlines(1)
         first_line = sl[0] if sl else ''
@@ -1198,20 +1218,25 b' class RepoFilesView(RepoAppView):'
         content = convert_line_endings(r_post.get('content', ''), line_ending_mode)
 
         message = r_post.get('message') or c.default_message
-        org_f_path = c.file.unicode_path
+        org_node_path = c.file.unicode_path
         filename = r_post['filename']
-        org_filename = c.file.name
+
+        root_path = c.file.dir_path
+        pure_path = self.create_pure_path(root_path, filename)
+        node_path = safe_unicode(bytes(pure_path))
 
-        if content == old_content and filename == org_filename:
-            h.flash(_('No changes'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_commit', repo_name=self.db_repo_name,
-                             commit_id='tip'))
+        default_redirect_url = h.route_path('repo_commit', repo_name=self.db_repo_name,
+                                            commit_id=commit_id)
+        if content == old_content and node_path == org_node_path:
+            h.flash(_('No changes detected on {}').format(org_node_path),
+                    category='warning')
+            raise HTTPFound(default_redirect_url)
+
         try:
             mapping = {
-                org_f_path: {
-                    'org_filename': org_f_path,
-                    'filename': os.path.join(c.file.dir_path, filename),
+                org_node_path: {
+                    'org_filename': org_node_path,
+                    'filename': node_path,
                     'content': content,
                     'lexer': '',
                     'op': 'mod',
@@ -1219,7 +1244,7 b' class RepoFilesView(RepoAppView):'
                 }
             }
 
-            ScmModel().update_nodes(
+            commit = ScmModel().update_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
@@ -1227,21 +1252,25 b' class RepoFilesView(RepoAppView):'
                 parent_commit=c.commit,
             )
 
-            h.flash(
-                _('Successfully committed changes to file `{}`').format(
+            h.flash(_('Successfully committed changes to file `{}`').format(
                     h.escape(f_path)), category='success')
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+
         except Exception:
             log.exception('Error occurred during commit')
             h.flash(_('Error occurred during commit'), category='error')
-        raise HTTPFound(
-            h.route_path('repo_commit', repo_name=self.db_repo_name,
-                         commit_id='tip'))
+
+        raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_add_file', request_method='GET',
         renderer='rhodecode:templates/files/files_add.mako')
+    @view_config(
+        route_name='repo_files_upload_file', request_method='GET',
+        renderer='rhodecode:templates/files/files_upload.mako')
     def repo_files_add_file(self):
         _ = self.request.translate
         c = self.load_default_context()
@@ -1252,27 +1281,20 b' class RepoFilesView(RepoAppView):'
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
-        c.default_message = (_('Added file via RhodeCode Enterprise'))
-        c.f_path = f_path.lstrip('/')  # ensure not relative path
 
-        if self.rhodecode_vcs_repo.is_empty:
+        if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
-            _branch_name = c.commit.branch
-            is_head = True
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
                 self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
 
-        if not is_head:
-            h.flash(_('You can only add files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
 
-        self.check_branch_permission(_branch_name)
+        c.default_message = (_('Added file via RhodeCode Enterprise'))
+        c.f_path = f_path.lstrip('/')  # ensure not relative path
 
         return self._get_template_context(c)
 
@@ -1289,86 +1311,62 b' class RepoFilesView(RepoAppView):'
 
         self._ensure_not_locked()
 
-        r_post = self.request.POST
-
-        c.commit = self._get_commit_or_redirect(
-            commit_id, redirect_after=False)
+        c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
-        if self.rhodecode_vcs_repo.is_empty:
-            # for empty repository we cannot check for current branch, we rely on
-            # c.commit.branch instead
-            _branch_name = c.commit.branch
-            is_head = True
-        else:
-            _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
-
-        if not is_head:
-            h.flash(_('You can only add files with commit '
-                      'being a valid branch head.'), category='warning')
-            raise HTTPFound(
-                h.route_path('repo_files',
-                             repo_name=self.db_repo_name, commit_id='tip',
-                             f_path=f_path))
-
-        self.check_branch_permission(_branch_name)
-
-        c.default_message = (_('Added file via RhodeCode Enterprise'))
-        c.f_path = f_path
-        unix_mode = 0
-        content = convert_line_endings(r_post.get('content', ''), unix_mode)
-
-        message = r_post.get('message') or c.default_message
-        filename = r_post.get('filename')
-        location = r_post.get('location', '')  # dir location
-        file_obj = r_post.get('upload_file', None)
-
-        if file_obj is not None and hasattr(file_obj, 'filename'):
-            filename = r_post.get('filename_upload')
-            content = file_obj.file
-
-            if hasattr(content, 'file'):
-                # non posix systems store real file under file attr
-                content = content.file
-
-        if self.rhodecode_vcs_repo.is_empty:
+        # calculate redirect URL
+        if self.rhodecode_vcs_repo.is_empty():
             default_redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
 
+        if self.rhodecode_vcs_repo.is_empty():
+            # for empty repository we cannot check for current branch, we rely on
+            # c.commit.branch instead
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+        else:
+            _branch_name, _sha_commit_id, is_head = \
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        self.forbid_non_head(is_head, f_path, commit_id=commit_id)
+        self.check_branch_permission(_branch_name, commit_id=commit_id)
+
+        c.default_message = (_('Added file via RhodeCode Enterprise'))
+        c.f_path = f_path
+
+        r_post = self.request.POST
+        message = r_post.get('message') or c.default_message
+        filename = r_post.get('filename')
+        unix_mode = 0
+        content = convert_line_endings(r_post.get('content', ''), unix_mode)
+
+        if not filename:
         # If there's no commit, redirect to repo summary
         if type(c.commit) is EmptyCommit:
             redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             redirect_url = default_redirect_url
-
-        if not filename:
-            h.flash(_('No filename'), category='warning')
+            h.flash(_('No filename specified'), category='warning')
             raise HTTPFound(redirect_url)
 
-        # extract the location from filename,
-        # allows using foo/bar.txt syntax to create subdirectories
-        subdir_loc = filename.rsplit('/', 1)
-        if len(subdir_loc) == 2:
-            location = os.path.join(location, subdir_loc[0])
+        root_path = f_path
+        pure_path = self.create_pure_path(root_path, filename)
+        node_path = safe_unicode(bytes(pure_path).lstrip('/'))
 
-        # strip all crap out of file, just leave the basename
-        filename = os.path.basename(filename)
-        node_path = os.path.join(location, filename)
         author = self._rhodecode_db_user.full_contact
-
-        try:
             nodes = {
                 node_path: {
                     'content': content
                 }
             }
-            ScmModel().create_nodes(
+
+        try:
+
+            commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
@@ -1377,13 +1375,15 b' class RepoFilesView(RepoAppView):'
                 author=author,
             )
 
-            h.flash(
-                _('Successfully committed new file `{}`').format(
+            h.flash(_('Successfully committed new file `{}`').format(
                     h.escape(node_path)), category='success')
+
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+
         except NonRelativePathError:
             log.exception('Non Relative path found')
-            h.flash(_(
-                'The location specified must be a relative path and must not '
+            h.flash(_('The location specified must be a relative path and must not '
                 'contain .. in the path'), category='warning')
             raise HTTPFound(default_redirect_url)
         except (NodeError, NodeAlreadyExistsError) as e:
@@ -1393,3 +1393,134 b' class RepoFilesView(RepoAppView):'
             h.flash(_('Error occurred during commit'), category='error')
 
         raise HTTPFound(default_redirect_url)
+
+    @LoginRequired()
+    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    @CSRFRequired()
+    @view_config(
+        route_name='repo_files_upload_file', request_method='POST',
+        renderer='json_ext')
+    def repo_files_upload_file(self):
+        _ = self.request.translate
+        c = self.load_default_context()
+        commit_id, f_path = self._get_commit_and_path()
+
+        self._ensure_not_locked()
+
+        c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
+        if c.commit is None:
+            c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
+
+        # calculate redirect URL
+        if self.rhodecode_vcs_repo.is_empty():
+            default_redirect_url = h.route_path(
+                'repo_summary', repo_name=self.db_repo_name)
+        else:
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
+
+        if self.rhodecode_vcs_repo.is_empty():
+            # for empty repository we cannot check for current branch, we rely on
+            # c.commit.branch instead
+            _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
+        else:
+            _branch_name, _sha_commit_id, is_head = \
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+
+        error = self.forbid_non_head(is_head, f_path, json_mode=True)
+        if error:
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+        error = self.check_branch_permission(_branch_name, json_mode=True)
+        if error:
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+
+        c.default_message = (_('Uploaded file via RhodeCode Enterprise'))
+        c.f_path = f_path
+
+        r_post = self.request.POST
+
+        message = c.default_message
+        user_message = r_post.getall('message')
+        if isinstance(user_message, list) and user_message:
+            # we take the first from duplicated results if it's not empty
+            message = user_message[0] if user_message[0] else message
+
+        nodes = {}
+
+        for file_obj in r_post.getall('files_upload') or []:
+            content = file_obj.file
+            filename = file_obj.filename
+
+            root_path = f_path
+            pure_path = self.create_pure_path(root_path, filename)
+            node_path = safe_unicode(bytes(pure_path).lstrip('/'))
+
+            nodes[node_path] = {
+                'content': content
+            }
+
+        if not nodes:
+            error = 'missing files'
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+
+        author = self._rhodecode_db_user.full_contact
+
+        try:
+            commit = ScmModel().create_nodes(
+                user=self._rhodecode_db_user.user_id,
+                repo=self.db_repo,
+                message=message,
+                nodes=nodes,
+                parent_commit=c.commit,
+                author=author,
+            )
+            if len(nodes) == 1:
+                flash_message = _('Successfully committed {} new files').format(len(nodes))
+            else:
+                flash_message = _('Successfully committed 1 new file')
+
+            h.flash(flash_message, category='success')
+
+            default_redirect_url = h.route_path(
+                'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
+
+        except NonRelativePathError:
+            log.exception('Non Relative path found')
+            error = _('The location specified must be a relative path and must not '
+                      'contain .. in the path')
+            h.flash(error, category='warning')
+
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+        except (NodeError, NodeAlreadyExistsError) as e:
+            error = h.escape(e)
+            h.flash(error, category='error')
+
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+        except Exception:
+            log.exception('Error occurred during commit')
+            error = _('Error occurred during commit')
+            h.flash(error, category='error')
+            return {
+                'error': error,
+                'redirect_url': default_redirect_url
+            }
+
+        return {
+            'error': None,
+            'redirect_url': default_redirect_url
+        }

rhodecode/apps/repository/views/repo_summary.py

@@ -72,6 +72,7 b' class RepoSummaryView(RepoAppView):'
                 log.debug("Searching for a README file.")
                 readme_node = ReadmeFinder(_renderer_type).search(commit)
             if readme_node:
+                log.debug('Found README node: %s', readme_node)
                 relative_urls = {
                     'raw': h.route_path(
                         'repo_file_raw', repo_name=_repo_name,
@@ -82,7 +83,8 b' class RepoSummaryView(RepoAppView):'
                 }
                 readme_data = self._render_readme_or_none(
                     commit, readme_node, relative_urls)
-                readme_filename = readme_node.path
+                readme_filename = readme_node.unicode_path
+
             return readme_data, readme_filename
 
         inv_context_manager = rc_cache.InvalidationContext(
@@ -152,6 +154,26 b' class RepoSummaryView(RepoAppView):'
         c.comments = self.db_repo.get_comments(page_ids)
         c.statuses = self.db_repo.statuses(page_ids)
 
+    def _prepare_and_set_clone_url(self, c):
+        username = ''
+        if self._rhodecode_user.username != User.DEFAULT_USER:
+            username = safe_str(self._rhodecode_user.username)
+
+        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
+        _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
+
+        if '{repo}' in _def_clone_uri:
+            _def_clone_uri_id = _def_clone_uri.replace('{repo}', '_{repoid}')
+        elif '{repoid}' in _def_clone_uri:
+            _def_clone_uri_id = _def_clone_uri.replace('_{repoid}', '{repo}')
+
+        c.clone_repo_url = self.db_repo.clone_url(
+            user=username, uri_tmpl=_def_clone_uri)
+        c.clone_repo_url_id = self.db_repo.clone_url(
+            user=username, uri_tmpl=_def_clone_uri_id)
+        c.clone_repo_url_ssh = self.db_repo.clone_url(
+            uri_tmpl=_def_clone_uri_ssh, ssh=True)
+
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
@@ -160,6 +182,7 b' class RepoSummaryView(RepoAppView):'
         renderer='rhodecode:templates/summary/summary_commits.mako')
     def summary_commits(self):
         c = self.load_default_context()
+        self._prepare_and_set_clone_url(c)
         self._load_commits_context(c)
         return self._get_template_context(c)
 
@@ -179,26 +202,11 b' class RepoSummaryView(RepoAppView):'
         c = self.load_default_context()
 
         # Prepare the clone URL
-        username = ''
-        if self._rhodecode_user.username != User.DEFAULT_USER:
-            username = safe_str(self._rhodecode_user.username)
-
-        _def_clone_uri = _def_clone_uri_id = c.clone_uri_tmpl
-        _def_clone_uri_ssh = c.clone_uri_ssh_tmpl
+        self._prepare_and_set_clone_url(c)
 
-        if '{repo}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace(
-                '{repo}', '_{repoid}')
-        elif '{repoid}' in _def_clone_uri:
-            _def_clone_uri_id = _def_clone_uri.replace(
-                '_{repoid}', '{repo}')
-
-        c.clone_repo_url = self.db_repo.clone_url(
-            user=username, uri_tmpl=_def_clone_uri)
-        c.clone_repo_url_id = self.db_repo.clone_url(
-            user=username, uri_tmpl=_def_clone_uri_id)
-        c.clone_repo_url_ssh = self.db_repo.clone_url(
-            uri_tmpl=_def_clone_uri_ssh, ssh=True)
+        # update every 5 min
+        if self.db_repo.last_commit_cache_update_diff > 60 * 5:
+            self.db_repo.update_commit_cache()
 
         # If enabled, get statistics data
 
@@ -231,8 +239,6 b' class RepoSummaryView(RepoAppView):'
         c.enable_downloads = self.db_repo.enable_downloads
         c.repository_followers = scm_model.get_followers(self.db_repo)
         c.repository_forks = scm_model.get_forks(self.db_repo)
-        c.repository_is_user_following = scm_model.is_following_repo(
-            self.db_repo_name, self._rhodecode_user.user_id)
 
         # first interaction with the VCS instance after here...
         if c.repository_requirements_missing:
@@ -317,8 +323,7 b' class RepoSummaryView(RepoAppView):'
             (_("Tag"), repo.tags, 'tag'),
             (_("Bookmark"), repo.bookmarks, 'book'),
         ]
-        res = self._create_reference_data(
-            repo, self.db_repo_name, refs_to_create)
+        res = self._create_reference_data(repo, self.db_repo_name, refs_to_create)
         data = {
             'more': False,
             'results': res
@@ -365,8 +370,7 b' class RepoSummaryView(RepoAppView):'
                 })
         return result
 
-    def _create_reference_items(self, repo, full_repo_name, refs, ref_type,
-                                format_ref_id):
+    def _create_reference_items(self, repo, full_repo_name, refs, ref_type, format_ref_id):
         result = []
         is_svn = h.is_svn(repo)
         for ref_name, raw_id in refs.iteritems():
@@ -378,6 +382,7 b' class RepoSummaryView(RepoAppView):'
                 'raw_id': raw_id,
                 'type': ref_type,
                 'files_url': files_url,
+                'idx': 0,
             })
         return result
 

rhodecode/apps/ssh_support/lib/backends/hg.py

@@ -20,12 +20,13 b''
 
 import os
 import sys
-import shutil
 import logging
 import tempfile
 import textwrap
-
+import collections
 from .base import VcsServer
+from rhodecode.model.db import RhodeCodeUi
+from rhodecode.model.settings import VcsSettingsModel
 
 log = logging.getLogger(__name__)
 
@@ -37,62 +38,46 b' class MercurialTunnelWrapper(object):'
         self.server = server
         self.stdin = sys.stdin
         self.stdout = sys.stdout
-        self.svn_conf_fd, self.svn_conf_path = tempfile.mkstemp()
-        self.hooks_env_fd, self.hooks_env_path = tempfile.mkstemp()
+        self.hooks_env_fd, self.hooks_env_path = tempfile.mkstemp(prefix='hgrc_rhodecode_')
 
     def create_hooks_env(self):
+        repo_name = self.server.repo_name
+        hg_flags = self.server.config_to_hgrc(repo_name)
 
         content = textwrap.dedent(
             '''
-            # SSH hooks version=1.0.0
-            [hooks]
-            pretxnchangegroup.ssh_auth=python:vcsserver.hooks.pre_push_ssh_auth
-            pretxnchangegroup.ssh=python:vcsserver.hooks.pre_push_ssh
-            changegroup.ssh=python:vcsserver.hooks.post_push_ssh
+            # RhodeCode SSH hooks version=2.0.0
+            {custom}
+            '''
+        ).format(custom='\n'.join(hg_flags))
             
-            preoutgoing.ssh=python:vcsserver.hooks.pre_pull_ssh
-            outgoing.ssh=python:vcsserver.hooks.post_pull_ssh
+        root = self.server.get_root_store()
+        hgrc_custom = os.path.join(root, repo_name, '.hg', 'hgrc_rhodecode')
+        hgrc_main = os.path.join(root, repo_name, '.hg', 'hgrc')
 
-            '''
-        )
+        # cleanup custom hgrc file
+        if os.path.isfile(hgrc_custom):
+            with open(hgrc_custom, 'wb') as f:
+                f.write('')
+            log.debug('Cleanup custom hgrc file under %s', hgrc_custom)
 
+        # write temp
         with os.fdopen(self.hooks_env_fd, 'w') as hooks_env_file:
             hooks_env_file.write(content)
-        root = self.server.get_root_store()
 
-        hgrc_custom = os.path.join(
-            root, self.server.repo_name, '.hg', 'hgrc_rhodecode')
-        log.debug('Wrote custom hgrc file under %s', hgrc_custom)
-        shutil.move(
-            self.hooks_env_path, hgrc_custom)
-
-        hgrc_main = os.path.join(
-            root, self.server.repo_name, '.hg', 'hgrc')
-        include_marker = '%include hgrc_rhodecode'
+        return self.hooks_env_path
 
-        if not os.path.isfile(hgrc_main):
-            os.mknod(hgrc_main)
-
-        with open(hgrc_main, 'rb') as f:
-            data = f.read()
-            has_marker = include_marker in data
+    def remove_configs(self):
+        os.remove(self.hooks_env_path)
 
-        if not has_marker:
-            log.debug('Adding include marker for hooks')
-            with open(hgrc_main, 'wa') as f:
-                f.write(textwrap.dedent('''
-                # added by RhodeCode
-                {}
-                '''.format(include_marker)))
-
-    def command(self):
+    def command(self, hgrc_path):
         root = self.server.get_root_store()
 
         command = (
-            "cd {root}; {hg_path} -R {root}{repo_name} "
+            "cd {root}; HGRCPATH={hgrc} {hg_path} -R {root}{repo_name} "
             "serve --stdio".format(
                 root=root, hg_path=self.server.hg_path,
-                repo_name=self.server.repo_name))
+                repo_name=self.server.repo_name, hgrc=hgrc_path))
         log.debug("Final CMD: %s", command)
         return command
 
@@ -102,22 +87,61 b' class MercurialTunnelWrapper(object):'
         action = '?'
         # permissions are check via `pre_push_ssh_auth` hook
         self.server.update_environment(action=action, extras=extras)
-        self.create_hooks_env()
-        return os.system(self.command())
+        custom_hgrc_file = self.create_hooks_env()
+
+        try:
+            return os.system(self.command(custom_hgrc_file))
+        finally:
+            self.remove_configs()
 
 
 class MercurialServer(VcsServer):
     backend = 'hg'
+    cli_flags = ['phases', 'largefiles', 'extensions', 'experimental', 'hooks']
 
-    def __init__(self, store, ini_path, repo_name,
-                 user, user_permissions, config, env):
-        super(MercurialServer, self).\
-            __init__(user, user_permissions, config, env)
+    def __init__(self, store, ini_path, repo_name, user, user_permissions, config, env):
+        super(MercurialServer, self).__init__(user, user_permissions, config, env)
 
         self.store = store
         self.ini_path = ini_path
         self.repo_name = repo_name
-        self._path = self.hg_path = config.get(
-            'app:main', 'ssh.executable.hg')
+        self._path = self.hg_path = config.get('app:main', 'ssh.executable.hg')
+        self.tunnel = MercurialTunnelWrapper(server=self)
+
+    def config_to_hgrc(self, repo_name):
+        ui_sections = collections.defaultdict(list)
+        ui = VcsSettingsModel(repo=repo_name).get_ui_settings(section=None, key=None)
+
+        # write default hooks
+        default_hooks = [
+            ('pretxnchangegroup.ssh_auth', 'python:vcsserver.hooks.pre_push_ssh_auth'),
+            ('pretxnchangegroup.ssh', 'python:vcsserver.hooks.pre_push_ssh'),
+            ('changegroup.ssh', 'python:vcsserver.hooks.post_push_ssh'),
+
+            ('preoutgoing.ssh', 'python:vcsserver.hooks.pre_pull_ssh'),
+            ('outgoing.ssh', 'python:vcsserver.hooks.post_pull_ssh'),
+        ]
+
+        for k, v in default_hooks:
+            ui_sections['hooks'].append((k, v))
 
-        self.tunnel = MercurialTunnelWrapper(server=self)
+        for entry in ui:
+            if not entry.active:
+                continue
+            sec = entry.section
+            key = entry.key
+
+            if sec in self.cli_flags:
+                # we want only custom hooks, so we skip builtins
+                if sec == 'hooks' and key in RhodeCodeUi.HOOKS_BUILTIN:
+                    continue
+
+                ui_sections[sec].append([key, entry.value])
+
+        flags = []
+        for _sec, key_val in ui_sections.items():
+            flags.append(' ')
+            flags.append('[{}]'.format(_sec))
+            for key, val in key_val:
+                flags.append('{}= {}'.format(key, val))
+        return flags

rhodecode/apps/ssh_support/tests/test_server_hg.py

@@ -18,6 +18,7 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import os
 import mock
 import pytest
 
@@ -68,14 +69,16 b' def hg_server(app):'
 
 class TestMercurialServer(object):
 
-    def test_command(self, hg_server):
+    def test_command(self, hg_server, tmpdir):
         server = hg_server.create()
+        custom_hgrc = os.path.join(str(tmpdir), 'hgrc')
         expected_command = (
-            'cd {root}; {hg_path} -R {root}{repo_name} serve --stdio'.format(
-                root=hg_server.root, hg_path=hg_server.hg_path,
+            'cd {root}; HGRCPATH={custom_hgrc} {hg_path} -R {root}{repo_name} serve --stdio'.format(
+                root=hg_server.root, custom_hgrc=custom_hgrc, hg_path=hg_server.hg_path,
                 repo_name=hg_server.repo_name)
         )
-        assert expected_command == server.tunnel.command()
+        server_command = server.tunnel.command(custom_hgrc)
+        assert expected_command == server_command
 
     @pytest.mark.parametrize('permissions, action, code', [
         ({}, 'pull', -2),

rhodecode/config/licenses.json

@@ -28,23 +28,16 b''
     {
         "license": [
             {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-coverage-3.7.1"
-    },
-    {
-        "license": [
-            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
+        "name": "python2.7-beautifulsoup4-4.6.3"
+    },
+    {
+        "license": "UNKNOWN",
         "name": "python2.7-bootstrapped-pip-9.0.1"
     },
     {
@@ -56,29 +49,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-cov-core-1.15.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-webtest-2.0.29"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-beautifulsoup4-4.6.3"
+        "name": "python2.7-webtest-2.0.32"
     },
     {
         "license": [
@@ -100,7 +71,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-webob-1.7.4"
+        "name": "python2.7-webob-1.8.4"
     },
     {
         "license": [
@@ -116,6 +87,28 b''
     {
         "license": [
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-coverage-4.5.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cov-core-1.15.0"
+    },
+    {
+        "license": [
+            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -127,6 +120,17 b''
     {
         "license": [
             {
+                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
+            },
+            {
+                "fullName": "LGPL"
+            }
+        ],
+        "name": "python2.7-gprof2dot-2017.9.19"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
@@ -136,7 +140,7 b''
                 "fullName": "DFSG approved"
             }
         ],
-        "name": "python2.7-pytest-timeout-1.2.1"
+        "name": "python2.7-pytest-timeout-1.3.2"
     },
     {
         "license": [
@@ -147,7 +151,32 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pytest-3.6.0"
+        "name": "python2.7-pytest-3.8.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pathlib2-2.3.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "New BSD License"
+            }
+        ],
+        "name": "python2.7-scandir-1.9.0"
     },
     {
         "license": [
@@ -172,7 +201,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pluggy-0.6.0"
+        "name": "python2.7-pluggy-0.9.0"
     },
     {
         "license": [
@@ -183,7 +212,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-atomicwrites-1.1.5"
+        "name": "python2.7-atomicwrites-1.2.1"
     },
     {
         "license": [
@@ -194,7 +223,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-more-itertools-4.3.0"
+        "name": "python2.7-more-itertools-5.0.0"
     },
     {
         "license": [
@@ -205,7 +234,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-attrs-18.1.0"
+        "name": "python2.7-attrs-18.2.0"
     },
     {
         "license": [
@@ -216,18 +245,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-py-1.5.3"
-    },
-    {
-        "license": [
-            {
-                "fullName": "GNU Lesser General Public License v3 or later (LGPLv3+)"
-            },
-            {
-                "fullName": "LGPL"
-            }
-        ],
-        "name": "python2.7-gprof2dot-2017.9.19"
+        "name": "python2.7-py-1.6.0"
     },
     {
         "license": [
@@ -254,17 +272,6 b''
     {
         "license": [
             {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-setuptools-scm-2.1.0"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -299,7 +306,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pytest-cov-2.5.1"
+        "name": "python2.7-pytest-cov-2.6.0"
     },
     {
         "license": [
@@ -310,7 +317,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-appenlight-client-0.6.25"
+        "name": "python2.7-appenlight-client-0.6.26"
     },
     {
         "license": [
@@ -326,10 +333,107 b''
     {
         "license": [
             {
-                "fullName": "AGPLv3 and Proprietary"
+                "fullName": "Apache 2.0 and Proprietary"
+            }
+        ],
+        "name": "python2.7-rhodecode-tools-1.2.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch1-dsl-0.0.12"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch1-1.10.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-rhodecode-tools-0.16.0"
+        "name": "python2.7-urllib3-1.24.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            },
+            {
+                "fullName": "Dual License"
+            }
+        ],
+        "name": "python2.7-python-dateutil-2.8.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch2-2.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-dsl-6.3.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-ipaddress-1.0.22"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-elasticsearch-6.3.1"
     },
     {
         "license": [
@@ -351,66 +455,13 b''
     {
         "license": [
             {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-urllib3-1.21"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-elasticsearch-dsl-2.2.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-elasticsearch-2.3.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            },
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            },
-            {
-                "fullName": "Dual License"
-            }
-        ],
-        "name": "python2.7-python-dateutil-2.7.3"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-markupsafe-1.0"
+        "name": "python2.7-markupsafe-1.1.0"
     },
     {
         "license": [
@@ -443,29 +494,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-click-6.6"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-bottle-0.12.13"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-cprofilev-1.0.7"
+        "name": "python2.7-click-7.0"
     },
     {
         "license": [
@@ -519,31 +548,6 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pathlib2-2.3.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            },
-            {
-                "fullName": "New BSD License"
-            }
-        ],
-        "name": "python2.7-scandir-1.9.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
         "name": "python2.7-backports.shutil-get-terminal-size-1.0.0"
     },
     {
@@ -555,7 +559,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pygments-2.2.0"
+        "name": "python2.7-pygments-2.3.1"
     },
     {
         "license": [
@@ -646,7 +650,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pickleshare-0.7.4"
+        "name": "python2.7-pickleshare-0.7.5"
     },
     {
         "license": [
@@ -690,7 +694,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-greenlet-0.4.13"
+        "name": "python2.7-greenlet-0.4.15"
     },
     {
         "license": [
@@ -701,7 +705,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-gevent-1.3.5"
+        "name": "python2.7-gevent-1.4.0"
     },
     {
         "license": [
@@ -712,7 +716,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-psutil-5.4.6"
+        "name": "python2.7-psutil-5.5.1"
     },
     {
         "license": [
@@ -745,7 +749,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-alembic-0.9.9"
+        "name": "python2.7-alembic-1.0.5"
     },
     {
         "license": {
@@ -754,7 +758,7 b''
             "spdxId": "Apache-2.0",
             "url": "http://spdx.org/licenses/Apache-2.0.html"
         },
-        "name": "python2.7-python-editor-1.0.3"
+        "name": "python2.7-python-editor-1.0.4"
     },
     {
         "license": [
@@ -842,39 +846,6 b''
     {
         "license": [
             {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-bleach-2.1.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-html5lib-1.0.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-webencodings-0.5.1"
-    },
-    {
-        "license": [
-            {
                 "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
                 "shortName": "bsdOriginal",
                 "spdxId": "BSD-4-Clause",
@@ -892,7 +863,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-testpath-0.3.1"
+        "name": "python2.7-testpath-0.4.2"
     },
     {
         "license": [
@@ -908,6 +879,28 b''
     {
         "license": [
             {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
+            }
+        ],
+        "name": "python2.7-bleach-3.1.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-webencodings-0.5.1"
+    },
+    {
+        "license": [
+            {
                 "fullName": "MIT License",
                 "shortName": "mit",
                 "spdxId": "MIT",
@@ -925,7 +918,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-configparser-3.5.0"
+        "name": "python2.7-configparser-3.7.3"
     },
     {
         "license": [
@@ -947,7 +940,73 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-mistune-0.8.3"
+        "name": "python2.7-mistune-0.8.4"
+    },
+    {
+        "license": {
+            "fullName": "GNU Lesser General Public License v3.0 or later",
+            "shortName": "lgpl3Plus",
+            "spdxId": "LGPL-3.0+",
+            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
+        },
+        "name": "python2.7-psycopg2-2.7.7"
+    },
+    {
+        "license": {
+            "fullName": "PostgreSQL License",
+            "shortName": "postgresql",
+            "spdxId": "PostgreSQL",
+            "url": "http://spdx.org/licenses/PostgreSQL.html"
+        },
+        "name": "postgresql-9.6.10"
+    },
+    {
+        "license": [
+            {
+                "fullName": "zlib License",
+                "shortName": "zlib",
+                "spdxId": "Zlib",
+                "url": "http://spdx.org/licenses/Zlib.html"
+            },
+            {
+                "fullName": "libpng License",
+                "shortName": "libpng",
+                "spdxId": "Libpng",
+                "url": "http://spdx.org/licenses/Libpng.html"
+            }
+        ],
+        "name": "python2.7-pysqlite-2.8.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-pymysql-0.8.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "GNU General Public License v1.0 only",
+                "shortName": "gpl1",
+                "spdxId": "GPL-1.0",
+                "url": "http://spdx.org/licenses/GPL-1.0.html"
+            }
+        ],
+        "name": "python2.7-mysql-python-1.2.5"
+    },
+    {
+        "license": {
+            "fullName": "GNU Library General Public License v2.1 only",
+            "shortName": "lgpl21",
+            "spdxId": "LGPL-2.1",
+            "url": "http://spdx.org/licenses/LGPL-2.1.html"
+        },
+        "name": "mariadb-connector-c-2.3.4"
     },
     {
         "license": [
@@ -958,7 +1017,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.interface-4.5.0"
+        "name": "python2.7-zope.interface-4.6.0"
     },
     {
         "license": [
@@ -969,7 +1028,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.event-4.3.0"
+        "name": "python2.7-zope.event-4.4"
     },
     {
         "license": [
@@ -980,7 +1039,7 b''
                 "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-zope.deprecation-4.3.0"
+        "name": "python2.7-zope.deprecation-4.4.0"
     },
     {
         "license": [
@@ -1043,7 +1102,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-paste-2.0.3"
+        "name": "python2.7-paste-3.0.5"
     },
     {
         "license": [
@@ -1061,7 +1120,7 b''
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-venusian-1.1.0"
+        "name": "python2.7-venusian-1.2.0"
     },
     {
         "license": {
@@ -1072,17 +1131,6 b''
         "name": "python2.7-urlobject-2.4.3"
     },
     {
-        "license": [
-            {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
-            }
-        ],
-        "name": "python2.7-trollius-1.0.4"
-    },
-    {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
@@ -1095,7 +1143,7 b''
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-supervisor-3.3.4"
+        "name": "python2.7-supervisor-3.3.5"
     },
     {
         "license": [
@@ -1114,7 +1162,7 b''
                 "url": "http://spdx.org/licenses/Python-2.0.html"
             }
         ],
-        "name": "python2.7-subprocess32-3.5.1"
+        "name": "python2.7-subprocess32-3.5.3"
     },
     {
         "license": [
@@ -1125,7 +1173,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-sshpubkeys-2.2.0"
+        "name": "python2.7-sshpubkeys-3.1.0"
     },
     {
         "license": [
@@ -1141,11 +1189,55 b''
     {
         "license": [
             {
-                "fullName": "Public Domain",
-                "shortName": "publicDomain"
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            },
+            {
+                "fullName": "BSD or Apache License, Version 2.0"
+            },
+            {
+                "fullName": "Apache License 2.0",
+                "shortName": "asl20",
+                "spdxId": "Apache-2.0",
+                "url": "http://spdx.org/licenses/Apache-2.0.html"
             }
         ],
-        "name": "python2.7-pycrypto-2.6.1"
+        "name": "python2.7-cryptography-2.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-cffi-1.12.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pycparser-2.19"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-asn1crypto-0.24.0"
     },
     {
         "license": [
@@ -1159,18 +1251,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-simplejson-3.11.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-setproctitle-1.1.10"
+        "name": "python2.7-simplejson-3.16.0"
     },
     {
         "license": [
@@ -1210,7 +1291,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-py-gfm-0.1.3"
+        "name": "python2.7-py-gfm-0.1.4"
     },
     {
         "license": [
@@ -1248,6 +1329,72 b''
     {
         "license": [
             {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-python-saml-2.4.2"
+    },
+    {
+        "license": [
+            {
+                "fullName": "Python Software Foundation License version 2",
+                "shortName": "psfl",
+                "spdxId": "Python-2.0",
+                "url": "http://spdx.org/licenses/Python-2.0.html"
+            }
+        ],
+        "name": "python2.7-defusedxml-0.5.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-isodate-0.6.0"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-dm.xmlsec.binding-1.3.7"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-lxml-4.2.5"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-wheel-0.30.0"
+    },
+    {
+        "license": [
+            {
                 "fullName": "License :: OSI Approved :: MIT License"
             },
             {
@@ -1260,14 +1407,7 b''
         "name": "python2.7-python-pam-1.8.4"
     },
     {
-        "license": [
-            {
-                "fullName": "GNU General Public License v1.0 only",
-                "shortName": "gpl1",
-                "spdxId": "GPL-1.0",
-                "url": "http://spdx.org/licenses/GPL-1.0.html"
-            }
-        ],
+        "license": "UNKNOWN",
         "name": "linux-pam-1.3.0"
     },
     {
@@ -1302,9 +1442,7 b''
         "name": "libkrb5-1.15.2"
     },
     {
-        "license":{
-            "fullName": "BSD-derived (https://www.openldap.org/software/release/license.html)"
-        },
+        "license": "UNKNOWN",
         "name": "openldap-2.4.45"
     },
     {
@@ -1316,7 +1454,18 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pyasn1-modules-0.2.2"
+        "name": "python2.7-pyasn1-modules-0.2.4"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
+        "name": "python2.7-pyasn1-0.4.5"
     },
     {
         "license": [
@@ -1327,42 +1476,36 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-pyasn1-0.4.4"
+        "name": "python2.7-pyramid-mailer-0.15.1"
     },
     {
         "license": [
             {
-                "fullName": "zlib License",
-                "shortName": "zlib",
-                "spdxId": "Zlib",
-                "url": "http://spdx.org/licenses/Zlib.html"
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
+            }
+        ],
+        "name": "python2.7-transaction-2.4.0"
             },
             {
-                "fullName": "libpng License",
-                "shortName": "libpng",
-                "spdxId": "Libpng",
-                "url": "http://spdx.org/licenses/Libpng.html"
+        "license": [
+            {
+                "fullName": "Zope Public License 2.1",
+                "shortName": "zpl21",
+                "spdxId": "ZPL-2.1",
+                "url": "http://spdx.org/licenses/ZPL-2.1.html"
             }
         ],
-        "name": "python2.7-pysqlite-2.8.3"
+        "name": "python2.7-repoze.sendmail-4.4.1"
     },
     {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-pyramid-1.9.2"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-hupper-1.3"
+        "name": "python2.7-pyramid-1.10.1"
     },
     {
         "license": [
@@ -1395,7 +1538,18 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pastedeploy-1.5.2"
+        "name": "python2.7-pastedeploy-2.0.1"
+    },
+    {
+        "license": [
+            {
+                "fullName": "MIT License",
+                "shortName": "mit",
+                "spdxId": "MIT",
+                "url": "http://spdx.org/licenses/MIT.html"
+            }
+        ],
+        "name": "python2.7-hupper-1.5"
     },
     {
         "license": {
@@ -1428,18 +1582,7 b''
                 "url": "http://www.repoze.org/LICENSE.txt"
             }
         ],
-        "name": "python2.7-pyramid-debugtoolbar-4.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "Python Software Foundation License version 2",
-                "shortName": "psfl",
-                "spdxId": "Python-2.0",
-                "url": "http://spdx.org/licenses/Python-2.0.html"
-            }
-        ],
-        "name": "python2.7-ipaddress-1.0.22"
+        "name": "python2.7-pyramid-debugtoolbar-4.5"
     },
     {
         "license": {
@@ -1468,29 +1611,16 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pyparsing-1.5.7"
+        "name": "python2.7-pyparsing-2.3.0"
     },
     {
         "license": [
             {
-                "fullName": "Apache License 2.0",
-                "shortName": "asl20",
-                "spdxId": "Apache-2.0",
-                "url": "http://spdx.org/licenses/Apache-2.0.html"
+                "fullName": "Public Domain",
+                "shortName": "publicDomain"
             }
         ],
-        "name": "python2.7-pygments-markdown-lexer-0.1.0.dev39"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-pyflakes-0.8.1"
+        "name": "python2.7-pycrypto-2.6.1"
     },
     {
         "license": {
@@ -1513,30 +1643,12 b''
         "name": "python2.7-py-bcrypt-0.4"
     },
     {
-        "license": {
-            "fullName": "GNU Lesser General Public License v3.0 or later",
-            "shortName": "lgpl3Plus",
-            "spdxId": "LGPL-3.0+",
-            "url": "http://spdx.org/licenses/LGPL-3.0+.html"
-        },
-        "name": "python2.7-psycopg2-2.7.4"
-    },
-    {
-        "license": {
-            "fullName": "PostgreSQL License",
-            "shortName": "postgresql",
-            "spdxId": "PostgreSQL",
-            "url": "http://spdx.org/licenses/PostgreSQL.html"
-        },
-        "name": "postgresql-9.6.10"
-    },
-    {
         "license": [
             {
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-peppercorn-0.5"
+        "name": "python2.7-peppercorn-0.6"
     },
     {
         "license": [
@@ -1547,7 +1659,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-pastescript-2.0.2"
+        "name": "python2.7-pastescript-3.0.0"
     },
     {
         "license": [
@@ -1569,60 +1681,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-objgraph-3.1.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-graphviz-0.9"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-pyotp-2.2.6"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-pymysql-0.8.1"
-    },
-    {
-        "license": [
-            {
-                "fullName": "GNU General Public License v1.0 only",
-                "shortName": "gpl1",
-                "spdxId": "GPL-1.0",
-                "url": "http://spdx.org/licenses/GPL-1.0.html"
-            }
-        ],
-        "name": "python2.7-mysql-python-1.2.5"
-    },
-    {
-        "license": {
-            "fullName": "GNU Library General Public License v2.1 only",
-            "shortName": "lgpl21",
-            "spdxId": "LGPL-2.1",
-            "url": "http://spdx.org/licenses/LGPL-2.1.html"
-        },
-        "name": "mariadb-connector-c-2.3.4"
+        "name": "python2.7-pyotp-2.2.7"
     },
     {
         "license": [
@@ -1644,29 +1703,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-lxml-3.7.3"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "python2.7-wheel-0.30.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-kombu-4.2.0"
+        "name": "python2.7-kombu-4.2.1"
     },
     {
         "license": [
@@ -1688,18 +1725,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-vine-1.1.4"
-    },
-    {
-        "license": [
-            {
-                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
-                "shortName": "bsdOriginal",
-                "spdxId": "BSD-4-Clause",
-                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
-            }
-        ],
-        "name": "python2.7-billiard-3.5.0.3"
+        "name": "python2.7-vine-1.2.0"
     },
     {
         "license": [
@@ -1721,7 +1747,7 b''
                 "url": "http://spdx.org/licenses/MIT.html"
             }
         ],
-        "name": "python2.7-iso8601-0.1.11"
+        "name": "python2.7-iso8601-0.1.12"
     },
     {
         "license": [
@@ -1765,7 +1791,7 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
-        "name": "python2.7-dogpile.cache-0.6.6"
+        "name": "python2.7-dogpile.cache-0.7.1"
     },
     {
         "license": {
@@ -1779,17 +1805,20 b''
     {
         "license": [
             {
+                "fullName": "Repoze Public License"
+            },
+            {
                 "fullName": "BSD-derived (http://www.repoze.org/LICENSE.txt)"
             }
         ],
-        "name": "python2.7-deform-2.0.5"
+        "name": "python2.7-deform-2.0.7"
     },
     {
         "license": {
             "fullName": "Repoze License",
             "url": "http://www.repoze.org/LICENSE.txt"
         },
-        "name": "python2.7-colander-1.4"
+        "name": "python2.7-colander-1.7.0"
     },
     {
         "license": [
@@ -1863,6 +1892,17 b''
                 "url": "http://spdx.org/licenses/BSD-4-Clause.html"
             }
         ],
+        "name": "python2.7-billiard-3.5.0.3"
+    },
+    {
+        "license": [
+            {
+                "fullName": "BSD 4-clause \"Original\" or \"Old\" License",
+                "shortName": "bsdOriginal",
+                "spdxId": "BSD-4-Clause",
+                "url": "http://spdx.org/licenses/BSD-4-Clause.html"
+            }
+        ],
         "name": "python2.7-babel-1.3"
     },
     {
@@ -1877,25 +1917,7 b''
         "name": "python2.7-authomatic-0.1.0.post1"
     },
     {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
-        "name": "node-grunt-cli-1.2.0"
-    },
-    {
-        "license": [
-            {
-                "fullName": "MIT License",
-                "shortName": "mit",
-                "spdxId": "MIT",
-                "url": "http://spdx.org/licenses/MIT.html"
-            }
-        ],
+        "license": "UNKNOWN",
         "name": "python2.7-rhodecode-testdata-0.10.0"
     }
 ]

rhodecode/config/middleware.py

@@ -250,7 +250,7 b' def includeme(config):'
 
     # Includes which are required. The application would fail without them.
     config.include('pyramid_mako')
-    config.include('pyramid_beaker')
+    config.include('rhodecode.lib.rc_beaker')
     config.include('rhodecode.lib.rc_cache')
 
     config.include('rhodecode.apps._base.navigation')

rhodecode/config/rcextensions/examples/validate_pushed_files_name_and_size.py

@@ -28,8 +28,8 b' def _pre_push_hook(*args, **kwargs):'
     [{u'hg_env|git_env': ...,
       u'multiple_heads': [],
       u'name': u'default',
-      u'new_rev': u'd0befe0692e722e01d5677f27a104631cf798b69',
-      u'old_rev': u'd0befe0692e722e01d5677f27a104631cf798b69',
+      u'new_rev': u'd0b2ae0692e722e01d5677f27a104631cf798b69',
+      u'old_rev': u'd0b1ae0692e722e01d5677f27a104631cf798b69',
       u'ref': u'',
       u'total_commits': 2,
       u'type': u'branch'}]
@@ -47,13 +47,17 b' def _pre_push_hook(*args, **kwargs):'
     forbid_files = repo_extra_fields.get('forbid_files_glob', {}).get('field_value')
     forbid_files = aslist(forbid_files)
 
+    # forbid_files = ['*']  # example pattern
+
     # optionally get bytes limit for a single file, e.g 1024 for 1KB
     forbid_size_over = repo_extra_fields.get('forbid_size_over', {}).get('field_value')
     forbid_size_over = int(forbid_size_over or 0)
 
+    # forbid_size_over = 1024  # example 1024
+
     def validate_file_name_and_size(file_data, forbidden_files=None, size_limit=None):
         """
-        This function validates commited files against some sort of rules.
+        This function validates comited files against some sort of rules.
         It should return a valid boolean, and a reason for failure
 
         file_data =[
@@ -87,6 +91,9 b' def _pre_push_hook(*args, **kwargs):'
 
         # validate A(dded) files and size
         if size_limit and operation == 'A':
+            if 'file_size' in file_data:
+                size = file_data['file_size']
+            else:
             size = len(file_data['raw_diff'])
 
             reason = 'File {} size of {} bytes exceeds limit {}'.format(

rhodecode/config/rcextensions/helpers/extract_pre_files.py

@@ -34,12 +34,51 b' from rhodecode.lib.vcs.backends.hg.diff '
 from rhodecode.lib.vcs.backends.git.diff import GitDiff
 
 
-def get_hg_files(repo, refs):
+def get_svn_files(repo, vcs_repo, refs):
+    txn_id = refs[0]
+    files = []
+    stdout, stderr = vcs_repo.run_svn_command(
+        ['svnlook', 'changed', repo.repo_full_path, '--transaction', txn_id])
+
+    svn_op_to_rc_op = {
+        'A': 'A',
+        'U': 'M',
+        'D': 'D',
+    }
+
+    for entry in stdout.splitlines():
+        parsed_entry = {
+            'raw_diff': '',
+            'filename': '',
+            'chunks': [],
+            'ops': {},
+            'file_size': 0
+        }
+
+        op = entry[0]
+        path = entry[1:].strip()
+
+        rc_op = svn_op_to_rc_op.get(op) or '?'
+        parsed_entry['filename'] = path
+        parsed_entry['operation'] = rc_op
+
+        if rc_op in ['A', 'M']:
+            stdout, stderr = vcs_repo.run_svn_command(
+                ['svnlook', 'filesize', repo.repo_full_path, path, '--transaction', txn_id])
+            file_size = int(stdout.strip())
+            parsed_entry['file_size'] = file_size
+
+        files.append(parsed_entry)
+
+    return files
+
+
+def get_hg_files(repo, vcs_repo, refs):
     files = []
     return files
 
 
-def get_git_files(repo, refs):
+def get_git_files(repo, vcs_repo, refs):
     files = []
 
     for data in refs:
@@ -57,7 +96,7 b' def get_git_files(repo, refs):'
             'diff', old_rev, new_rev
         ]
 
-        stdout, stderr = repo.run_git_command(cmd, extra_env=git_env)
+        stdout, stderr = vcs_repo.run_git_command(cmd, extra_env=git_env)
         vcs_diff = GitDiff(stdout)
 
         diff_processor = diffs.DiffProcessor(vcs_diff, format='newdiff')
@@ -86,11 +125,14 b' def run(*args, **kwargs):'
     if vcs_type == 'git':
         for rev_data in kwargs['commit_ids']:
             new_environ = dict((k, v) for k, v in rev_data['git_env'])
-        files = get_git_files(vcs_repo, kwargs['commit_ids'])
+        files = get_git_files(repo, vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'hg':
         for rev_data in kwargs['commit_ids']:
             new_environ = dict((k, v) for k, v in rev_data['hg_env'])
-        files = get_hg_files(vcs_repo, kwargs['commit_ids'])
+        files = get_hg_files(repo, vcs_repo, kwargs['commit_ids'])
+
+    if vcs_type == 'svn':
+        files = get_svn_files(repo, vcs_repo, kwargs['commit_ids'])
 
     return files

rhodecode/integrations/views.py

@@ -402,7 +402,8 b' class RepoIntegrationsView(IntegrationSe'
         c.rhodecode_db_repo = self.repo
         c.repo_name = self.db_repo.repo_name
         c.repository_pull_requests = ScmModel().get_pull_requests(self.repo)
-
+        c.repository_is_user_following = ScmModel().is_following_repo(
+            c.repo_name, self._rhodecode_user.user_id)
         c.has_origin_repo_read_perm = False
         if self.db_repo.fork:
             c.has_origin_repo_read_perm = h.HasRepoPermissionAny(

rhodecode/lib/audit_logger.py

@@ -92,6 +92,9 b' ACTIONS_V1 = {'
     'repo.commit.comment.delete': {'data': {}},
     'repo.commit.vote': '',
 
+    'repo.artifact.add': '',
+    'repo.artifact.delete': '',
+
     'repo_group.create': {'data': {}},
     'repo_group.edit': {'old_data': {}},
     'repo_group.edit.permissions': {},

rhodecode/lib/auth.py

@@ -2078,8 +2078,7 b' class HasRepoPermissionAny(PermsFunction'
 class HasRepoGroupPermissionAny(PermsFunction):
     def __call__(self, group_name=None, check_location='', user=None):
         self.repo_group_name = group_name
-        return super(HasRepoGroupPermissionAny, self).__call__(
-            check_location, user)
+        return super(HasRepoGroupPermissionAny, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions
@@ -2095,8 +2094,7 b' class HasRepoGroupPermissionAny(PermsFun'
 class HasRepoGroupPermissionAll(PermsFunction):
     def __call__(self, group_name=None, check_location='', user=None):
         self.repo_group_name = group_name
-        return super(HasRepoGroupPermissionAll, self).__call__(
-            check_location, user)
+        return super(HasRepoGroupPermissionAll, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions
@@ -2112,8 +2110,7 b' class HasRepoGroupPermissionAll(PermsFun'
 class HasUserGroupPermissionAny(PermsFunction):
     def __call__(self, user_group_name=None, check_location='', user=None):
         self.user_group_name = user_group_name
-        return super(HasUserGroupPermissionAny, self).__call__(
-            check_location, user)
+        return super(HasUserGroupPermissionAny, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions
@@ -2129,8 +2126,7 b' class HasUserGroupPermissionAny(PermsFun'
 class HasUserGroupPermissionAll(PermsFunction):
     def __call__(self, user_group_name=None, check_location='', user=None):
         self.user_group_name = user_group_name
-        return super(HasUserGroupPermissionAll, self).__call__(
-            check_location, user)
+        return super(HasUserGroupPermissionAll, self).__call__(check_location, user)
 
     def check_permissions(self, user):
         perms = user.permissions

rhodecode/lib/base.py

@@ -288,7 +288,6 b' def attach_context_attributes(context, r'
     """
     config = request.registry.settings
 
-
     rc_config = SettingsModel().get_all_settings(cache=True)
 
     context.rhodecode_version = rhodecode.__version__
@@ -375,15 +374,20 b' def attach_context_attributes(context, r'
         "sideside": "sideside"
     }.get(request.GET.get('diffmode'))
 
-    if diffmode and diffmode != request.session.get('rc_user_session_attr.diffmode'):
-        request.session['rc_user_session_attr.diffmode'] = diffmode
-
-    # session settings per user
+    is_api = hasattr(request, 'rpc_user')
     session_attrs = {
         # defaults
         "clone_url_format": "http",
         "diffmode": "sideside"
     }
+
+    if not is_api:
+        # don't access pyramid session for API calls
+        if diffmode and diffmode != request.session.get('rc_user_session_attr.diffmode'):
+            request.session['rc_user_session_attr.diffmode'] = diffmode
+
+        # session settings per user
+
     for k, v in request.session.items():
         pref = 'rc_user_session_attr.'
         if k and k.startswith(pref):
@@ -420,8 +424,12 b' def attach_context_attributes(context, r'
         'extra': {'plugins': {}}
     }
     # END CONFIG VARS
+    if is_api:
+        csrf_token = None
+    else:
+        csrf_token = auth.get_csrf_token(session=request.session)
 
-    context.csrf_token = auth.get_csrf_token(session=request.session)
+    context.csrf_token = csrf_token
     context.backends = rhodecode.BACKENDS.keys()
     context.backends.sort()
     unread_count = 0
@@ -537,7 +545,7 b' def bootstrap_config(request):'
 
     # allow pyramid lookup in testing
     config.include('pyramid_mako')
-    config.include('pyramid_beaker')
+    config.include('rhodecode.lib.rc_beaker')
     config.include('rhodecode.lib.rc_cache')
 
     add_events_routes(config)

rhodecode/lib/db_manage.py

@@ -375,6 +375,27 b' class DbManage(object):'
         hgevolve.ui_active = False
         self.sa.add(hgevolve)
 
+        hgevolve = RhodeCodeUi()
+        hgevolve.ui_section = 'experimental'
+        hgevolve.ui_key = 'evolution'
+        hgevolve.ui_value = ''
+        hgevolve.ui_active = False
+        self.sa.add(hgevolve)
+
+        hgevolve = RhodeCodeUi()
+        hgevolve.ui_section = 'experimental'
+        hgevolve.ui_key = 'evolution.exchange'
+        hgevolve.ui_value = ''
+        hgevolve.ui_active = False
+        self.sa.add(hgevolve)
+
+        hgevolve = RhodeCodeUi()
+        hgevolve.ui_section = 'extensions'
+        hgevolve.ui_key = 'topic'
+        hgevolve.ui_value = ''
+        hgevolve.ui_active = False
+        self.sa.add(hgevolve)
+
         # enable hggit disabled by default
         hggit = RhodeCodeUi()
         hggit.ui_section = 'extensions'
@@ -464,9 +485,6 b' class DbManage(object):'
             self.populate_default_permissions()
         return fixed
 
-    def update_repo_info(self):
-        RepoModel.update_repoinfo()
-
     def config_prompt(self, test_repo_path='', retries=3):
         defaults = self.cli_args
         _path = defaults.get('repos_location')

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

@@ -614,7 +614,7 b' class Repository(Base, BaseModel):'
         if (cs_cache != self.changeset_cache or not self.changeset_cache):
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s', self.repo_name, cs_cache)
+            log.debug('updated repo %s with new commit cache %s', self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache
             Session().add(self)

rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py

@@ -38,8 +38,6 b' from sqlalchemy.orm import relationship,'
 from sqlalchemy.exc import OperationalError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
-from Crypto.Cipher import AES
-from Crypto import Random
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
 from rhodecode.translation import _

rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py

@@ -2164,7 +2164,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py

@@ -2230,7 +2230,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py

@@ -2278,7 +2278,7 b' class Repository(Base, BaseModel):'
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
                 last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py

@@ -2301,7 +2301,7 b' class Repository(Base, BaseModel):'
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
                 last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py

@@ -2301,7 +2301,7 b' class Repository(Base, BaseModel):'
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
                 last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py

@@ -1865,7 +1865,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py

@@ -1868,7 +1868,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py

@@ -1867,7 +1867,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py

@@ -1869,7 +1869,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py

@@ -1869,7 +1869,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py

@@ -1912,7 +1912,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py

@@ -1913,7 +1913,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py

@@ -2100,7 +2100,7 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.fromtimestamp(0)
             last_change = cs_cache.get('date') or _default
-            log.debug('updated repo %s with new cs cache %s',
+            log.debug('updated repo %s with new commit cache %s',
                       self.repo_name, cs_cache)
             self.updated_on = last_change
             self.changeset_cache = cs_cache

rhodecode/lib/encrypt.py

@@ -111,4 +111,28 b' class AESCipher(object):'
 
     @staticmethod
     def _unpad(s):
-        return s[:-ord(s[len(s)-1:])]
  No newline at end of file
+        return s[:-ord(s[len(s)-1:])]
+
+
+def validate_and_get_enc_data(enc_data, enc_key, enc_strict_mode):
+    parts = enc_data.split('$', 3)
+    if not len(parts) == 3:
+        # probably not encrypted values
+        return enc_data
+    else:
+        if parts[0] != 'enc':
+            # parts ok but without our header ?
+            return enc_data
+
+        # at that stage we know it's our encryption
+        if parts[1] == 'aes':
+            decrypted_data = AESCipher(enc_key).decrypt(parts[2])
+        elif parts[1] == 'aes_hmac':
+            decrypted_data = AESCipher(
+                enc_key, hmac=True,
+                strict_verification=enc_strict_mode).decrypt(parts[2])
+        else:
+            raise ValueError(
+                'Encryption type part is wrong, must be `aes` '
+                'or `aes_hmac`, got `%s` instead' % (parts[1]))
+        return decrypted_data

rhodecode/lib/helpers.py

@@ -199,6 +199,7 b' class _GetError(object):'
         if form_errors and field_name in form_errors:
             return literal(tmpl % form_errors.get(field_name))
 
+
 get_error = _GetError()
 
 
@@ -214,38 +215,45 b' class _ToolTip(object):'
         tooltip_title = escape(tooltip_title)
         tooltip_title = tooltip_title.replace('<', '&lt;').replace('>', '&gt;')
         return tooltip_title
+
+
 tooltip = _ToolTip()
 
+files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy the full path"></i>'
 
-def files_breadcrumbs(repo_name, commit_id, file_path):
+
+def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False):
     if isinstance(file_path, str):
         file_path = safe_unicode(file_path)
 
-    # TODO: johbo: Is this always a url like path, or is this operating
-    # system dependent?
-    path_segments = file_path.split('/')
+    route_qry = {'at': at_ref} if at_ref else None
 
-    repo_name_html = escape(repo_name)
-    if len(path_segments) == 1 and path_segments[0] == '':
-        url_segments = [repo_name_html]
-    else:
+    # first segment is a `..` link to repo files
+    root_name = literal(u'<i class="icon-home"></i>')
         url_segments = [
             link_to(
-                repo_name_html,
+            root_name,
                 route_path(
                     'repo_files',
                     repo_name=repo_name,
                     commit_id=commit_id,
-                    f_path=''),
-                class_='pjax-link')]
+                f_path='',
+                _query=route_qry),
+        )]
 
+    path_segments = file_path.split('/')
     last_cnt = len(path_segments) - 1
     for cnt, segment in enumerate(path_segments):
         if not segment:
             continue
         segment_html = escape(segment)
 
-        if cnt != last_cnt:
+        last_item = cnt == last_cnt
+
+        if last_item and linkify_last_item is False:
+            # plain version
+            url_segments.append(segment_html)
+        else:
             url_segments.append(
                 link_to(
                     segment_html,
@@ -253,12 +261,32 b' def files_breadcrumbs(repo_name, commit_'
                         'repo_files',
                         repo_name=repo_name,
                         commit_id=commit_id,
-                        f_path='/'.join(path_segments[:cnt + 1])),
-                    class_='pjax-link'))
+                        f_path='/'.join(path_segments[:cnt + 1]),
+                        _query=route_qry),
+                ))
+
+    limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:]
+    if limit_items and len(limited_url_segments) < len(url_segments):
+        url_segments = limited_url_segments
+
+    full_path = file_path
+    icon = files_icon.format(escape(full_path))
+    if file_path == '':
+        return root_name
         else:
-            url_segments.append(segment_html)
+        return literal(' / '.join(url_segments) + icon)
+
+
+def files_url_data(request):
+    matchdict = request.matchdict
 
-    return literal('/'.join(url_segments))
+    if 'f_path' not in matchdict:
+        matchdict['f_path'] = ''
+
+    if 'commit_id' not in matchdict:
+        matchdict['commit_id'] = 'tip'
+
+    return json.dumps(matchdict)
 
 
 def code_highlight(code, lexer, formatter, use_hl_filter=False):
@@ -1196,7 +1224,7 b' class InitialsGravatar(object):'
             </text>
         </svg>""".format(
             size=self.size,
-            f_size=self.size/1.85,  # scale the text inside the box nicely
+            f_size=self.size/2.05,  # scale the text inside the box nicely
             background=self.background,
             text_color=self.text_color,
             text=initials.upper(),
@@ -1486,10 +1514,12 b' def breadcrumb_repo_link(repo):'
     """
 
     path = [
-        link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name))
+        link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name),
+                title='last change:{}'.format(format_date(group.last_commit_change)))
         for group in repo.groups_with_parents
     ] + [
-        link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name))
+        link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name),
+                title='last change:{}'.format(format_date(repo.last_commit_change)))
     ]
 
     return literal(' &raquo; '.join(path))
@@ -1507,11 +1537,13 b' def breadcrumb_repo_group_link(repo_grou'
 
     path = [
         link_to(group.name,
-                route_path('repo_group_home', repo_group_name=group.group_name))
+                route_path('repo_group_home', repo_group_name=group.group_name),
+                title='last change:{}'.format(format_date(group.last_commit_change)))
         for group in repo_group.parents
     ] + [
         link_to(repo_group.name,
-                route_path('repo_group_home', repo_group_name=repo_group.group_name))
+                route_path('repo_group_home', repo_group_name=repo_group.group_name),
+                title='last change:{}'.format(format_date(repo_group.last_commit_change)))
     ]
 
     return literal(' &raquo; '.join(path))
@@ -1907,23 +1939,26 b' def secure_form(form_url, method="POST",'
 
 def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
     select_html = select(name, selected, options, **attrs)
+
     select2 = """
         <script>
             $(document).ready(function() {
                   $('#%s').select2({
-                      containerCssClass: 'drop-menu',
+                      containerCssClass: 'drop-menu %s',
                       dropdownCssClass: 'drop-menu-dropdown',
                       dropdownAutoWidth: true%s
                   });
             });
         </script>
     """
+
     filter_option = """,
                         minimumResultsForSearch: -1
     """
     input_id = attrs.get('id') or name
+    extra_classes = ' '.join(attrs.pop('extra_classes', []))
     filter_enabled = "" if enable_filter else filter_option
-    select_script = literal(select2 % (input_id, filter_enabled))
+    select_script = literal(select2 % (input_id, extra_classes, filter_enabled))
 
     return literal(select_html+select_script)
 
@@ -1944,7 +1979,7 b' def get_visual_attr(tmpl_context_var, at'
 
 def get_last_path_part(file_node):
     if not file_node.path:
-        return u''
+        return u'/'
 
     path = safe_unicode(file_node.path.split('/')[-1])
     return u'../' + path
@@ -2033,10 +2068,11 b' def reviewer_as_json(*args, **kwargs):'
 def get_repo_view_type(request):
     route_name = request.matched_route.name
     route_to_view_type = {
-        'repo_changelog': 'changelog',
+        'repo_changelog': 'commits',
+        'repo_commits': 'commits',
         'repo_files': 'files',
         'repo_summary': 'summary',
         'repo_commit': 'commit'
+    }
 
-    }
     return route_to_view_type.get(route_name)

rhodecode/lib/hooks_utils.py

@@ -80,7 +80,7 b' def trigger_log_create_pull_request_hook'
     extras = _get_rc_scm_extras(username, repo_name, repo_alias,
                                 'create_pull_request')
     events.trigger(events.PullRequestCreateEvent(pull_request))
-    extras.update(pull_request.get_api_data())
+    extras.update(pull_request.get_api_data(with_merge_state=False))
     hooks_base.log_create_pull_request(**extras)
 
 

rhodecode/lib/index/__init__.py

@@ -80,6 +80,13 b' class BaseSearcher(object):'
     def extract_search_tags(query):
         return []
 
+    @staticmethod
+    def escape_specials(val):
+        """
+        Handle and escape reserved chars for search
+        """
+        return val
+
 
 def search_config(config, prefix='search.'):
     _config = {}

rhodecode/lib/markdown_ext.py

@@ -20,7 +20,55 b''
 
 import markdown
 
-from mdx_gfm import GithubFlavoredMarkdownExtension  # pragma: no cover
+from markdown.extensions import Extension
+from markdown.extensions.fenced_code import FencedCodeExtension
+from markdown.extensions.smart_strong import SmartEmphasisExtension
+from markdown.extensions.tables import TableExtension
+from markdown.extensions.nl2br import Nl2BrExtension
+
+import gfm
+
+
+class GithubFlavoredMarkdownExtension(Extension):
+    """
+    An extension that is as compatible as possible with GitHub-flavored
+    Markdown (GFM).
+
+    This extension aims to be compatible with the variant of GFM that GitHub
+    uses for Markdown-formatted gists and files (including READMEs). This
+    variant seems to have all the extensions described in the `GFM
+    documentation`_, except:
+
+    - Newlines in paragraphs are not transformed into ``br`` tags.
+    - Intra-GitHub links to commits, repositories, and issues are not
+      supported.
+
+    If you need support for features specific to GitHub comments and issues,
+    please use :class:`mdx_gfm.GithubFlavoredMarkdownExtension`.
+
+    .. _GFM documentation: https://guides.github.com/features/mastering-markdown/
+    """
+
+    def extendMarkdown(self, md, md_globals):
+        # Built-in extensions
+        FencedCodeExtension().extendMarkdown(md, md_globals)
+        SmartEmphasisExtension().extendMarkdown(md, md_globals)
+        TableExtension().extendMarkdown(md, md_globals)
+
+        # Custom extensions
+        gfm.AutolinkExtension().extendMarkdown(md, md_globals)
+        gfm.AutomailExtension().extendMarkdown(md, md_globals)
+        gfm.HiddenHiliteExtension([
+            ('guess_lang', 'False'),
+            ('css_class', 'highlight')
+        ]).extendMarkdown(md, md_globals)
+        gfm.SemiSaneListExtension().extendMarkdown(md, md_globals)
+        gfm.SpacedLinkExtension().extendMarkdown(md, md_globals)
+        gfm.StrikethroughExtension().extendMarkdown(md, md_globals)
+        gfm.TaskListExtension([
+            ('list_attrs', {'class': 'checkbox'})
+        ]).extendMarkdown(md, md_globals)
+        Nl2BrExtension().extendMarkdown(md, md_globals)
 
 
 # Global Vars

rhodecode/lib/markup_renderer.py

@@ -500,7 +500,6 b' class MarkupRenderer(object):'
             (body, resources) = html_exporter.from_notebook_node(notebook)
             header = '<!-- ## IPYTHON NOTEBOOK RENDERING ## -->'
             js = MakoTemplate(r'''
-            <!-- Load mathjax -->
                 <!-- MathJax configuration -->
                 <script type="text/x-mathjax-config">
                 MathJax.Hub.Config({
@@ -526,12 +525,13 b' class MarkupRenderer(object):'
                     showMathMenu: false
                 });
                 </script>
-                <!-- End of mathjax configuration -->
+            <!-- End of MathJax configuration -->
                 <script src="${h.asset('js/src/math_jax/MathJax.js')}"></script>
             ''').render(h=helpers)
 
-            css = '<style>{}</style>'.format(
-                ''.join(_sanitize_resources(resources['inlining']['css'])))
+            css = MakoTemplate(r'''
+            <link rel="stylesheet" type="text/css" href="${h.asset('css/style-ipython.css', ver=ver)}" media="screen"/>
+            ''').render(h=helpers, ver='ver1')
 
             body = '\n'.join([header, css, js, body])
             return body, resources

rhodecode/lib/middleware/simplegit.py

@@ -142,7 +142,7 b' class SimpleGit(simplevcs.SimpleVCS):'
         return self.scm_app.create_git_wsgi_app(
             repo_path, repo_name, config)
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         extras['git_update_server_info'] = utils2.str2bool(
             rhodecode.CONFIG.get('git_update_server_info'))
 
@@ -152,4 +152,5 b' class SimpleGit(simplevcs.SimpleVCS):'
         extras['git_lfs_enabled'] = utils2.str2bool(
             config.get('vcs_git_lfs', 'enabled'))
         extras['git_lfs_store_path'] = custom_store or default_lfs_store()
+        extras['git_lfs_http_scheme'] = scheme
         return extras

rhodecode/lib/middleware/simplehg.py

@@ -153,7 +153,7 b' class SimpleHg(simplevcs.SimpleVCS):'
     def _create_wsgi_app(self, repo_path, repo_name, config):
         return self.scm_app.create_hg_wsgi_app(repo_path, repo_name, config)
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         config = utils.make_db_config(repo=repo_name)
         config.set('rhodecode', 'RC_SCM_DATA', json.dumps(extras))
 

rhodecode/lib/middleware/simplesvn.py

@@ -87,20 +87,22 b' class SimpleSvnApp(object):'
             stream = True
 
         stream = stream
-        log.debug(
-            'Calling SVN PROXY: method:%s via `%s`, Stream: %s',
-            req_method, path_info, stream)
+        log.debug('Calling SVN PROXY at `%s`, using method:%s. Stream: %s',
+                  path_info, req_method, stream)
+        try:
         response = requests.request(
             req_method, path_info,
             data=data, headers=request_headers, stream=stream)
+        except requests.ConnectionError:
+            log.exception('ConnectionError occurred for endpoint %s', path_info)
+            raise
 
         if response.status_code not in [200, 401]:
+            text = '\n{}'.format(response.text) if response.text else ''
             if response.status_code >= 500:
-                log.error('Got SVN response:%s with text:\n`%s`',
-                          response, response.text)
+                log.error('Got SVN response:%s with text:`%s`', response, text)
             else:
-                log.debug('Got SVN response:%s with text:\n`%s`',
-                          response, response.text)
+                log.debug('Got SVN response:%s with text:`%s`', response, text)
         else:
             log.debug('got response code: %s', response.status_code)
 
@@ -217,7 +219,7 b' class SimpleSvn(simplevcs.SimpleVCS):'
         conf = self.repo_vcs_config
         return str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled'))
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         conf = self.repo_vcs_config
         server_url = conf.get('vcs_svn_proxy', 'http_server_url')
         server_url = server_url or self.DEFAULT_HTTP_SERVER

rhodecode/lib/middleware/simplevcs.py

@@ -360,6 +360,13 b' class SimpleVCS(object):'
 
         return perm_result
 
+    def _get_http_scheme(self, environ):
+        try:
+            return environ['wsgi.url_scheme']
+        except Exception:
+            log.exception('Failed to read http scheme')
+            return 'http'
+
     def _check_ssl(self, environ, start_response):
         """
         Checks the SSL check flag and returns False if SSL is not present
@@ -597,7 +604,9 b' class SimpleVCS(object):'
             extras, environ, action, txn_id=txn_id)
         log.debug('HOOKS extras is %s', extras)
 
-        config = self._create_config(extras, self.acl_repo_name)
+        http_scheme = self._get_http_scheme(environ)
+
+        config = self._create_config(extras, self.acl_repo_name, scheme=http_scheme)
         app = self._create_wsgi_app(repo_path, self.url_repo_name, config)
         with callback_daemon:
             app.rc_extras = extras
@@ -643,7 +652,7 b' class SimpleVCS(object):'
         """Return the WSGI app that will finally handle the request."""
         raise NotImplementedError()
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         """Create a safe config representation."""
         raise NotImplementedError()
 

rhodecode/lib/user_sessions.py

@@ -23,6 +23,7 b' import re'
 import time
 import datetime
 import dateutil
+import pickle
 
 from rhodecode.model.db import DbSession, Session
 
@@ -142,7 +143,6 b' class FileAuthSessions(BaseAuthSessions)'
         return stats['callbacks']
 
 
-
 class MemcachedAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'ext:memcached'
     _key_regex = re.compile(r'ITEM (.*_session) \[(.*); (.*)\]')
@@ -195,6 +195,43 b' class MemcachedAuthSessions(BaseAuthSess'
         raise CleanupCommand('Cleanup for this session type not yet available')
 
 
+class RedisAuthSessions(BaseAuthSessions):
+    SESSION_TYPE = 'ext:redis'
+
+    def _get_client(self):
+        import redis
+        args = {
+            'socket_timeout': 60,
+            'url': self.config.get('beaker.session.url')
+        }
+
+        client = redis.StrictRedis.from_url(**args)
+        return client
+
+    def get_count(self):
+        client = self._get_client()
+        return len(client.keys('beaker_cache:*'))
+
+    def get_expired_count(self, older_than_seconds=None):
+        expiry_date = self._seconds_to_date(older_than_seconds)
+        return self.NOT_AVAILABLE
+
+    def clean_sessions(self, older_than_seconds=None):
+        client = self._get_client()
+        expiry_time = time.time() - older_than_seconds
+        deleted_keys = 0
+        for key in client.keys('beaker_cache:*'):
+            data = client.get(key)
+            if data:
+                json_data = pickle.loads(data)
+                accessed_time = json_data['_accessed_time']
+                if accessed_time < expiry_time:
+                    client.delete(key)
+                    deleted_keys += 1
+
+        return deleted_keys
+
+
 class MemoryAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'memory'
 
@@ -212,6 +249,7 b' def get_session_handler(session_type):'
     types = {
         'file': FileAuthSessions,
         'ext:memcached': MemcachedAuthSessions,
+        'ext:redis': RedisAuthSessions,
         'ext:database': DbAuthSessions,
         'memory': MemoryAuthSessions
     }

rhodecode/lib/utils.py

@@ -371,7 +371,8 b' def config_data_from_db(clear_session=Tr'
             config.append((
                 safe_str(setting.section), safe_str(setting.key), False))
     log.debug(
-        'settings ui from db: %s',
+        'settings ui from db@repo[%s]: %s',
+        repo,
         ','.join(map(lambda s: '[{}] {}={}'.format(*s), ui_data)))
     if clear_session:
         meta.Session.remove()

rhodecode/lib/vcs/backends/base.py

@@ -33,6 +33,8 b' import collections'
 import warnings
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
+
 from pyramid import compat
 
 from rhodecode.translation import lazy_ugettext
@@ -53,6 +55,7 b' log = logging.getLogger(__name__)'
 
 FILEMODE_DEFAULT = 0o100644
 FILEMODE_EXECUTABLE = 0o100755
+EMPTY_COMMIT_ID = '0' * 40
 
 Reference = collections.namedtuple('Reference', ('type', 'name', 'commit_id'))
 
@@ -161,7 +164,7 b' class MergeResponse(object):'
             u'This pull request cannot be merged because the source contains '
             u'more branches than the target.'),
         MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS: lazy_ugettext(
-            u'This pull request cannot be merged because the target '
+            u'This pull request cannot be merged because the target `{target_ref.name}` '
             u'has multiple heads: `{heads}`.'),
         MergeFailureReason.TARGET_IS_LOCKED: lazy_ugettext(
             u'This pull request cannot be merged because the target repository is '
@@ -261,6 +264,7 b' class BaseRepository(object):'
     EMPTY_COMMIT_ID = '0' * 40
 
     path = None
+    _commit_ids_ver = 0
 
     def __init__(self, repo_path, config=None, create=False, **kwargs):
         """
@@ -309,6 +313,9 b' class BaseRepository(object):'
     def _remote(self):
         raise NotImplementedError
 
+    def _heads(self, branch=None):
+        return []
+
     @LazyProperty
     def EMPTY_COMMIT(self):
         return EmptyCommit(self.EMPTY_COMMIT_ID)
@@ -380,7 +387,7 b' class BaseRepository(object):'
         return commit.size
 
     def is_empty(self):
-        return not bool(self.commit_ids)
+        return self._remote.is_empty()
 
     @staticmethod
     def check_url(url, config):
@@ -401,6 +408,15 b' class BaseRepository(object):'
     # COMMITS
     # ==========================================================================
 
+    @CachedProperty('_commit_ids_ver')
+    def commit_ids(self):
+        raise NotImplementedError
+
+    def append_commit_id(self, commit_id):
+        if commit_id not in self.commit_ids:
+            self._rebuild_cache(self.commit_ids + [commit_id])
+            self._commit_ids_ver = time.time()
+
     def get_commit(self, commit_id=None, commit_idx=None, pre_load=None, translate_tag=None):
         """
         Returns instance of `BaseCommit` class. If `commit_id` and `commit_idx`
@@ -1091,12 +1107,12 b' class BaseCommit(object):'
         """
         return None
 
-    def archive_repo(self, file_path, kind='tgz', subrepos=None,
-                     prefix=None, write_metadata=False, mtime=None):
+    def archive_repo(self, archive_dest_path, kind='tgz', subrepos=None,
+                     prefix=None, write_metadata=False, mtime=None, archive_at_path='/'):
         """
         Creates an archive containing the contents of the repository.
 
-        :param file_path: path to the file which to create the archive.
+        :param archive_dest_path: path to the file which to create the archive.
         :param kind: one of following: ``"tbz2"``, ``"tgz"``, ``"zip"``.
         :param prefix: name of root directory in archive.
             Default is repository name and commit's short_id joined with dash:
@@ -1104,10 +1120,11 b' class BaseCommit(object):'
         :param write_metadata: write a metadata file into archive.
         :param mtime: custom modification time for archive creation, defaults
             to time.time() if not given.
+        :param archive_at_path: pack files at this path (default '/')
 
         :raise VCSError: If prefix has a problem.
         """
-        allowed_kinds = settings.ARCHIVE_SPECS.keys()
+        allowed_kinds = [x[0] for x in settings.ARCHIVE_SPECS]
         if kind not in allowed_kinds:
             raise ImproperArchiveTypeError(
                 'Archive kind (%s) not supported use one of %s' %
@@ -1115,11 +1132,11 b' class BaseCommit(object):'
 
         prefix = self._validate_archive_prefix(prefix)
 
-        mtime = mtime or time.mktime(self.date.timetuple())
+        mtime = mtime is not None or time.mktime(self.date.timetuple())
 
         file_info = []
         cur_rev = self.repository.get_commit(commit_id=self.raw_id)
-        for _r, _d, files in cur_rev.walk('/'):
+        for _r, _d, files in cur_rev.walk(archive_at_path):
             for f in files:
                 f_path = os.path.join(prefix, f.path)
                 file_info.append(
@@ -1128,15 +1145,15 b' class BaseCommit(object):'
         if write_metadata:
             metadata = [
                 ('repo_name', self.repository.name),
-                ('rev', self.raw_id),
-                ('create_time', mtime),
+                ('commit_id', self.raw_id),
+                ('mtime', mtime),
                 ('branch', self.branch),
                 ('tags', ','.join(self.tags)),
             ]
             meta = ["%s:%s" % (f_name, value) for f_name, value in metadata]
             file_info.append(('.archival.txt', 0o644, False, '\n'.join(meta)))
 
-        connection.Hg.archive_repo(file_path, mtime, file_info, kind)
+        connection.Hg.archive_repo(archive_dest_path, mtime, file_info, kind)
 
     def _validate_archive_prefix(self, prefix):
         if prefix is None:
@@ -1505,9 +1522,7 b' class BaseInMemoryCommit(object):'
                 "Cannot remove node at %s from "
                 "following parents: %s" % (not_removed, parents))
 
-    def commit(
-            self, message, author, parents=None, branch=None, date=None,
-            **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         """
         Performs in-memory commit (doesn't check workdir in any way) and
         returns newly created :class:`BaseCommit`. Updates repository's
@@ -1555,7 +1570,7 b' class EmptyCommit(BaseCommit):'
     """
 
     def __init__(
-            self, commit_id='0' * 40, repo=None, alias=None, idx=-1,
+            self, commit_id=EMPTY_COMMIT_ID, repo=None, alias=None, idx=-1,
             message='', author='', date=None):
         self._empty_commit_id = commit_id
         # TODO: johbo: Solve idx parameter, default value does not make
@@ -1615,7 +1630,7 b' class EmptyChangeset(EmptyCommit):'
             "Use EmptyCommit instead of EmptyChangeset", DeprecationWarning)
         return super(EmptyCommit, cls).__new__(cls, *args, **kwargs)
 
-    def __init__(self, cs='0' * 40, repo=None, requested_revision=None,
+    def __init__(self, cs=EMPTY_COMMIT_ID, repo=None, requested_revision=None,
                  alias=None, revision=-1, message='', author='', date=None):
         if requested_revision is not None:
             warnings.warn(

rhodecode/lib/vcs/backends/git/commit.py

@@ -234,8 +234,7 b' class GitCommit(base.BaseCommit):'
         path = self._fix_path(path)
         if self._get_kind(path) != NodeKind.FILE:
             raise CommitError(
-                "File does not exist for commit %s at  '%s'" %
-                (self.raw_id, path))
+                "File does not exist for commit %s at  '%s'" % (self.raw_id, path))
         return path
 
     def _get_file_nodes(self):
@@ -353,8 +352,7 b' class GitCommit(base.BaseCommit):'
     def get_nodes(self, path):
         if self._get_kind(path) != NodeKind.DIR:
             raise CommitError(
-                "Directory does not exist for commit %s at "
-                " '%s'" % (self.raw_id, path))
+                "Directory does not exist for commit %s at '%s'" % (self.raw_id, path))
         path = self._fix_path(path)
         id_, _ = self._get_id_for_path(path)
         tree_id = self._remote[id_]['id']

rhodecode/lib/vcs/backends/git/inmemory.py

@@ -29,8 +29,7 b' from rhodecode.lib.vcs.backends import b'
 
 class GitInMemoryCommit(base.BaseInMemoryCommit):
 
-    def commit(self, message, author, parents=None, branch=None, date=None,
-               **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         """
         Performs in-memory commit (doesn't check workdir in any way) and
         returns newly created `GitCommit`. Updates repository's
@@ -94,12 +93,12 b' class GitInMemoryCommit(base.BaseInMemor'
             commit_data, branch, commit_tree, updated, removed)
 
         # Update vcs repository object
-        self.repository.commit_ids.append(commit_id)
-        self.repository._rebuild_cache(self.repository.commit_ids)
+        self.repository.append_commit_id(commit_id)
 
         # invalidate parsed refs after commit
         self.repository._refs = self.repository._get_refs()
         self.repository.branches = self.repository._get_branches()
-        tip = self.repository.get_commit()
+        tip = self.repository.get_commit(commit_id)
+
         self.reset()
         return tip

rhodecode/lib/vcs/backends/git/repository.py

@@ -25,8 +25,10 b' GIT repository module'
 import logging
 import os
 import re
+import time
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import (
@@ -69,6 +71,9 b' class GitRepository(BaseRepository):'
         # caches
         self._commit_ids = {}
 
+        # dependent that trigger re-computation of  commit_ids
+        self._commit_ids_ver = 0
+
     @LazyProperty
     def _remote(self):
         return connection.Git(self.path, self.config, with_wire=self.with_wire)
@@ -81,7 +86,7 b' class GitRepository(BaseRepository):'
     def head(self):
         return self._remote.head()
 
-    @LazyProperty
+    @CachedProperty('_commit_ids_ver')
     def commit_ids(self):
         """
         Returns list of commit ids, in ascending order.  Being lazy
@@ -222,13 +227,10 b' class GitRepository(BaseRepository):'
             return []
         return output.splitlines()
 
-    def _get_commit_id(self, commit_id_or_idx):
+    def _lookup_commit(self, commit_id_or_idx, translate_tag=True):
         def is_null(value):
             return len(value) == commit_id_or_idx.count('0')
 
-        if self.is_empty():
-            raise EmptyRepositoryError("There are no commits yet")
-
         if commit_id_or_idx in (None, '', 'tip', 'HEAD', 'head', -1):
             return self.commit_ids[-1]
 
@@ -238,8 +240,7 b' class GitRepository(BaseRepository):'
             try:
                 commit_id_or_idx = self.commit_ids[int(commit_id_or_idx)]
             except Exception:
-                msg = "Commit %s does not exist for %s" % (
-                    commit_id_or_idx, self)
+                msg = "Commit {} does not exist for `{}`".format(commit_id_or_idx, self.name)
                 raise CommitDoesNotExistError(msg)
 
         elif is_bstr:
@@ -261,8 +262,7 b' class GitRepository(BaseRepository):'
 
             if (not SHA_PATTERN.match(commit_id_or_idx) or
                     commit_id_or_idx not in self.commit_ids):
-                msg = "Commit %s does not exist for %s" % (
-                    commit_id_or_idx, self)
+                msg = "Commit {} does not exist for `{}`".format(commit_id_or_idx, self.name)
                 raise CommitDoesNotExistError(msg)
 
         # Ensure we return full id
@@ -431,19 +431,42 b' class GitRepository(BaseRepository):'
         Returns `GitCommit` object representing commit from git repository
         at the given `commit_id` or head (most recent commit) if None given.
         """
+        if self.is_empty():
+            raise EmptyRepositoryError("There are no commits yet")
+
         if commit_id is not None:
             self._validate_commit_id(commit_id)
+            try:
+                # we have cached idx, use it without contacting the remote
+                idx = self._commit_ids[commit_id]
+                return GitCommit(self, commit_id, idx, pre_load=pre_load)
+            except KeyError:
+                pass
+
         elif commit_idx is not None:
             self._validate_commit_idx(commit_idx)
+            try:
+                _commit_id = self.commit_ids[commit_idx]
+                if commit_idx < 0:
+                    commit_idx = self.commit_ids.index(_commit_id)
+                return GitCommit(self, _commit_id, commit_idx, pre_load=pre_load)
+            except IndexError:
             commit_id = commit_idx
-        commit_id = self._get_commit_id(commit_id)
-        try:
+        else:
+            commit_id = "tip"
+
+        commit_id = self._lookup_commit(commit_id)
+        remote_idx = None
             if translate_tag:
                 # Need to call remote to translate id for tagging scenario
-                commit_id = self._remote.get_object(commit_id)["commit_id"]
+            remote_data = self._remote.get_object(commit_id)
+            commit_id = remote_data["commit_id"]
+            remote_idx = remote_data["idx"]
+
+        try:
             idx = self._commit_ids[commit_id]
         except KeyError:
-            raise RepositoryError("Cannot get object with id %s" % commit_id)
+            idx = remote_idx or 0
 
         return GitCommit(self, commit_id, idx, pre_load=pre_load)
 
@@ -472,6 +495,7 b' class GitRepository(BaseRepository):'
         """
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
+
         self._validate_branch_name(branch_name)
 
         if start_id is not None:
@@ -479,9 +503,9 b' class GitRepository(BaseRepository):'
         if end_id is not None:
             self._validate_commit_id(end_id)
 
-        start_raw_id = self._get_commit_id(start_id)
+        start_raw_id = self._lookup_commit(start_id)
         start_pos = self._commit_ids[start_raw_id] if start_id else None
-        end_raw_id = self._get_commit_id(end_id)
+        end_raw_id = self._lookup_commit(end_id)
         end_pos = max(0, self._commit_ids[end_raw_id]) if end_id else None
 
         if None not in [start_id, end_id] and start_pos > end_pos:
@@ -589,8 +613,9 b' class GitRepository(BaseRepository):'
         commit = commit.parents[0]
         self._remote.set_refs('refs/heads/%s' % branch_name, commit.raw_id)
 
-        self.commit_ids = self._get_all_commit_ids()
-        self._rebuild_cache(self.commit_ids)
+        self._commit_ids_ver = time.time()
+        # we updated _commit_ids_ver so accessing self.commit_ids will re-compute it
+        return len(self.commit_ids)
 
     def get_common_ancestor(self, commit_id1, commit_id2, repo2):
         if commit_id1 == commit_id2:

rhodecode/lib/vcs/backends/hg/commit.py

@@ -193,13 +193,6 b' class MercurialCommit(base.BaseCommit):'
         children = self._remote.ctx_children(self.idx)
         return self._make_commits(children)
 
-    def diff(self, ignore_whitespace=True, context=3):
-        result = self._remote.ctx_diff(
-            self.idx,
-            git=True, ignore_whitespace=ignore_whitespace, context=context)
-        diff = ''.join(result)
-        return MercurialDiff(diff)
-
     def _fix_path(self, path):
         """
         Mercurial keeps filenodes as str so we need to encode from unicode

rhodecode/lib/vcs/backends/hg/inmemory.py

@@ -30,8 +30,7 b' from rhodecode.lib.vcs.exceptions import'
 
 class MercurialInMemoryCommit(BaseInMemoryCommit):
 
-    def commit(self, message, author, parents=None, branch=None, date=None,
-               **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         """
         Performs in-memory commit (doesn't check workdir in any way) and
         returns newly created `MercurialCommit`. Updates repository's
@@ -83,15 +82,14 b' class MercurialInMemoryCommit(BaseInMemo'
 
         date, tz = date_to_timestamp_plus_offset(date)
 
-        new_id = self.repository._remote.commitctx(
+        commit_id = self.repository._remote.commitctx(
             message=message, parents=parent_ids,
             commit_time=date, commit_timezone=tz, user=author,
             files=self.get_paths(), extra=kwargs, removed=removed,
             updated=updated)
+        self.repository.append_commit_id(commit_id)
 
-        self.repository.commit_ids.append(new_id)
-        self.repository._rebuild_cache(self.repository.commit_ids)
         self.repository.branches = self.repository._get_branches()
-        tip = self.repository.get_commit()
+        tip = self.repository.get_commit(commit_id)
         self.reset()
         return tip

rhodecode/lib/vcs/backends/hg/repository.py

@@ -24,9 +24,11 b' HG repository module'
 import os
 import logging
 import binascii
+import time
 import urllib
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import (
@@ -85,11 +87,14 b' class MercurialRepository(BaseRepository'
         # caches
         self._commit_ids = {}
 
+        # dependent that trigger re-computation of  commit_ids
+        self._commit_ids_ver = 0
+
     @LazyProperty
     def _remote(self):
         return connection.Hg(self.path, self.config, with_wire=self.with_wire)
 
-    @LazyProperty
+    @CachedProperty('_commit_ids_ver')
     def commit_ids(self):
         """
         Returns list of commit ids, in ascending order.  Being lazy
@@ -157,8 +162,7 b' class MercurialRepository(BaseRepository'
 
         return OrderedDict(sorted(_tags, key=get_name, reverse=True))
 
-    def tag(self, name, user, commit_id=None, message=None, date=None,
-            **kwargs):
+    def tag(self, name, user, commit_id=None, message=None, date=None, **kwargs):
         """
         Creates and returns a tag for the given ``commit_id``.
 
@@ -172,6 +176,7 b' class MercurialRepository(BaseRepository'
         """
         if name in self.tags:
             raise TagAlreadyExistError("Tag %s already exists" % name)
+
         commit = self.get_commit(commit_id=commit_id)
         local = kwargs.setdefault('local', False)
 
@@ -180,8 +185,7 b' class MercurialRepository(BaseRepository'
 
         date, tz = date_to_timestamp_plus_offset(date)
 
-        self._remote.tag(
-            name, commit.raw_id, message, local, user, date, tz)
+        self._remote.tag(name, commit.raw_id, message, local, user, date, tz)
         self._remote.invalidate_vcs_cache()
 
         # Reinitialize tags
@@ -203,6 +207,7 b' class MercurialRepository(BaseRepository'
         """
         if name not in self.tags:
             raise TagDoesNotExistError("Tag %s does not exist" % name)
+
         if message is None:
             message = "Removed tag %s" % name
         local = False
@@ -271,8 +276,9 b' class MercurialRepository(BaseRepository'
         self._remote.strip(commit_id, update=False, backup="none")
 
         self._remote.invalidate_vcs_cache()
-        self.commit_ids = self._get_all_commit_ids()
-        self._rebuild_cache(self.commit_ids)
+        self._commit_ids_ver = time.time()
+        # we updated _commit_ids_ver so accessing self.commit_ids will re-compute it
+        return len(self.commit_ids)
 
     def verify(self):
         verify = self._remote.verify()
@@ -425,18 +431,20 b' class MercurialRepository(BaseRepository'
         if commit_id is not None:
             self._validate_commit_id(commit_id)
             try:
+                # we have cached idx, use it without contacting the remote
                 idx = self._commit_ids[commit_id]
                 return MercurialCommit(self, commit_id, idx, pre_load=pre_load)
             except KeyError:
                 pass
+
         elif commit_idx is not None:
             self._validate_commit_idx(commit_idx)
             try:
-                id_ = self.commit_ids[commit_idx]
+                _commit_id = self.commit_ids[commit_idx]
                 if commit_idx < 0:
-                    commit_idx += len(self.commit_ids)
-                return MercurialCommit(
-                    self, id_, commit_idx, pre_load=pre_load)
+                    commit_idx = self.commit_ids.index(_commit_id)
+
+                return MercurialCommit(self, _commit_id, commit_idx, pre_load=pre_load)
             except IndexError:
                 commit_id = commit_idx
         else:
@@ -448,8 +456,8 b' class MercurialRepository(BaseRepository'
         try:
             raw_id, idx = self._remote.lookup(commit_id, both=True)
         except CommitDoesNotExistError:
-            msg = "Commit %s does not exist for %s" % (
-                commit_id, self)
+            msg = "Commit {} does not exist for `{}`".format(
+                *map(safe_str, [commit_id, self.name]))
             raise CommitDoesNotExistError(msg)
 
         return MercurialCommit(self, raw_id, idx, pre_load=pre_load)
@@ -477,11 +485,11 b' class MercurialRepository(BaseRepository'
           ``end`` could not be found.
         """
         # actually we should check now if it's not an empty repo
-        branch_ancestors = False
         if self.is_empty():
             raise EmptyRepositoryError("There are no commits yet")
         self._validate_branch_name(branch_name)
 
+        branch_ancestors = False
         if start_id is not None:
             self._validate_commit_id(start_id)
             c_start = self.get_commit(commit_id=start_id)
@@ -715,11 +723,16 b' class MercurialRepository(BaseRepository'
 
         try:
             if target_ref.type == 'branch' and len(self._heads(target_ref.name)) != 1:
-                heads = ','.join(self._heads(target_ref.name))
+                heads = '\n,'.join(self._heads(target_ref.name))
+                metadata = {
+                    'target_ref': target_ref,
+                    'source_ref': source_ref,
+                    'heads': heads
+                }
                 return MergeResponse(
                     False, False, None,
                     MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS,
-                    metadata={'heads': heads})
+                    metadata=metadata)
         except CommitDoesNotExistError:
             log.exception('Failure when looking up branch heads on hg target')
             return MergeResponse(
@@ -892,11 +905,15 b' class MercurialRepository(BaseRepository'
 
         def read_patterns(suffix):
             svalue = None
+            for section, option in [
+                ('narrowacl', username + suffix),
+                ('narrowacl', 'default' + suffix),
+                ('narrowhgacl', username + suffix),
+                ('narrowhgacl', 'default' + suffix)
+            ]:
             try:
-                svalue = hgacl.get('narrowhgacl', username + suffix)
-            except configparser.NoOptionError:
-                try:
-                    svalue = hgacl.get('narrowhgacl', 'default' + suffix)
+                    svalue = hgacl.get(section, option)
+                    break  # stop at the first value we find
                 except configparser.NoOptionError:
                     pass
             if not svalue:

rhodecode/lib/vcs/backends/svn/inmemory.py

@@ -30,8 +30,7 b' from rhodecode.lib.vcs.backends import b'
 
 class SubversionInMemoryCommit(base.BaseInMemoryCommit):
 
-    def commit(self, message, author, parents=None, branch=None, date=None,
-               **kwargs):
+    def commit(self, message, author, parents=None, branch=None, date=None, **kwargs):
         if branch not in (None, self.repository.DEFAULT_BRANCH_NAME):
             raise NotImplementedError("Branches are not yet supported")
 
@@ -74,8 +73,7 b' class SubversionInMemoryCommit(base.Base'
         # we should not add the commit_id, if it is already evaluated, it
         # will not be evaluated again.
         commit_id = str(svn_rev)
-        if commit_id not in self.repository.commit_ids:
-            self.repository.commit_ids.append(commit_id)
+        self.repository.append_commit_id(commit_id)
         tip = self.repository.get_commit()
         self.reset()
         return tip

rhodecode/lib/vcs/backends/svn/repository.py

@@ -27,6 +27,7 b' import os'
 import urllib
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
+from zope.cachedescriptors.property import CachedProperty
 
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib.datelib import date_astimestamp
@@ -75,6 +76,9 b' class SubversionRepository(base.BaseRepo'
 
         self._init_repo(create, src_url)
 
+        # dependent that trigger re-computation of  commit_ids
+        self._commit_ids_ver = 0
+
     @LazyProperty
     def _remote(self):
         return connection.Svn(self.path, self.config)
@@ -93,11 +97,31 b' class SubversionRepository(base.BaseRepo'
         else:
             self._check_path()
 
-    @LazyProperty
+    @CachedProperty('_commit_ids_ver')
     def commit_ids(self):
         head = self._remote.lookup(None)
         return [str(r) for r in xrange(1, head + 1)]
 
+    def _rebuild_cache(self, commit_ids):
+        pass
+
+    def run_svn_command(self, cmd, **opts):
+        """
+        Runs given ``cmd`` as svn command and returns tuple
+        (stdout, stderr).
+
+        :param cmd: full svn command to be executed
+        :param opts: env options to pass into Subprocess command
+        """
+        if not isinstance(cmd, list):
+            raise ValueError('cmd must be a list, got %s instead' % type(cmd))
+
+        skip_stderr_log = opts.pop('skip_stderr_log', False)
+        out, err = self._remote.run_svn_command(cmd, **opts)
+        if err and not skip_stderr_log:
+            log.debug('Stderr output of svn command "%s":\n%s', cmd, err)
+        return out, err
+
     @LazyProperty
     def branches(self):
         return self._tags_or_branches('vcs_svn_branch')
@@ -260,7 +284,7 b' class SubversionRepository(base.BaseRepo'
             try:
                 commit_id = self.commit_ids[commit_idx]
             except IndexError:
-                raise CommitDoesNotExistError
+                raise CommitDoesNotExistError('No commit with idx: {}'.format(commit_idx))
 
         commit_id = self._sanitize_commit_id(commit_id)
         commit = SubversionCommit(repository=self, commit_id=commit_id)

rhodecode/lib/vcs/conf/settings.py

@@ -42,12 +42,16 b' BACKENDS = {'
     'svn': 'rhodecode.lib.vcs.backends.svn.SubversionRepository',
 }
 
-# TODO: Remove once controllers/files.py is adjusted
-ARCHIVE_SPECS = {
-    'tbz2': ('application/x-bzip2', '.tar.bz2'),
-    'tgz': ('application/x-gzip', '.tar.gz'),
-    'zip': ('application/zip', '.zip'),
-}
+
+ARCHIVE_SPECS = [
+    ('tbz2', 'application/x-bzip2', 'tbz2'),
+    ('tbz2', 'application/x-bzip2', '.tar.bz2'),
+
+    ('tgz', 'application/x-gzip', '.tgz'),
+    ('tgz', 'application/x-gzip', '.tar.gz'),
+
+    ('zip', 'application/zip', '.zip'),
+]
 
 HOOKS_PROTOCOL = None
 HOOKS_DIRECT_CALLS = False

rhodecode/lib/vcs/utils/helpers.py

@@ -101,23 +101,35 b' def parse_datetime(text):'
     :param text: string of desired date/datetime or something more verbose,
       like *yesterday*, *2weeks 3days*, etc.
     """
+    if not text:
+        raise ValueError('Wrong date: "%s"' % text)
 
-    text = text.strip().lower()
+    if isinstance(text, datetime.datetime):
+        return text
 
-    INPUT_FORMATS = (
+    # we limit a format to no include microseconds e.g 2017-10-17t17:48:23.XXXX
+    text = text.strip().lower()[:19]
+
+    input_formats = (
         '%Y-%m-%d %H:%M:%S',
+        '%Y-%m-%dt%H:%M:%S',
         '%Y-%m-%d %H:%M',
+        '%Y-%m-%dt%H:%M',
         '%Y-%m-%d',
         '%m/%d/%Y %H:%M:%S',
+        '%m/%d/%Yt%H:%M:%S',
         '%m/%d/%Y %H:%M',
+        '%m/%d/%Yt%H:%M',
         '%m/%d/%Y',
         '%m/%d/%y %H:%M:%S',
+        '%m/%d/%yt%H:%M:%S',
         '%m/%d/%y %H:%M',
+        '%m/%d/%yt%H:%M',
         '%m/%d/%y',
     )
-    for format in INPUT_FORMATS:
+    for format_def in input_formats:
         try:
-            return datetime.datetime(*time.strptime(text, format)[:6])
+            return datetime.datetime(*time.strptime(text, format_def)[:6])
         except ValueError:
             pass
 

rhodecode/model/db.py

@@ -25,6 +25,7 b' Database Models for RhodeCode Enterprise'
 import re
 import os
 import time
+import string
 import hashlib
 import logging
 import datetime
@@ -39,7 +40,7 b' from sqlalchemy import ('
     Index, Sequence, UniqueConstraint, ForeignKey, CheckConstraint, Column,
     Boolean, String, Unicode, UnicodeText, DateTime, Integer, LargeBinary,
     Text, Float, PickleType)
-from sqlalchemy.sql.expression import true, false
+from sqlalchemy.sql.expression import true, false, case
 from sqlalchemy.sql.functions import coalesce, count  # pragma: no cover
 from sqlalchemy.orm import (
     relationship, joinedload, class_mapper, validates, aliased)
@@ -50,6 +51,7 b' from sqlalchemy.dialects.mysql import LO'
 from zope.cachedescriptors.property import Lazy as LazyProperty
 from pyramid import compat
 from pyramid.threadlocal import get_current_request
+from webhelpers.text import collapse, remove_formatting
 
 from rhodecode.translation import _
 from rhodecode.lib.vcs import get_vcs_instance
@@ -57,13 +59,13 b' from rhodecode.lib.vcs.backends.base imp'
 from rhodecode.lib.utils2 import (
     str2bool, safe_str, get_commit_safe, safe_unicode, sha1_safe,
     time_to_datetime, aslist, Optional, safe_int, get_clone_url, AttributeDict,
-    glob2re, StrictAttributeDict, cleaned_uri)
+    glob2re, StrictAttributeDict, cleaned_uri, datetime_to_time, OrderedDefaultDict)
 from rhodecode.lib.jsonalchemy import MutationObj, MutationList, JsonType, \
     JsonRaw
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.caching_query import FromCache
-from rhodecode.lib.encrypt import AESCipher
-
+from rhodecode.lib.encrypt import AESCipher, validate_and_get_enc_data
+from rhodecode.lib.encrypt2 import Encryptor
 from rhodecode.model.meta import Base, Session
 
 URL_SEP = '/'
@@ -159,43 +161,45 b' class EncryptedTextValue(TypeDecorator):'
     impl = Text
 
     def process_bind_param(self, value, dialect):
-        if not value:
-            return value
-        if value.startswith('enc$aes$') or value.startswith('enc$aes_hmac$'):
-            # protect against double encrypting if someone manually starts
-            # doing
-            raise ValueError('value needs to be in unencrypted format, ie. '
-                             'not starting with enc$aes')
-        return 'enc$aes_hmac$%s' % AESCipher(
-            ENCRYPTION_KEY, hmac=True).encrypt(value)
-
-    def process_result_value(self, value, dialect):
+        """
+        Setter for storing value
+        """
         import rhodecode
-
         if not value:
             return value
 
-        parts = value.split('$', 3)
-        if not len(parts) == 3:
-            # probably not encrypted values
-            return value
+        # protect against double encrypting if values is already encrypted
+        if value.startswith('enc$aes$') \
+                or value.startswith('enc$aes_hmac$') \
+                or value.startswith('enc2$'):
+            raise ValueError('value needs to be in unencrypted format, '
+                             'ie. not starting with enc$ or enc2$')
+
+        algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
+        if algo == 'aes':
+            return 'enc$aes_hmac$%s' % AESCipher(ENCRYPTION_KEY, hmac=True).encrypt(value)
+        elif algo == 'fernet':
+            return Encryptor(ENCRYPTION_KEY).encrypt(value)
         else:
-            if parts[0] != 'enc':
-                # parts ok but without our header ?
+            ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
+
+    def process_result_value(self, value, dialect):
+        """
+        Getter for retrieving value
+        """
+
+        import rhodecode
+        if not value:
                 return value
-            enc_strict_mode = str2bool(rhodecode.CONFIG.get(
-                'rhodecode.encrypted_values.strict') or True)
-            # at that stage we know it's our encryption
-            if parts[1] == 'aes':
-                decrypted_data = AESCipher(ENCRYPTION_KEY).decrypt(parts[2])
-            elif parts[1] == 'aes_hmac':
-                decrypted_data = AESCipher(
-                    ENCRYPTION_KEY, hmac=True,
-                    strict_verification=enc_strict_mode).decrypt(parts[2])
+
+        algo = rhodecode.CONFIG.get('rhodecode.encrypted_values.algorithm') or 'aes'
+        enc_strict_mode = str2bool(rhodecode.CONFIG.get('rhodecode.encrypted_values.strict') or True)
+        if algo == 'aes':
+            decrypted_data = validate_and_get_enc_data(value, ENCRYPTION_KEY, enc_strict_mode)
+        elif algo == 'fernet':
+            return Encryptor(ENCRYPTION_KEY).decrypt(value)
             else:
-                raise ValueError(
-                    'Encryption type part is wrong, must be `aes` '
-                    'or `aes_hmac`, got `%s` instead' % (parts[1]))
+            ValueError('Bad encryption algorithm, should be fernet or aes, got: {}'.format(algo))
             return decrypted_data
 
 
@@ -407,6 +411,15 b' class RhodeCodeUi(Base, BaseModel):'
     HOOK_PUSH = 'changegroup.push_logger'
     HOOK_PUSH_KEY = 'pushkey.key_push'
 
+    HOOKS_BUILTIN = [
+        HOOK_PRE_PULL,
+        HOOK_PULL,
+        HOOK_PRE_PUSH,
+        HOOK_PRETX_PUSH,
+        HOOK_PUSH,
+        HOOK_PUSH_KEY,
+    ]
+
     # TODO: johbo: Unify way how hooks are configured for git and hg,
     # git part is currently hardcoded.
 
@@ -1665,11 +1678,12 b' class Repository(Base, BaseModel):'
         cascade="all, delete, delete-orphan")
     ui = relationship('RepoRhodeCodeUi', cascade="all")
     settings = relationship('RepoRhodeCodeSetting', cascade="all")
-    integrations = relationship('Integration',
-                                cascade="all, delete, delete-orphan")
+    integrations = relationship('Integration', cascade="all, delete, delete-orphan")
 
     scoped_tokens = relationship('UserApiKeys', cascade="all")
 
+    artifacts = relationship('FileStore', cascade="all")
+
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
                                    safe_unicode(self.repo_name))
@@ -1717,7 +1731,9 b' class Repository(Base, BaseModel):'
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         dummy = EmptyCommit().__json__()
         if not self._changeset_cache:
-            return dummy
+            dummy['source_repo_id'] = self.repo_id
+            return json.loads(json.dumps(dummy))
+
         try:
             return json.loads(self._changeset_cache)
         except TypeError:
@@ -2170,6 +2186,20 b' class Repository(Base, BaseModel):'
         return make_lock, currently_locked, lock_info
 
     @property
+    def last_commit_cache_update_diff(self):
+        return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
+
+    @property
+    def last_commit_change(self):
+        from rhodecode.lib.vcs.utils.helpers import parse_datetime
+        empty_date = datetime.datetime.fromtimestamp(0)
+        date_latest = self.changeset_cache.get('date', empty_date)
+        try:
+            return parse_datetime(date_latest)
+        except Exception:
+            return empty_date
+
+    @property
     def last_db_change(self):
         return self.updated_on
 
@@ -2262,6 +2292,7 b' class Repository(Base, BaseModel):'
         """
         Update cache of last changeset for repository, keys should be::
 
+            source_repo_id
             short_id
             raw_id
             revision
@@ -2269,15 +2300,15 b' class Repository(Base, BaseModel):'
             message
             date
             author
-
-        :param cs_cache:
+            updated_on
+
         """
         from rhodecode.lib.vcs.backends.base import BaseChangeset
         if cs_cache is None:
             # use no-cache version here
             scm_repo = self.scm_instance(cache=False, config=config)
 
-            empty = not scm_repo or scm_repo.is_empty()
+            empty = scm_repo is None or scm_repo.is_empty()
             if not empty:
                 cs_cache = scm_repo.get_commit(
                     pre_load=["author", "date", "message", "parents"])
@@ -2297,18 +2328,28 b' class Repository(Base, BaseModel):'
         if is_outdated(cs_cache) or not self.changeset_cache:
             _default = datetime.datetime.utcnow()
             last_change = cs_cache.get('date') or _default
-            if self.updated_on and self.updated_on > last_change:
                 # we check if last update is newer than the new value
                 # if yes, we use the current timestamp instead. Imagine you get
                 # old commit pushed 1y ago, we'd set last update 1y to ago.
-                last_change = _default
-            log.debug('updated repo %s with new cs cache %s',
-                      self.repo_name, cs_cache)
-            self.updated_on = last_change
+            last_change_timestamp = datetime_to_time(last_change)
+            current_timestamp = datetime_to_time(last_change)
+            if last_change_timestamp > current_timestamp:
+                cs_cache['date'] = _default
+
+            cs_cache['updated_on'] = time.time()
             self.changeset_cache = cs_cache
             Session().add(self)
             Session().commit()
+
+            log.debug('updated repo %s with new commit cache %s',
+                      self.repo_name, cs_cache)
         else:
+            cs_cache = self.changeset_cache
+            cs_cache['updated_on'] = time.time()
+            self.changeset_cache = cs_cache
+            Session().add(self)
+            Session().commit()
+
             log.debug('Skipping update_commit_cache for repo:`%s` '
                       'commit already with latest changes', self.repo_name)
 
@@ -2397,6 +2438,7 b' class Repository(Base, BaseModel):'
         # control over cache behaviour
         if cache is None and full_cache and not config:
             return self._get_instance_cached()
+        # cache here is sent to the "vcs server"
         return self._get_instance(cache=bool(cache), config=config)
 
     def _get_instance_cached(self):
@@ -2425,8 +2467,7 b' class Repository(Base, BaseModel):'
             else:
                 instance = get_instance_cached(*args)
 
-            log.debug(
-                'Repo instance fetched in %.3fs', inv_context_manager.compute_time)
+            log.debug('Repo instance fetched in %.3fs', inv_context_manager.compute_time)
             return instance
 
     def _get_instance(self, cache=True, config=None):
@@ -2440,7 +2481,8 b' class Repository(Base, BaseModel):'
             with_wire=custom_wire,
             create=False,
             _vcs_alias=self.repo_type)
-
+        if repo is not None:
+            repo.count()  # cache rebuild
         return repo
 
     def __json__(self):
@@ -2467,7 +2509,8 b' class RepoGroup(Base, BaseModel):'
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
-    group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
+    _group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
+    group_name_hash = Column("repo_group_name_hash", String(1024), nullable=False, unique=False)
     group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
     group_description = Column("group_description", String(10000), nullable=True, unique=None, default=None)
     enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
@@ -2475,6 +2518,8 b' class RepoGroup(Base, BaseModel):'
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
     personal = Column('personal', Boolean(), nullable=True, unique=None, default=None)
+    _changeset_cache = Column(
+        "changeset_cache", LargeBinary(), nullable=True)  # JSON data
 
     repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
     users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all')
@@ -2490,6 +2535,38 b' class RepoGroup(Base, BaseModel):'
         return u"<%s('id:%s:%s')>" % (
             self.__class__.__name__, self.group_id, self.group_name)
 
+    @hybrid_property
+    def group_name(self):
+        return self._group_name
+
+    @group_name.setter
+    def group_name(self, value):
+        self._group_name = value
+        self.group_name_hash = self.hash_repo_group_name(value)
+
+    @hybrid_property
+    def changeset_cache(self):
+        from rhodecode.lib.vcs.backends.base import EmptyCommit
+        dummy = EmptyCommit().__json__()
+        if not self._changeset_cache:
+            dummy['source_repo_id'] = ''
+            return json.loads(json.dumps(dummy))
+
+        try:
+            return json.loads(self._changeset_cache)
+        except TypeError:
+            return dummy
+        except Exception:
+            log.error(traceback.format_exc())
+            return dummy
+
+    @changeset_cache.setter
+    def changeset_cache(self, val):
+        try:
+            self._changeset_cache = json.dumps(val)
+        except Exception:
+            log.error(traceback.format_exc())
+
     @validates('group_parent_id')
     def validate_group_parent_id(self, key, val):
         """
@@ -2506,6 +2583,18 b' class RepoGroup(Base, BaseModel):'
         return h.escape(self.group_description)
 
     @classmethod
+    def hash_repo_group_name(cls, repo_group_name):
+        val = remove_formatting(repo_group_name)
+        val = safe_str(val).lower()
+        chars = []
+        for c in val:
+            if c not in string.ascii_letters:
+                c = str(ord(c))
+            chars.append(c)
+
+        return ''.join(chars)
+
+    @classmethod
     def _generate_choice(cls, repo_group):
         from webhelpers.html import literal as _literal
         _name = lambda k: _literal(cls.CHOICES_SEPARATOR.join(k))
@@ -2573,8 +2662,7 b' class RepoGroup(Base, BaseModel):'
         return q.all()
 
     @property
-    def parents(self):
-        parents_recursion_limit = 10
+    def parents(self, parents_recursion_limit = 10):
         groups = []
         if self.parent_group is None:
             return groups
@@ -2597,6 +2685,20 b' class RepoGroup(Base, BaseModel):'
         return groups
 
     @property
+    def last_commit_cache_update_diff(self):
+        return time.time() - (safe_int(self.changeset_cache.get('updated_on')) or 0)
+
+    @property
+    def last_commit_change(self):
+        from rhodecode.lib.vcs.utils.helpers import parse_datetime
+        empty_date = datetime.datetime.fromtimestamp(0)
+        date_latest = self.changeset_cache.get('date', empty_date)
+        try:
+            return parse_datetime(date_latest)
+        except Exception:
+            return empty_date
+
+    @property
     def last_db_change(self):
         return self.updated_on
 
@@ -2635,7 +2737,7 b' class RepoGroup(Base, BaseModel):'
 
         return cnt + children_count(self)
 
-    def _recursive_objects(self, include_repos=True):
+    def _recursive_objects(self, include_repos=True, include_groups=True):
         all_ = []
 
         def _get_members(root_gr):
@@ -2645,11 +2747,16 b' class RepoGroup(Base, BaseModel):'
             childs = root_gr.children.all()
             if childs:
                 for gr in childs:
+                    if include_groups:
                     all_.append(gr)
                     _get_members(gr)
 
+        root_group = []
+        if include_groups:
+            root_group = [self]
+
         _get_members(self)
-        return [self] + all_
+        return root_group + all_
 
     def recursive_groups_and_repos(self):
         """
@@ -2663,6 +2770,12 b' class RepoGroup(Base, BaseModel):'
         """
         return self._recursive_objects(include_repos=False)
 
+    def recursive_repos(self):
+        """
+        Returns all children repositories for this group
+        """
+        return self._recursive_objects(include_groups=False)
+
     def get_new_name(self, group_name):
         """
         returns new full group name based on parent and new name
@@ -2673,6 +2786,63 b' class RepoGroup(Base, BaseModel):'
                        self.parent_group else [])
         return RepoGroup.url_sep().join(path_prefix + [group_name])
 
+    def update_commit_cache(self, config=None):
+        """
+        Update cache of last changeset for newest repository inside this group, keys should be::
+
+            source_repo_id
+            short_id
+            raw_id
+            revision
+            parents
+            message
+            date
+            author
+
+        """
+        from rhodecode.lib.vcs.utils.helpers import parse_datetime
+
+        def repo_groups_and_repos():
+            all_entries = OrderedDefaultDict(list)
+
+            def _get_members(root_gr, pos=0):
+
+                for repo in root_gr.repositories:
+                    all_entries[root_gr].append(repo)
+
+                # fill in all parent positions
+                for parent_group in root_gr.parents:
+                    all_entries[parent_group].extend(all_entries[root_gr])
+
+                children_groups = root_gr.children.all()
+                if children_groups:
+                    for cnt, gr in enumerate(children_groups, 1):
+                        _get_members(gr, pos=pos+cnt)
+
+            _get_members(root_gr=self)
+            return all_entries
+
+        empty_date = datetime.datetime.fromtimestamp(0)
+        for repo_group, repos in repo_groups_and_repos().items():
+
+            latest_repo_cs_cache = {}
+            for repo in repos:
+                repo_cs_cache = repo.changeset_cache
+                date_latest = latest_repo_cs_cache.get('date', empty_date)
+                date_current = repo_cs_cache.get('date', empty_date)
+                current_timestamp = datetime_to_time(parse_datetime(date_latest))
+                if current_timestamp < datetime_to_time(parse_datetime(date_current)):
+                    latest_repo_cs_cache = repo_cs_cache
+                    latest_repo_cs_cache['source_repo_id'] = repo.repo_id
+
+            latest_repo_cs_cache['updated_on'] = time.time()
+            repo_group.changeset_cache = latest_repo_cs_cache
+            Session().add(repo_group)
+            Session().commit()
+
+            log.debug('updated repo group %s with new commit cache %s',
+                      repo_group.group_name, latest_repo_cs_cache)
+
     def permissions(self, with_admins=True, with_owner=True,
                     expand_from_user_groups=False):
         """
@@ -2768,6 +2938,13 b' class RepoGroup(Base, BaseModel):'
         }
         return data
 
+    def get_dict(self):
+        # Since we transformed `group_name` to a hybrid property, we need to
+        # keep compatibility with the code which uses `group_name` field.
+        result = super(RepoGroup, self).get_dict()
+        result['group_name'] = result.pop('_group_name', None)
+        return result
+
 
 class Permission(Base, BaseModel):
     __tablename__ = 'permissions'
@@ -4258,9 +4435,16 b' class Gist(Base, BaseModel):'
     # SCM functions
 
     def scm_instance(self, **kwargs):
+        """
+        Get an instance of VCS Repository
+
+        :param kwargs:
+        """
+        from rhodecode.model.gist import GistModel
         full_repo_path = os.path.join(self.base_path(), self.gist_access_id)
         return get_vcs_instance(
-            repo_path=safe_str(full_repo_path), create=False)
+            repo_path=safe_str(full_repo_path), create=False,
+            _vcs_alias=GistModel.vcs_backend)
 
 
 class ExternalIdentity(Base, BaseModel):
@@ -4904,8 +5088,8 b' class FileStore(Base, BaseModel):'
 
     @classmethod
     def create(cls, file_uid, filename, file_hash, file_size, file_display_name='',
-               file_description='', enabled=True, check_acl=True,
-               user_id=None, scope_repo_id=None, scope_repo_group_id=None):
+               file_description='', enabled=True, check_acl=True, user_id=None,
+               scope_user_id=None, scope_repo_id=None, scope_repo_group_id=None):
 
         store_entry = FileStore()
         store_entry.file_uid = file_uid
@@ -4919,6 +5103,7 b' class FileStore(Base, BaseModel):'
         store_entry.enabled = enabled
 
         store_entry.user_id = user_id
+        store_entry.scope_user_id = scope_user_id
         store_entry.scope_repo_id = scope_repo_id
         store_entry.scope_repo_group_id = scope_repo_group_id
         return store_entry

rhodecode/model/forms.py

@@ -618,7 +618,7 b' def PullRequestForm(localizer, repo_id):'
         revisions = All(#v.NotReviewedRevisions(localizer, repo_id)(),
                         v.UniqueList(localizer)(not_empty=True))
         review_members = formencode.ForEach(ReviewerForm())
-        pullrequest_title = v.UnicodeString(strip=True, required=True, min=3, max=255)
+        pullrequest_title = v.UnicodeString(strip=True, required=True, min=1, max=255)
         pullrequest_desc = v.UnicodeString(strip=True, required=False)
         description_renderer = v.UnicodeString(strip=True, required=False)
 

rhodecode/model/gist.py

@@ -47,6 +47,7 b" GIST_METADATA_FILE = '.rc_gist_metadata'"
 
 class GistModel(BaseModel):
     cls = Gist
+    vcs_backend = 'hg'
 
     def _get_gist(self, gist):
         """
@@ -145,7 +146,7 b' class GistModel(BaseModel):'
         gist_repo_path = os.path.join(GIST_STORE_LOC, gist_id)
         log.debug('Creating new %s GIST repo in %s', gist_type, gist_repo_path)
         repo = RepoModel()._create_filesystem_repo(
-            repo_name=gist_id, repo_type='hg', repo_group=GIST_STORE_LOC,
+            repo_name=gist_id, repo_type=self.vcs_backend, repo_group=GIST_STORE_LOC,
             use_global_config=True)
 
         # now create single multifile commit

rhodecode/model/pull_request.py

@@ -683,6 +683,7 b' class PullRequestModel(BaseModel):'
 
         # source repo
         source_repo = pull_request.source_repo.scm_instance()
+
         try:
             source_commit = source_repo.get_commit(commit_id=source_ref_name)
         except CommitDoesNotExistError:
@@ -696,6 +697,7 b' class PullRequestModel(BaseModel):'
 
         # target repo
         target_repo = pull_request.target_repo.scm_instance()
+
         try:
             target_commit = target_repo.get_commit(commit_id=target_ref_name)
         except CommitDoesNotExistError:
@@ -752,8 +754,8 b' class PullRequestModel(BaseModel):'
             target_commit.raw_id, source_commit.raw_id, source_repo, merge=True,
             pre_load=pre_load)
 
-        ancestor = target_repo.get_common_ancestor(
-            target_commit.raw_id, source_commit.raw_id, source_repo)
+        ancestor = source_repo.get_common_ancestor(
+            source_commit.raw_id, target_commit.raw_id, target_repo)
 
         pull_request.source_ref = '%s:%s:%s' % (
             source_ref_type, source_ref_name, source_commit.raw_id)
@@ -1314,10 +1316,21 b' class PullRequestModel(BaseModel):'
             merge_state = self._refresh_merge_state(
                 pull_request, target_vcs, target_ref)
         else:
-            possible = pull_request.\
-                last_merge_status == MergeFailureReason.NONE
+            possible = pull_request.last_merge_status == MergeFailureReason.NONE
+            metadata = {
+                'target_ref': pull_request.target_ref_parts,
+                'source_ref': pull_request.source_ref_parts,
+            }
+            if not possible and target_ref.type == 'branch':
+                # NOTE(marcink): case for mercurial multiple heads on branch
+                heads = target_vcs._heads(target_ref.name)
+                if len(heads) != 1:
+                    heads = '\n,'.join(target_vcs._heads(target_ref.name))
+                    metadata.update({
+                        'heads': heads
+                    })
             merge_state = MergeResponse(
-                possible, False, None, pull_request.last_merge_status)
+                possible, False, None, pull_request.last_merge_status, metadata=metadata)
 
         return merge_state
 
@@ -1326,6 +1339,7 b' class PullRequestModel(BaseModel):'
             name_or_id = reference.name
         else:
             name_or_id = reference.commit_id
+
         refreshed_commit = vcs_repository.get_commit(name_or_id)
         refreshed_reference = Reference(
             reference.type, reference.name, refreshed_commit.raw_id)

rhodecode/model/repo.py

@@ -192,14 +192,14 b' class RepoModel(BaseModel):'
         return repo_log
 
     @classmethod
-    def update_repoinfo(cls, repositories=None):
+    def update_commit_cache(cls, repositories=None):
         if not repositories:
             repositories = Repository.getAll()
         for repo in repositories:
             repo.update_commit_cache()
 
     def get_repos_as_dict(self, repo_list=None, admin=False,
-                          super_user_actions=False):
+                          super_user_actions=False, short_name=None):
         _render = get_current_request().get_partial_renderer(
             'rhodecode:templates/data_table/_dt_elements.mako')
         c = _render.get_call_context()
@@ -208,8 +208,12 b' class RepoModel(BaseModel):'
             return _render('quick_menu', repo_name)
 
         def repo_lnk(name, rtype, rstate, private, archived, fork_of):
+            if short_name is not None:
+                short_name_var = short_name
+            else:
+                short_name_var = not admin
             return _render('repo_name', name, rtype, rstate, private, archived, fork_of,
-                           short_name=not admin, admin=False)
+                           short_name=short_name_var, admin=False)
 
         def last_change(last_change):
             if admin and isinstance(last_change, datetime.datetime) and not last_change.tzinfo:
@@ -250,8 +254,8 b' class RepoModel(BaseModel):'
                                  repo.private, repo.archived, repo.fork),
                 "name_raw": repo.repo_name.lower(),
 
-                "last_change": last_change(repo.last_db_change),
-                "last_change_raw": datetime_to_time(repo.last_db_change),
+                "last_change": last_change(repo.last_commit_change),
+                "last_change_raw": datetime_to_time(repo.last_commit_change),
 
                 "last_changeset": last_rev(repo.repo_name, cs_cache),
                 "last_changeset_raw": cs_cache.get('revision'),

rhodecode/model/repo_group.py

@@ -97,6 +97,8 b' class RepoGroupModel(BaseModel):'
         return string.Template(template).safe_substitute(
             username=user.username,
             user_id=user.user_id,
+            first_name=user.first_name,
+            last_name=user.last_name,
         )
 
     def create_personal_repo_group(self, user, commit_early=True):
@@ -307,6 +309,10 b' class RepoGroupModel(BaseModel):'
             # trigger the post hook
             from rhodecode.lib.hooks_base import log_create_repository_group
             repo_group = RepoGroup.get_by_group_name(group_name)
+
+            # update repo group commit caches initially
+            repo_group.update_commit_cache()
+
             log_create_repository_group(
                 created_by=user.username, **repo_group.get_dict())
 
@@ -684,6 +690,13 b' class RepoGroupModel(BaseModel):'
                 'revoked permission from usergroup: {} on repogroup: {}'.format(
                     group_name, repo_group), namespace='security.repogroup')
 
+    @classmethod
+    def update_commit_cache(cls, repo_groups=None):
+        if not repo_groups:
+            repo_groups = RepoGroup.getAll()
+        for repo_group in repo_groups:
+            repo_group.update_commit_cache()
+
     def get_repo_groups_as_dict(self, repo_group_list=None, admin=False,
                                 super_user_actions=False):
 
@@ -705,6 +718,11 b' class RepoGroupModel(BaseModel):'
                     (datetime.datetime.now() - datetime.datetime.utcnow()).seconds)
             return _render("last_change", last_change)
 
+        def last_rev(repo_name, cs_cache):
+            return _render('revision', repo_name, cs_cache.get('revision'),
+                           cs_cache.get('raw_id'), cs_cache.get('author'),
+                           cs_cache.get('message'), cs_cache.get('date'))
+
         def desc(desc, personal):
             return _render(
                 'repo_group_desc', desc, personal, c.visual.stylify_metatags)
@@ -721,13 +739,19 b' class RepoGroupModel(BaseModel):'
 
         repo_group_data = []
         for group in repo_group_list:
+            cs_cache = group.changeset_cache
+            last_repo_name = cs_cache.get('source_repo_name')
 
             row = {
                 "menu": quick_menu(group.group_name),
                 "name": repo_group_lnk(group.group_name),
                 "name_raw": group.group_name,
-                "last_change": last_change(group.last_db_change),
-                "last_change_raw": datetime_to_time(group.last_db_change),
+                "last_change": last_change(group.last_commit_change),
+                "last_change_raw": datetime_to_time(group.last_commit_change),
+
+                "last_changeset": "",
+                "last_changeset_raw": "",
+
                 "desc": desc(group.description_safe, group.personal),
                 "top_level_repos": 0,
                 "owner": user_profile(group.user.username)

rhodecode/model/scm.py

@@ -818,6 +818,8 b' class ScmModel(BaseModel):'
                 repo_name=repo.repo_name, repo_alias=scm_instance.alias,
                 commit_ids=[tip.raw_id])
 
+        return tip
+
     def delete_nodes(self, user, repo, message, nodes, parent_commit=None,
                      author=None, trigger_push_hook=True):
         """

rhodecode/model/settings.py

@@ -119,6 +119,7 b' class SettingsModel(BaseModel):'
         new_ui.ui_value = val
         new_ui.ui_active = active
 
+        repository_id = ''
         if self.repo:
             repo = self._get_repo(self.repo)
             repository_id = repo.repo_id
@@ -440,26 +441,39 b' class VcsSettingsModel(object):'
     HOOKS_SETTINGS = (
         ('hooks', 'changegroup.repo_size'),
         ('hooks', 'changegroup.push_logger'),
-        ('hooks', 'outgoing.pull_logger'),)
+        ('hooks', 'outgoing.pull_logger'),
+    )
     HG_SETTINGS = (
         ('extensions', 'largefiles'),
         ('phases', 'publish'),
-        ('extensions', 'evolve'),)
+        ('extensions', 'evolve'),
+        ('extensions', 'topic'),
+        ('experimental', 'evolution'),
+        ('experimental', 'evolution.exchange'),
+    )
     GIT_SETTINGS = (
-        ('vcs_git_lfs', 'enabled'),)
+        ('vcs_git_lfs', 'enabled'),
+    )
     GLOBAL_HG_SETTINGS = (
         ('extensions', 'largefiles'),
         ('largefiles', 'usercache'),
         ('phases', 'publish'),
         ('extensions', 'hgsubversion'),
-        ('extensions', 'evolve'),)
+        ('extensions', 'evolve'),
+        ('extensions', 'topic'),
+        ('experimental', 'evolution'),
+        ('experimental', 'evolution.exchange'),
+    )
+
     GLOBAL_GIT_SETTINGS = (
         ('vcs_git_lfs', 'enabled'),
-        ('vcs_git_lfs', 'store_location'))
+        ('vcs_git_lfs', 'store_location')
+    )
 
     GLOBAL_SVN_SETTINGS = (
         ('vcs_svn_proxy', 'http_requests_enabled'),
-        ('vcs_svn_proxy', 'http_server_url'))
+        ('vcs_svn_proxy', 'http_server_url')
+    )
 
     SVN_BRANCH_SECTION = 'vcs_svn_branch'
     SVN_TAG_SECTION = 'vcs_svn_tag'
@@ -574,12 +588,38 b' class VcsSettingsModel(object):'
     def create_repo_svn_settings(self, data):
         return self._create_svn_settings(self.repo_settings, data)
 
+    def _set_evolution(self, settings, is_enabled):
+        if is_enabled:
+            # if evolve is active set evolution=all
+
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution'), value='all',
+                active=True)
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution.exchange'), value='yes',
+                active=True)
+            # if evolve is active set topics server support
+            self._create_or_update_ui(
+                settings, *('extensions', 'topic'), value='',
+                active=True)
+
+        else:
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution'), value='',
+                active=False)
+            self._create_or_update_ui(
+                settings, *('experimental', 'evolution.exchange'), value='no',
+                active=False)
+            self._create_or_update_ui(
+                settings, *('extensions', 'topic'), value='',
+                active=False)
+
     @assert_repo_settings
     def create_or_update_repo_hg_settings(self, data):
         largefiles, phases, evolve = \
-            self.HG_SETTINGS
+            self.HG_SETTINGS[:3]
         largefiles_key, phases_key, evolve_key = \
-            self._get_settings_keys(self.HG_SETTINGS, data)
+            self._get_settings_keys(self.HG_SETTINGS[:3], data)
 
         self._create_or_update_ui(
             self.repo_settings, *largefiles, value='',
@@ -587,21 +627,22 b' class VcsSettingsModel(object):'
         self._create_or_update_ui(
             self.repo_settings, *evolve, value='',
             active=data[evolve_key])
+        self._set_evolution(self.repo_settings, is_enabled=data[evolve_key])
+
         self._create_or_update_ui(
             self.repo_settings, *phases, value=safe_str(data[phases_key]))
 
     def create_or_update_global_hg_settings(self, data):
         largefiles, largefiles_store, phases, hgsubversion, evolve \
-            = self.GLOBAL_HG_SETTINGS
+            = self.GLOBAL_HG_SETTINGS[:5]
         largefiles_key, largefiles_store_key, phases_key, subversion_key, evolve_key \
-            = self._get_settings_keys(self.GLOBAL_HG_SETTINGS, data)
+            = self._get_settings_keys(self.GLOBAL_HG_SETTINGS[:5], data)
 
         self._create_or_update_ui(
             self.global_settings, *largefiles, value='',
             active=data[largefiles_key])
         self._create_or_update_ui(
-            self.global_settings, *largefiles_store,
-            value=data[largefiles_store_key])
+            self.global_settings, *largefiles_store, value=data[largefiles_store_key])
         self._create_or_update_ui(
             self.global_settings, *phases, value=safe_str(data[phases_key]))
         self._create_or_update_ui(
@@ -609,9 +650,10 b' class VcsSettingsModel(object):'
         self._create_or_update_ui(
             self.global_settings, *evolve, value='',
             active=data[evolve_key])
+        self._set_evolution(self.global_settings, is_enabled=data[evolve_key])
 
     def create_or_update_repo_git_settings(self, data):
-        # NOTE(marcink): # comma make unpack work properly
+        # NOTE(marcink): # comma makes unpack work properly
         lfs_enabled, \
             = self.GIT_SETTINGS
 
@@ -675,6 +717,7 b' class VcsSettingsModel(object):'
     def get_repo_ui_settings(self, section=None, key=None):
         global_uis = self.global_settings.get_ui(section, key)
         repo_uis = self.repo_settings.get_ui(section, key)
+
         filtered_repo_uis = self._filter_ui_settings(repo_uis)
         filtered_repo_uis_keys = [
             (s.section, s.key) for s in filtered_repo_uis]

rhodecode/model/ssh_key.py

@@ -24,10 +24,15 b' import traceback'
 import sshpubkeys
 import sshpubkeys.exceptions
 
+from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives import serialization as crypto_serialization
+from cryptography.hazmat.backends import default_backend as crypto_default_backend
+
 from rhodecode.model import BaseModel
 from rhodecode.model.db import UserSshKeys
 from rhodecode.model.meta import Session
 
+
 log = logging.getLogger(__name__)
 
 
@@ -62,16 +67,24 b' class SshKeyModel(BaseModel):'
             raise
 
     def generate_keypair(self, comment=None):
-        from Crypto.PublicKey import RSA
-
-        key = RSA.generate(2048)
-        private = key.exportKey('PEM')
 
-        pubkey = key.publickey()
-        public = pubkey.exportKey('OpenSSH')
+        key = rsa.generate_private_key(
+            backend=crypto_default_backend(),
+            public_exponent=65537,
+            key_size=2048
+        )
+        private_key = key.private_bytes(
+            crypto_serialization.Encoding.PEM,
+            crypto_serialization.PrivateFormat.PKCS8,
+            crypto_serialization.NoEncryption())
+        public_key = key.public_key().public_bytes(
+            crypto_serialization.Encoding.OpenSSH,
+            crypto_serialization.PublicFormat.OpenSSH
+        )
+
         if comment:
-            public = public + " " + comment
-        return private, public
+            public_key = public_key + " " + comment
+        return private_key, public_key
 
     def create(self, user, fingerprint, key_data, description):
         """

rhodecode/public/css/buttons.less

@@ -14,11 +14,11 b' input[type="button"] {'
     font-family: @text-light;
     text-decoration: none;
     text-shadow: none;
-    color: @grey4;
+    color: @grey2;
     background-color: white;
     background-image: none;
     border: none;
-    .border ( @border-thickness-buttons, @grey4 );
+    .border ( @border-thickness-buttons, @grey5 );
     .border-radius (@border-radius);
     cursor: pointer;
     white-space: nowrap;
@@ -26,6 +26,10 b' input[type="button"] {'
        -moz-transition: background .3s,color .3s;
          -o-transition: background .3s,color .3s;
             transition: background .3s,color .3s;
+            box-shadow: @button-shadow;
+    -webkit-box-shadow: @button-shadow;
+
+
 
     a {
         display: block;
@@ -44,8 +48,9 b' input[type="button"] {'
         outline:none;
     }
     &:hover {
-        color: white;
-        background-color: @grey4;
+        color: @rcdarkblue;
+        background-color: @white;
+        .border ( @border-thickness, @grey4 );
     }
 
     .icon-remove-sign {
@@ -70,26 +75,26 b' input[type="button"] {'
 
 
 .btn-default {
-    .border ( @border-thickness-buttons, @rcblue );
+    border: @border-thickness solid @grey5;
     background-image: none;
-    color: @rcblue;
+    color: @grey2;
 
     a {
-        color: @rcblue;
+        color: @grey2;
     }
 
     &:hover,
     &.active {
-        color: white;
-        background-color: @rcdarkblue;
-        .border ( @border-thickness, @rcdarkblue );
+        color: @rcdarkblue;
+        background-color: @white;
+        .border ( @border-thickness, @grey4 );
 
         a {
-            color: white;
+            color: @grey2;
         }
     }
     &:disabled {
-        .border ( @border-thickness-buttons, @grey4 );
+        .border ( @border-thickness-buttons, @grey5 );
         background-color: transparent;
     }
 }
@@ -326,6 +331,7 b' input[type="submit"] {'
         .border ( @border-thickness-buttons, @rcblue );
         background-color: @rcblue;
         color: white;
+        opacity: 0.5;
     }
 }
 
@@ -416,3 +422,23 b' input[type="reset"] {'
     }
 }
 
+
+.button-links {
+    float: left;
+    display: inline;
+    margin: 0;
+    padding-left: 0;
+    list-style: none;
+    text-align: right;
+
+    li {
+
+
+    }
+
+    li.active {
+        background-color: @grey6;
+        .border ( @border-thickness, @grey4 );
+    }
+
+}

rhodecode/public/css/code-block.less

@@ -404,12 +404,9 b' div.codeblock {'
 
     // TODO: johbo: Added interim to get rid of the margin around
     // Select2 widgets. This needs further cleanup.
-    margin-top: @padding;
-
     overflow: auto;
     padding: 0px;
-    border: @border-thickness solid @grey5;
-    background: @grey6;
+    border: @border-thickness solid @grey6;
     .border-radius(@border-radius);
 
     #remove_gist {
@@ -479,7 +476,7 b' div.codeblock {'
     }
 
     .code-body {
-        padding: @padding;
+        padding: 0.8em 1em;
         background-color: #ffffff;
         min-width: 100%;
         box-sizing: border-box;
@@ -492,6 +489,21 b' div.codeblock {'
             height: auto;
             width: 100%;
         }
+
+        .markdown-block {
+            padding: 1em 0;
+        }
+    }
+
+    .codeblock-header {
+        background: @grey7;
+        height: 36px;
+    }
+
+    .path {
+        border-bottom: 1px solid @grey6;
+        padding: .65em 1em;
+        height: 18px;
     }
 }
 

rhodecode/public/css/codemirror.less

@@ -27,7 +27,7 b''
 
 .CodeMirror-gutters {
   border-right: 1px solid #ddd;
-  background-color: @grey6;
+  background-color: white;
   white-space: nowrap;
 }
 .CodeMirror-linenumbers {}

rhodecode/public/css/comments.less

@@ -426,7 +426,7 b' form.comment-form {'
 
 .comment-form-login {
     .comment-help {
-        padding: 0.9em; //same as the button
+        padding: 0.7em; //same as the button
     }
 
     div.clearfix { 

rhodecode/public/css/deform.less

@@ -38,7 +38,7 b''
 
   .form-control {
     width: 100%;
-    padding: 0.9em;
+    padding: 0.7em;
     border: 1px solid #979797;
     border-radius: 2px;
   }

rhodecode/public/css/forms.less

@@ -231,6 +231,11 b' form.rcform {'
 
     .drop-menu {
         float: left;
+
+        & + .last-item {
+            margin: 0;
+        }
+
         margin: 0 @input-padding 0 0;
     }
 
@@ -271,14 +276,15 b' form.rcform {'
 .badged-field {
     .user-badge {
         line-height: 25px;
-        padding: 10px 5px;
+        padding: .4em;
         border-radius: @border-radius;
-        border-top: 1px solid @rclightblue;
-        border-left: 1px solid @rclightblue;
-        border-bottom: 1px solid @rclightblue;
+        border-top: 1px solid @grey4;
+        border-left: 1px solid @grey4;
+        border-bottom: 1px solid @grey4;
         font-size: 14px;
         font-style: normal;
         color: @text-light;
+        background: @grey7;
         display: inline-block;
         vertical-align: top;
         cursor: default;

rhodecode/public/css/legacy_code_styles.less

@@ -212,6 +212,13 b' div.markdown-block strong {'
   margin: 0;
 }
 
+div.markdown-block ul.checkbox,
+div.markdown-block ol.checkbox {
+    padding-left: 20px !important;
+    margin-top: 0px !important;
+    margin-bottom: 18px !important;
+}
+
 div.markdown-block ul,
 div.markdown-block ol {
     padding-left: 30px !important;
@@ -219,6 +226,13 b' div.markdown-block ol {'
     margin-bottom: 18px !important;
 }
 
+div.markdown-block ul.checkbox li,
+div.markdown-block ol.checkbox li {
+    list-style: none !important;
+    margin: 6px !important;
+    padding: 0 !important;
+}
+
 div.markdown-block ul li,
 div.markdown-block ol li {
     list-style: disc !important;

rhodecode/public/css/login.less

@@ -198,15 +198,16 b''
 }
 
 .user-menu.submenu {
-    right: 0; 
-    left: auto;
+    right: 0!important;
+    left: auto!important;
     min-width: 290px;
 }
 
-
 .user-menu {
     .bookmark-items {
-        padding: 4px 2px;
+        border-top: @border-thickness solid @grey6;
+        margin-top: 1em;
+        padding: 1em .5em;
         color: @grey3;
         border-bottom: @grey3;
 
@@ -227,8 +228,10 b''
     padding: @menupadding;
     z-index: 999;
     overflow: hidden;
-    background-color: @grey6;
+    background-color: @white;
+    border: 1px solid @grey5;
     color: @grey2;
+    box-shadow: @dropdown-shadow;
 
     h4 {
         margin-bottom: 12px;
@@ -289,15 +292,16 b''
     .big_gravatar {
         float: left;
         display: block;
-        margin-top: .5em;
+        padding: .5em;
     }
 
-    .full_name,
-    .email {
-        margin: 0 0 0 65px;
+    .full_name {
+        margin: 0 0 0 70px;
+        padding-top: 1em;
     }
 
     .email {
+        margin: 0 0 0 70px;
         font-family: @text-light;
     }
 
@@ -307,8 +311,6 b''
         padding: @padding 0 0 0;
 
         li {
-            border-top: @border-thickness solid @grey5;
-
             input {
                 margin: @padding 0 0 0;
             }

rhodecode/public/css/main.less

@@ -107,6 +107,12 b' input + .action-link, .action-link.first'
 
 .clipboard-action {
   cursor: pointer;
+  color: @grey4;
+  margin-left: 5px;
+
+  &:hover {
+    color: @grey2;
+  }
 }
 
 ul.simple-list{
@@ -237,7 +243,7 b' input.inline[type="file"] {'
 	position: relative;
 	vertical-align: bottom;
 	padding: 0 @header-padding;
-	background-color: @grey2;
+	background-color: @grey1;
 	color: @grey5;
 
 	.title {
@@ -271,7 +277,9 b' input.inline[type="file"] {'
 // Gists
 #files_data {
     clear: both; //for firefox
-}
+    padding-top: 10px;
+}
+
 #gistid {
     margin-right: @padding;
 }
@@ -516,7 +524,7 b' ul.auth_plugins {'
 	text-align: center;
 	vertical-align: middle;
 	color: @grey2;
-	background-color: @grey6;
+    font-size: 11px;
 
 	p {
 		margin: 0;
@@ -605,10 +613,20 b' button.close {'
 }
 
 
-input {
+input, textarea {
 	&.disabled {
 		opacity: .5;
 	}
+
+    &:hover {
+        border-color: @grey3;
+        box-shadow: @button-shadow;
+    }
+
+    &:focus {
+        border-color: @rcblue;
+        box-shadow: @button-shadow;
+    }
 }
 
 // remove extra padding in firefox
@@ -643,16 +661,20 b' select {'
 	padding: 0 18px 0 8px;
 	line-height:1em;
 	font-size: @basefontsize;
-	border: @border-thickness solid @rcblue;
+	border: @border-thickness solid @grey5;
+    border-radius: @border-radius;
 	background:white url("../images/dt-arrow-dn.png") no-repeat 100% 50%;
-	color: @rcblue;
+	color: @grey4;
+    box-shadow: @button-shadow;
 
 	&:after {
 		content: "\00A0\25BE";
 	}
 
-	&:focus {
+	&:focus, &:hover {
 		outline: none;
+        border-color: @grey4;
+        color: @rcdarkblue;
 	}
 }
 
@@ -712,8 +734,8 b' label {'
     margin: -5px 0;
     padding: 0;
     line-height: 1em;
-    border: 1px solid @grey4;
     box-sizing: content-box;
+    border-radius: 50%;
 
     &.gravatar-large {
         margin: -0.5em .25em -0.5em 0;
@@ -938,9 +960,6 b' label {'
 }
 
 
-#graph_nodes {
-    padding-top: 43px;
-}
 
 #graph_content{
 
@@ -973,13 +992,12 b' label {'
     }
 
     .graph-col-wrapper {
-        padding-left: 110px;
 
         #graph_nodes {
             width: 100px;
-            margin-left: -110px;
-            float: left;
-            clear: left;
+            position: absolute;
+            left: 70px;
+            z-index: -1;
         }
     }
 
@@ -996,6 +1014,16 b' label {'
     }
 }
 
+.obsolete-toggle {
+    line-height: 30px;
+    margin-left: -15px;
+}
+
+#rev_range_container, #rev_range_clear, #rev_range_more {
+    margin-top: -5px;
+    margin-bottom: -5px;
+}
+
 #filter_changelog {
     float: left;
 }
@@ -1029,6 +1057,10 b' label {'
 	padding: 9px 2px;
 	line-height: 1em;
 	font-size: @navigation-fontsize;
+
+    a {
+      color: @grey5
+    }
 }
 
 img {
@@ -1047,7 +1079,7 b' label {'
 }
 
 .flag_status {
-    margin: 2px 8px 6px 2px;
+    margin: 2px;
     &.under_review {
         .circle(5px, @alert3);
     }
@@ -1218,24 +1250,37 b' table.integrations {'
 
 .autocomplete-suggestions {
     width: auto !important; // overrides autocomplete.js
+    min-width: 278px;
     margin: 0;
-    border: @border-thickness solid @rcblue;
+    border: @border-thickness solid @grey5;
     border-radius: @border-radius;
-    color: @rcblue;
+    color: @grey2;
     background-color: white;
 }
+
+.autocomplete-qfilter-suggestions {
+    width: auto !important; // overrides autocomplete.js
+    max-height: 100% !important;
+    min-width: 376px;
+    margin: 0;
+    border: @border-thickness solid @grey5;
+    color: @grey2;
+    background-color: white;
+}
+
 .autocomplete-selected {
     background: #F0F0F0;
 }
+
 .ac-container-wrap {
 	margin: 0;
 	padding: 8px;
-	border-bottom: @border-thickness solid @rclightblue;
+	border-bottom: @border-thickness solid @grey5;
 	list-style-type: none;
 	cursor: pointer;
 
 		&:hover {
-			background-color: @rclightblue;
+			background-color: @grey7;
 	}
 
 	img {
@@ -1292,7 +1337,7 b' table.integrations {'
 
     #editor_container{
         position: relative;
-        margin: @padding;
+      margin: @padding 10px;
     }
 }
 
@@ -1796,7 +1841,6 b' BIN_FILENODE = 7'
 }
 
 #changeset_compare_view_content {
-    margin-bottom: @space;
     clear: both;
     width: 100%;
     box-sizing: border-box;
@@ -2027,15 +2071,15 b' BIN_FILENODE = 7'
 
 // Files
 .edit-file-title {
-    border-bottom: @border-thickness solid @border-default-color;
-
-    .breadcrumbs {
-        margin-bottom: 0;
+    font-size: 16px;
+
+    .title-heading {
+      padding: 2px;
     }
 }
 
 .edit-file-fieldset {
-    margin-top: @sidebarpadding;
+    margin: @sidebarpadding 0;
 
     .fieldset {
         .left-label {
@@ -2080,8 +2124,29 b' BIN_FILENODE = 7'
 .new-file,
 #filter_activate,
 #filter_deactivate {
-    float: left;
-    margin: 0 0 0 15px;
+    float: right;
+    margin: 0 0 0 10px;
+}
+
+.file-upload-transaction-wrapper {
+    margin-top: 57px;
+    clear: both;
+}
+
+.file-upload-transaction-wrapper .error {
+    color: @color5;
+}
+
+.file-upload-transaction {
+    min-height: 200px;
+    padding: 54px;
+    border: 1px solid @grey5;
+    text-align: center;
+    clear: both;
+}
+
+.file-upload-transaction i {
+    font-size: 48px
 }
 
 h3.files_location{
@@ -2089,11 +2154,12 b' h3.files_location{'
 }
 
 .browser-nav {
+    width: 100%;
 	display: table;
-	margin-bottom: @space;
-
+    margin-bottom: 20px;
 
 	.info_box {
+        float: left;
 		display: inline-table;
 		height: 2.5em;
 
@@ -2102,36 +2168,58 b' h3.files_location{'
 			vertical-align: middle;
 		}
 
+        .drop-menu {
+            margin: 0 10px;
+        }
+
 		.info_box_elem {
-			border-top: @border-thickness solid @rcblue;
-			border-bottom: @border-thickness solid @rcblue;
+			border-top: @border-thickness solid @grey5;
+			border-bottom: @border-thickness solid @grey5;
+            box-shadow: @button-shadow;
 
             #at_rev, a {
-                padding: 0.6em 0.9em;
+                padding: 0.6em 0.4em;
                 margin: 0;
                 .box-shadow(none);
                 border: 0;
                 height: 12px;
+                color: @grey2;
             }
 
             input#at_rev {
                 max-width: 50px;
-                text-align: right;
+                text-align: center;
             }
 
 			&.previous {
-				border: @border-thickness solid @rcblue;
+				border: @border-thickness solid @grey5;
+                border-top-left-radius: @border-radius;
+                border-bottom-left-radius: @border-radius;
+
+                &:hover {
+                    border-color: @grey4;
+                }
+
                 .disabled {
-                  color: @grey4;
+                  color: @grey5;
                   cursor: not-allowed;
+                  opacity: 0.5;
                 }
 			}
 
 			&.next {
-				border: @border-thickness solid @rcblue;
+				border: @border-thickness solid @grey5;
+                border-top-right-radius: @border-radius;
+                border-bottom-right-radius: @border-radius;
+
+                &:hover {
+                    border-color: @grey4;
+                }
+
                 .disabled {
-                  color: @grey4;
+                  color: @grey5;
                   cursor: not-allowed;
+                  opacity: 0.5;
                 }
 			}
 		}
@@ -2148,6 +2236,12 b' h3.files_location{'
                 margin-right: @padding;
 			}
 		}
+
+	}
+
+    .select-index-number {
+        margin: 0 0 0 20px;
+        color: @grey3;
 	}
 
 	.search_activate {
@@ -2178,25 +2272,53 b' h3.files_location{'
 	margin: -25px 0px 5px 0px;
 }
 
-.node-filter {
-  font-size: @repo-title-fontsize;
-  padding: 4px 0px 0px 0px;
-
-  .node-filter-path {
-      float: left;
-      color: @grey4;
-    }
-    .node-filter-input {
-        float: left;
-        margin: -2px 0px 0px 2px;
+.files-quick-filter {
+  float: right;
+  width: 180px;
+  position: relative;
+}
+
+.files-filter-box {
+  display: flex;
+  padding: 0px;
+  border-radius: 3px;
+  margin-bottom: 0;
+
+  a {
+    border: none !important;
+  }
+
+  li {
+    list-style-type: none
+  }
+}
+
+.files-filter-box-path {
+  line-height: 33px;
+  padding: 0;
+  width: 20px;
+  position: absolute;
+  z-index: 11;
+  left: 5px;
+}
+
+.files-filter-box-input {
+  margin-right: 0;
+
         input {
-            padding: 2px;
-            border: none;
-            font-size: @repo-title-fontsize;
-        }
-    }
-}
-
+    border: 1px solid @white;
+    padding-left: 25px;
+    width: 145px;
+
+    &:hover {
+        border-color: @grey6;
+    }
+
+    &:focus {
+        border-color: @grey5;
+    }
+  }
+}
 
 .browser-result{
 	td a{
@@ -2215,6 +2337,142 b' h3.files_location{'
 }
 
 
+.edit-file-fieldset #location,
+.edit-file-fieldset #filename {
+  display: flex;
+  width: -moz-available; /* WebKit-based browsers will ignore this. */
+  width: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
+  width: fill-available;
+  border: 0;
+}
+
+.path-items {
+  display: flex;
+  padding: 0;
+  border: 1px solid #eeeeee;
+  width: 100%;
+  float: left;
+
+  .breadcrumb-path {
+    line-height: 30px;
+    padding: 0 4px;
+    white-space: nowrap;
+  }
+
+  .location-path {
+    width: -moz-available; /* WebKit-based browsers will ignore this. */
+    width: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
+    width: fill-available;
+
+    .file-name-input {
+      padding: 0.5em 0;
+    }
+
+  }
+
+  ul {
+    display: flex;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+  }
+
+  li {
+    list-style-type: none;
+  }
+
+}
+
+.editor-items {
+  height: 40px;
+  margin: 10px 0 -17px 10px;
+
+  .editor-action {
+    cursor: pointer;
+  }
+
+  .editor-action.active {
+    border-bottom: 2px solid #5C5C5C;
+  }
+
+  li {
+    list-style-type: none;
+  }
+}
+
+.edit-file-fieldset .message textarea {
+  border: 1px solid #eeeeee;
+}
+
+#files_data .codeblock {
+  background-color: #F5F5F5;
+}
+
+#editor_preview {
+  background: white;
+}
+
+.show-editor {
+  padding: 10px;
+  background-color: white;
+
+}
+
+.show-preview {
+  padding: 10px;
+  background-color: white;
+  border-left: 1px solid #eeeeee;
+}
+// quick filter
+.grid-quick-filter {
+  float: right;
+    position: relative;
+}
+
+.grid-filter-box {
+  display: flex;
+  padding: 0px;
+  border-radius: 3px;
+  margin-bottom: 0;
+
+  a {
+    border: none !important;
+  }
+
+  li {
+    list-style-type: none
+  }
+}
+
+.grid-filter-box-icon {
+  line-height: 33px;
+  padding: 0;
+  width: 20px;
+  position: absolute;
+  z-index: 11;
+  left: 5px;
+}
+
+.grid-filter-box-input {
+  margin-right: 0;
+
+  input {
+    border: 1px solid @white;
+    padding-left: 25px;
+    width: 145px;
+
+    &:hover {
+        border-color: @grey6;
+    }
+
+    &:focus {
+        border-color: @grey5;
+    }
+  }
+}
+
+
+
 // Search
 
 .search-form{
@@ -2277,7 +2535,7 b' div.search-code-body {'
     }
 
     .code-body {
-        border: @border-thickness solid @border-default-color;
+        border: @border-thickness solid @grey6;
         .border-radius(@border-radius);
     }
 
@@ -2297,6 +2555,11 b' div.search-code-body {'
         .break { background-color: #DDE7EF; width: 100%; color: #747474; display: block; }
     }
 
+    .path {
+      border-bottom: none !important;
+      border-left: 1px solid @grey6 !important;
+      border-right: 1px solid @grey6 !important;
+    }
 }
 
 table.rctable td.td-search-results div {
@@ -2472,3 +2735,56 b' form.markup-form {'
     padding: 20px;
     background-color: white;
 }
+
+
+.dropzone-wrapper {
+  border: 1px solid @grey5;
+  padding: 20px;
+}
+
+.dropzone,
+.dropzone-pure {
+    border: 2px dashed @grey5;
+    border-radius: 5px;
+    background: white;
+    min-height: 200px;
+    padding: 54px;
+
+  .dz-message {
+      font-weight: 700;
+      text-align: center;
+      margin: 2em 0;
+  }
+
+}
+
+.dz-preview {
+    margin: 10px 0 !important;
+    position: relative;
+    vertical-align: top;
+    padding: 10px;
+    border-bottom: 1px solid @grey5;
+}
+
+.dz-filename {
+    font-weight: 700;
+    float:left;
+}
+
+.dz-sending {
+  float: right;
+}
+
+.dz-response {
+  clear:both
+}
+
+.dz-filename-size {
+    float:right
+}
+
+.dz-error-message {
+    color: @alert2;
+    padding-top: 10px;
+    clear: both;
+}

rhodecode/public/css/navigation.less

@@ -2,10 +2,21 b''
 // For use in RhodeCode applications;
 // see style guide documentation for guidelines.
 
+// TOP MAIN DARK NAVIGATION
+
+.header .main_nav.horizontal-list {
+    float: right;
+    color: @grey4;
+        > li {
+            a {
+                color: @grey4;
+                }
+            }
+}
+
 // HEADER NAVIGATION
 
 .horizontal-list {
-    float: right;
     display: block;
     margin: 0;
     padding: 0;
@@ -18,6 +29,7 b''
     li {
         line-height: 1em;
         list-style-type: none;
+        margin: 0 20px 0 0;
 
         a {
             padding: 0 .5em;
@@ -55,12 +67,6 b''
             .user {
                 padding-bottom: 10px;
             }
-
-            &.open {
-                .user {
-                    border-bottom: 5px solid @rcblue;
-                }
-            }
         }
 
         &:before { content: none; }
@@ -80,10 +86,6 b''
             }
         }
 
-        &.active {
-            border-bottom: 5px solid @rcblue;
-        }
-
         &.open {
 
             a {
@@ -118,14 +120,12 b''
         > a,
         &.has_select2 a {
             display: block;
-            padding: 10px 0 2px;
+            padding: 10px 0;
         }
 
         .menulabel {
-            padding: 0 .5em;
             line-height: 1em;
             // for this specifically we do not use a variable
-            border-right: 1px solid @grey4;
         }
 
         .pr_notifications {
@@ -141,7 +141,7 b''
         &.open,
         &.active {
             a {
-                color: @grey1;
+                color: @rcblue;
             }
         }
     }
@@ -156,6 +156,14 b''
         position: relative;
     }
 
+    .menulink {
+        &.disabled {
+        color: @grey3;
+        cursor: default;
+        opacity: 0.5;
+        }
+    }
+
     #quick_login {
 
         li a {
@@ -281,16 +289,19 b''
 }
 
 .navigation li:last-child .submenu {
-    right: -20px;
-    left: auto;
+    right: auto;
+    left: 0;
+    border: 1px solid @grey5;
+    background: @white;
+    box-shadow: @dropdown-shadow;
 }
 
 .submenu {
     position: absolute;
     top: 100%;
     left: 0;
-    min-width: 150px;
-    margin: 6px 0 0;
+    min-width: 180px;
+    margin: 2px 0 0;
     padding: 0;
     text-align: left;
     font-family: @text-light;
@@ -303,7 +314,7 b''
         padding: 0 .5em;
         line-height: 1em;
         color: @grey3;
-        background-color: @grey6;
+        background-color: @white;
         list-style-type: none;
 
         a {
@@ -324,7 +335,7 b''
             z-index: 30;
         }
         &:hover {
-            background-color: @grey5;
+            background-color: @grey7;
             -webkit-transition: background .3s;
                -moz-transition: background .3s;
                  -o-transition: background .3s;
@@ -501,10 +512,10 b''
 
 #context-bar {
     display: block;
-    margin: 0 auto;
+    margin: 0 auto 20px 0;
     padding: 0 @header-padding;
-    background-color: @grey6;
-    border-bottom: @border-thickness solid @grey5;
+    background-color: @grey7;
+    border-bottom: 1px solid @grey5;
 
     .clear {
         clear: both;
@@ -513,19 +524,22 b''
 
 ul#context-pages {
     li {
-        line-height: 1em;
         list-style-type: none;
 
         a {
-            color: @grey3;
+            color: @grey2;
+
+            &:hover {
+                color: @grey1;
+            }
         }
 
         &.active {
             // special case, non-variable color
-            border-bottom: 4px solid @nav-grey;
+            border-bottom: 2px solid @rcblue;
 
             a {
-                color: @grey1;
+                color: @rcblue;
             }
         }
     }
@@ -534,8 +548,9 b' ul#context-pages {'
 // PAGINATION
 
 .pagination {
-    border: @border-thickness solid @rcblue;
-    color: @rcblue;
+    border: @border-thickness solid @grey5;
+    color: @grey2;
+    box-shadow: @button-shadow;
 
     .current {
         color: @grey4;
@@ -552,33 +567,44 b' ul#context-pages {'
 .dataTables_paginate, .pagination-wh {
     text-align: left;
     display: inline-block;
-    border-left: 1px solid @rcblue;
+    border-left: 1px solid @grey5;
     float: none;
     overflow: hidden;
+    box-shadow: @button-shadow;
 
     .paginate_button, .pager_curpage,
     .pager_link, .pg-previous, .pg-next, .pager_dotdot {
         display: inline-block;
         padding: @menupadding/4 @menupadding;
-        border: 1px solid @rcblue;
+        border: 1px solid @grey5;
         border-left: 0;
-        color: @rcblue;
+        color: @grey2;
         cursor: pointer;
         float: left;
+
+        &:hover {
+            color: @rcdarkblue;
+        }
     }
 
-    .pager_curpage, .pager_dotdot,
-    .paginate_button.current, .paginate_button.disabled,
+    .paginate_button.disabled,
     .disabled {
         color: @grey3;
         cursor: default;
+        opacity: 0.5;
+    }
+
+    .paginate_button.current, .pager_curpage {
+        background: @rcblue;
+        border-color: @rcblue;
+        color: @white;
     }
 
     .ellipsis {
         display: inline-block;
         text-align: left;
         padding: @menupadding/4 @menupadding;
-        border: 1px solid @rcblue;
+        border: 1px solid @grey5;
         border-left: 0;
         float: left;
     }
@@ -595,14 +621,6 b' ul#context-pages {'
     font-family: @text-regular;
     color: @grey1;
 
-    &#graph_nodes {
-        clear:both;
-        width: auto;
-        margin-left: -100px;
-        padding: 0;
-        border: none;
-    }
-
     .nav-pills {
         margin: 0;
     }
@@ -631,19 +649,56 b' ul#context-pages {'
 
 .main_filter_help_box {
     padding: 7px 7px;
-    border-top: 1px solid @grey4;
-    border-right: 1px solid @grey4;
-    border-bottom: 1px solid @grey4;
     display: inline-block;
     vertical-align: top;
     background: inherit;
     position: absolute;
-    right: 8px;
+    right: 0;
     top: 9px;
 }
 
 .main_filter_input_box {
     display: inline-block;
+
+    .searchItems {
+        display:flex;
+        background: @black;
+        padding: 0px;
+        border-radius: 3px;
+        border: 1px solid @black;
+
+        a {
+            border: none !important;
+        }
+    }
+
+    .searchTag {
+        line-height: 28px;
+        padding: 0 5px;
+
+        .tag {
+            color: @grey5;
+            border-color: @grey2;
+            background: @grey1;
+        }
+    }
+
+    .searchTagFilter {
+        background-color: @black !important;
+        margin-right: 0;
+    }
+
+    .searchTagHelp {
+        background-color: @grey1 !important;
+        margin: 0;
+    }
+    .searchTagHelp:hover {
+        background-color: @grey1 !important;
+    }
+    .searchTagInput {
+        background-color: @grey1 !important;
+        margin-right: 0;
+    }
 }
 
 .main_filter_box {
@@ -651,23 +706,24 b' ul#context-pages {'
 }
 
 #main_filter_help {
-    background: @grey3;
+    background: @grey1;
     border: 1px solid black;
     position: absolute;
     white-space: pre;
     z-index: 9999;
     color: @nav-grey;
-    margin: 1px 7px;
     padding: 0 10px;
 }
 
-.main_filter_input {
-    padding: 5px;
-    min-width: 260px;
-    color: @nav-grey;
-    background: @grey3;
+input {
+
+    &.main_filter_input {
+        padding: 5px 10px;
+        min-width: 340px;
+        color: @grey7;
+        background: @black;
     min-height: 18px;
-
+        border: 0;
 
     &:active {
       color: @grey2 !important;
@@ -678,6 +734,7 b' ul#context-pages {'
       background: white !important;
     }
 }
+}
 
 
 

rhodecode/public/css/panels.less

@@ -63,10 +63,6 b''
     &.user-profile {
         float: left;
 
-        .panel-heading {
-            margin-bottom: @padding;
-        }
-    
         .panel-body {
             &:extend(.clearfix);
         }

rhodecode/public/css/rcicons.less

@@ -1,11 +1,13 b''
 @font-face {
   font-family: 'rcicons';
-  src: url('../fonts/RCIcons/rcicons.eot?74666722');
-  src: url('../fonts/RCIcons/rcicons.eot?74666722#iefix') format('embedded-opentype'),
-       url('../fonts/RCIcons/rcicons.woff2?74666722') format('woff2'),
-       url('../fonts/RCIcons/rcicons.woff?74666722') format('woff'),
-       url('../fonts/RCIcons/rcicons.ttf?74666722') format('truetype'),
-       url('../fonts/RCIcons/rcicons.svg?74666722#rcicons') format('svg');
+
+  src: url('../fonts/RCIcons/rcicons.eot?92789106');
+  src: url('../fonts/RCIcons/rcicons.eot?92789106#iefix') format('embedded-opentype'),
+       url('../fonts/RCIcons/rcicons.woff2?92789106') format('woff2'),
+       url('../fonts/RCIcons/rcicons.woff?92789106') format('woff'),
+       url('../fonts/RCIcons/rcicons.ttf?92789106') format('truetype'),
+       url('../fonts/RCIcons/rcicons.svg?92789106#rcicons') format('svg');
+
   font-weight: normal;
   font-style: normal;
 }
@@ -55,78 +57,164 b''
   /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
 
+.animate-spin {
+  -moz-animation: spin 2s infinite linear;
+  -o-animation: spin 2s infinite linear;
+  -webkit-animation: spin 2s infinite linear;
+  animation: spin 2s infinite linear;
+  display: inline-block;
+}
+@-moz-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-o-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@-ms-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+@keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  100% {
+    -moz-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    -webkit-transform: rotate(359deg);
+    transform: rotate(359deg);
+  }
+}
+
+
+
 .icon-no-margin::before {
     margin: 0;
 
 }
 // -- ICON CLASSES -- //
+// sorter = lambda s: '\n'.join(sorted(s.splitlines()))
 
+.icon-delete:before { content: '\e800'; } /* '' */
+.icon-ok:before { content: '\e801'; } /* '' */
+.icon-comment:before { content: '\e802'; } /* '' */
 .icon-bookmark:before { content: '\e803'; } /* '' */
 .icon-branch:before { content: '\e804'; } /* '' */
+.icon-tag:before { content: '\e805'; } /* '' */
 .icon-lock:before { content: '\e806'; } /* '' */
 .icon-unlock:before { content: '\e807'; } /* '' */
-.icon-delete:before { content: '\e808'; } /* '' */
-.icon-false:before { content: '\e808'; } /* '' */
-
-.icon-ok:before { content: '\e809'; } /* '' */
-.icon-true:before { content: '\e809'; } /* '' */
-
-.icon-comment:before { content: '\e80a'; } /* '' */
-.icon-comment-add:before { content: '\e816'; } /* '' */
-.icon-comment_toggle:before { content: '\e818'; } /* '' */
-
-.icon-feed:before { content: '\e80b'; } /* '' */
-
-.icon-right:before { content: '\e80c'; } /* '' */
-.icon-left:before { content: '\e80d'; } /* '' */
-
-.icon-arrow_down:before { content: '\e80e'; } /* '' */
-.icon-arrow_up:before { content: '\e80e'; } /* '' */
-
-.icon-group:before { content: '\e812'; } /* '' */
-
-.icon-fork:before { content: '\e814'; } /* '' */
-.icon-merge:before { content: '\e814'; } /* '' */
-
-.icon-more:before { content: '\e815'; } /* '' */
-
-.icon-more-linked { cursor: pointer; color: @grey3 }
-.icon-more-linked:before { content: '\e815'; } /* '' */
-
-.icon-expand-linked { cursor: pointer; color: @grey3; font-size: 8px }
-.icon-expand-linked:before { content: '\e80e'; } /* '' */
-
-.icon-git-inv:before { content: '\e80f'; } /* '' */
-.icon-hg-inv:before { content: '\e810'; } /* '' */
-.icon-svn-inv:before { content: '\e811'; } /* '' */
-
-.icon-git:before { content: '\e81a'; } /* '' */
-.icon-hg:before { content: '\e81b'; } /* '' */
-.icon-svn:before { content: '\e820'; } /* '' */
-
-.icon-minus:before { content: '\e81c'; } /* '' */
+.icon-feed:before { content: '\e808'; } /* '' */
+.icon-left:before { content: '\e809'; } /* '' */
+.icon-right:before { content: '\e80a'; } /* '' */
+.icon-down:before { content: '\e80b'; } /* '' */
+.icon-folder:before { content: '\e80c'; } /* '' */
+.icon-folder-open:before { content: '\e80d'; } /* '' */
+.icon-folder-empty:before { content: '\f114'; } /* '' */
+.icon-folder-open-empty:before { content: '\f115'; } /* '' */
+.icon-trash-empty:before { content: '\e80e'; } /* '' */
+.icon-group:before { content: '\e80f'; } /* '' */
+.icon-remove:before { content: '\e810'; } /* '' */
+.icon-fork:before { content: '\e811'; } /* '' */
+.icon-more:before { content: '\e812'; } /* '' */
+.icon-search:before { content: '\e813'; } /* '' */
+.icon-scissors:before { content: '\e814'; } /* '' */
+.icon-download:before { content: '\e815'; } /* '' */
+.icon-doc:before { content: '\e816'; } /* '' */
+.icon-cog:before { content: '\e817'; } /* '' */
+.icon-cog-alt:before { content: '\e818'; } /* '' */
+.icon-eye:before { content: '\e819'; } /* '' */
+.icon-eye-off:before { content: '\e81a'; } /* '' */
+.icon-cancel-circled2:before { content: '\e81b'; } /* '' */
+.icon-cancel-circled:before { content: '\e81c'; } /* '' */
 .icon-plus:before { content: '\e81d'; } /* '' */
-.icon-remove:before { content: '\e81e'; } /* '' */
-.icon-remove-sign:before { content: '\e81e'; } /* '' */
-
-.icon-rhodecode:before { content: '\e81f'; } /* '' */
-
-.icon-tag:before { content: '\e821'; } /* '' */
-.icon-copy:before { content: '\f0c5'; } /* '' */
-.icon-clipboard:before { content: '\f0c5'; } /* '' */
+.icon-plus-circled:before { content: '\e81e'; } /* '' */
+.icon-minus-circled:before { content: '\e81f'; } /* '' */
+.icon-minus:before { content: '\e820'; } /* '' */
+.icon-info-circled:before { content: '\e821'; } /* '' */
+.icon-upload:before { content: '\e822'; } /* '' */
+.icon-home:before { content: '\e823'; } /* '' */
+.icon-git:before { content: '\e82a'; } /* '' */
+.icon-hg:before { content: '\e82d'; } /* '' */
+.icon-svn:before { content: '\e82e'; } /* '' */
+.icon-comment-add:before { content: '\e82f'; } /* '' */
+.icon-comment-toggle:before { content: '\e830'; } /* '' */
+.icon-rhodecode:before { content: '\e831'; } /* '' */
+.icon-up:before { content: '\e832'; } /* '' */
+.icon-merge:before { content: '\e833'; } /* '' */
+.icon-docs:before { content: '\f0c5'; } /* '' */
+.icon-menu:before { content: '\f0c9'; } /* '' */
+.icon-paste:before { content: '\f0ea'; } /* '' */
+.icon-doc-text:before { content: '\f0f6'; } /* '' */
+.icon-plus-squared:before { content: '\f0fe'; } /* '' */
+.icon-minus-squared:before { content: '\f146'; } /* '' */
+.icon-minus-squared-alt:before { content: '\f147'; } /* '' */
+.icon-doc-inv:before { content: '\f15b'; } /* '' */
+.icon-doc-text-inv:before { content: '\f15c'; } /* '' */
+.icon-plus-squared-alt:before { content: '\f196'; } /* '' */
+.icon-file-code:before { content: '\f1c9'; } /* '' */
+.icon-history:before { content: '\f1da'; } /* '' */
+.icon-sliders:before { content: '\f1de'; } /* '' */
+.icon-trash:before { content: '\f1f8'; } /* '' */
+.icon-spin-alt:before { content: '\e834'; } /* '' */
+.icon-spin:before { content: '\e838'; } /* '' */
 
 
-.icon-folder:before { content: '\e813'; } /* '' */
-.icon-folder-close:before { content: '\e813'; } /* '' */
-
-.icon-directory:before { content: '\e800'; } /* '' */
-.icon-directory-empty:before { content: '\f114'; } /* '' */
-.icon-file-text:before { content: '\f0f6'; } /* '' */
-.icon-file-text-inv:before { content: '\f15c'; } /* '' */
-.icon-file-code:before { content: '\f1c9'; } /* '' */
-
-// MERGED ICONS
-
+// MERGED ICONS BASED ON CURRENT ONES
+.icon-repo-group:before { &:extend(.icon-folder-open:before); }
 .icon-repo-private:before { &:extend(.icon-lock:before); }
 .icon-repo-lock:before { &:extend(.icon-lock:before); }
 .icon-unlock-alt:before { &:extend(.icon-unlock:before); }
@@ -134,9 +222,20 b''
 .icon-repo-public:before { &:extend(.icon-unlock:before); }
 .icon-rss-sign:before { &:extend(.icon-feed:before); }
 .icon-code-fork:before {  &:extend(.icon-fork:before);  }
+.icon-arrow_up:before { &:extend(.icon-up:before); }
+.icon-file:before { &:extend(.icon-file-code:before); }
+.icon-file-text:before { &:extend(.icon-file-code:before); }
+.icon-directory:before { &:extend(.icon-folder:before); }
+.icon-more-linked:before { &:extend(.icon-more:before); }
+.icon-clipboard:before { &:extend(.icon-docs:before); }
+.icon-copy:before { &:extend(.icon-docs:before); }
+.icon-true:before { &:extend(.icon-ok:before); }
+.icon-false:before { &:extend(.icon-delete:before); }
+.icon-expand-linked:before { &:extend(.icon-down:before); }
+.icon-pr-merge-fail:before { &:extend(.icon-delete:before); }
 
 // TRANSFORM
-.icon-arrow_up:before {transform: rotate(180deg);}
+
 .icon-merge:before {transform: rotate(180deg);}
 
 // -- END ICON CLASSES -- //
@@ -152,6 +251,9 b''
 .icon-svn-inv { color: @color1 !important; }
 .icon-repo-lock { color: #FF0000; }
 .icon-repo-unlock { color: #FF0000; }
+.icon-false { color: @grey5 }
+.icon-expand-linked { cursor: pointer; color: @grey3; font-size: 14px }
+.icon-more-linked { cursor: pointer; color: @grey3 }
 
 .repo-switcher-dropdown .select2-result-label {
     .icon-git:before {

rhodecode/public/css/readme-box.less

@@ -88,7 +88,6 b' div.readme_box pre {'
   font-size: 13px !important;
   overflow: visible !important;
   line-height: 140% !important;
-  background-color: @grey7;
 }
 
 div.readme_box img {
@@ -156,10 +155,10 b' div.readme_box code {'
 }
 
 div.readme_box pre {
-    border: @border-thickness solid @grey5;
+    border: @border-thickness solid #CBDBEB;
     overflow: auto;
     padding: .5em;
-    background-color: @grey7;
+    background-color: #FCFEFF;
 }
 
 div.readme_box pre > code {

rhodecode/public/css/select2.less

@@ -17,7 +17,7 b''
 .select2-search,
 .select2-search input {.box-sizing(border-box);}
 .select2-container .select2-choice{display:block; line-height:1em; -webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;user-select:none; }
-.main .select2-container .select2-choice { background-color: white; }
+.main .select2-container .select2-choice { background-color: white; box-shadow: @button-shadow;}
 .select2-container .select2-choice abbr { display: none; width: 12px; height: 12px; position: absolute; right: 24px; top: 8px; font-size: 1px; text-decoration: none; border: 0; background: url('../images/select2.png') right top no-repeat; cursor: pointer; outline: 0; }
 .select2-container.select2-allowclear .select2-choice abbr {display: inline-block;}
 .select2-container .select2-choice abbr:hover { background-position: right -11px; cursor: pointer; }
@@ -92,10 +92,18 b' select.select2{height:28px;visibility:hi'
     min-width: 160px;
     margin: 0 @padding 0 0;
     padding: 0;
-    border: @border-thickness solid @rcblue;
+    border: @border-thickness solid @grey5;
     border-radius: @border-radius;
-    color: @rcblue;
+    color: @grey2;
     background-color: white;
+
+    a {
+        color: @grey2;
+
+        &:hover {
+            color: @rcdarkblue;
+        }
+    }
 }
 
 .drop-menu-dropdown {
@@ -120,7 +128,7 b' select.select2{height:28px;visibility:hi'
 
     a {
         display:block;
-        padding: .9em;
+        padding: .7em;
         padding-right: 2em;
         position: relative;
 
@@ -129,7 +137,7 b' select.select2{height:28px;visibility:hi'
             content: "\00A0\25BE";
             right: .1em;
             line-height: 1em;
-            top: 0.4em;
+            top: 0.2em;
             width: 1em;
             font-size: 20px;
         }
@@ -157,6 +165,12 b' select.select2{height:28px;visibility:hi'
     width: 100%;
     margin: .5em 0;
     padding: .5em;
+    border-color: @grey4;
+
+    &:focus, &:hover {
+        border-color: @rcblue;
+        box-shadow: @button-shadow;
+    }
 }
 
 .select2-no-results {
@@ -176,7 +190,13 b' select.select2{height:28px;visibility:hi'
 
         &:hover,
         &.select2-highlighted {
-            background-color: @rclightblue;
+            background-color: @grey7;
+
+            .select2-result-label {
+                &:hover {
+                    color: @grey1!important;
+                }
+            }
         }
 
         &.select2-result-with-children {
@@ -189,8 +209,7 b' select.select2{height:28px;visibility:hi'
             display:block;
             padding: 8px;
             font-family: @text-regular;
-            border-bottom: @border-thickness solid @rclightblue;
-            color: @rcblue;
+            color: @grey2;
             cursor: pointer;
         }
         &.select2-result-with-children {
@@ -205,7 +224,7 b' select.select2{height:28px;visibility:hi'
             ul.select2-result-sub li .select2-result-label {
                 padding-left: 16px;
                 font-family: @text-regular;
-                color: @rcblue;
+                color: @grey2;
                 cursor: pointer;
             }
         }

rhodecode/public/css/summary.less

@@ -3,30 +3,33 b''
 // Used for headers and file detail summary screens.
 
 .summary {
-    float: left;
+    clear: both;
+    float: none;
     position: relative;
     width: 100%;
     margin: 0;
     padding: 0;
+    background: #FCFCFC;
+    border: 1px solid #EAEAEA;
+    border-radius: @border-radius;
+    margin-bottom: 20px;
 
     .summary-detail-header {
-        float: left;
         display: block;
         width: 100%;
-        margin-bottom: @textmargin;
+        margin-bottom: 10px;
         padding: 0 0 .5em 0;
         border-bottom: @border-thickness solid @border-default-color;
 
         .breadcrumbs {
-            float: left;
             display: inline;
             margin: 0;
             padding: 0;
         }
+
         h4 {
-            float: left;
             margin: 0 1em 0 0;
-            padding: 0;
+            padding: 10px 0 5px 20px;
             line-height: 1.2em;
             font-size: @basefontsize;
         }
@@ -42,11 +45,11 b''
     }
 
     .summary-detail {
-        float: left;
+        float: none;
         position: relative;
-        width: 73%;
-        margin: 0 3% @space 0;
-        padding: 0;
+        width: 100%;
+        margin: 0;
+        padding: 0 0 20px 0;
 
         .file_diff_buttons {
             margin-top: @space;
@@ -62,18 +65,37 b''
             height: 30px;
             margin: 0;
             padding: 0;
+            width: 130px;
             font-weight: @text-semibold-weight;
             font-family: @text-semibold;
         }
+        .left-clone select {
+            width: 130px;
+            margin-right: 0;
+            background-color: @grey7;
+            border-color: @grey4;
+            color: #5C5C5C;
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
+        }
 
         .right-clone {
-            float: right;
-            width: 83%;
+            float: left;
+            width: ~"calc(100% - 170px)";
+
+            .clipboard-action {
+                margin-left: -30px;
+            }
         }
 
         .clone_url_input {
-            width: ~"calc(100% - 35px)";
-            padding:  5px;
+            width: ~"calc(100% - 90px)";
+            padding: 6px 30px 6px 10px;
+            height: 14px;
+            box-shadow: 0 1px 1px 0 rgba(0,0,0,0.07);
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+            margin-left: -1px;
         }
 
         &.directory {
@@ -123,18 +145,32 b''
         border: @border-thickness solid @border-default-color;
         .border-radius(@border-radius);
     }
+
+    .btn-collapse {
+        clear: both;
+        float: none;
+        background: #F7F7F7;
+        text-align: center;
+        color: #949494;
+        font-size: 11px;
+
+        &:hover {
+            background: #f1f1f1;
+            color: #2B2B2D;
+        }
+    }
 }
 
 // this is used outside of just the summary
 .fieldset, // similar to form fieldset
 .summary .sidebar-right-content { // these have to match
     clear: both;
-    float: left;
+    float: none;
     position: relative;
     display:block;
     width: 100%;
-    min-height: 1em;
-    margin-bottom: @textmargin;
+    min-height: 20px;
+    margin-bottom: 10px;
     padding: 0;
     line-height: 1.2em;
 
@@ -147,19 +183,28 b''
 }
 
 .summary .sidebar-right-content {
-    margin-bottom: @space;
+    margin-bottom: 0;
 
     .rc-user {
         min-width: 0;
     }
+
+    li {
+        list-style: none;
+        line-height: normal;
+    }
+}
+
+.summary {
+    .fieldset {
+        margin-bottom: 0;
+    }
 }
 
 .fieldset {
 
     .left-label { // similar to form legend
-        float: left;
         display: block;
-        width: 25%;
         margin: 0;
         padding: 0;
         font-weight: @text-semibold-weight;
@@ -167,16 +212,78 b''
     }
 
     .left-label-summary {
-        .left-label;
-        width: 150px;
+        padding-left: 20px;
+        margin-bottom: 5px;
+
+        p {
+            margin-bottom: 5px;
+            color: @grey1;
+            float: left;
+            width: 130px;
+
+            &.spacing {
+                margin-top: 10px;
+            }
+        }
+
+        .right-label-summary {
+            float: left;
+            margin-top: 7px;
+            width: ~"calc(100% - 160px)";
+        }
+    }
+
+    .left-label-summary-files {
+        padding-left: 45px;
+        margin-top: 5px;
+
+        p {
+            margin-bottom: 5px;
+            color: @grey1;
+            float: left;
+            width: 130px;
+
+            &.spacing {
+                margin-top: 10px;
+            }
+        }
+
+        .right-label-summary {
+            float: left;
+            margin-top: 7px;
+        }
+    }
+
+    .left-content {
+        width: ~"calc(60% - 20px)";
+        float: left;
+        margin: 15px 0 15px 20px;
+
+        .rc-user {
+            min-width: auto;
+            max-width: none;
+            min-height: auto;
+            padding-right: 5px;
+        }
+
+        .left-content-avatar {
+            width: 45px;
+            float: left;
+            margin-top: 8px;
+        }
+
+        .left-content-message {
+            float: left;
+            width: ~"calc(100% - 45px)";
+        }
     }
     
     .right-content { // similar to form fields
         float: left;
         display: block;
-        width: 75%;
-        margin: 0 0 0 -15%;
-        padding: 0 0 0 15%;
+        width: ~"calc(40% - 20px)";
+        text-align: right;
+        margin: 15px 20px 15px 0;
 
         .truncate-wrap,
         .truncate {
@@ -187,11 +294,49 b''
         .commit-long {
             overflow-x: auto;
         }
+
+        .commit-info {
+            margin-top: 7px;
+        }
+
+        .summary-tag,
+        .summary-tagtag,
+        .summary-branchtag,
+        .summary-booktag,
+        .summary-metatag,
+        .summary-perm_tag {
+            background:transparent;
+            border: none;
+            box-shadow: none;
+            margin-left: 10px;
+            font-size: 13px;
+        }
+
+        .summary-tag span,
+        .summary-tag i,
+        .summary-tag a {
+            color: @grey1;
+        }
+
+    }
+    .commit {
+        color: @grey1;
+        margin-bottom: 5px;
+        white-space: pre;
     }
     .commit.truncate-wrap {
         overflow:hidden;
         text-overflow: ellipsis;
     }
+    .commit-author {
+        color: @grey1;
+    }
+    .commit-date {
+        color: @grey4;
+    }
+    .fieldset-text-line {
+        line-height: 36px;
+    }
 }
 
 // expand commit message
@@ -222,11 +367,38 b''
 }
     
 // Quick Start section
+
+.empty-repo {
+    border: 1px solid #EAEAEA;
+    border-bottom: 0;
+    border-radius: @border-radius;
+    padding: 0 20px;
+}
+
+.empty-repo h3, .quick_start p {
+    margin-bottom: 10px;
+}
+
+.quick_start pre {
+    background: #FCFEFF;
+    border: 1px solid #CBDBEB;
+    box-shadow: @button-shadow;
+    padding: 10px 15px;
+    border-radius: 4px;
+    color: @grey2;
+}
+
+.clear-fix {
+    clear: both;
+}
+
 .quick_start {
-    float: left;
     display: block;
     position: relative;
-    width: 100%;
+    border: 1px solid #EAEAEA;
+    border-top: 0;
+    border-radius: @border-radius;
+    padding: 0 20px;
 
     // adds some space to make copy and paste easier
     .left-label,
@@ -235,6 +407,7 b''
     }
 }
 
+
 .submodule {
     .summary-detail {
         width: 100%;
@@ -250,23 +423,32 b''
     display: block;
     width: 100%;
     margin: 0;
-    padding: @space 0 10px 0;
-    border-top: @border-thickness solid @border-default-color; 
 
-    .stats {
+    .file-filename {
         float: left;
+        padding: 10px;
     }
-    .stats-filename {
-        font-size: 120%;
+
+    .file-stats {
+        padding: 10px;
+        float:right;
     }
+
+
     .stats-first-item {
         padding: 0px 0px 0px 3px;
     }
 
+    .stats-info {
+        font-size: 11px;
+        color: @grey4;
+    }
+
     .buttons {
         float: right;
         text-align: right;
         color: @grey4;
+        padding: 10px;
     }
 
     .file-container {
@@ -289,3 +471,22 b''
     
 }
 
+.rctable.repo_summary {
+    border: 1px solid #eaeaea;
+    border-radius: 2px;
+    border-collapse: inherit;
+    border-bottom: 0;
+
+    th {
+        background: @grey7;
+        border-bottom: 0;
+    }
+
+    td {
+        border-color: #eaeaea;
+    }
+
+    td.td-status {
+        padding: 0 0 0 10px;
+    }
+}

rhodecode/public/css/tables.less

@@ -33,7 +33,7 b' table.dataTable {'
     td {
         height: auto;
         max-width: 20%;
-        padding: .65em 1em .65em 0;
+        padding: .65em 0 .65em 1em;
         vertical-align: middle;
         border-bottom: @border-thickness solid @grey5;
         white-space: normal;
@@ -103,6 +103,11 b' table.dataTable {'
             }
         }
 
+        &.td-icon {
+            min-width: 20px;
+            width: 20px;
+        }
+
         &.td-hash {
             min-width: 80px;
             width: 200px;
@@ -113,6 +118,12 b' table.dataTable {'
             }
         }
 
+        &.td-graphbox {
+            width: 100px;
+            max-width: 100px;
+            min-width: 100px;
+        }
+
         &.td-time {
             width: 160px;
             white-space: nowrap;
@@ -141,6 +152,11 b' table.dataTable {'
             }
         }
 
+        &.td-grid-name {
+            white-space: nowrap;
+            min-width: 300px;
+        }
+
         &.td-componentname {
             white-space: nowrap;
         }
@@ -403,29 +419,11 b' table.trending_language_tbl {'
 
 .trending_language {
     position: relative;
-    width: 100%;
-    height: 19px;
     overflow: hidden;
-    background-color: @grey6;
+    color: @text-color;
+    width: 400px;
 
-    span, b{
-        position: absolute;
-        display: block;
-        height: 12px;
-        margin-bottom: 0px;
-        white-space: pre;
-        padding: floor(@basefontsize/4);
-        top: 0;
-        left: 0;
-    }
-
-    span{
-        color: @text-color;
-        z-index: 0;
-        min-width: 20px;
-    }
-
-    b {
+    .lang-bar {
         z-index: 1;
         overflow: hidden;
         background-color: @rcblue;
@@ -437,6 +435,9 b' table.trending_language_tbl {'
 
 // Changesets
 #changesets.rctable {
+    th {
+        padding: 0 1em 0.65em 0;
+    }
 
     // td must be fixed height for graph
     td {

rhodecode/public/css/tags.less

@@ -13,15 +13,19 b''
     font-size: (-1 + @basefontsize); //fit in tables
     line-height: .9em;
     border: none;
+    box-shadow: @button-shadow;
     .border-radius(@border-radius);
     font-family: @text-regular;
     background-image: none;
     color: @grey4;
-    .border ( @border-thickness-tags, @grey4 );
+    .border ( @border-thickness-tags, @grey5 );
     white-space: nowrap;
     a {
         color: inherit;
-        text-decoration: underline;
+
+        &:hover {
+            color: @grey2;
+        }
 
         i,
         [class^="icon-"]:before,
@@ -29,6 +33,10 b''
             text-decoration: none;
         }
     }
+
+    &:hover {
+        border-color: @grey4;
+    }
 }
 
 .tag0 { .border   ( @border-thickness-tags, @grey4 ); color:@grey4; }

rhodecode/public/css/type.less

@@ -46,6 +46,13 b' h6, .h6 { font-size: 1em; font-weight'
 .breadcrumbs {
     font-size: @repo-title-fontsize;
     margin: 0;
+    width: ~"calc(100% - 180px)";
+    float: left;
+
+    h4 {
+        font-size: @basefontsize;
+        margin-bottom: 15px;
+    }
 }
 
 .breadcrumbs_light {
@@ -156,6 +163,19 b' pre {'
 
 // Emphasis & misc
 // -------------------------
+.discreet {
+  color: @grey4;
+  font-size: 85%;
+  font-weight: normal;
+
+  a {
+    color: @grey4;
+
+    &:hover {
+      color: @rcdarkblue;
+    }
+  }
+}
 
 small,
 .small {
@@ -231,7 +251,8 b' mark,'
     clear: both;
     float: left;
     width: 100%;
-    margin: @pagepadding/2 0 @pagepadding;
+    margin: @pagepadding/2 0 @pagepadding/4;
+    min-height: 25px;
 
     .breadcrumbs {
         float: left;
@@ -285,6 +306,11 b' mark,'
     }
 
     .title-content {
+
+      &.repo-title {
+        float: none
+      }
+
       float: left;
       margin: 0;
       padding: 0;

rhodecode/public/css/variables.less

@@ -8,13 +8,15 b''
 @rchighlightblue: lighten(@rcblue, 35%);
 
 // Secondary Colors (greyscale)
-@grey1: #202020;		//midnight
-@grey2: #323232;		//charcoal
-@grey3: #666666;		//tungsten
-@grey4: #979797;		//light grey
+@black: #000;
+@white: #fff;
+@grey1: #2B2B2D;		//midnight
+@grey2: #5C5C5C;		//charcoal
+@grey3: #7E7F7F;		//tungsten
+@grey4: #949494;		//light grey
 @grey5: #dbd9da;		//greyish
 @grey6: #eeeeee;		//silver
-@grey7: #f9f9f9;		//light silver
+@grey7: #F5F5F5;		//light silver
 
 // special for navigation
 @nav-grey: #CDCCCD;
@@ -102,7 +104,7 b''
 
 // FORMS (new)
 @border-thickness-inputs: 1px;
-@input-padding: @button-padding; //needs to match button padding
+@input-padding: .6em; //needs to match button padding
 // TODO: johbo: Needed for working computation of paddings around labels etc.
 // Expected to be replaced once we are done with the form refactoring.
 @input-padding-px: 12px;
@@ -128,10 +130,14 b''
 @fields-input-l: 720px;
 
 // BUTTONS
-@button-padding: .9em;
+@button-padding: .7em;
+@button-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.07);
+
+// DROPDOWNS
+@dropdown-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.07);
 
 // DEFAULT WIDTHS
-@wrapper-maxwidth: 1200px;
+@wrapper-maxwidth: 1600px;
 @sidebar-width: 145px;
 @sidebar-all-width: @sidebar-width + 2 * @sidebarpadding;
 @sidebar-small-width: 100px;

rhodecode/public/fonts/RCIcons/rcicons.svg

@@ -1,78 +1,134 b''
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2019 by original authors @ fontello.com</metadata>
 <defs>
 <font id="rcicons" horiz-adv-x="1000" >
 <font-face font-family="rcicons" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
 <missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="directory" unicode="&#xe800;" d="M929 511v-393q0-51-37-88t-88-37h-679q-51 0-88 37t-37 88v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h375q51 0 88-37t37-88z" horiz-adv-x="928.6" />
+<glyph glyph-name="delete" unicode="&#xe800;" d="M515 758c-211 0-384-173-384-385 0-211 173-385 384-385s385 174 385 385c0 212-173 385-385 385z m227-416c0-15-11-27-30-27h-397c-15 0-30 12-30 27v62c0 15 11 27 30 27h397c15 0 30-12 30-27v-62z" horiz-adv-x="1000" />
 
-<glyph glyph-name="bookmark" unicode="&#xe803;" d="M767-96l-234 267c-8 12-25 12-33 0l-233-267c-17-17-42-4-42 25v842c0 17 13 33 25 33h533c13 0 25-16 25-33v-838c0-29-25-46-41-29z" horiz-adv-x="1000" />
+<glyph glyph-name="ok" unicode="&#xe801;" d="M515 735c-211 0-384-173-384-385 0-211 173-385 384-385s385 174 385 385c0 212-173 385-385 385z m239-296l-304-304c-11-12-27-12-38 0l-139 138c-11 12-11 27 0 39l42 42c12 11 27 11 39 0l58-58c11-11 27-11 38 0l219 219c12 12 27 12 39 0l42-42c15-8 15-23 4-34z" horiz-adv-x="1000" />
+
+<glyph glyph-name="comment" unicode="&#xe802;" d="M131 65v504c0 73 58 131 131 131h507c73 0 131-58 131-131v-288c0-73-58-131-131-131h-496c-4 0-11-4-15-8l-93-92c-11-15-34-4-34 15z m131 574c-39 0-73-31-73-74v-411l46 46c4 4 7 8 15 8h519c39 0 73 31 73 73v288c0 39-30 73-73 73h-507z" horiz-adv-x="1000" />
 
-<glyph glyph-name="branch" unicode="&#xe804;" d="M829 579c0 67-54 121-121 121s-125-54-125-121c0-41 21-79 59-104-17-129-125-167-192-179v287c38 21 63 59 63 105 0 66-55 120-125 120s-121-54-121-120c0-46 25-84 62-105v-458c-37-25-62-62-62-108 0-67 54-121 121-121s120 54 120 121c0 46-25 83-62 104v50c58 8 154 29 225 100 50 50 79 117 87 196 46 25 71 66 71 112z m-441 150c20 0 41-16 41-41s-16-42-41-42c-21 0-42 17-42 42s21 41 42 41z m0-750c-21 0-42 17-42 42 0 21 17 42 42 42 20 0 41-17 41-42 0-25-16-42-41-42z m320 642c21 0 42-17 42-42s-17-41-42-41c-20 0-41 16-41 41s16 42 41 42z" horiz-adv-x="1000" />
+<glyph glyph-name="bookmark" unicode="&#xe803;" d="M780-140l-260 290c-10 10-25 10-35 0l-260-295c-20-20-45-5-45 30v930c-5 20 10 35 25 35h590c15 0 30-15 30-35v-925c0-35-30-50-45-30z" horiz-adv-x="1000" />
+
+<glyph glyph-name="branch" unicode="&#xe804;" d="M875 600c0 76-58 134-134 134s-134-58-134-134c0-49 27-89 63-112-18-142-139-183-210-196v313c45 22 71 62 71 111 0 76-58 134-134 134s-134-58-134-134c0-49 27-94 67-116v-500c-40-22-67-67-67-116 0-76 58-134 134-134s134 58 134 134c0 49-26 94-67 116v58c63 9 166 31 246 112 58 58 89 129 98 214 40 22 67 67 67 116z m-478 161c27 0 45-18 45-45s-18-45-45-45-44 18-44 45 18 45 44 45z m0-822c-26 0-44 18-44 45s18 45 44 45 45-18 45-45-22-45-45-45z m344 706c27 0 45-18 45-45s-18-45-45-45-45 18-45 45 23 45 45 45z" horiz-adv-x="1000" />
 
-<glyph glyph-name="lock" unicode="&#xe806;" d="M817 429h-50v109c0 8 0 12 0 20 0 5 0 9 0 13 0 4 0 4 0 8 0 9-4 17-4 25 0 4 0 9-5 9-4 8-4 16-8 25 0 0 0 0 0 4-4 8-8 21-12 29 0 4-5 4-5 4-4 8-8 13-12 21 0 4-4 4-4 8-4 4-9 13-13 17 0 4-4 4-4 8-8 9-12 13-21 21 0 0-4 0-4 4-8 4-12 13-21 17-4 0-4 4-8 4-8 4-13 8-21 13-4 0-4 4-8 4-9 4-17 8-29 12 0 0 0 0 0 0-9 4-21 4-30 9-4 0-4 0-8 0-4 0-8 0-8 0 0 0-4 0-4 0 0 0-5 0-5 0 0 0 0 0 0 0 0 0 0 0 0 0-4 0-8 0-8 0-4 0-4 0-8 0-4 0-4 0-9 0 0 0 0 0 0 0-4 0-8 0-8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-4 0-4 0 0 0-4 0-4 0-4 0-9 0-9 0-4 0-8 0-8 0-8 0-21-5-29-9 0 0 0 0 0 0-38-12-50-16-58-21-5 0-5-4-9-4-4 0-12-4-16-8-5-4-9-4-9-4-8-4-16-13-25-17 0 0-4 0-4-4-4-4-12-13-21-21 0 0-4-4-4-8-4 0-12-9-17-13 0-4-4-4-4-8-4-8-8-13-12-21 0 0-4-4-4-4-5-13-9-21-13-29 0-4 0-4-4-9-4-8-4-12-8-20 0-5 0-9-5-9 0-8-4-16-4-25 0-4 0-4 0-8 0-4 0-8 0-13 0-8 0-12 0-20v-109h-46c-16 0-29-12-29-29v-475c0-17 13-29 29-29h638c17 0 29 12 29 29v475c-4 17-17 29-33 29z m-459 109c0 66 50 125 113 137 0 0 4 0 4 0 8 0 17 0 21 4 0 0 4 0 4 0 0 0 0 0 0 0 8 0 17 0 21-4 0 0 4 0 4 0 63-12 113-71 113-137v-109h-280v109z" horiz-adv-x="1000" />
+<glyph glyph-name="tag" unicode="&#xe805;" d="M460 788l-366 8c-18 0-31-13-31-31l13-366c0-9 4-13 9-22l464-465c14-13 31-13 45 0l352 353c14 14 14 31 0 45l-468 469c-5 4-14 9-18 9z m-103-224c0-35-31-67-67-67-35 0-67 32-67 67 0 36 32 67 67 67s67-26 67-67z" horiz-adv-x="1000" />
+
+<glyph glyph-name="lock" unicode="&#xe806;" d="M813 426h-54v107c0 9 0 13 0 18 0 4 0 9 0 13 0 5 0 5 0 9 0 9 0 14-4 23 0 4 0 4-5 9 0 8-4 13-9 22 0 0 0 4-4 4-5 9-9 18-14 27 0 0-4 5-4 5 4 8 0 17-5 22 0 4-4 4-4 9-5 4-9 13-14 18 0 0-4 4-4 4-9 9-13 14-22 22 0 0-5 0-5 5-4 4-13 9-22 13-5 0-5 5-9 5-4 4-13 9-18 9-4 0-4 4-9 4-9 5-18 9-27 9 0 0 0 0 0 0-9 5-17 5-31 9-4 0-4 0-9 0-4 0-4 0-9 0 0 0-4 0-4 0 0 0-5 0-5 0 0 0 0 0 0 0 0 0 0 0 0 0-4 0-9 0-9 0 0 0-4 0-4 0-4 0-4 0-9 0 0 0 0 0 0 0-4 0-9 0-9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-4 0-4 0 0 0-5 0-5 0-4 0-4 0-9 0-4 0-4 0-9 0-9 0-22-4-31-9 0 0 0 0 0 0-22 0-36-4-45-9-4 0-4-4-8-4-5-5-9-5-18-9 0-5-5-5-5-5-9-4-18-9-22-18 0 0-5 0-5-4-9-4-13-9-22-18 0 0-4-4-4-4-5-5-9-14-14-18 0-5-4-5-4-9-9-5-14-14-14-18-4 0-4-4-4-4-5-9-9-18-13-27 0 0 0-5-5-5 0-13-4-18-4-26 0-5 0-5-5-9 0-9-4-14-4-23 0-4 0-4 0-9 0-4 0-9 0-13 0-5 0-13 0-18v-107h-49c-18 0-27-13-27-27v-464c0-18 13-27 27-27h620c18 0 27 13 27 27v464c4 18-9 27-22 27z m-451 107c0 67 49 121 111 134 0 0 0 0 5 0 9 0 13 0 22 0 0 0 5 0 5 0 0 0 0 0 0 0 8 0 13 0 22 0 0 0 0 0 4 0 63-13 112-67 112-134v-107h-281v107z" horiz-adv-x="1000" />
 
-<glyph glyph-name="unlock" unicode="&#xe807;" d="M817 429h-459v109c0 66 50 125 113 137 0 0 4 0 4 0 8 0 17 0 21 4 0 0 4 0 4 0 0 0 0 0 4 0 9 0 17 0 25-4 0 0 0 0 0 0 9 0 17-4 25-8 0 0 4 0 4-4 9-5 13-9 21-13 0 0 0 0 0 0 9-4 13-8 17-17 0 0 4-4 4-4 4-4 8-8 13-16 0 0 0-5 4-5 4-8 8-12 12-20 0 0 0-5 4-5 5-8 5-12 5-20 0 0 0-5 0-5 0 0 0 0 0-4 4-12 16-25 29-25h66c17 0 30 17 30 34 0 0 0 0 0 0 0 4 0 4 0 4 0 8-5 16-5 25 0 4 0 8-4 8-4 8-4 17-8 21 4 17 4 17 4 21-4 8-8 16-12 29 0 4-5 4-5 4-4 8-8 13-12 21 0 4-4 4-4 8-4 4-9 13-13 17 0 4-4 4-4 8-8 9-12 13-21 21 0 0-4 0-4 4-8 4-12 13-21 17-12-4-16-4-16-4-9 4-13 8-21 12-4 0-4 4-9 4-8 5-16 9-29 13 0 0 0 0 0 0-8 4-21 4-29 8-4 0-4 0-8 0-9 0-17 0-25 4-4 0-9 0-9 0-8 0-16 0-29 0 0 0-4 0-4 0-8 0-21-4-29-4-8 0-13-4-21-4 0 0-4 0-4 0-113-42-188-142-188-262v-109h-50c-16 0-29-12-29-29v-475c0-17 13-29 29-29h634c16 0 29 12 29 29v475c0 17-13 29-29 29z" horiz-adv-x="1000" />
+<glyph glyph-name="unlock" unicode="&#xe807;" d="M781 415h-385v93c0 57 43 104 96 115 0 0 0 0 4 0 8 0 12 0 19 0 0 0 4 0 4 0 0 0 0 0 4 0 8 0 16 0 23-4 0 0 0 0 0 0 8 0 12-4 19-7 0 0 4 0 4-4 4-4 12-4 16-8 0 0 0 0 0 0 4-4 11-8 15-11 0 0 4-4 4-4 4-4 8-8 11-12 0 0 0 0 4-4 4-4 8-11 12-19 0 0 0-4 0-4 4-4 4-11 4-15 0 0 0-4 0-4 0 0 0 0 0-4 4-11 11-19 23-19h57c16 0 27 11 24 27 0 0 0 0 0 0 0 0 0 4 0 4 0 7-4 11-4 19 0 4 0 4-4 8 0 15 0 19-4 27 0 0 0 3-4 3-4 8-8 16-11 23 0 0-4 4-4 4-4 8-8 12-12 16 0 4-4 4-4 7-3 4-7 12-11 16 0 0-4 4-4 4-8 7-12 11-19 19 0 0-4 0-4 4-4 4-12 7-19 11-4 0-4 4-8 4-4 4-12 8-15 8-4 0-4 4-8 4-8 3-15 7-23 7 0 0 0 0 0 0-8 4-16 4-27 8-4 0-4 0-8 0-7 0-11 0-19 4-4 0-8 0-8 0-7 0-15 0-23 0 0 0-4 0-4 0-7 0-15-4-27-4-3 0-11-4-15-4 0 0-4 0-4 0-92-27-157-115-157-215v-93h-43c-15 0-23-11-23-23v-400c0-15 12-23 23-23h535c15 0 23 12 23 23v400c4 12-8 23-23 23z" horiz-adv-x="1000" />
 
-<glyph glyph-name="delete" unicode="&#xe808;" d="M500 804c-254 0-454-204-454-454 0-250 204-454 454-454s454 204 454 454c0 250-204 454-454 454z m267-491c0-17-17-34-34-34h-466c-21 0-34 13-34 34v75c0 16 17 33 34 33h466c21 0 34-13 34-33v-75z" horiz-adv-x="1000" />
+<glyph glyph-name="feed" unicode="&#xe808;" d="M842 739h-653c-35 0-58-27-58-58v-658c0-31 27-58 58-58h657c31 0 58 27 58 58v658c-4 31-31 58-62 58z m-534-666c-39 0-73 31-73 73s30 73 73 73c38 0 73-30 73-73s-35-73-73-73z m246-11c-35 0-58 27-58 57 0 112-88 200-200 200-31 0-65 27-65 58 0 35 23 62 54 62l11 0c177 0 319-143 319-320-3-30-30-57-61-57z m196 0c-35 0-58 27-58 57 0 220-180 400-400 400-30 0-65 27-65 62 0 34 23 61 54 61l11 0c285 0 520-230 520-519 0-34-27-61-62-61z" horiz-adv-x="1000" />
+
+<glyph glyph-name="left" unicode="&#xe809;" d="M692 773l70-69c11-12 11-27 0-39l-289-288c-11-12-11-27 0-38l296-297c12-11 12-27 0-38l-69-69c-11-12-27-12-38 0l-404 404c-12 11-12 26 0 38l396 396c11 12 27 12 38 0z" horiz-adv-x="1000" />
 
-<glyph glyph-name="ok" unicode="&#xe809;" d="M500 804c-250 0-454-204-454-454 0-250 204-454 454-454s454 204 454 454c0 250-204 454-454 454z m283-346l-358-358c-12-12-33-12-46 0l-162 163c-13 12-13 33 0 45l50 50c12 13 33 13 46 0l66-66c13-13 34-13 46 0l263 262c12 13 33 13 45 0l50-50c13-16 13-37 0-46z" horiz-adv-x="1000" />
+<glyph glyph-name="right" unicode="&#xe80a;" d="M339-65l-74 69c-11 11-11 27 0 38l289 289c11 11 11 27 0 38l-296 296c-12 12-12 27 0 39l69 69c12 12 27 12 38 0l404-404c12-11 12-27 0-38l-392-396c-12-12-31-12-38 0z" horiz-adv-x="1000" />
+
+<glyph glyph-name="down" unicode="&#xe80b;" d="M704 454l-173-219c-8-8-23-8-27 0l-173 219c-8 11 0 31 15 31h346c12 0 20-20 12-31z" horiz-adv-x="1000" />
 
-<glyph glyph-name="comment" unicode="&#xe80a;" d="M42-13v601c0 87 71 154 154 154h600c87 0 154-71 154-154v-342c0-88-71-154-154-154h-583c-9 0-13-4-17-9l-113-112c-12-17-41-4-41 16z m158 684c-46 0-87-38-87-88v-487l54 54c4 4 12 8 16 8h617c46 0 88 38 88 88v342c0 45-38 87-88 87h-600z" horiz-adv-x="1000" />
+<glyph glyph-name="folder" unicode="&#xe80c;" d="M929 511v-393q0-51-37-88t-88-37h-679q-51 0-88 37t-37 88v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h375q51 0 88-37t37-88z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="folder-open" unicode="&#xe80d;" d="M1049 319q0-17-18-37l-187-221q-24-28-67-48t-81-20h-607q-19 0-33 7t-15 24q0 17 17 37l188 221q24 28 67 48t80 20h607q19 0 34-7t15-24z m-192 192v-90h-464q-53 0-110-26t-92-67l-188-221-2-3q0 2-1 7t0 7v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h303q52 0 88-37t37-88z" horiz-adv-x="1071.4" />
 
-<glyph glyph-name="feed" unicode="&#xe80b;" d="M888 804h-780c-37 0-66-29-66-66v-780c0-37 29-66 66-66h780c37 0 66 29 66 66v780c0 37-29 66-66 66z m-638-787c-46 0-83 37-83 83 0 46 37 88 87 88 46 0 88-38 88-88-4-46-46-83-92-83z m292-13c-38 0-71 34-71 71 0 133-108 238-238 238-37 0-75 29-75 66 0 38 25 71 63 71l12 0c209 0 380-171 380-379 0-33-30-67-71-67z m237 0c-37 0-71 34-71 71 0 263-212 475-475 475-37 0-75 29-75 67 0 37 25 71 63 71l12 0c338 0 613-275 613-613 4-37-29-71-67-71z" horiz-adv-x="1000" />
+<glyph glyph-name="trash-empty" unicode="&#xe80e;" d="M286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q23 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
 
-<glyph glyph-name="right" unicode="&#xe80c;" d="M308-96l-75 75c-12 13-12 29 0 42l309 308c12 13 12 29 0 42l-317 312c-12 13-12 30 0 42l75 75c13 13 29 13 42 0l433-433c13-13 13-29 0-42l-425-421c-8-12-29-12-42 0z" horiz-adv-x="1000" />
+<glyph glyph-name="group" unicode="&#xe80f;" d="M962 219v-15c0-4-4-12-12-12h-161-4c-16 20-39 39-77 43-35 7-54 15-69 23 7 7 19 11 30 15 46 8 58 23 66 35 7 11 7 23 0 38-8 16-31 43-31 81 0 38 0 104 73 104h8 7c73-4 77-66 73-104 0-38-23-69-30-81-8-15-8-27 0-38 7-12 23-27 65-35 54-4 62-46 62-54 0 0 0 0 0 0z m-708-15c15 15 38 31 69 35 39 7 62 15 73 26-7 8-19 16-34 20-47 7-58 23-66 34-7 12-7 23 0 39 8 15 31 42 31 81 0 38 0 103-73 103h-8-11c-73-3-77-65-73-103 0-39 23-70 30-81 8-16 8-27 0-39-7-11-23-27-65-34-46-8-54-50-54-54 0 0 0 0 0 0v-16c0-3 4-11 12-11h161 8z m454 11c-73 12-96 35-108 54-11 20-11 39 0 62 12 23 50 69 54 131 4 61 0 165-119 169h-16-15c-119-4-123-104-119-166 4-61 38-107 54-130 11-23 11-43 0-62-12-19-35-42-108-54-73-11-85-80-85-88 0 0 0 0 0 0v-23c0-8 8-16 16-16h257 258c8 0 15 8 15 16v23c0 0 0 0 0 0-3 4-11 73-84 84z" horiz-adv-x="1000" />
+
+<glyph glyph-name="remove" unicode="&#xe810;" d="M724 112q0-22-15-38l-76-76q-16-15-38-15t-38 15l-164 165-164-165q-16-15-38-15t-38 15l-76 76q-16 16-16 38t16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38z" horiz-adv-x="785.7" />
 
-<glyph glyph-name="left" unicode="&#xe80d;" d="M683 800l75-75c13-12 13-29 0-42l-308-308c-12-12-12-29 0-42l317-316c12-13 12-30 0-42l-75-75c-13-13-29-13-42 0l-433 433c-13 13-13 30 0 42l425 425c12 13 29 13 41 0z" horiz-adv-x="1000" />
+<glyph glyph-name="fork" unicode="&#xe811;" d="M792 654c0 58-46 100-100 100-57 0-100-46-100-100 0-35 20-65 47-85-12-84-70-123-127-142-58 15-116 54-127 142 27 20 46 50 46 85 0 58-46 100-100 100s-108-42-108-100c0-39 23-73 54-89 12-107 77-188 181-226v-162c-31-19-50-50-50-88 0-58 46-101 100-101s100 47 100 101c0 38-19 69-50 88v162c104 38 169 119 181 226 30 20 53 50 53 89z m-465 35c19 0 35-16 35-35s-16-31-35-31-35 12-35 31 16 35 35 35z m181-635c-19 0-35 15-35 35s16 34 35 34c19 0 34-15 34-34s-15-35-34-35z m184 635c20 0 35-16 35-35s-15-31-35-31-34 16-34 35 15 31 34 31z" horiz-adv-x="1000" />
+
+<glyph glyph-name="more" unicode="&#xe812;" d="M546 435h-100c-15 0-27-12-27-27v-100c0-16 12-27 27-27h100c16 0 27 11 27 27v100c0 15-11 27-27 27z m0 307h-100c-15 0-27-11-27-27v-100c0-15 12-26 27-26h100c16 0 27 11 27 26v100c0 16-11 27-27 27z m0-615h-100c-15 0-27-12-27-27v-100c0-15 12-27 27-27h100c16 0 27 12 27 27v100c0 15-11 27-27 27z" horiz-adv-x="1000" />
 
-<glyph glyph-name="arrow_down" unicode="&#xe80e;" d="M950 542l-412-521c-17-21-50-21-67 0l-417 521c-21 25-4 71 34 71h829c37 0 58-46 33-71z" horiz-adv-x="1000" />
+<glyph glyph-name="search" unicode="&#xe813;" d="M643 386q0 103-73 176t-177 74-177-74-73-176 73-177 177-73 177 73 73 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 153-31 125-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="scissors" unicode="&#xe814;" d="M536 350q14 0 25-11t10-25-10-25-25-10-25 10-11 25 11 25 25 11z m167-36l283-222q16-11 14-31-3-20-19-28l-72-36q-7-4-16-4-10 0-17 4l-385 216-62-36q-4-3-7-3 8-28 6-54-4-43-31-83t-74-69q-74-47-154-47-76 0-124 44-51 47-44 116 4 42 31 82t73 69q74 47 155 47 46 0 84-18 5 8 13 13l68 40-68 41q-8 5-13 12-38-17-84-17-81 0-155 47-46 30-73 69t-31 82q-3 33 8 63t36 52q47 44 124 44 80 0 154-47 46-29 74-68t31-83q2-27-6-54 3-1 7-3l62-37 385 216q7 5 17 5 9 0 16-4l72-36q16-9 19-28 2-20-14-32z m-380 145q26 24 12 61t-59 65q-52 33-107 33-42 0-63-20-26-24-12-60t59-66q51-33 107-33 41 0 63 20z m-47-415q45 28 59 65t-12 60q-22 20-63 20-56 0-107-33-45-28-59-65t12-60q21-20 63-20 55 0 107 33z m99 342l54-33v7q0 20 18 31l8 4-44 26-15-14q-1-2-5-6t-7-7q-1-1-2-2t-2-1z m125-125l54-18 410 321-71 36-429-240v-64l-89-53 5-5q1-1 4-3 2-2 6-7t6-6l15-15z m393-232l71 35-290 228-99-77q-1-2-7-4z" horiz-adv-x="1000" />
 
-<glyph glyph-name="git" unicode="&#xe80f;" d="M896 808h-792c-33 0-62-29-62-62v-792c0-33 29-62 62-62h792c33 0 62 29 62 62v792c0 33-29 62-62 62z m-4-850h-788v788h788v-788z m-667 338c-4 12-8 25-8 42 0 12 0 25 4 37 4 13 8 21 12 33s13 21 21 30 17 16 25 20c13 0 21 5 34 9 8 4 20 4 33 4 8 0 21 0 29-4 8 0 17-4 21-9 8-4 12-8 17-12 4-4 8-8 12-13l-17-20c-4-5-4-5-8-9-4 0-8 0-12 4-5 5-9 5-13 9-4 0-8 4-8 4-4 0-9 4-13 4-4 0-8 0-12 0-9 0-21-4-29-8-9-4-17-13-21-17-4-8-13-17-13-29-4-13-4-25-4-38 0-8 0-20 4-29 4-8 4-16 13-21 4-4 8-8 16-12 9-4 13-4 21-4 9 0 13 0 17 0 4 0 8 4 17 4l4 37h-25c-4 0-4 0-9 5s0 8 0 12l5 29h79l-13-100c-4-4-12-8-16-12-9-4-13-4-21-9-9 0-13-4-21-4-8 0-17 0-25 0-13 0-29 4-42 9-12 4-21 12-29 20-12 13-21 21-25 38z m300-63h-54l29 234h54l-29-234z m146 192h-58l4 42h171l-5-42h-58l-25-192h-54l25 192z" horiz-adv-x="1000" />
+<glyph glyph-name="download" unicode="&#xe815;" d="M714 100q0 15-10 25t-25 11-25-11-11-25 11-25 25-11 25 11 10 25z m143 0q0 15-10 25t-26 11-25-11-10-25 10-25 25-11 26 11 10 25z m72 125v-179q0-22-16-37t-38-16h-821q-23 0-38 16t-16 37v179q0 22 16 38t38 16h259l75-76q33-32 76-32t76 32l76 76h259q22 0 38-16t16-38z m-182 318q10-23-8-39l-250-250q-10-11-25-11t-25 11l-250 250q-17 16-8 39 10 21 33 21h143v250q0 15 11 25t25 11h143q14 0 25-11t10-25v-250h143q24 0 33-21z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="doc" unicode="&#xe816;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="hg" unicode="&#xe810;" d="M896 808h-792c-33 0-62-29-62-62v-792c0-33 29-62 62-62h792c33 0 62 29 62 62v792c-4 33-29 62-62 62z m-4-850h-788v788h788v-788z m-571 275h-54l29 234h54l-12-100h83l12 100h55l-30-234h-54l13 100h-84l-12-100z m217 63c-5 12-9 25-9 42 0 12 0 25 4 37 5 13 9 21 13 33 4 9 12 21 21 25s16 17 25 21c8 4 21 9 29 13 12 4 21 4 33 4 9 0 21 0 29-4s17-4 21-9c9-4 13-8 17-12 4-4 8-8 12-13l-16-20c-4-5-4-5-9-9-4 0-8 0-12 4-4 5-8 5-13 9-4 0-8 4-8 4-4 0-8 4-12 4-5 0-9 0-13 0-8 0-21-4-29-8-8-4-17-13-21-17s-12-17-12-29c-5-13-5-25-5-38 0-8 0-20 5-29 4-8 4-16 12-21 4-4 8-8 17-12 8-4 12-4 21-4 8 0 12 0 16 0 4 0 9 4 17 4l4 37h-21c-4 0-4 0-8 5s-4 4 0 8l4 29h79l-12-100c-4-4-13-8-17-12-8-5-12-5-21-9-8 0-12-4-21-4-8 0-16 0-25 0-12 0-29 4-41 8-13 5-21 13-29 21-13 17-21 29-25 42z" horiz-adv-x="1000" />
+<glyph glyph-name="cog" unicode="&#xe817;" d="M571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m286 61v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-27 59-77 6-6 6-13t-5-13q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 21l-79-60q-6-5-14-5-8 0-14 6-70 64-92 94-4 5-4 13 0 6 5 12 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 16 20 16h124q7 0 13-5t7-12l15-103q28-9 51-20l79 59q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-12 0-7-4-13-9-12-29-37t-30-40q15-28 23-54l102-16q7-1 12-7t4-13z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="cog-alt" unicode="&#xe818;" d="M500 350q0 59-42 101t-101 42-101-42-42-101 42-101 101-42 101 42 42 101z m429-286q0 29-22 51t-50 21-50-21-21-51q0-29 21-50t50-21 51 21 21 50z m0 572q0 29-22 50t-50 21-50-21-21-50q0-30 21-51t50-21 51 21 21 51z m-215-235v-103q0-6-4-11t-8-6l-87-14q-6-19-18-42 19-27 50-64 4-6 4-11 0-7-4-11-12-17-46-50t-43-33q-7 0-12 4l-64 50q-21-11-43-17-6-60-13-87-4-13-17-13h-104q-6 0-11 4t-5 10l-13 85q-19 6-42 18l-66-50q-4-4-11-4-6 0-12 4-80 75-80 90 0 5 4 10 5 8 23 30t26 34q-13 24-20 46l-85 13q-5 1-9 5t-4 11v104q0 5 4 10t9 6l86 14q7 19 18 42-19 27-50 64-4 6-4 11 0 7 4 12 12 16 46 49t44 33q6 0 12-4l64-50q19 10 43 18 6 60 13 86 3 13 16 13h104q6 0 11-4t6-10l13-85q19-6 42-17l65 49q5 4 12 4 6 0 11-4 81-75 81-90 0-4-4-10-7-9-24-30t-25-34q13-27 19-46l85-12q6-2 9-6t4-11z m357-298v-78q0-9-83-17-6-15-16-29 28-63 28-77 0-2-2-4-68-40-69-40-5 0-26 27t-29 37q-11-1-17-1t-17 1q-7-11-29-37t-25-27q-1 0-69 40-3 2-3 4 0 14 29 77-10 14-17 29-83 8-83 17v78q0 9 83 18 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-38q12 1 17 1t17-1q28 40 51 63l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-9 83-18z m0 572v-78q0-9-83-18-6-15-16-29 28-63 28-77 0-2-2-4-68-39-69-39-5 0-26 26t-29 38q-11-1-17-1t-17 1q-7-12-29-38t-25-26q-1 0-69 39-3 2-3 4 0 14 29 77-10 14-17 29-83 9-83 18v78q0 9 83 17 7 16 17 29-29 63-29 77 0 2 3 4 2 1 19 11t33 19 17 9q4 0 25-26t29-37q12 1 17 1t17-1q28 39 51 62l4 1q2 0 69-39 2-2 2-4 0-14-28-77 9-13 16-29 83-8 83-17z" horiz-adv-x="1071.4" />
 
-<glyph glyph-name="svn" unicode="&#xe811;" d="M896 808h-792c-33 0-62-29-62-62v-796c0-29 29-58 62-58h796c33 0 63 29 63 62v792c-5 33-34 62-67 62z m0-854h-792v792h788v-792z m-717 296c-4 4-8 8-12 13l21 25c0 0 4 4 4 4 4 0 4 0 8 0 4 0 4 0 8-4 5 0 5-5 9-9 4-4 8-4 12-8 4 0 9-4 17-4 8 0 17 4 21 8 4 4 8 13 8 25 0 4 0 8-4 13-4 4-4 4-8 8-5 4-9 4-13 4-4 0-8 4-17 4-4 0-12 4-16 9-4 4-9 8-13 12-4 4-8 8-8 17-4 4-4 12-4 21 0 12 0 20 4 29 4 8 8 16 17 25 8 8 16 12 25 16 12 9 25 13 37 13 8 0 13 0 21 0 8 0 12-4 17-4 4-4 12-4 16-9 4-8 9-12 9-16l-17-21c0-4-4-4-4-4 0 0-4 0-9 0-4 0-4 0-8 4-4 0-4 4-8 4-4 0-9 4-13 4-4 0-8 4-12 4-4 0-9 0-13 0-4 0-8-4-8-4-4-4-4-4-4-8 0-4 0-8 0-13 0-4 0-8 4-12 4-4 4-4 8-8 4-5 9-5 13-5 4 0 8-4 16-4 5-4 13-4 17-8 4-4 8-8 13-13s8-8 8-16c4-4 4-13 4-21 0-13 0-25-4-33-4-13-8-21-17-30-8-8-16-12-29-16-12-4-25-9-37-9-9 0-13 0-21 5s-13 4-21 8c-4-4-13 0-17 4z m250-17l-54 234h42c4 0 8 0 12-4 4-5 4-5 4-9l25-129c0-4 5-12 5-17 0-8 4-12 4-20 4 8 4 12 8 20 4 9 4 13 8 17l55 129c0 0 0 4 4 4 0 0 4 5 4 5 0 0 4 0 4 4 0 0 4 0 4 0h42l-117-238h-50z m221 0h-46l29 238h30c4 0 4 0 4 0 0 0 4 0 4 0 0 0 4 0 4-4 0 0 0-4 4-4l84-146c0 4 0 8 0 12 0 4 0 9 0 9l16 133h46l-29-238h-29c-4 0-9 0-9 0-4 0-4 5-8 9l-83 146c0-5 0-5 0-9 0-4 0-4 0-8l-17-138z" horiz-adv-x="1000" />
+<glyph glyph-name="eye" unicode="&#xe819;" d="M929 314q-85 132-213 197 34-58 34-125 0-103-73-177t-177-73-177 73-73 177q0 67 34 125-128-65-213-197 75-114 187-182t242-68 243 68 186 182z m-402 215q0 11-8 19t-19 7q-70 0-120-50t-50-119q0-11 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19z m473-215q0-19-11-38-78-129-210-206t-279-77-279 77-210 206q-11 19-11 38t11 39q78 128 210 205t279 78 279-78 210-205q11-20 11-39z" horiz-adv-x="1000" />
+
+<glyph glyph-name="eye-off" unicode="&#xe81a;" d="M310 105l43 79q-48 35-76 88t-27 114q0 67 34 125-128-65-213-197 94-144 239-209z m217 424q0 11-8 19t-19 7q-70 0-120-50t-50-119q0-11 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19z m202 106q0-4 0-5-59-105-176-316t-176-316l-28-50q-5-9-15-9-7 0-75 39-9 6-9 16 0 7 25 49-80 36-147 96t-117 137q-11 17-11 38t11 39q86 131 212 207t277 76q50 0 100-10l31 54q5 9 15 9 3 0 10-3t18-9 18-10 18-10 10-7q9-5 9-15z m21-249q0-78-44-142t-117-91l157 280q4-25 4-47z m250-72q0-19-11-38-22-36-61-81-84-96-194-149t-234-53l41 74q119 10 219 76t169 171q-65 100-158 164l35 63q53-36 102-85t81-103q11-19 11-39z" horiz-adv-x="1000" />
 
-<glyph glyph-name="group" unicode="&#xe812;" d="M958 221v-17c0-4-4-8-8-8h-167-4c-16 21-41 37-79 46-37 4-58 16-71 25 9 8 17 12 34 16 45 9 62 21 66 38s9 25 0 37c-8 13-33 46-33 84 0 41 0 104 75 108h8 13c75-4 79-71 75-108 0-42-25-71-34-84-8-16-8-25 0-37s21-29 67-38c54-12 58-58 58-62 0 0 0 0 0 0z m-725-17c17 17 38 34 71 38 42 8 63 16 75 25-8 8-21 16-37 21-46 8-63 20-67 37-8 13-8 25 0 38 8 12 33 45 33 83 0 42 0 104-75 108h-12-8c-75-4-80-71-80-108 0-42 25-71 34-83 8-17 8-25 0-38-9-12-21-29-67-37-50-9-54-50-54-59 0 0 0 0 0 0v-16c0-5 4-9 8-9h167 12z m463 13c-75 12-96 37-108 58-13 21-13 42 0 63 12 25 50 70 54 133 4 62 0 167-121 175h-21-17c-116-4-120-113-120-175 4-63 41-113 54-133 12-25 12-42 0-63-13-21-38-46-109-58-75-13-87-84-87-92 0 0 0 0 0 0v-25c0-8 8-17 17-17h262 267c8 0 16 9 16 17v25c0 0 0 0 0 0 0 8-8 79-87 92z" horiz-adv-x="1000" />
+<glyph glyph-name="cancel-circled2" unicode="&#xe81b;" d="M612 248l-81-82q-6-5-13-5t-13 5l-76 77-77-77q-5-5-13-5t-12 5l-82 82q-6 6-6 13t6 13l76 76-76 77q-6 5-6 12t6 13l82 82q5 5 12 5t13-5l77-77 76 77q6 5 13 5t13-5l81-82q6-5 6-13t-6-12l-76-77 76-76q6-6 6-13t-6-13z m120 102q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="cancel-circled" unicode="&#xe81c;" d="M641 224q0 14-10 25l-101 101 101 101q10 11 10 25 0 15-10 26l-51 50q-10 11-25 11-15 0-25-11l-101-101-101 101q-11 11-25 11-16 0-26-11l-50-50q-11-11-11-26 0-14 11-25l101-101-101-101q-11-11-11-25 0-15 11-26l50-50q10-11 26-11 14 0 25 11l101 101 101-101q10-11 25-11 15 0 25 11l51 50q10 11 10 26z m216 126q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="folder" unicode="&#xe813;" d="M742 17h-659c-12 0-25 8-33 16-8 13-8 25 0 38l179 342c4 12 17 20 34 20h658c12 0 25-8 33-16 9-13 9-25 0-38l-179-341c-8-13-21-21-33-21z m-596 75h575l142 266h-580l-137-266z m-29-38h-75v550c0 21 16 38 37 38h246c8 0 21-4 25-13l54-54h325c21 0 38-17 38-37v-105h-75v67h-300c-9 0-17 4-25 8l-59 59h-191v-513z" horiz-adv-x="1000" />
+<glyph glyph-name="plus" unicode="&#xe81d;" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" />
 
-<glyph glyph-name="fork" unicode="&#xe814;" d="M838 688c0 66-55 120-121 120-67 0-121-54-121-120 0-42 21-80 54-100-12-100-83-146-150-167-71 21-137 67-150 167 33 20 54 58 54 100 0 66-54 120-121 120s-120-54-120-120c0-46 29-88 66-109 13-129 88-225 213-271v-191c-38-21-63-59-63-100 0-67 54-121 121-121s121 54 121 121c0 46-25 83-58 104v192c120 45 200 137 212 270 33 17 63 59 63 105z m-555 37c21 0 42-17 42-42s-17-41-42-41-41 16-41 41 21 42 41 42z m217-750c-21 0-42 17-42 42 0 21 17 41 42 41s42-16 42-41c0-25-21-42-42-42z m217 750c21 0 41-17 41-42s-16-41-41-41-42 16-42 41 21 42 42 42z" horiz-adv-x="1000" />
+<glyph glyph-name="plus-circled" unicode="&#xe81e;" d="M679 314v72q0 14-11 25t-25 10h-143v143q0 15-11 25t-25 11h-71q-15 0-25-11t-11-25v-143h-143q-14 0-25-10t-10-25v-72q0-14 10-25t25-10h143v-143q0-15 11-25t25-11h71q15 0 25 11t11 25v143h143q14 0 25 10t11 25z m178 36q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="minus-circled" unicode="&#xe81f;" d="M679 314v72q0 14-11 25t-25 10h-429q-14 0-25-10t-10-25v-72q0-14 10-25t25-10h429q14 0 25 10t11 25z m178 36q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="more" unicode="&#xe815;" d="M592 408v-120c0-17-13-34-34-34h-120c-17 0-34 13-34 34v120c0 17 13 34 34 34h120c21 0 34-17 34-34z m-34 400h-120c-17 0-34-12-34-33v-121c0-16 13-33 34-33h120c17 0 34 12 34 33v121c0 21-13 33-34 33z m0-733h-120c-17 0-34-12-34-33v-121c0-17 13-34 34-34h120c17 0 34 13 34 34v121c0 16-13 33-34 33z" horiz-adv-x="1000" />
+<glyph glyph-name="minus" unicode="&#xe820;" d="M786 439v-107q0-22-16-38t-38-15h-678q-23 0-38 15t-16 38v107q0 23 16 38t38 16h678q23 0 38-16t16-38z" horiz-adv-x="785.7" />
+
+<glyph glyph-name="info-circled" unicode="&#xe821;" d="M571 82v89q0 8-5 13t-12 5h-54v286q0 8-5 13t-13 5h-178q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h53v-179h-53q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h250q7 0 12 5t5 13z m-71 500v89q0 8-5 13t-13 5h-107q-8 0-13-5t-5-13v-89q0-8 5-13t13-5h107q8 0 13 5t5 13z m357-232q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="comment-add" unicode="&#xe816;" d="M48-12v593c0 86 69 155 154 155h596c85 0 154-69 154-155v-338c0-86-69-155-154-155h-584c-7 0-12-2-16-7l-110-110c-14-14-40-4-40 17z m154 679c-47 0-85-38-85-86v-486l52 53c5 4 10 7 17 7h612c47 0 85 38 85 86v340c0 48-38 86-85 86h-596z m479-284l0 48c0 5-5 10-10 10l-114 0c-5 0-9 4-9 9v114c0 5-5 10-10 10h-47c-5 0-10-5-10-10v-114c0-5-5-9-10-9h-114c-5 0-9-5-9-10v-48c0-4 4-9 9-9h114c5 0 10-5 10-10l0-114c0-5 5-9 10-9l47 0c5 0 10 4 10 9v114c0 5 4 10 9 10h114c5-3 10 2 10 9z" horiz-adv-x="1000" />
+<glyph glyph-name="upload" unicode="&#xe822;" d="M714 29q0 14-10 25t-25 10-25-10-11-25 11-25 25-11 25 11 10 25z m143 0q0 14-10 25t-26 10-25-10-10-25 10-25 25-11 26 11 10 25z m72 125v-179q0-22-16-38t-38-16h-821q-23 0-38 16t-16 38v179q0 22 16 38t38 15h238q12-31 39-51t62-20h143q34 0 61 20t40 51h238q22 0 38-15t16-38z m-182 361q-9-22-33-22h-143v-250q0-15-10-25t-25-11h-143q-15 0-25 11t-11 25v250h-143q-23 0-33 22-9 22 8 39l250 250q10 10 25 10t25-10l250-250q18-17 8-39z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="home" unicode="&#xe823;" d="M888 336q16-16 11-27t-27-11l-84 0 0-310q0-14-1-21t-8-13-23-6l-204 0 0 310-204 0 0-310-194 0q-28 0-35 10t-7 30l0 310-84 0q-22 0-27 11t11 27l400 402q16 16 38 16t38-16z" horiz-adv-x="900" />
 
-<glyph glyph-name="comment_toggle" unicode="&#xe818;" d="M798 736h-596c-85 0-154-69-154-155v-593c0-19 22-29 36-20 2 1 5 3 7 5l109 109c2 2 5 4 8 5 2 1 4 1 6 1h584c85 0 154 69 154 155v338c0 86-69 155-154 155z m-680-639v484c0 47 38 85 86 85h476c-86-84-504-511-509-515l-53-54z" horiz-adv-x="1000" />
+<glyph glyph-name="git" unicode="&#xe82a;" d="M929 844h-858c-36 0-65-30-65-65v-857c0-36 30-65 65-65h857c36 0 65 30 65 65v857c1 35-29 65-64 65z m-729-549c4-11 9-20 14-27 6-8 14-14 22-18 9-4 19-6 29-6 9 0 16 1 24 2 7 2 14 4 20 7l6 51h-27c-4 0-8 1-10 4-2 1-3 5-3 7l5 39h105l-16-131c-8-7-16-12-25-15-9-4-18-8-28-10-10-3-18-5-30-7-10-1-21-2-33-2-20 0-38 4-54 11-16 8-30 18-41 30-12 13-20 28-27 45-6 18-10 36-10 56 0 18 3 34 7 50 3 17 10 30 17 44 8 14 16 25 26 36 10 12 22 20 34 28 13 7 26 14 41 17 15 4 30 7 47 7 13 0 25-2 36-4 11-3 21-6 29-10 8-4 16-9 22-14 6-5 13-11 18-16l-20-31c-4-5-9-8-14-9-5-1-10 0-16 4-5 3-10 6-14 8-5 3-9 5-14 7-5 1-10 2-15 3-5 2-11 2-17 2-14 0-27-3-38-9-11-6-21-14-29-25-8-10-15-24-18-38-5-15-7-31-7-48-1-14 2-27 4-38z m336-102h-71l39 315h71l-39-315z m343 258h-80l-33-258h-70l32 258h-80l7 57h231l-7-57z" horiz-adv-x="1000" />
 
-<glyph glyph-name="git-inv" unicode="&#xe81a;" d="M929 844h-858c-36 0-65-30-65-65v-857c0-36 30-65 65-65h857c36 0 65 30 65 65v857c1 35-29 65-64 65z m-729-549c4-11 9-20 14-27 6-8 14-14 22-18 9-4 19-6 29-6 9 0 16 1 24 2 7 2 14 4 20 7l6 51h-27c-4 0-8 1-10 4-2 1-3 5-3 7l5 39h105l-16-131c-8-7-16-12-25-15-9-4-18-8-28-10-10-3-18-5-30-7-10-1-21-2-33-2-20 0-38 4-54 11-16 8-30 18-41 30-12 13-20 28-27 45-6 18-10 36-10 56 0 18 3 34 7 50 3 17 10 30 17 44 8 14 16 25 26 36 10 12 22 20 34 28 13 7 26 14 41 17 15 4 30 7 47 7 13 0 25-2 36-4 11-3 21-6 29-10 8-4 16-9 22-14 6-5 13-11 18-16l-20-31c-4-5-9-8-14-9-5-1-10 0-16 4-5 3-10 6-14 8-5 3-9 5-14 7-5 1-10 2-15 3-5 2-11 2-17 2-14 0-27-3-38-9-11-6-21-14-29-25-8-10-15-24-18-38-5-15-7-31-7-48-1-14 2-27 4-38z m336-102h-71l39 315h71l-39-315z m343 258h-80l-33-258h-70l32 258h-80l7 57h231l-7-57z" horiz-adv-x="1000" />
+<glyph glyph-name="hg" unicode="&#xe82d;" d="M927 841h-853c-36 0-65-29-65-65v-853c0-36 29-65 65-65h853c36 0 65 29 65 65v853c0 36-29 65-65 65z m-483-648h-70l16 133h-113l-17-133h-70l39 313h70l-16-132h113l16 132h71l-39-313z m177 101c3-11 8-20 14-27 7-8 14-14 23-18 8-4 18-6 28-6 9 0 16 1 23 3 7 1 14 3 20 6l6 51h-27c-4 0-7 1-9 3-3 3-3 6-3 9l5 39h104l-16-131c-8-6-16-11-25-15-9-5-18-8-27-11-9-2-19-4-30-6-10-1-21-2-33-2-19 0-37 4-53 11-16 7-30 17-41 29-11 13-20 28-26 45-7 17-10 35-10 55 0 17 2 34 6 50 4 15 10 30 17 43 7 14 16 26 26 36 10 11 22 20 34 28 13 7 27 13 41 17 14 4 30 7 46 7 13 0 25-2 36-4 11-3 20-6 29-10 8-4 16-9 23-14 7-5 13-11 18-17l-23-28c-4-5-8-8-13-9-5-1-11 0-16 3-5 4-10 7-14 9-5 3-9 5-14 6-4 2-9 3-14 4-5 1-11 1-17 1-14 0-27-3-38-8-11-6-21-14-29-25-8-10-15-23-19-38-5-15-7-31-7-49 0-13 2-26 5-37z" horiz-adv-x="1000" />
+
+<glyph glyph-name="svn" unicode="&#xe82e;" d="M933 841h-852c-36 0-65-29-65-65v-853c0-36 29-65 65-65h852c36 0 66 29 66 65v853c0 36-30 65-66 65z m-765-438c3-4 7-7 13-10 5-3 11-6 18-8 7-3 14-5 21-8 7-3 14-6 21-10 7-4 13-9 18-14 5-6 10-13 13-20 3-8 5-18 5-29 0-16-3-30-8-44-6-14-14-26-24-37-10-10-22-18-37-24-15-7-31-10-49-10-9 0-18 1-27 3s-18 5-27 9c-8 4-16 8-23 13-7 5-13 10-18 17l25 32c2 3 4 5 7 6 3 2 6 3 9 3 4 0 8-2 12-4 3-3 8-6 12-10 5-3 10-6 16-9 6-3 14-4 23-4 13 0 23 3 30 10 7 7 10 18 10 32 0 6-1 12-4 16-4 4-8 7-13 10-5 3-11 6-18 8-7 2-14 5-21 7-7 3-14 6-21 9-6 4-12 8-18 14-5 6-9 13-12 21-3 8-5 18-5 30 0 14 3 28 8 40 5 13 12 25 22 35 10 9 22 17 36 23 14 6 29 9 47 9 9 0 17-1 26-3s16-4 23-8c7-3 14-7 20-11 6-5 11-10 15-15l-21-29c-2-3-5-6-7-7-3-2-6-3-9-3-3 0-7 1-10 3-3 3-7 5-11 8-4 2-9 4-14 7-5 2-12 3-19 3-6 0-12-1-17-3-5-2-9-4-12-8-4-3-6-7-8-11-1-5-2-10-2-15 0-5 2-10 5-14z m312-210h-64l-77 313h57c6 0 10-1 14-4 4-3 6-6 7-11l32-173c2-7 4-14 6-23 1-8 3-17 4-26 3 9 6 18 9 26 4 9 7 16 11 23l73 173c1 2 2 4 4 6 2 2 4 3 6 5 2 1 4 2 7 3 3 1 5 1 8 1h57l-154-313z m423 0h-37c-5 0-10 1-13 2-4 2-7 5-10 9l-109 194c-1-4-1-8-1-12-1-4-1-7-1-10l-22-183h-62l39 313h37c3 0 6 0 8 0 2 0 4-1 5-1 2-1 3-2 4-4s3-3 5-5l110-194c0 5 0 10 1 14 0 5 1 9 1 13l21 177h62l-38-313z" horiz-adv-x="1000" />
 
-<glyph glyph-name="hg-inv" unicode="&#xe81b;" d="M927 841h-853c-36 0-65-29-65-65v-853c0-36 29-65 65-65h853c36 0 65 29 65 65v853c0 36-29 65-65 65z m-483-648h-70l16 133h-113l-17-133h-70l39 313h70l-16-132h113l16 132h71l-39-313z m177 101c3-11 8-20 14-27 7-8 14-14 23-18 8-4 18-6 28-6 9 0 16 1 23 3 7 1 14 3 20 6l6 51h-27c-4 0-7 1-9 3-3 3-3 6-3 9l5 39h104l-16-131c-8-6-16-11-25-15-9-5-18-8-27-11-9-2-19-4-30-6-10-1-21-2-33-2-19 0-37 4-53 11-16 7-30 17-41 29-11 13-20 28-26 45-7 17-10 35-10 55 0 17 2 34 6 50 4 15 10 30 17 43 7 14 16 26 26 36 10 11 22 20 34 28 13 7 27 13 41 17 14 4 30 7 46 7 13 0 25-2 36-4 11-3 20-6 29-10 8-4 16-9 23-14 7-5 13-11 18-17l-23-28c-4-5-8-8-13-9-5-1-11 0-16 3-5 4-10 7-14 9-5 3-9 5-14 6-4 2-9 3-14 4-5 1-11 1-17 1-14 0-27-3-38-8-11-6-21-14-29-25-8-10-15-23-19-38-5-15-7-31-7-49 0-13 2-26 5-37z" horiz-adv-x="1000" />
+<glyph glyph-name="comment-add" unicode="&#xe82f;" d="M952 258v317c0 7 0 13 0 20-1 12-4 24-8 36-7 22-20 43-37 59-16 17-36 30-58 37-12 4-25 7-37 8-7 1-13 1-19 1h-576c-13 0-26 0-38-2-13-2-25-5-36-10-22-9-41-23-57-40-15-18-27-39-33-62-3-12-5-25-5-38-1-13 0-26 0-39v-557c0-9 5-17 13-21 6-3 15-3 21 0 3 1 5 3 7 5 2 2 4 5 7 7 4 5 9 9 14 14l28 28c9 10 19 19 28 29 9 9 19 18 28 27 4 5 8 9 14 10 2 1 5 1 8 1h567c13 0 25 0 38 2 24 4 47 13 66 27 19 13 35 31 46 51 12 22 19 46 19 71 1 6 0 13 0 19z m-69 307v-317c0-7 0-13 0-19-1-6-3-13-5-18-4-10-9-20-16-28-15-17-37-27-59-28-7 0-13 0-19 0h-576c-7 0-13 0-20 0-3 0-6 0-9-1-3-1-5-2-7-4-2-2-4-4-6-6-3-2-5-4-7-7-5-4-10-9-14-14-10-9-19-18-28-28v485c0 12 2 24 7 35 4 10 10 19 18 27 16 16 38 25 60 25h590c6 0 12 0 18-1 22-3 42-15 56-33 7-9 12-20 15-31 1-5 2-12 2-18 1-6 0-13 0-19z m-214-117h-131c-4 0-11 8-11 12v126c0 8-8 16-12 16h-50c-7 0-15-8-15-12v-130c0-4-8-12-12-12h-126c-8 0-16-8-16-11v-50c0-8 8-16 12-16h127c7 0 15-7 15-11v-127c0-8 8-15 11-15h50c8 0 16 7 16 11v127c0 8 7 15 11 15h127c8 0 15 8 15 12v50c0 7-7 15-11 15z" horiz-adv-x="1000" />
+
+<glyph glyph-name="comment-toggle" unicode="&#xe830;" d="M798 736h-596c-85 0-154-69-154-155v-593c0-19 22-29 36-20 2 1 5 3 7 5l109 109c2 2 5 4 8 5 2 1 4 1 6 1h584c85 0 154 69 154 155v338c0 86-69 155-154 155z m-680-639v484c0 47 38 85 86 85h476c-86-84-504-511-509-515l-53-54z" horiz-adv-x="1000" />
 
-<glyph glyph-name="minus" unicode="&#xe81c;" d="M895 269h-790c-5 0-10 5-10 10v142c0 5 5 10 10 10h793c5 0 9-5 9-10v-142c-2-5-7-10-12-10z" horiz-adv-x="1000" />
+<glyph glyph-name="rhodecode" unicode="&#xe831;" d="M175 633c-2-4-3-8-4-12-3-10-6-20-9-30-3-13-7-25-11-38-3-11-6-23-10-35-2-7-4-15-6-22-1-1-1-2-1-4 0 0 0 0 0 0 0-1 1-2 1-2 2-7 5-14 7-21 4-11 8-22 12-33 4-12 9-25 13-37 4-11 8-23 12-34 3-7 5-14 7-21 1-1 1-2 2-3 0-1 1-1 1-2 4-6 8-12 11-17 7-10 13-19 19-29 7-11 14-22 22-33 6-10 13-21 20-31 5-7 9-15 14-22 1-2 3-4 4-5 0-1 1-1 1-2 3-3 6-5 8-8 7-6 13-12 19-19 9-8 17-16 25-24 10-10 19-19 29-28 9-9 18-18 27-27 8-8 16-15 23-23 5-5 11-10 16-15 1-1 3-3 5-5 7-5 14-10 21-15 11-8 21-15 31-23 4-2 7-5 11-7 0-1 1-2 2-2 0 0 0-1 1 0 7 3 14 7 21 11 11 6 23 11 34 17 6 4 12 7 19 10 0 0 0 1 1 1 1 2 2 3 3 5 4 5 8 10 13 15 6 8 12 16 18 24 8 9 15 19 23 28 8 11 16 21 24 31 8 11 16 21 24 31 8 10 15 19 23 28 6 8 12 16 18 24 4 5 8 10 12 15 2 2 3 3 4 5 0 0 0 0 0 0-1 1-2 1-3 1-3 0-6 1-9 2-5 1-10 2-15 3-6 2-13 4-20 5-8 3-16 5-24 7-9 3-19 6-28 9-10 3-21 7-31 11-12 4-23 8-34 13-12 5-24 10-36 15-13 6-26 12-38 18-13 7-26 14-39 21-13 7-27 15-39 23-14 9-27 17-40 27-13 9-26 19-39 29-13 11-25 22-37 33-13 11-25 23-36 36-12 13-23 26-34 40-11 14-21 28-31 43-9 15-19 31-27 47 0 1 0 1 0 1z m-3 3c-1-5-3-9-4-14-3-10-7-21-10-32-4-12-8-25-12-37-3-10-6-20-9-30-1-3-2-6-3-8 0-1 0-2 0-2 1-5 3-10 5-15 3-10 6-20 10-30 4-12 8-24 12-37 4-12 8-24 12-36 3-9 6-18 9-26 1-3 1-5 2-8 0 0 1-1 1-2 2-4 5-8 7-12 5-10 10-19 15-28 6-11 12-23 19-34 6-11 12-22 18-33 4-8 8-15 12-23 1-2 2-4 4-6 4-5 8-9 13-14 7-8 15-16 23-24 9-10 18-20 26-29 9-9 17-18 25-26 5-6 10-11 15-17 2-1 3-3 5-5 5-5 11-11 17-17 9-8 17-17 26-26 9-9 18-18 27-27 7-7 14-14 21-21 2-2 3-3 5-5 0 0 1-1 1-1 0 0 1 0 1 0 11 2 22 3 32 5 9 1 17 2 26 3 0 0 1 1 1 1 1 1 2 3 4 4 4 5 9 10 13 15 7 8 14 15 20 22 9 9 17 18 25 27 9 10 18 20 27 30 8 9 17 19 26 29 8 9 16 17 24 26 7 7 13 15 20 22 4 5 8 9 13 14 1 1 2 2 3 3 0 1 1 1 1 1 0 1-3 1-3 1-3 1-7 2-10 3-4 2-9 3-14 5-6 2-13 4-19 6-8 3-16 6-24 9-9 3-18 7-27 11-10 4-20 8-30 13-11 5-22 10-33 16-12 5-23 11-35 18-12 6-24 13-36 20-12 8-25 16-37 24-13 8-25 17-37 26-13 10-25 19-38 29-12 11-24 21-36 33-12 11-24 23-35 35-11 13-22 25-33 39-10 13-21 27-30 42-10 15-19 30-27 45-9 16-17 32-24 48z m-2 10c-1-4-2-8-3-11-1-10-3-19-5-29-2-12-5-25-7-37-3-13-5-26-8-39-1-10-3-20-5-30-1-5-2-10-3-15 0-1 0-1 0-2 1-3 2-5 3-8 3-9 7-19 10-29 4-12 9-25 13-37 4-11 8-22 11-33 2-5 4-11 6-16 0-1 1-2 1-2 1-3 2-5 4-7 4-9 8-18 13-27 6-12 11-23 17-35 6-11 11-22 17-33 3-7 7-14 11-21 0-2 1-3 1-4 1-1 2-1 2-2 5-6 9-11 14-17 8-9 15-18 22-27 9-10 17-20 26-30 7-9 15-18 22-27 5-6 10-11 15-17 0-1 1-2 2-3 0 0 0 0 0 0 1-1 2-1 3-2 7-4 14-9 21-14 10-7 21-14 31-22 11-7 21-14 31-20 6-4 12-9 18-13 3-2 7-5 10-8 10-8 19-16 29-24 7-5 13-11 20-17 1 0 1 0 1 1 1 1 2 2 3 3 4 4 8 8 12 13 6 6 12 13 18 20 8 8 16 17 23 25 9 10 18 19 26 29 9 9 18 19 27 29 9 9 18 19 26 28 8 9 16 17 23 26 6 6 13 13 19 20 4 4 7 8 11 12 1 2 3 3 4 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0-3 1-3 1-3 1-6 2-9 2-5 2-10 4-15 5-6 2-12 5-18 7-8 3-16 6-24 9-8 4-17 8-26 12-10 4-20 9-30 13-11 6-22 11-32 16-12 6-23 13-35 19-12 7-23 14-35 21-13 8-25 16-37 24-12 8-25 17-37 26-12 9-24 19-36 29-13 10-25 21-36 32-12 11-24 22-35 34-12 12-22 25-33 38-11 13-21 26-30 40-10 14-19 29-28 44-9 15-17 30-24 46-4 10-8 20-12 30z m696 21c-2 4-5 7-9 9-5 3-11 5-16 8-11 4-23 9-34 13-23 8-47 14-71 20-24 6-49 12-74 17-25 6-50 10-76 15-25 4-50 8-75 10-13 1-26 1-39 0-6-1-13-2-19-3-6-1-13-2-19-3-26-4-51-9-77-14-25-5-50-10-75-16-25-5-49-12-74-20-12-4-24-9-36-13-6-3-11-5-17-8-3-1-6-2-9-3-3-1-5-2-8-4-4-2-7-5-10-9-1-2-2-4-3-7-1-3-2-6-3-9-4-11-7-24-9-36-5-24-7-49-6-74 0-13 1-25 3-38 1-12 3-25 5-37 5-25 12-50 20-74 4-12 8-24 13-36 4-11 10-22 15-33 10-21 21-42 34-62 12-20 25-39 39-58 14-19 28-37 43-55 16-18 33-36 50-54 17-18 34-35 52-52 18-17 36-33 55-49 10-7 19-15 28-22 10-8 19-15 28-23 2-2 5-4 7-7 0 0 1-1 1-1 0 0 1 0 1 0 0 0 1 0 2 0 4 4 9 8 14 11 9 8 19 15 28 23 18 15 36 31 54 47 18 16 35 32 52 49 17 16 33 34 49 51 16 18 32 37 47 56 14 18 28 38 41 57 13 20 25 40 36 61 11 21 21 43 30 65 9 22 17 45 23 68 6 23 11 47 13 70 3 24 3 49 2 73 0 3-1 6-2 9 0 3-1 6-2 9-1 6-2 12-3 18-3 11-5 22-8 33-4 9-7 19-11 28-2 5 13-29 0 0z m-51-210c-7-25-15-49-26-73-9-22-19-44-30-64-12-21-24-40-37-59-13-19-27-38-42-56-15-18-31-36-47-54-17-18-34-36-52-53-18-17-37-34-56-50-9-7-19-15-28-23-1 0-2-1-2-1-1 0-2 0-2 0-1 0-2 1-2 1 0 0-1 1-1 1-2 1-3 3-4 4-4 3-9 7-14 11-2 1-4 3-7 5-2 2-4 4-6 6-5 4-9 8-14 13-9 8-18 17-27 25-10 9-18 18-27 27-4 4-8 9-13 13-4 4-8 9-12 13-17 17-33 35-49 53-15 18-30 37-44 57-14 20-27 40-38 61-12 21-23 42-32 64-10 22-18 45-25 67-2 6-4 12-5 19-1 6-2 12-3 19-2 13-4 26-4 39-1 13-2 26-1 39 0 12 1 25 3 37 0 4 0 7 1 10 0 1 0 3 0 5 1 1 1 3 1 4 0 3 1 5 2 7 0 2 0 3 0 4 0 1 1 2 2 3 1 0 2 1 3 2 0 0 1 0 1 1 1 0 2 0 3 1 3 1 6 2 9 3 6 2 12 5 18 7 23 8 47 16 72 23 12 3 24 6 37 9 6 1 12 2 18 4 7 1 13 2 19 4 26 5 51 9 77 13 13 1 26 3 39 5 3 0 7 1 10 1 1 1 3 1 4 1 2 0 3 0 4 0 6 0 12 0 17-1 1 0 2-1 4-1 1 0 3-1 4-1 3 0 6-1 9-1 7-1 13-2 19-3 13-2 25-4 38-6 25-4 51-8 76-13 25-6 50-12 75-19 12-4 24-8 37-12 6-2 12-4 18-6 3-1 6-2 9-3 1-1 3-1 4-2 1 0 1 0 2 0 1-1 2-1 2-1 2-2 3-2 4-4 1-1 1-1 1-2 0-1 0-2 0-2 1-1 1-2 1-3 2-6 3-13 4-19 1-7 2-13 3-20 0-3 0-6 0-9 0-1 0-2 0-2 0-1 0-2 0-3 1-1 1-3 1-5 5-23 7-48 5-72-1-13-3-26-6-38-8-29 8 35 0 0z m-197 0c-2 4-3 9-5 13 0 1 0 1 0 2-1 0 0 1-1 1 0 1 0 2 0 2 0 1-1 2-1 3-1 2-3 4-4 5-2 2-5 4-7 4 2 2 4 3 7 5 1 1 2 2 3 2 1 1 2 1 2 2 0 1 0 1 0 2 1 0 1 1 2 1 0 1 1 2 1 4 0 2 0 4 0 6 0 3 0 5 0 7 0 3 0 5-1 7-1 6-4 10-8 14-1 2-3 3-5 4-3 2-5 4-8 5-3 1-6 2-9 3-3 0-5 0-7 0-3 0-6 0-8 0-13 0-25 0-37 0-5 0-10 0-14 0-1 0-2 0-3 0 0 0 0-4 0-5 0-3 0-6 0-9 0-1 0-2 0-3 0-1 0-1 1-1 1 0 12 0 12 0 0-8 0-16 0-24 0-13 0-25 0-38 0-4 0-7 0-11 0 0 0-1 0-1-3 0-5 0-8 0-1 0-2 0-4 0 0 0-1 0-1-1 0-2 0-4 0-6 0-1 0-14 0-14 10 0 19 0 29 0 5 0 11 0 16 0 1 0 3 0 4 0 0 0 0 3 0 3 0 6 0 11 0 17 0 1 0 1-1 1-1 0-2 0-4 0-1 0-3 0-4 0 0 0-1-1-1 0 0 5 0 10 0 15 0 2 0 5 0 8 0 1 0 1 0 2 0 0 0 0 1 0 2 0 5 0 8 0 2 0 4 0 6 0 1 0 3 0 4 0 1 0 2-1 3-2 1-1 2-2 3-3 0-1 0-1 0-2 0-2 1-3 1-4 1-1 1-2 2-3 0-1 0-1 0-1 0-1 0-2 0-2 1-6 2-12 3-17 1-3 1-5 2-8 0 0 0-1 0-1 0 0 0 0 0 0 11 0 21 0 32 0 0 0 1 0 1 0 0 0 0 0 0 0 0 3 0 5 0 8 0 5 0 10 0 15 0 0 0 0 0 0-1-2-1-4-2-5z m-26 53c0-2-3-3-4-4-1 0-1-1-1-1 0 0-1 0-1 0 0 0-1 0-1 0-1-1-1-2-2-2-1 0-2 0-3 0-2 0-4 0-5 0-1 0-2 0-2 0-3 0-7 0-10 0 0 0-4 0-4 0 0 9 0 19 0 28 0 0 13 0 14 0 4 0 8 0 12-1 1 0 3-1 4-2 1 0 2-1 3-2 1-2 2-4 3-6 0-1 0-1 0-2-1-1-1-1-1-2-1-1-1-1-1-2-1-1-1-2-1-4z m131-53c0 9 0 18 0 27 0 9-2 18-8 24-7 7-19 8-28 7-2 0-4 0-6-1-1 0-1-1-2-2-1 0-2 0-2-1-3-1-6-3-8-6 0 9 0 18 0 27 0 6 0 12 0 18 0 2 0 3 0 5 0 1 0 1 0 1-11 0-22 0-32 0-1 0-3 0-4 0 0 0 0-4 0-4 0-5 0-11 0-16 0 0 1 0 1 0 1 0 3 0 4 0 3 0 5 0 8 0 0 0 0-5 0-6 0-11 0-23 0-34 0-11 0-22 0-33 0-1 0-2 0-3 0-1 0-1-1-1-3 0-6 0-9 0-1 0-2 0-3 0 0 0 0-1 0-1 0-6 0-11 0-17 0-1 0-1 0-2 0 0 0 0 0 0 2 0 3 0 4 0 12 0 24 0 36 0 0 0 9 0 9 0 0 5 0 10 0 15 0 1 0 3 0 5 0 0-6 0-7 0 0 0-6 0-6 0 0 1 0 3 0 4 0 6 0 12 0 18 0 3 0 5 0 7 0 1 0 1 0 2 0 0 1 1 2 2 1 1 2 2 3 2 1 1 1 1 2 1 1 0 1 0 1 1 2 1 3 1 4 1 3 1 5 0 7-1 1-1 2-2 3-3 1-1 2-2 2-3 1-2 1-4 1-6 0-3 0-7 0-11 0-11 0-22 0-33 0-1 0-2 1-2 1 0 3 0 5 0 6 0 12 0 19 0 3 0 7 0 11 0 0 0 0 14 0 15 0 2 0 4 0 6-2-1-5-2-7-2z m7 122c-2 0-5 0-7 0-1 0-2 0-3 0 0 0 0 0 0 0-3-5-7-10-10-14-1-2-3-5-4-7 0 0-1-1-1-2 0 0 0-1 0-1 0-1 0-4 0-4 0 0 1 0 2 0 3 0 5 0 8 0 3 0 5 0 8 0 0 0 0-1 0-1 0-1 0-3 0-4 0-2 0-3 0-4 0-1 0-1 1-1 1 0 3 0 4 0 1 0 2 0 2 0 0 3 0 6 0 8 0 1 0 2 1 2 1 0 2 0 4 0 0 0 0 0 0 0 0 1 0 1 0 2 0 0 0 3 0 3-1 0-2 0-3 0-1 0-2 0-2 1 0 7 0 15 0 22z m-7-15c0-1 0-2 0-4 0-1 0-1 0-2 0 0 0-1 0-2 0 0-1 0-1 0-1 0-2 0-3 0-1 0-3 0-4 0 1 2 3 4 4 6 1 1 1 2 2 3 1 2 2 4 2 7 0-3 0-5 0-8z m41-2c-3 2-8 2-11 2-1 0-2 0-2 0 0 0 0 1 0 1 0 2 0 3 0 4 0 0 13 0 14 0 1 0 1 0 1 1 0 1 0 2 0 4 0 1 0 2 0 3 0 0-1 0-1 0-6 0-11 0-17 0-1 0-1 0-2 0 0 0 0-1 0-1-1-2-1-4-1-6-1-5-1-9-2-14 4 0 9 1 12-1 3-1 4-4 4-7-1-4-5-4-7-4-2 0-9-1-9 2-1-2-1-5-2-8 1 0 3-1 5-1 2-1 5-1 7-1 4 0 8 2 11 5 2 3 2 7 2 11 0 2 0 5 0 7 0 1-1 2-2 3 0 0 0 0 0 0-3 2 2 0 0 0z" horiz-adv-x="1000" />
+
+<glyph glyph-name="up" unicode="&#xe832;" d="M687 254l-173 217c-8 9-22 9-29 0l-173-217c-9-12-1-29 15-29h345c16 0 24 17 15 29z" horiz-adv-x="1000" />
 
-<glyph glyph-name="plus" unicode="&#xe81d;" d="M917 291v116c0 14-12 24-24 24h-283c-15 0-24 12-24 24v288c0 14-12 24-24 24h-117c-14 0-24-12-24-24v-283c0-15-11-24-23-24h-291c-14 0-24-12-24-24v-117c0-14 12-23 24-23h283c15 0 24-12 24-24v-284c0-14 12-23 24-23h117c14 0 24 11 24 23v279c0 14 11 24 23 24h284c19 0 31 12 31 24z" horiz-adv-x="1000" />
+<glyph glyph-name="merge" unicode="&#xe833;" d="M200 110c0-72 58-131 130-131s130 59 130 131c0 45-24 86-60 109 18 139 133 179 202 190v-301c-38-23-65-64-65-112 0-72 59-130 130-130s130 58 130 130c0 48-26 89-65 112v487c39 23 65 64 65 112 0 72-58 130-130 130s-130-58-130-130c0-48 27-89 65-112v-55c-60-8-162-32-238-108-54-54-86-124-94-208-42-22-70-65-70-114z m468-158c-24 0-44 20-44 43s20 44 44 44c24 0 43-20 43-44s-19-43-43-43z m0 798c24 0 43-19 43-43s-20-43-43-43c-24 0-44 19-44 43s20 43 44 43z m-338-684c-24 0-43 20-43 43s19 44 43 44c24 0 43-20 43-44s-19-43-43-43z" horiz-adv-x="1000" />
 
-<glyph glyph-name="remove" unicode="&#xe81e;" d="M836 602l-84 84c-9 9-26 9-35 0l-200-200c-10-10-26-10-36 0l-200 200c-9 9-26 9-36 0l-83-84c-9-9-9-26 0-35l200-200c10-10 10-26 0-36l-200-200c-9-9-9-26 0-36l83-83c10-9 27-9 36 0l200 200c10 10 26 10 36 0l200-200c9-9 26-9 35 0l84 83c9 10 9 27 0 36l-200 200c-10 10-10 26 0 36l200 200c9 12 9 26 0 35z" horiz-adv-x="1000" />
+<glyph glyph-name="spin-alt" unicode="&#xe834;" d="M498 850c-114 0-228-39-320-116l0 0c173 140 428 130 588-31 134-134 164-332 89-495-10-29-5-50 12-68 21-20 61-23 84 0 3 3 12 15 15 24 71 180 33 393-112 539-99 98-228 147-356 147z m-409-274c-14 0-29-5-39-16-3-3-13-15-15-24-71-180-34-393 112-539 185-185 479-195 676-31l0 0c-173-140-428-130-589 31-134 134-163 333-89 495 11 29 6 50-12 68-11 11-27 17-44 16z" horiz-adv-x="1001" />
+
+<glyph glyph-name="spin" unicode="&#xe838;" d="M462 850c-6 0-11-5-11-11l0-183 0 0c0-6 5-11 11-11l69 0c1 0 1 0 1 0 7 0 12 5 12 11l0 183 0 0c0 6-5 11-12 11l-69 0c0 0 0 0-1 0z m250-47c-4 1-8-2-10-5l-91-158 0 0c-4-6-2-13 4-16l60-34c0-1 0-1 0-1 6-3 13-1 16 4l91 158c3 6 2 13-4 16l-61 35c-1 1-3 1-5 1z m-428-2c-2 0-4-1-6-2l-61-35c-5-3-7-10-4-16l91-157c0 0 0 0 0 0 3-6 10-8 16-5l61 35c5 4 7 11 4 16l-91 157c0 1 0 1 0 1-2 4-6 6-10 6z m620-163c-2 0-4 0-6-1l-157-91c0 0 0 0 0 0-6-3-8-10-5-16l35-61c4-5 11-7 16-4l157 91c1 0 1 0 1 0 6 3 7 11 4 16l-35 61c-2 4-6 6-10 5z m-810-4c-5 0-9-2-11-6l-35-61c-3-5-1-12 4-15l158-91 0 0c6-4 13-2 16 4l35 60c0 0 0 0 0 0 3 6 1 13-4 16l-158 91c-2 1-4 2-5 2z m712-235l0 0c-6 0-11-5-11-11l0-69c0-1 0-1 0-1 0-7 5-12 11-12l183 0 0 0c6 0 11 5 11 12l0 69c0 0 0 0 0 1 0 6-5 11-11 11l-183 0z m-794-5l0 0c-7 0-12-5-12-12l0-69c0 0 0 0 0-1 0-6 5-11 12-11l182 0 0 0c6 0 11 5 11 11l0 69c0 1 0 1 0 1 0 7-5 12-11 12l-182 0z m772-153c-4 0-8-2-10-6l-34-60c-1 0-1 0-1 0-3-6-1-13 4-16l158-91c6-3 13-1 16 4l35 61c3 5 1 12-4 15l-158 92 0 0c-2 1-4 1-6 1z m-566-5c-1 0-3 0-5-1l-157-91c0 0-1 0-1 0-5-3-7-10-4-16l35-61c3-5 10-7 16-4l157 91c0 0 0 0 0 0 6 3 8 10 5 16l-35 61c-3 3-7 6-11 5z m468-121c-2 0-4 0-6-1l-61-35c-5-4-7-11-4-16l91-157c0-1 0-1 0-1 3-6 11-7 16-4l61 35c5 3 7 10 4 16l-91 157c0 0 0 0 0 0-2 4-6 6-10 6z m-367-2c-4 0-8-2-10-6l-91-158c-3-6-1-13 4-16l61-35c5-3 12-1 15 4l92 158 0 0c3 6 1 13-5 16l-60 35c0 0 0 0 0 0-2 1-4 1-6 2z m149-58c-7 0-12-5-12-11l0-183 0 0c0-6 5-11 12-11l69 0c0 0 0 0 1 0 6 0 11 5 11 11l0 183 0 0c0 6-5 11-11 11l-69 0c-1 0-1 0-1 0z" horiz-adv-x="1000" />
 
-<glyph glyph-name="rhodecode" unicode="&#xe81f;" d="M175 633c-2-4-3-8-4-12-3-10-6-20-9-30-3-13-7-25-11-38-3-11-6-23-10-35-2-7-4-15-6-22-1-1-1-2-1-4 0 0 0 0 0 0 0-1 1-2 1-2 2-7 5-14 7-21 4-11 8-22 12-33 4-12 9-25 13-37 4-11 8-23 12-34 3-7 5-14 7-21 1-1 1-2 2-3 0-1 1-1 1-2 4-6 8-12 11-17 7-10 13-19 19-29 7-11 14-22 22-33 6-10 13-21 20-31 5-7 9-15 14-22 1-2 3-4 4-5 0-1 1-1 1-2 3-3 6-5 8-8 7-6 13-12 19-19 9-8 17-16 25-24 10-10 19-19 29-28 9-9 18-18 27-27 8-8 16-15 23-23 5-5 11-10 16-15 1-1 3-3 5-5 7-5 14-10 21-15 11-8 21-15 31-23 4-2 7-5 11-7 0-1 1-2 2-2 0 0 0-1 1 0 7 3 14 7 21 11 11 6 23 11 34 17 6 4 12 7 19 10 0 0 0 1 1 1 1 2 2 3 3 5 4 5 8 10 13 15 6 8 12 16 18 24 8 9 15 19 23 28 8 11 16 21 24 31 8 11 16 21 24 31 8 10 15 19 23 28 6 8 12 16 18 24 4 5 8 10 12 15 2 2 3 3 4 5 0 0 0 0 0 0-1 1-2 1-3 1-3 0-6 1-9 2-5 1-10 2-15 3-6 2-13 4-20 5-8 3-16 5-24 7-9 3-19 6-28 9-10 3-21 7-31 11-12 4-23 8-34 13-12 5-24 10-36 15-13 6-26 12-38 18-13 7-26 14-39 21-13 7-27 15-39 23-14 9-27 17-40 27-13 9-26 19-39 29-13 11-25 22-37 33-13 11-25 23-36 36-12 13-23 26-34 40-11 14-21 28-31 43-9 15-19 31-27 47 0 1 0 1 0 1z m-3 3c-1-5-3-9-4-14-3-10-7-21-10-32-4-12-8-25-12-37-3-10-6-20-9-30-1-3-2-6-3-8 0-1 0-2 0-2 1-5 3-10 5-15 3-10 6-20 10-30 4-12 8-24 12-37 4-12 8-24 12-36 3-9 6-18 9-26 1-3 1-5 2-8 0 0 1-1 1-2 2-4 5-8 7-12 5-10 10-19 15-28 6-11 12-23 19-34 6-11 12-22 18-33 4-8 8-15 12-23 1-2 2-4 4-6 4-5 8-9 13-14 7-8 15-16 23-24 9-10 18-20 26-29 9-9 17-18 25-26 5-6 10-11 15-17 2-1 3-3 5-5 5-5 11-11 17-17 9-8 17-17 26-26 9-9 18-18 27-27 7-7 14-14 21-21 2-2 3-3 5-5 0 0 1-1 1-1 0 0 1 0 1 0 11 2 22 3 32 5 9 1 17 2 26 3 0 0 1 1 1 1 1 1 2 3 4 4 4 5 9 10 13 15 7 8 14 15 20 22 9 9 17 18 25 27 9 10 18 20 27 30 8 9 17 19 26 29 8 9 16 17 24 26 7 7 13 15 20 22 4 5 8 9 13 14 1 1 2 2 3 3 0 1 1 1 1 1 0 1-3 1-3 1-3 1-7 2-10 3-4 2-9 3-14 5-6 2-13 4-19 6-8 3-16 6-24 9-9 3-18 7-27 11-10 4-20 8-30 13-11 5-22 10-33 16-12 5-23 11-35 18-12 6-24 13-36 20-12 8-25 16-37 24-13 8-25 17-37 26-13 10-25 19-38 29-12 11-24 21-36 33-12 11-24 23-35 35-11 13-22 25-33 39-10 13-21 27-30 42-10 15-19 30-27 45-9 16-17 32-24 48z m-2 10c-1-4-2-8-3-11-1-10-3-19-5-29-2-12-5-25-7-37-3-13-5-26-8-39-1-10-3-20-5-30-1-5-2-10-3-15 0-1 0-1 0-2 1-3 2-5 3-8 3-9 7-19 10-29 4-12 9-25 13-37 4-11 8-22 11-33 2-5 4-11 6-16 0-1 1-2 1-2 1-3 2-5 4-7 4-9 8-18 13-27 6-12 11-23 17-35 6-11 11-22 17-33 3-7 7-14 11-21 0-2 1-3 1-4 1-1 2-1 2-2 5-6 9-11 14-17 8-9 15-18 22-27 9-10 17-20 26-30 7-9 15-18 22-27 5-6 10-11 15-17 0-1 1-2 2-3 0 0 0 0 0 0 1-1 2-1 3-2 7-4 14-9 21-14 10-7 21-14 31-22 11-7 21-14 31-20 6-4 12-9 18-13 3-2 7-5 10-8 10-8 19-16 29-24 7-5 13-11 20-17 1 0 1 0 1 1 1 1 2 2 3 3 4 4 8 8 12 13 6 6 12 13 18 20 8 8 16 17 23 25 9 10 18 19 26 29 9 9 18 19 27 29 9 9 18 19 26 28 8 9 16 17 23 26 6 6 13 13 19 20 4 4 7 8 11 12 1 2 3 3 4 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0-3 1-3 1-3 1-6 2-9 2-5 2-10 4-15 5-6 2-12 5-18 7-8 3-16 6-24 9-8 4-17 8-26 12-10 4-20 9-30 13-11 6-22 11-32 16-12 6-23 13-35 19-12 7-23 14-35 21-13 8-25 16-37 24-12 8-25 17-37 26-12 9-24 19-36 29-13 10-25 21-36 32-12 11-24 22-35 34-12 12-22 25-33 38-11 13-21 26-30 40-10 14-19 29-28 44-9 15-17 30-24 46-4 10-8 20-12 30z m696 21c-2 4-5 7-9 9-5 3-11 5-16 8-11 4-23 9-34 13-23 8-47 14-71 20-24 6-49 12-74 17-25 6-50 10-76 15-25 4-50 8-75 10-13 1-26 1-39 0-6-1-13-2-19-3-6-1-13-2-19-3-26-4-51-9-77-14-25-5-50-10-75-16-25-5-49-12-74-20-12-4-24-9-36-13-6-3-11-5-17-8-3-1-6-2-9-3-3-1-5-2-8-4-4-2-7-5-10-9-1-2-2-4-3-7-1-3-2-6-3-9-4-11-7-24-9-36-5-24-7-49-6-74 0-13 1-25 3-38 1-12 3-25 5-37 5-25 12-50 20-74 4-12 8-24 13-36 4-11 10-22 15-33 10-21 21-42 34-62 12-20 25-39 39-58 14-19 28-37 43-55 16-18 33-36 50-54 17-18 34-35 52-52 18-17 36-33 55-49 10-7 19-15 28-22 10-8 19-15 28-23 2-2 5-4 7-7 0 0 1-1 1-1 0 0 1 0 1 0 0 0 1 0 2 0 4 4 9 8 14 11 9 8 19 15 28 23 18 15 36 31 54 47 18 16 35 32 52 49 17 16 33 34 49 51 16 18 32 37 47 56 14 18 28 38 41 57 13 20 25 40 36 61 11 21 21 43 30 65 9 22 17 45 23 68 6 23 11 47 13 70 3 24 3 49 2 73 0 3-1 6-2 9 0 3-1 6-2 9-1 6-2 12-3 18-3 11-5 22-8 33-4 9-7 19-11 28-2 5 13-29 0 0z m-51-210c-7-25-15-49-26-73-9-22-19-44-30-64-12-21-24-40-37-59-13-19-27-38-42-56-15-18-31-36-47-54-17-18-34-36-52-53-18-17-37-34-56-50-9-7-19-15-28-23-1 0-2-1-2-1-1 0-2 0-2 0-1 0-2 1-2 1 0 0-1 1-1 1-2 1-3 3-4 4-4 3-9 7-14 11-2 1-4 3-7 5-2 2-4 4-6 6-5 4-9 8-14 13-9 8-18 17-27 25-10 9-18 18-27 27-4 4-8 9-13 13-4 4-8 9-12 13-17 17-33 35-49 53-15 18-30 37-44 57-14 20-27 40-38 61-12 21-23 42-32 64-10 22-18 45-25 67-2 6-4 12-5 19-1 6-2 12-3 19-2 13-4 26-4 39-1 13-2 26-1 39 0 12 1 25 3 37 0 4 0 7 1 10 0 1 0 3 0 5 1 1 1 3 1 4 0 3 1 5 2 7 0 2 0 3 0 4 0 1 1 2 2 3 1 0 2 1 3 2 0 0 1 0 1 1 1 0 2 0 3 1 3 1 6 2 9 3 6 2 12 5 18 7 23 8 47 16 72 23 12 3 24 6 37 9 6 1 12 2 18 4 7 1 13 2 19 4 26 5 51 9 77 13 13 1 26 3 39 5 3 0 7 1 10 1 1 1 3 1 4 1 2 0 3 0 4 0 6 0 12 0 17-1 1 0 2-1 4-1 1 0 3-1 4-1 3 0 6-1 9-1 7-1 13-2 19-3 13-2 25-4 38-6 25-4 51-8 76-13 25-6 50-12 75-19 12-4 24-8 37-12 6-2 12-4 18-6 3-1 6-2 9-3 1-1 3-1 4-2 1 0 1 0 2 0 1-1 2-1 2-1 2-2 3-2 4-4 1-1 1-1 1-2 0-1 0-2 0-2 1-1 1-2 1-3 2-6 3-13 4-19 1-7 2-13 3-20 0-3 0-6 0-9 0-1 0-2 0-2 0-1 0-2 0-3 1-1 1-3 1-5 5-23 7-48 5-72-1-13-3-26-6-38-8-29 8 35 0 0z m-197 0c-2 4-3 9-5 13 0 1 0 1 0 2-1 0 0 1-1 1 0 1 0 2 0 2 0 1-1 2-1 3-1 2-3 4-4 5-2 2-5 4-7 4 2 2 4 3 7 5 1 1 2 2 3 2 1 1 2 1 2 2 0 1 0 1 0 2 1 0 1 1 2 1 0 1 1 2 1 4 0 2 0 4 0 6 0 3 0 5 0 7 0 3 0 5-1 7-1 6-4 10-8 14-1 2-3 3-5 4-3 2-5 4-8 5-3 1-6 2-9 3-3 0-5 0-7 0-3 0-6 0-8 0-13 0-25 0-37 0-5 0-10 0-14 0-1 0-2 0-3 0 0 0 0-4 0-5 0-3 0-6 0-9 0-1 0-2 0-3 0-1 0-1 1-1 1 0 12 0 12 0 0-8 0-16 0-24 0-13 0-25 0-38 0-4 0-7 0-11 0 0 0-1 0-1-3 0-5 0-8 0-1 0-2 0-4 0 0 0-1 0-1-1 0-2 0-4 0-6 0-1 0-14 0-14 10 0 19 0 29 0 5 0 11 0 16 0 1 0 3 0 4 0 0 0 0 3 0 3 0 6 0 11 0 17 0 1 0 1-1 1-1 0-2 0-4 0-1 0-3 0-4 0 0 0-1-1-1 0 0 5 0 10 0 15 0 2 0 5 0 8 0 1 0 1 0 2 0 0 0 0 1 0 2 0 5 0 8 0 2 0 4 0 6 0 1 0 3 0 4 0 1 0 2-1 3-2 1-1 2-2 3-3 0-1 0-1 0-2 0-2 1-3 1-4 1-1 1-2 2-3 0-1 0-1 0-1 0-1 0-2 0-2 1-6 2-12 3-17 1-3 1-5 2-8 0 0 0-1 0-1 0 0 0 0 0 0 11 0 21 0 32 0 0 0 1 0 1 0 0 0 0 0 0 0 0 3 0 5 0 8 0 5 0 10 0 15 0 0 0 0 0 0-1-2-1-4-2-5z m-26 53c0-2-3-3-4-4-1 0-1-1-1-1 0 0-1 0-1 0 0 0-1 0-1 0-1-1-1-2-2-2-1 0-2 0-3 0-2 0-4 0-5 0-1 0-2 0-2 0-3 0-7 0-10 0 0 0-4 0-4 0 0 9 0 19 0 28 0 0 13 0 14 0 4 0 8 0 12-1 1 0 3-1 4-2 1 0 2-1 3-2 1-2 2-4 3-6 0-1 0-1 0-2-1-1-1-1-1-2-1-1-1-1-1-2-1-1-1-2-1-4z m131-53c0 9 0 18 0 27 0 9-2 18-8 24-7 7-19 8-28 7-2 0-4 0-6-1-1 0-1-1-2-2-1 0-2 0-2-1-3-1-6-3-8-6 0 9 0 18 0 27 0 6 0 12 0 18 0 2 0 3 0 5 0 1 0 1 0 1-11 0-22 0-32 0-1 0-3 0-4 0 0 0 0-4 0-4 0-5 0-11 0-16 0 0 1 0 1 0 1 0 3 0 4 0 3 0 5 0 8 0 0 0 0-5 0-6 0-11 0-23 0-34 0-11 0-22 0-33 0-1 0-2 0-3 0-1 0-1-1-1-3 0-6 0-9 0-1 0-2 0-3 0 0 0 0-1 0-1 0-6 0-11 0-17 0-1 0-1 0-2 0 0 0 0 0 0 2 0 3 0 4 0 12 0 24 0 36 0 0 0 9 0 9 0 0 5 0 10 0 15 0 1 0 3 0 5 0 0-6 0-7 0 0 0-6 0-6 0 0 1 0 3 0 4 0 6 0 12 0 18 0 3 0 5 0 7 0 1 0 1 0 2 0 0 1 1 2 2 1 1 2 2 3 2 1 1 1 1 2 1 1 0 1 0 1 1 2 1 3 1 4 1 3 1 5 0 7-1 1-1 2-2 3-3 1-1 2-2 2-3 1-2 1-4 1-6 0-3 0-7 0-11 0-11 0-22 0-33 0-1 0-2 1-2 1 0 3 0 5 0 6 0 12 0 19 0 3 0 7 0 11 0 0 0 0 14 0 15 0 2 0 4 0 6-2-1-5-2-7-2z m7 122c-2 0-5 0-7 0-1 0-2 0-3 0 0 0 0 0 0 0-3-5-7-10-10-14-1-2-3-5-4-7 0 0-1-1-1-2 0 0 0-1 0-1 0-1 0-4 0-4 0 0 1 0 2 0 3 0 5 0 8 0 3 0 5 0 8 0 0 0 0-1 0-1 0-1 0-3 0-4 0-2 0-3 0-4 0-1 0-1 1-1 1 0 3 0 4 0 1 0 2 0 2 0 0 3 0 6 0 8 0 1 0 2 1 2 1 0 2 0 4 0 0 0 0 0 0 0 0 1 0 1 0 2 0 0 0 3 0 3-1 0-2 0-3 0-1 0-2 0-2 1 0 7 0 15 0 22z m-7-15c0-1 0-2 0-4 0-1 0-1 0-2 0 0 0-1 0-2 0 0-1 0-1 0-1 0-2 0-3 0-1 0-3 0-4 0 1 2 3 4 4 6 1 1 1 2 2 3 1 2 2 4 2 7 0-3 0-5 0-8z m41-2c-3 2-8 2-11 2-1 0-2 0-2 0 0 0 0 1 0 1 0 2 0 3 0 4 0 0 13 0 14 0 1 0 1 0 1 1 0 1 0 2 0 4 0 1 0 2 0 3 0 0-1 0-1 0-6 0-11 0-17 0-1 0-1 0-2 0 0 0 0-1 0-1-1-2-1-4-1-6-1-5-1-9-2-14 4 0 9 1 12-1 3-1 4-4 4-7-1-4-5-4-7-4-2 0-9-1-9 2-1-2-1-5-2-8 1 0 3-1 5-1 2-1 5-1 7-1 4 0 8 2 11 5 2 3 2 7 2 11 0 2 0 5 0 7 0 1-1 2-2 3 0 0 0 0 0 0-3 2 2 0 0 0z" horiz-adv-x="1000" />
+<glyph glyph-name="docs" unicode="&#xf0c5;" d="M946 636q23 0 38-16t16-38v-678q0-23-16-38t-38-16h-535q-23 0-38 16t-16 38v160h-303q-23 0-38 16t-16 38v375q0 22 11 49t27 42l228 228q15 16 42 27t49 11h232q23 0 38-16t16-38v-183q38 23 71 23h232z m-303-119l-167-167h167v167z m-357 214l-167-167h167v167z m109-361l176 176v233h-214v-233q0-22-15-37t-38-16h-233v-357h286v143q0 22 11 49t27 42z m534-449v643h-215v-232q0-22-15-38t-38-15h-232v-358h500z" horiz-adv-x="1000" />
+
+<glyph glyph-name="menu" unicode="&#xf0c9;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="svn-inv" unicode="&#xe820;" d="M933 841h-852c-36 0-65-29-65-65v-853c0-36 29-65 65-65h852c36 0 66 29 66 65v853c0 36-30 65-66 65z m-765-438c3-4 7-7 13-10 5-3 11-6 18-8 7-3 14-5 21-8 7-3 14-6 21-10 7-4 13-9 18-14 5-6 10-13 13-20 3-8 5-18 5-29 0-16-3-30-8-44-6-14-14-26-24-37-10-10-22-18-37-24-15-7-31-10-49-10-9 0-18 1-27 3s-18 5-27 9c-8 4-16 8-23 13-7 5-13 10-18 17l25 32c2 3 4 5 7 6 3 2 6 3 9 3 4 0 8-2 12-4 3-3 8-6 12-10 5-3 10-6 16-9 6-3 14-4 23-4 13 0 23 3 30 10 7 7 10 18 10 32 0 6-1 12-4 16-4 4-8 7-13 10-5 3-11 6-18 8-7 2-14 5-21 7-7 3-14 6-21 9-6 4-12 8-18 14-5 6-9 13-12 21-3 8-5 18-5 30 0 14 3 28 8 40 5 13 12 25 22 35 10 9 22 17 36 23 14 6 29 9 47 9 9 0 17-1 26-3s16-4 23-8c7-3 14-7 20-11 6-5 11-10 15-15l-21-29c-2-3-5-6-7-7-3-2-6-3-9-3-3 0-7 1-10 3-3 3-7 5-11 8-4 2-9 4-14 7-5 2-12 3-19 3-6 0-12-1-17-3-5-2-9-4-12-8-4-3-6-7-8-11-1-5-2-10-2-15 0-5 2-10 5-14z m312-210h-64l-77 313h57c6 0 10-1 14-4 4-3 6-6 7-11l32-173c2-7 4-14 6-23 1-8 3-17 4-26 3 9 6 18 9 26 4 9 7 16 11 23l73 173c1 2 2 4 4 6 2 2 4 3 6 5 2 1 4 2 7 3 3 1 5 1 8 1h57l-154-313z m423 0h-37c-5 0-10 1-13 2-4 2-7 5-10 9l-109 194c-1-4-1-8-1-12-1-4-1-7-1-10l-22-183h-62l39 313h37c3 0 6 0 8 0 2 0 4-1 5-1 2-1 3-2 4-4s3-3 5-5l110-194c0 5 0 10 1 14 0 5 1 9 1 13l21 177h62l-38-313z" horiz-adv-x="1000" />
+<glyph glyph-name="paste" unicode="&#xf0ea;" d="M429-79h500v358h-233q-22 0-37 15t-16 38v232h-214v-643z m142 804v36q0 7-5 12t-12 6h-393q-7 0-13-6t-5-12v-36q0-7 5-13t13-5h393q7 0 12 5t5 13z m143-375h167l-167 167v-167z m286-71v-375q0-23-16-38t-38-16h-535q-23 0-38 16t-16 38v89h-303q-23 0-38 16t-16 37v750q0 23 16 38t38 16h607q22 0 38-16t15-38v-183q12-7 20-15l228-228q16-15 27-42t11-49z" horiz-adv-x="1000" />
+
+<glyph glyph-name="doc-text" unicode="&#xf0f6;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z m-572 483q0 7 5 12t13 5h393q8 0 13-5t5-12v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36z m411-125q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z m0-143q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="tag" unicode="&#xe821;" d="M450 791l-371 11c-17 0-31-14-31-31l12-369c0-7 2-16 9-21l471-471c12-12 31-12 46 0l359 359c12 12 12 31 0 45l-474 467c-7 7-14 10-21 10z m-86-222c0-45-38-83-83-83s-83 38-83 83 38 83 83 83 83-38 83-83z" horiz-adv-x="1000" />
+<glyph glyph-name="plus-squared" unicode="&#xf0fe;" d="M714 314v72q0 14-10 25t-25 10h-179v179q0 15-11 25t-25 11h-71q-15 0-25-11t-11-25v-179h-178q-15 0-25-10t-11-25v-72q0-14 11-25t25-10h178v-179q0-14 11-25t25-11h71q15 0 25 11t11 25v179h179q14 0 25 10t10 25z m143 304v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="folder-empty" unicode="&#xf114;" d="M857 118v393q0 22-15 38t-38 15h-393q-23 0-38 16t-16 38v36q0 22-15 38t-38 15h-179q-22 0-38-15t-16-38v-536q0-22 16-38t38-16h679q22 0 38 16t15 38z m72 393v-393q0-51-37-88t-88-37h-679q-51 0-88 37t-37 88v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h375q51 0 88-37t37-88z" horiz-adv-x="928.6" />
 
-<glyph glyph-name="copy" unicode="&#xf0c5;" d="M946 636q23 0 38-16t16-38v-678q0-23-16-38t-38-16h-535q-23 0-38 16t-16 38v160h-303q-23 0-38 16t-16 38v375q0 22 11 49t27 42l228 228q15 16 42 27t49 11h232q23 0 38-16t16-38v-183q38 23 71 23h232z m-303-119l-167-167h167v167z m-357 214l-167-167h167v167z m109-361l176 176v233h-214v-233q0-22-15-37t-38-16h-233v-357h286v143q0 22 11 49t27 42z m534-449v643h-215v-232q0-22-15-38t-38-15h-232v-358h500z" horiz-adv-x="1000" />
+<glyph glyph-name="folder-open-empty" unicode="&#xf115;" d="M994 331q0 19-30 19h-607q-22 0-48-12t-39-29l-164-203q-11-13-11-22 0-20 30-20h607q23 0 48 13t40 29l164 203q10 12 10 22z m-637 90h429v90q0 22-16 38t-38 15h-321q-23 0-38 16t-16 38v36q0 22-15 38t-38 15h-179q-22 0-38-15t-16-38v-476l143 175q25 30 65 49t78 19z m708-90q0-35-25-67l-165-203q-24-30-65-49t-78-19h-607q-51 0-88 37t-37 88v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h303q52 0 88-37t37-88v-90h107q30 0 56-13t37-40q8-17 8-37z" horiz-adv-x="1071.4" />
+
+<glyph glyph-name="minus-squared" unicode="&#xf146;" d="M714 314v72q0 14-10 25t-25 10h-500q-15 0-25-10t-11-25v-72q0-14 11-25t25-10h500q14 0 25 10t10 25z m143 304v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="file-text" unicode="&#xf0f6;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z m-572 483q0 7 5 12t13 5h393q8 0 13-5t5-12v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36z m411-125q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z m0-143q8 0 13-5t5-13v-36q0-8-5-13t-13-5h-393q-8 0-13 5t-5 13v36q0 8 5 13t13 5h393z" horiz-adv-x="857.1" />
+<glyph glyph-name="minus-squared-alt" unicode="&#xf147;" d="M643 404v-36q0-8-5-13t-13-5h-464q-8 0-13 5t-5 13v36q0 7 5 12t13 5h464q8 0 13-5t5-12z m71-250v464q0 37-26 63t-63 26h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63z m72 464v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
+
+<glyph glyph-name="doc-inv" unicode="&#xf15b;" d="M571 564v264q13-8 21-16l227-228q8-7 16-20h-264z m-71-18q0-22 16-37t38-16h303v-589q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h446v-304z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="directory-empty" unicode="&#xf114;" d="M857 118v393q0 22-15 38t-38 15h-393q-23 0-38 16t-16 38v36q0 22-15 38t-38 15h-179q-22 0-38-15t-16-38v-536q0-22 16-38t38-16h679q22 0 38 16t15 38z m72 393v-393q0-51-37-88t-88-37h-679q-51 0-88 37t-37 88v536q0 51 37 88t88 37h179q51 0 88-37t37-88v-18h375q51 0 88-37t37-88z" horiz-adv-x="928.6" />
+<glyph glyph-name="doc-text-inv" unicode="&#xf15c;" d="M819 584q8-7 16-20h-264v264q13-8 21-16z m-265-91h303v-589q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h446v-304q0-22 16-37t38-16z m89-411v36q0 8-5 13t-13 5h-393q-8 0-13-5t-5-13v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z m0 143v36q0 8-5 13t-13 5h-393q-8 0-13-5t-5-13v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z m0 143v36q0 7-5 12t-13 5h-393q-8 0-13-5t-5-12v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z" horiz-adv-x="857.1" />
 
-<glyph glyph-name="file-text-inv" unicode="&#xf15c;" d="M819 584q8-7 16-20h-264v264q13-8 21-16z m-265-91h303v-589q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h446v-304q0-22 16-37t38-16z m89-411v36q0 8-5 13t-13 5h-393q-8 0-13-5t-5-13v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z m0 143v36q0 8-5 13t-13 5h-393q-8 0-13-5t-5-13v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z m0 143v36q0 7-5 12t-13 5h-393q-8 0-13-5t-5-12v-36q0-8 5-13t13-5h393q8 0 13 5t5 13z" horiz-adv-x="857.1" />
+<glyph glyph-name="plus-squared-alt" unicode="&#xf196;" d="M643 404v-36q0-8-5-13t-13-5h-196v-196q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v196h-196q-8 0-13 5t-5 13v36q0 7 5 12t13 5h196v197q0 8 5 13t13 5h36q8 0 13-5t5-13v-197h196q8 0 13-5t5-12z m71-250v464q0 37-26 63t-63 26h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63z m72 464v-464q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q66 0 114-48t47-113z" horiz-adv-x="785.7" />
 
 <glyph glyph-name="file-code" unicode="&#xf1c9;" d="M819 638q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-429v-858h715z m-518 500q4 7 12 7t13-3l28-21q7-5 7-12t-3-13l-102-136 102-136q4-6 3-13t-7-12l-28-21q-6-4-13-4t-12 7l-126 168q-8 11 0 22z m447-167q8-11 0-22l-126-168q-4-6-11-7t-14 4l-28 21q-6 5-7 12t3 13l102 136-102 136q-4 6-3 13t7 12l28 21q6 4 14 3t11-7z m-346-258q-7 1-11 8t-3 13l77 464q1 7 7 11t14 3l35-5q7-2 11-8t3-13l-77-464q-1-7-7-11t-13-3z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="history" unicode="&#xf1da;" d="M857 350q0-87-34-166t-91-137-137-92-166-34q-96 0-183 41t-147 114q-4 6-4 13t5 11l76 77q6 5 14 5 9-1 13-7 41-53 100-82t126-29q58 0 110 23t92 61 61 91 22 111-22 111-61 91-92 61-110 23q-55 0-105-20t-90-57l77-77q17-16 8-38-10-23-33-23h-250q-15 0-25 11t-11 25v250q0 24 22 33 22 10 39-8l72-72q60 57 137 88t159 31q87 0 166-34t137-92 91-137 34-166z m-357 161v-250q0-8-5-13t-13-5h-178q-8 0-13 5t-5 13v35q0 8 5 13t13 5h125v197q0 8 5 13t12 5h36q8 0 13-5t5-13z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="sliders" unicode="&#xf1de;" d="M196 64v-71h-196v71h196z m197 72q14 0 25-11t11-25v-143q0-14-11-25t-25-11h-143q-14 0-25 11t-11 25v143q0 15 11 25t25 11h143z m89 214v-71h-482v71h482z m-357 286v-72h-125v72h125z m732-572v-71h-411v71h411z m-536 643q15 0 26-10t10-26v-142q0-15-10-25t-26-11h-142q-15 0-25 11t-11 25v142q0 15 11 26t25 10h142z m358-286q14 0 25-10t10-25v-143q0-15-10-25t-25-11h-143q-15 0-25 11t-11 25v143q0 14 11 25t25 10h143z m178-71v-71h-125v71h125z m0 286v-72h-482v72h482z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="trash" unicode="&#xf1f8;" d="M286 82v393q0 8-5 13t-13 5h-36q-8 0-13-5t-5-13v-393q0-8 5-13t13-5h36q8 0 13 5t5 13z m143 0v393q0 8-5 13t-13 5h-36q-8 0-13-5t-5-13v-393q0-8 5-13t13-5h36q8 0 13 5t5 13z m142 0v393q0 8-5 13t-12 5h-36q-8 0-13-5t-5-13v-393q0-8 5-13t13-5h36q7 0 12 5t5 13z m-303 554h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q23 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
 </font>
 </defs>
 </svg>
  No newline at end of file

rhodecode/public/js/rhodecode/base/keyboard-bindings.js

@@ -98,7 +98,7 b' function setRCMouseBindings(repoName, re'
         });
         Mousetrap.bind(['g c'], function(e) {
             window.location = pyroutes.url(
-                'repo_changelog', {'repo_name': repoName});
+                'repo_commits', {'repo_name': repoName});
         });
         Mousetrap.bind(['g F'], function(e) {
             window.location = pyroutes.url(

rhodecode/public/js/rhodecode/routes.js

@@ -131,6 +131,7 b' function registerRCRoutes() {'
     pyroutes.register('repo_new', '/_admin/repos/new', []);
     pyroutes.register('repo_create', '/_admin/repos/create', []);
     pyroutes.register('repo_groups', '/_admin/repo_groups', []);
+    pyroutes.register('repo_groups_data', '/_admin/repo_groups_data', []);
     pyroutes.register('repo_group_new', '/_admin/repo_group/new', []);
     pyroutes.register('repo_group_create', '/_admin/repo_group/create', []);
     pyroutes.register('channelstream_connect', '/_admin/channelstream/connect', []);
@@ -148,6 +149,7 b' function registerRCRoutes() {'
     pyroutes.register('repo_group_list_data', '/_repo_groups', []);
     pyroutes.register('goto_switcher_data', '/_goto_data', []);
     pyroutes.register('markup_preview', '/_markup_preview', []);
+    pyroutes.register('file_preview', '/_file_preview', []);
     pyroutes.register('store_user_session_value', '/_store_session_attr', []);
     pyroutes.register('journal', '/_admin/journal', []);
     pyroutes.register('journal_rss', '/_admin/journal/rss', []);
@@ -195,14 +197,17 b' function registerRCRoutes() {'
     pyroutes.register('repo_files_edit_file', '/%(repo_name)s/edit_file/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('repo_files_update_file', '/%(repo_name)s/update_file/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('repo_files_add_file', '/%(repo_name)s/add_file/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
+    pyroutes.register('repo_files_upload_file', '/%(repo_name)s/upload_file/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('repo_files_create_file', '/%(repo_name)s/create_file/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('repo_refs_data', '/%(repo_name)s/refs-data', ['repo_name']);
     pyroutes.register('repo_refs_changelog_data', '/%(repo_name)s/refs-data-changelog', ['repo_name']);
     pyroutes.register('repo_stats', '/%(repo_name)s/repo_stats/%(commit_id)s', ['repo_name', 'commit_id']);
+    pyroutes.register('repo_commits', '/%(repo_name)s/commits', ['repo_name']);
+    pyroutes.register('repo_commits_file', '/%(repo_name)s/commits/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
+    pyroutes.register('repo_commits_elements', '/%(repo_name)s/commits_elements', ['repo_name']);
+    pyroutes.register('repo_commits_elements_file', '/%(repo_name)s/commits_elements/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('repo_changelog', '/%(repo_name)s/changelog', ['repo_name']);
     pyroutes.register('repo_changelog_file', '/%(repo_name)s/changelog/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
-    pyroutes.register('repo_changelog_elements', '/%(repo_name)s/changelog_elements', ['repo_name']);
-    pyroutes.register('repo_changelog_elements_file', '/%(repo_name)s/changelog_elements/%(commit_id)s/%(f_path)s', ['repo_name', 'commit_id', 'f_path']);
     pyroutes.register('repo_compare_select', '/%(repo_name)s/compare', ['repo_name']);
     pyroutes.register('repo_compare', '/%(repo_name)s/compare/%(source_ref_type)s@%(source_ref)s...%(target_ref_type)s@%(target_ref)s', ['repo_name', 'source_ref_type', 'source_ref', 'target_ref_type', 'target_ref']);
     pyroutes.register('tags_home', '/%(repo_name)s/tags', ['repo_name']);
@@ -356,6 +361,12 b' function registerRCRoutes() {'
     pyroutes.register('my_account_auth_tokens_add', '/_admin/my_account/auth_tokens/new', []);
     pyroutes.register('my_account_external_identity', '/_admin/my_account/external-identity', []);
     pyroutes.register('my_account_external_identity_delete', '/_admin/my_account/external-identity/delete', []);
+    pyroutes.register('repo_artifacts_list', '/%(repo_name)s/artifacts', ['repo_name']);
+    pyroutes.register('repo_artifacts_data', '/%(repo_name)s/artifacts_data', ['repo_name']);
+    pyroutes.register('repo_artifacts_new', '/%(repo_name)s/artifacts/new', ['repo_name']);
+    pyroutes.register('repo_artifacts_get', '/%(repo_name)s/artifacts/download/%(uid)s', ['repo_name', 'uid']);
+    pyroutes.register('repo_artifacts_store', '/%(repo_name)s/artifacts/store', ['repo_name']);
+    pyroutes.register('repo_artifacts_delete', '/%(repo_name)s/artifacts/delete/%(uid)s', ['repo_name', 'uid']);
     pyroutes.register('repo_automation', '/%(repo_name)s/settings/automation', ['repo_name']);
     pyroutes.register('repo_automation_update', '/%(repo_name)s/settings/automation/%(entry_id)s/update', ['repo_name', 'entry_id']);
     pyroutes.register('edit_repo_remote_push', '/%(repo_name)s/settings/remote/push', ['repo_name']);

rhodecode/public/js/src/plugins/jquery.autocomplete.js

@@ -528,7 +528,19 b''
                 if ($.isFunction(serviceUrl)) {
                     serviceUrl = serviceUrl.call(that.element, query);
                 }
-                cacheKey = serviceUrl + '?' + $.param(params || {});
+
+                var callParams = {};
+                //make an evaluated copy of params
+                $.each(params, function(index, value) {
+                    if($.isFunction(value)){
+                        callParams[index] = value();
+                    }
+                    else {
+                        callParams[index] = value;
+                    }
+                });
+
+                cacheKey = serviceUrl + '?' + $.param(callParams);
                 response = that.cachedResponse[cacheKey];
             }
 
@@ -536,7 +548,7 b''
                 that.suggestions = response.suggestions;
                 that.suggest();
             } else if (!that.isBadQuery(query)) {
-                if (options.onSearchStart.call(that.element, options.params) === false) {
+                if (options.onSearchStart.call(that.element, params) === false) {
                     return;
                 }
                 if (that.currentRequest) {

rhodecode/public/js/src/rhodecode.js

@@ -102,7 +102,7 b' var showRepoStats = function(target, dat'
     var total = 0;
     var no_data = true;
     var tbl = document.createElement('table');
-    tbl.setAttribute('class', 'trending_language_tbl');
+    tbl.setAttribute('class', 'trending_language_tbl rctable');
 
     $.each(data, function(key, val){
         total += val.count;
@@ -120,54 +120,47 b' var showRepoStats = function(target, dat'
         cnt += 1;
         no_data = false;
 
-        var hide = cnt > 2;
         var tr = document.createElement('tr');
-        if (hide) {
-            tr.setAttribute('style', 'display:none');
-            tr.setAttribute('class', 'stats_hidden');
-        }
 
         var key = val[0];
         var obj = {"desc": val[1].desc, "count": val[1].count};
 
-        var percentage = Math.round((obj.count / total * 100), 2);
-
+        // meta language names
         var td1 = document.createElement('td');
-        td1.width = 300;
         var trending_language_label = document.createElement('div');
-        trending_language_label.innerHTML = obj.desc + " (.{0})".format(key);
+        trending_language_label.innerHTML = obj.desc;
         td1.appendChild(trending_language_label);
 
+        // extensions
         var td2 = document.createElement('td');
-        var trending_language = document.createElement('div');
-        var nr_files = obj.count +" "+ _ngettext('file', 'files', obj.count);
-
-        trending_language.title = key + " " + nr_files;
+        var extension = document.createElement('div');
+        extension.innerHTML = ".{0}".format(key)
+        td2.appendChild(extension);
 
-        trending_language.innerHTML = "<span>" + percentage + "% " + nr_files
-                + "</span><b>" + percentage + "% " + nr_files + "</b>";
+        // number of files
+        var td3 = document.createElement('td');
+        var file_count = document.createElement('div');
+        var percentage_num = Math.round((obj.count / total * 100), 2);
+        var label = _ngettext('file', 'files', obj.count);
+        file_count.innerHTML = "{0} {1} ({2}%)".format(obj.count, label, percentage_num) ;
+        td3.appendChild(file_count);
 
-        trending_language.setAttribute("class", 'trending_language');
-        $('b', trending_language)[0].style.width = percentage + "%";
-        td2.appendChild(trending_language);
+        // percentage
+        var td4 = document.createElement('td');
+        td4.setAttribute("class", 'trending_language');
+
+        var percentage = document.createElement('div');
+        percentage.setAttribute('class', 'lang-bar');
+        percentage.innerHTML = "&nbsp;";
+        percentage.style.width = percentage_num + '%';
+        td4.appendChild(percentage);
 
         tr.appendChild(td1);
         tr.appendChild(td2);
+        tr.appendChild(td3);
+        tr.appendChild(td4);
         tbl.appendChild(tr);
-        if (cnt == 3) {
-            var show_more = document.createElement('tr');
-            var td = document.createElement('td');
-            lnk = document.createElement('a');
 
-            lnk.href = '#';
-            lnk.innerHTML = _gettext('Show more');
-            lnk.id = 'code_stats_show_more';
-            td.appendChild(lnk);
-
-            show_more.appendChild(td);
-            show_more.appendChild(document.createElement('td'));
-            tbl.appendChild(show_more);
-        }
     });
 
     $(container).html(tbl);

rhodecode/public/js/src/rhodecode/changelog.js

@@ -46,6 +46,8 b' var CommitsController = function () {'
         self.$graphCanvas.html('');
 
         var edgeData = $("[data-graph]").data('graph') || this.$graphCanvas.data('graph') || [];
+        var prev_link = $('.load-more-commits').find('.prev-commits').get(0);
+        var next_link = $('.load-more-commits').find('.next-commits').get(0);
 
         // Determine max number of edges per row in graph
         var edgeCount = 1;
@@ -57,10 +59,20 b' var CommitsController = function () {'
             });
         });
 
+        if (prev_link && next_link) {
+            var graph_padding = -64;
+        }
+        else if (next_link) {
+            var graph_padding = -32;
+        } else {
+            var graph_padding = 0;
+        }
+
         var x_step = Math.min(10, Math.floor(86 / edgeCount));
+        var height = $('#changesets').find('.commits-range').height() + graph_padding;
         var graph_options = {
             width: 100,
-            height: $('#changesets').find('.commits-range').height(),
+            height: height,
             x_step: x_step,
             y_step: 42,
             dotRadius: 3.5,
@@ -85,13 +97,20 b' var CommitsController = function () {'
         this.$graphCanvas.commits(graph_options);
 
         this.setLabelText(edgeData);
-        if ($('.load-more-commits').find('.prev-commits').get(0)) {
-            var padding = 75;
 
-        } else {
-            var padding = 43;
+        var padding = 90;
+        if (prev_link) {
+            padding += 34;
+
         }
         $('#graph_nodes').css({'padding-top': padding});
+
+        $.each($('.message.truncate'), function(idx, value) {
+            if(!(value.offsetWidth < value.scrollWidth)){
+                $(this).closest('td').siblings('.expand_commit').find('i').hide();
+            }
+        });
+
     };
 
     this.getChunkUrl = function (page, chunk, branch, commit_id, f_path) {
@@ -112,10 +131,10 b' var CommitsController = function () {'
         }
 
         if (urlData['commit_id'] && urlData['f_path']) {
-            return pyroutes.url('repo_changelog_elements_file', urlData);
+            return pyroutes.url('repo_commits_elements_file', urlData);
         }
         else {
-            return pyroutes.url('repo_changelog_elements', urlData);
+            return pyroutes.url('repo_commits_elements', urlData);
         }
 
     };

rhodecode/public/js/src/rhodecode/codemirror.js

@@ -204,7 +204,12 b' var CodeMirrorCompleteAfter = function(c'
 };
 
 var initCodeMirror = function(textAreadId, resetUrl, focus, options) {
+  if (textAreadId.substr(0,1) === "#"){
+    var ta = $(textAreadId).get(0);
+  }else {
   var ta = $('#' + textAreadId).get(0);
+  }
+
   if (focus === undefined) {
       focus = true;
   }
@@ -644,18 +649,6 b' var fillCodeMirrorOptions = function(tar'
   }
 };
 
-var CodeMirrorPreviewEnable = function(edit_mode) {
-  // in case it a preview enabled mode enable the button
-  if (['markdown', 'rst', 'gfm'].indexOf(edit_mode) !== -1) {
-    $('#render_preview').removeClass('hidden');
-  }
-  else {
-    if (!$('#render_preview').hasClass('hidden')) {
-      $('#render_preview').addClass('hidden');
-    }
-  }
-};
-
 
  /* markup form */
 (function(mod) {

rhodecode/public/js/src/rhodecode/comments.js

@@ -587,12 +587,14 b' var CommentsController = function() {'
           $('#content').removeClass("wrapper");
           $('#content').addClass("wide-mode-wrapper");
           $(node).addClass('btn-success');
+          return true
       } else {
           $('#content').removeClass("wide-mode-wrapper");
           $('#content').addClass("wrapper");
           $(node).removeClass('btn-success');
+          return false
       }
-      return false;
+
   };
 
   this.toggleComments = function(node, show) {

rhodecode/public/js/src/rhodecode/files.js

@@ -19,17 +19,23 b''
 /**
  * Search file list
  */
-// global reference to file-node filter
-var _NODEFILTER = {};
+
+var NodeFilter = {};
 
 var fileBrowserListeners = function(node_list_url, url_base){
-  var n_filter = $('#node_filter').get(0);
+    var $filterInput = $('#node_filter');
+    var n_filter = $filterInput.get(0);
 
-  _NODEFILTER.filterTimeout = null;
+    NodeFilter.filterTimeout = null;
   var nodes = null;
 
-  _NODEFILTER.fetchNodes = function(callback) {
-    $.ajax({url: node_list_url, headers: {'X-PARTIAL-XHR': true}})
+    NodeFilter.focus = function () {
+        $filterInput.focus()
+    };
+
+    NodeFilter.fetchNodes = function (callback) {
+        $.ajax(
+            {url: node_list_url, headers: {'X-PARTIAL-XHR': true}})
       .done(function(data){
         nodes = data.nodes;
         if (callback) {
@@ -41,36 +47,125 b' var fileBrowserListeners = function(node'
       });
   };
 
-  _NODEFILTER.fetchNodesCallback = function() {
-    $('#node_filter_box_loading').hide();
-    $('#node_filter_box').removeClass('hidden').show();
-    n_filter.focus();
-    if ($('#node_filter').hasClass('init')){
-      n_filter.value = '';
-      $('#node_filter').removeClass('init');
+    NodeFilter.initFilter = function (e) {
+        if ($filterInput.hasClass('loading')) {
+            return
+        }
+
+        // in case we are already loaded, do nothing
+        if (!$filterInput.hasClass('init')) {
+            return NodeFilter.handleKey(e);
+        }
+        var iconLoading = 'icon-spin animate-spin';
+        var iconSearch = 'icon-search';
+        $('.files-filter-box-path i').removeClass(iconSearch).addClass(iconLoading);
+        $filterInput.addClass('loading');
+
+        var callback = function (org) {
+            return function () {
+                if ($filterInput.hasClass('init')) {
+                    $filterInput.removeClass('init');
+                    $filterInput.removeClass('loading');
     }
+                $('.files-filter-box-path i').removeClass(iconLoading).addClass(iconSearch);
+
+                // auto re-filter if we filled in the input
+                if (n_filter.value !== "") {
+                    NodeFilter.updateFilter(n_filter, e)()
+                }
+
+            }
+        };
+        // load node data
+        NodeFilter.fetchNodes(callback());
+
+    };
+
+    NodeFilter.resetFilter = function () {
+        $('#tbody').show();
+        $('#tbody_filtered').hide();
+        $filterInput.val('');
+    };
+
+    NodeFilter.handleKey = function (e) {
+        var scrollDown = function (element) {
+            var elementBottom = element.offset().top + $(element).outerHeight();
+            var windowBottom = window.innerHeight + $(window).scrollTop();
+            if (elementBottom > windowBottom) {
+                var offset = elementBottom - window.innerHeight;
+                $('html,body').scrollTop(offset);
+                return false;
+            }
+            return true;
   };
 
-  _NODEFILTER.initFilter = function(){
-    $('#node_filter_box_loading').removeClass('hidden').show();
-    $('#search_activate_id').hide();
-    $('#search_deactivate_id').removeClass('hidden').show();
-    $('#add_node_id').hide();
-    _NODEFILTER.fetchNodes(_NODEFILTER.fetchNodesCallback);
+        var scrollUp = function (element) {
+            if (element.offset().top < $(window).scrollTop()) {
+                $('html,body').scrollTop(element.offset().top);
+                return false;
+            }
+            return true;
+        };
+        var $hlElem = $('.browser-highlight');
+
+        if (e.keyCode === 40) { // Down
+            if ($hlElem.length === 0) {
+                $('.browser-result').first().addClass('browser-highlight');
+            } else {
+                var next = $hlElem.next();
+                if (next.length !== 0) {
+                    $hlElem.removeClass('browser-highlight');
+                    next.addClass('browser-highlight');
+                }
+            }
+
+            if ($hlElem.get(0) !== undefined){
+                scrollDown($hlElem);
+            }
+        }
+        if (e.keyCode === 38) { // Up
+            e.preventDefault();
+            if ($hlElem.length !== 0) {
+                var next = $hlElem.prev();
+                if (next.length !== 0) {
+                    $('.browser-highlight').removeClass('browser-highlight');
+                    next.addClass('browser-highlight');
+                }
+            }
+
+            if ($hlElem.get(0) !== undefined){
+                scrollUp($hlElem);
+            }
+
+        }
+        if (e.keyCode === 13) { // Enter
+            if ($('.browser-highlight').length !== 0) {
+                var url = $('.browser-highlight').find('.match-link').attr('href');
+                window.location = url;
+            }
+        }
+        if (e.keyCode === 27) { // Esc
+            NodeFilter.resetFilter();
+            $('html,body').scrollTop(0);
+        }
+
+        var capture_keys = [
+            40, // ArrowDown
+            38, // ArrowUp
+            39, // ArrowRight
+            37, // ArrowLeft
+            13, // Enter
+            27  // Esc
+        ];
+
+        if ($.inArray(e.keyCode, capture_keys) === -1) {
+            clearTimeout(NodeFilter.filterTimeout);
+            NodeFilter.filterTimeout = setTimeout(NodeFilter.updateFilter(n_filter, e), 200);
+        }
+
   };
 
-  _NODEFILTER.resetFilter = function(){
-    $('#node_filter_box_loading').hide();
-    $('#node_filter_box').hide();
-    $('#search_activate_id').show();
-    $('#search_deactivate_id').hide();
-    $('#add_node_id').show();
-    $('#tbody').show();
-    $('#tbody_filtered').hide();
-    $('#node_filter').val('');
-  };
-
-  _NODEFILTER.fuzzy_match = function(filepath, query) {
+    NodeFilter.fuzzy_match = function (filepath, query) {
     var highlight = [];
     var order = 0;
     for (var i = 0; i < query.length; i++) {
@@ -89,11 +184,13 b' var fileBrowserListeners = function(node'
         return false;
       }
     }
-    return {'order': order,
-            'highlight': highlight};
+        return {
+            'order': order,
+            'highlight': highlight
+        };
   };
 
-  _NODEFILTER.sortPredicate = function(a, b) {
+    NodeFilter.sortPredicate = function (a, b) {
     if (a.order < b.order) return -1;
     if (a.order > b.order) return 1;
     if (a.filepath < b.filepath) return -1;
@@ -101,17 +198,17 b' var fileBrowserListeners = function(node'
     return 0;
   };
 
-  _NODEFILTER.updateFilter = function(elem, e) {
+    NodeFilter.updateFilter = function (elem, e) {
     return function(){
       // Reset timeout
-      _NODEFILTER.filterTimeout = null;
+            NodeFilter.filterTimeout = null;
       var query = elem.value.toLowerCase();
       var match = [];
       var matches_max = 20;
       if (query !== ""){
         var results = [];
         for(var k=0;k<nodes.length;k++){
-          var result = _NODEFILTER.fuzzy_match(
+                    var result = NodeFilter.fuzzy_match(
               nodes[k].name.toLowerCase(), query);
           if (result) {
             result.type = nodes[k].type;
@@ -119,7 +216,7 b' var fileBrowserListeners = function(node'
             results.push(result);
           }
         }
-        results = results.sort(_NODEFILTER.sortPredicate);
+                results = results.sort(NodeFilter.sortPredicate);
         var limit = matches_max;
         if (results.length < matches_max) {
           limit = results.length;
@@ -142,7 +239,7 b' var fileBrowserListeners = function(node'
             };
 
             var typeIcon = '<i class="{0}"></i>'.format(typeObj[t]);
-            match.push('<tr class="browser-result"><td><a class="pjax-link" href="{0}">{1}{2}</a></td><td colspan="5"></td></tr>'.format(new_url,typeIcon, n_hl));
+                        match.push('<tr class="browser-result"><td><a class="match-link" href="{0}">{1}{2}</a></td><td colspan="5"></td></tr>'.format(new_url, typeIcon, n_hl));
           }
         }
         if(results.length > limit){
@@ -162,8 +259,7 b' var fileBrowserListeners = function(node'
           match.push('<tr><td>{0}</td><td colspan="5"></td></tr>'.format(_gettext('No matching files')));
         }
         $('#tbody_filtered').html(match.join(""));
-      }
-      else{
+            } else {
         $('#tbody').show();
         $('#tbody_filtered').hide();
       }
@@ -171,82 +267,6 b' var fileBrowserListeners = function(node'
     };
   };
 
-  var scrollDown = function(element){
-    var elementBottom = element.offset().top + $(element).outerHeight();
-    var windowBottom = window.innerHeight + $(window).scrollTop();
-    if (elementBottom > windowBottom) {
-      var offset = elementBottom - window.innerHeight;
-      $('html,body').scrollTop(offset);
-      return false;
-    }
-    return true;
-  };
-
-  var scrollUp = function(element){
-    if (element.offset().top < $(window).scrollTop()) {
-      $('html,body').scrollTop(element.offset().top);
-      return false;
-    }
-    return true;
-  };
-
-  $('#filter_activate').click(function() {
-    _NODEFILTER.initFilter();
-  });
-
-  $('#filter_deactivate').click(function() {
-    _NODEFILTER.resetFilter();
-  });
-
-  $(n_filter).click(function() {
-    if ($('#node_filter').hasClass('init')){
-      n_filter.value = '';
-      $('#node_filter').removeClass('init');
-    }
-  });
-
-  $(n_filter).keydown(function(e) {
-    if (e.keyCode === 40){ // Down
-      if ($('.browser-highlight').length === 0){
-        $('.browser-result').first().addClass('browser-highlight');
-      } else {
-        var next = $('.browser-highlight').next();
-        if (next.length !== 0) {
-          $('.browser-highlight').removeClass('browser-highlight');
-          next.addClass('browser-highlight');
-        }
-      }
-      scrollDown($('.browser-highlight'));
-    }
-    if (e.keyCode === 38){ // Up
-      e.preventDefault();
-      if ($('.browser-highlight').length !== 0){
-        var next = $('.browser-highlight').prev();
-        if (next.length !== 0) {
-          $('.browser-highlight').removeClass('browser-highlight');
-          next.addClass('browser-highlight');
-        }
-      }
-      scrollUp($('.browser-highlight'));
-    }
-    if (e.keyCode === 13){ // Enter
-      if ($('.browser-highlight').length !== 0){
-        var url = $('.browser-highlight').find('.pjax-link').attr('href');
-        $.pjax({url: url, container: '#pjax-container', timeout: pjaxTimeout});
-      }
-    }
-    if (e.keyCode === 27){ // Esc
-      _NODEFILTER.resetFilter();
-      $('html,body').scrollTop(0);
-    }
-  });
-  var capture_keys = [40, 38, 39, 37, 13, 27];
-  $(n_filter).keyup(function(e) {
-    if ($.inArray(e.keyCode, capture_keys) === -1){
-      clearTimeout(_NODEFILTER.filterTimeout);
-      _NODEFILTER.filterTimeout = setTimeout(_NODEFILTER.updateFilter(n_filter, e),200);
-    }
-  });
 };
 
 var getIdentNode = function(n){
@@ -308,3 +328,190 b' var getSelectionLink = function(e) {'
     }
   }
 };
+
+var getFileState = function() {
+    // relies on a global set filesUrlData
+    var f_path = filesUrlData['f_path'];
+    var commit_id = filesUrlData['commit_id'];
+
+    var url_params = {
+        repo_name: templateContext.repo_name,
+        commit_id: commit_id,
+        f_path:'__FPATH__'
+    };
+    if (atRef !== '') {
+        url_params['at'] = atRef
+    }
+
+    var _url_base = pyroutes.url('repo_files', url_params);
+    var _node_list_url = pyroutes.url('repo_files_nodelist',
+            {repo_name: templateContext.repo_name,
+             commit_id: commit_id, f_path: f_path});
+
+    return {
+        f_path: f_path,
+        commit_id: commit_id,
+        node_list_url: _node_list_url,
+        url_base: _url_base
+    };
+};
+
+var getFilesMetadata = function() {
+    // relies on metadataRequest global state
+    if (metadataRequest && metadataRequest.readyState != 4) {
+        metadataRequest.abort();
+    }
+
+    if ($('#file-tree-wrapper').hasClass('full-load')) {
+        // in case our HTML wrapper has full-load class we don't
+        // trigger the async load of metadata
+        return false;
+    }
+
+    var state = getFileState();
+    var url_data = {
+        'repo_name': templateContext.repo_name,
+        'commit_id': state.commit_id,
+        'f_path': state.f_path
+    };
+
+    var url = pyroutes.url('repo_nodetree_full', url_data);
+
+    metadataRequest = $.ajax({url: url});
+
+    metadataRequest.done(function(data) {
+        $('#file-tree').html(data);
+        timeagoActivate();
+    });
+    metadataRequest.fail(function (data, textStatus, errorThrown) {
+        if (data.status != 0) {
+            alert("Error while fetching metadata.\nError code {0} ({1}).Please consider reloading the page".format(data.status,data.statusText));
+        }
+    });
+};
+
+// show more authors
+var showAuthors = function(elem, annotate) {
+    var state = getFileState('callbacks');
+
+    var url = pyroutes.url('repo_file_authors',
+                {'repo_name': templateContext.repo_name,
+                 'commit_id': state.commit_id, 'f_path': state.f_path});
+
+    $.pjax({
+        url: url,
+        data: 'annotate={0}'.format(annotate),
+        container: '#file_authors',
+        push: false,
+        timeout: 5000
+    }).complete(function(){
+        $(elem).hide();
+        $('#file_authors_title').html(_gettext('All Authors'))
+    })
+};
+
+
+(function (mod) {
+
+    if (typeof exports == "object" && typeof module == "object") {
+        // CommonJS
+        module.exports = mod();
+    } else {
+        // Plain browser env
+        (this || window).FileEditor = mod();
+    }
+
+})(function () {
+    "use strict";
+
+    function FileEditor(textAreaElement, options) {
+        if (!(this instanceof FileEditor)) {
+            return new FileEditor(textAreaElement, options);
+        }
+        // bind the element instance to our Form
+        var te = $(textAreaElement).get(0);
+        if (te !== undefined) {
+            te.FileEditor = this;
+        }
+
+        this.modes_select = '#set_mode';
+        this.filename_selector = '#filename';
+        this.commit_btn_selector = '#commit_btn';
+        this.line_wrap_selector = '#line_wrap';
+        this.editor_preview_selector = '#editor_preview';
+
+        if (te !== undefined) {
+            this.cm = initCodeMirror(textAreaElement, null, false);
+        }
+
+        // FUNCTIONS and helpers
+        var self = this;
+
+        this.submitHandler = function() {
+            $(self.commit_btn_selector).on('click', function(e) {
+
+                var filename = $(self.filename_selector).val();
+                if (filename === "") {
+                    alert("Missing filename");
+                    e.preventDefault();
+                }
+
+                var button = $(this);
+                if (button.hasClass('clicked')) {
+                    button.attr('disabled', true);
+                } else {
+                    button.addClass('clicked');
+                }
+            });
+        };
+        this.submitHandler();
+
+        // on select line wraps change the editor
+        this.lineWrapHandler = function () {
+            $(self.line_wrap_selector).on('change', function (e) {
+                var selected = e.currentTarget;
+                var line_wraps = {'on': true, 'off': false}[selected.value];
+                setCodeMirrorLineWrap(self.cm, line_wraps)
+            });
+        };
+        this.lineWrapHandler();
+
+
+        this.showPreview = function () {
+
+            var _text = self.cm.getValue();
+            var _file_path = $(self.filename_selector).val();
+            if (_text && _file_path) {
+                $('.show-preview').addClass('active');
+                $('.show-editor').removeClass('active');
+
+                $(self.editor_preview_selector).show();
+                $(self.cm.getWrapperElement()).hide();
+
+
+                var post_data = {'text': _text, 'file_path': _file_path, 'csrf_token': CSRF_TOKEN};
+                $(self.editor_preview_selector).html(_gettext('Loading ...'));
+
+                var url = pyroutes.url('file_preview');
+
+                ajaxPOST(url, post_data, function (o) {
+                    $(self.editor_preview_selector).html(o);
+                })
+            }
+
+        };
+
+        this.showEditor = function () {
+            $(self.editor_preview_selector).hide();
+            $('.show-editor').addClass('active');
+            $('.show-preview').removeClass('active');
+
+            $(self.cm.getWrapperElement()).show();
+        };
+
+
+    }
+
+    return FileEditor;
+});
+

rhodecode/public/js/src/rhodecode/followers.js

@@ -17,56 +17,42 b''
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 var onSuccessFollow = function(target){
-    var f = $(target);
-    var f_cnt = $('#current_followers_count');
+    var targetEl = $(target);
 
-    if(f.hasClass('follow')){
-        f.removeClass('follow');
-        f.addClass('following');
-        f.attr('title', _gettext('Stop following this repository'));
-        $(f).html(_gettext('Unfollow'));
-        if(f_cnt.length){
-            var cnt = Number(f_cnt.html())+1;
-            f_cnt.html(cnt);
-        }
-    }
-    else{
-        f.removeClass('following');
-        f.addClass('follow');
-        f.attr('title', _gettext('Start following this repository'));
-        $(f).html(_gettext('Follow'));
-        if(f_cnt.length){
-            var cnt = Number(f_cnt.html())-1;
-            f_cnt.html(cnt);
-        }
+    var callback = function () {
+        targetEl.animate({'opacity': 1.00}, 200);
+        if (targetEl.hasClass('watching')) {
+            targetEl.removeClass('watching');
+            targetEl.attr('title', _gettext('Stopped watching this repository'));
+            $(targetEl).html('<i class="icon-eye"></i>'+_gettext('Watch'));
+        } else {
+            targetEl.addClass('watching');
+            targetEl.attr('title', _gettext('Started watching this repository'));
+            $(targetEl).html('<i class="icon-eye-off"></i>'+_gettext('Unwatch'));
     }
 };
+    targetEl.animate({'opacity': 0.15}, 200, callback);
+};
 
-// TODO:: check if the function is needed. 0 usage found
-var toggleFollowingUser = function(target,follows_user_id,token,user_id){
+
+var toggleFollowingUser = function (target, follows_user_id) {
     var args = {
         'follows_user_id': follows_user_id,
-        'auth_token': token,
         'csrf_token': CSRF_TOKEN
     };
-    if(user_id != undefined){
-        args.user_id = user_id
-    }
+
     ajaxPOST(pyroutes.url('toggle_following'), args, function(){
         onSuccessFollow(target);
     });
     return false;
 };
 
-var toggleFollowingRepo = function(target,follows_repo_id,token,user_id){
+var toggleFollowingRepo = function (target, follows_repo_id) {
     var args = {
         'follows_repo_id': follows_repo_id,
-        'auth_token': token,
         'csrf_token': CSRF_TOKEN
     };
-    if(user_id != undefined){
-        args.user_id = user_id
-    }
+
     ajaxPOST(pyroutes.url('toggle_following'), args, function(){
         onSuccessFollow(target);
     });

rhodecode/public/js/src/rhodecode/select2_widgets.js

@@ -73,10 +73,3 b' var select2RefSwitcher = function(target'
     {'repo_name': templateContext.repo_name});
   select2RefBaseSwitcher(targetElement, loadUrl, initialData);
 };
-
-var select2FileHistorySwitcher = function(targetElement, initialData, state) {
-  var loadUrl = pyroutes.url('repo_file_history',
-    {'repo_name': templateContext.repo_name, 'commit_id': state.rev,
-     'f_path': state.f_path});
-  select2RefBaseSwitcher(targetElement, loadUrl, initialData);
-};

rhodecode/templates/admin/admin_audit_log_entry.mako

@@ -9,20 +9,23 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='audit_logs')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-    <!-- box / title -->
+
     <div class="title">
-        ${self.breadcrumbs()}
+        ${_('Audit long entry')} ${c.audit_log_entry.entry_id}
     </div>
-    <!-- end box / title -->
+
     <div class="table">
         <div id="user_log">
             <table class="rctable audit-log">

rhodecode/templates/admin/admin_audit_logs.mako

@@ -8,7 +8,19 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
+<%def name="breadcrumbs_links()"></%def>
+
+<%def name="menu_bar_nav()">
+    ${self.menu_items(active='admin')}
+</%def>
+
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='audit_logs')}
+</%def>
+
+<%def name="main()">
+<div class="box">
+    <div class="title">
     ${h.form(None, id_="filter_form", method="get")}
         <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or ''}" placeholder="${_('filter...')}"/>
         <input type='submit' value="${_('filter')}" class="btn" />
@@ -16,19 +28,8 b''
     ${h.end_form()}
     <p class="filterexample" style="position: inherit" onclick="$('#search-help').toggle()">${_('Example Queries')}</p>
     <pre id="search-help" style="display: none">${h.tooltip(h.journal_filter_help(request))}</pre>
-</%def>
-
-<%def name="menu_bar_nav()">
-    ${self.menu_items(active='admin')}
-</%def>
+    </div>
 
-<%def name="main()">
-<div class="box">
-    <!-- box / title -->
-    <div class="title">
-        ${self.breadcrumbs()}
-    </div>
-    <!-- end box / title -->
     <div class="table">
         <div id="user_log">
             <%include file="/admin/admin_log_base.mako" />

rhodecode/templates/admin/auth/auth_settings.mako

@@ -8,29 +8,26 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))}
-    &raquo;
-    ${_('Authentication Plugins')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='authentication')}
+</%def>
+
 <%def name="main()">
 
 <div class="box">
-  <div class="title">
-    ${self.breadcrumbs()}
-  </div>
 
   <div class='sidebar-col-wrapper'>
 
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           % for item in resource.get_root().get_nav_list():
-            <li ${'class=active' if item == resource else ''}>
+            <li ${('class=active' if item == resource else '')}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
           % endfor
@@ -66,10 +63,10 b''
                   <th>${_('Plugin ID')}</th>
                   <th>${_('Enabled')}</th>
                   %for plugin in available_plugins:
-                      <tr class="${'inactive' if (not plugin.is_active() and plugin.get_id() in enabled_plugins) else ''}">
+                      <tr class="${('inactive' if (not plugin.is_active() and plugin.get_id() in enabled_plugins) else '')}">
                           <td>
-                            <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${'btn-success' if plugin.get_id() in enabled_plugins else ''}">
-                              ${_('activated') if plugin.get_id() in enabled_plugins else _('not active')}
+                            <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${('btn-success' if plugin.get_id() in enabled_plugins else '')}">
+                              ${(_('activated') if plugin.get_id() in enabled_plugins else _('not active'))}
                             </span>
                           </td>
                           <td>${plugin.get_display_name()}</td>

rhodecode/templates/admin/auth/plugin_settings.mako

@@ -20,19 +20,20 b''
   ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='authentication')}
+</%def>
+
 <%def name="main()">
+
   <div class="box">
-    <div class="title">
-      ${self.breadcrumbs()}
-    </div>
+
     <div class='sidebar-col-wrapper'>
 
-      ## TODO: This is repeated in the auth root template and should be merged
-      ##       into a single solution.
       <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           % for item in resource.get_root().get_nav_list():
-            <li ${'class=active' if item == resource else ''}>
+            <li ${('class=active' if item == resource else '')}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
           % endfor

rhodecode/templates/admin/defaults/defaults.mako

@@ -18,11 +18,12 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='defaults')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.breadcrumbs()}
-    </div>
 
     ##main
     <div class="sidebar-col-wrapper">

rhodecode/templates/admin/gists/index.mako

@@ -3,9 +3,9 b''
 
 <%def name="title()">
     %if c.show_private:
-        ${_('Private Gists for user %s') % c.rhodecode_user.username}
+        ${_('Private Gists for user {}').format(c.rhodecode_user.username)}
     %elif c.show_public:
-        ${_('Public Gists for user %s') % c.rhodecode_user.username}
+        ${_('Public Gists for user {}').format(c.rhodecode_user.username)}
     %else:
         ${_('Public Gists')}
     %endif
@@ -14,64 +14,59 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    %if c.show_private and not c.show_public:
-        ${_('Private Gists for user %s') % c.rhodecode_user.username}
-    %elif c.show_public and not c.show_private:
-        ${_('Public Gists for user %s') % c.rhodecode_user.username}
-    %elif c.show_public and c.show_private:
-        ${_('All Gists for user %s') % c.rhodecode_user.username}
-    %else:
-        ${_('All Public Gists')}
-    %endif
-    -  <span id="gists_count">0</span>
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='gists')}
 </%def>
 
-
+<%def name="main()">
 
-<%def name="main()">
 <div class="box">
   <div class="title">
-      ${self.breadcrumbs(class_="breadcrumbs block-left")}
+
+    <ul class="button-links">
+      % if c.is_super_admin:
+        <li class="btn ${('active' if c.active=='all' else '')}"><a href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
+      %endif
+      <li class="btn ${('active' if c.active=='public' else '')}"><a href="${h.route_path('gists_show')}">${_('All public')}</a></li>
       %if c.rhodecode_user.username != h.DEFAULT_USER:
-      <ul class="links block-right">
-        <li>
-           <a href="${h.route_path('gists_new')}" class="btn btn-primary">${_(u'Create New Gist')}</a>
-        </li>
+        <li class="btn ${('active' if c.active=='my_all' else '')}"><a href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
+        <li class="btn ${('active' if c.active=='my_private' else '')}"><a href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
+        <li class="btn ${('active' if c.active=='my_public' else '')}"><a href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
+      %endif
       </ul>
-      %endif
-  </div>
-
 
-  <div class="sidebar-col-wrapper scw-small">
-    ##main
-    <div class="sidebar">
-        <ul class="nav nav-pills nav-stacked">
-          % if h.HasPermissionAll('hg.admin')('access admin gists page'):
-            <li class="${'active' if c.active=='all' else ''}"><a href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
+    % if c.rhodecode_user.username != h.DEFAULT_USER:
+        <div class="pull-right">
+            <a class="btn btn-primary" href="${h.route_path('gists_new')}" >
+                ${_(u'Create New Gist')}
+            </a>
+        </div>
           %endif
-          <li class="${'active' if c.active=='public' else ''}"><a href="${h.route_path('gists_show')}">${_('All public')}</a></li>
-          %if c.rhodecode_user.username != h.DEFAULT_USER:
-            <li class="${'active' if c.active=='my_all' else ''}"><a href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
-            <li class="${'active' if c.active=='my_private' else ''}"><a href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
-            <li class="${'active' if c.active=='my_public' else ''}"><a href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
-          %endif
+
+    <div class="grid-quick-filter">
+        <ul class="grid-filter-box">
+            <li class="grid-filter-box-icon">
+                <i class="icon-search"></i>
+            </li>
+            <li class="grid-filter-box-input">
+                <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            </li>
         </ul>
     </div>
 
-    <div class="main-content">
+  </div>
+
+    <div class="main-content-full-width">
         <div id="repos_list_wrap">
             <table id="gist_list_table" class="display"></table>
         </div>
     </div>
-  </div>
+
 </div>
-<script>
+
+<script type="text/javascript">
 $(document).ready(function() {
 
     var get_datatable_count = function(){

rhodecode/templates/admin/gists/show.mako

@@ -48,7 +48,7 b''
                         </code>
                     </div>
                     <div class="stats">
-                       %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.rhodecode_user.user_id:
+                       %if c.is_super_admin or c.gist.gist_owner == c.rhodecode_user.user_id:
                         <div class="remove_gist">
                             ${h.secure_form(h.route_path('gist_delete', gist_id=c.gist.gist_access_id), request=request)}
                                 ${h.submit('remove_gist', _('Delete'),class_="btn btn-mini btn-danger",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}
@@ -59,7 +59,7 b''
                           ## only owner should see that
                           <a href="#copySource" onclick="return false;" class="btn btn-mini icon-clipboard clipboard-action" data-clipboard-text="${c.files[0].content}">${_('Copy content')}</a>
 
-                          %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.rhodecode_user.user_id:
+                          %if c.is_super_admin or c.gist.gist_owner == c.rhodecode_user.user_id:
                             ${h.link_to(_('Edit'), h.route_path('gist_edit', gist_id=c.gist.gist_access_id), class_="btn btn-mini")}
                           %endif
                           ${h.link_to(_('Show as Raw'), h.route_path('gist_show_formatted', gist_id=c.gist.gist_access_id, revision='tip', format='raw'), class_="btn btn-mini")}

rhodecode/templates/admin/integrations/base.mako

@@ -6,7 +6,7 b''
       elif context['c'].repo_group:
         return "/admin/repo_groups/repo_group_edit.mako"
       else:
-        return "/admin/settings/settings.mako"
+        return "/admin/integrations/global.mako"
 %>
 <%inherit file="${inherit(context)}" />
 
@@ -31,12 +31,6 b''
   %endif
 </%def>
 
-<%def name="menu_bar_subnav()">
-  %if c.repo:
-    ${self.repo_menu(active='options')}
-  %endif
-</%def>
-
 <%def name="main_content()">
   ${next.body()}
 </%def>

rhodecode/templates/admin/integrations/list.mako

@@ -43,7 +43,7 b''
       %if c.repo:
         ${_('Current Integrations for Repository: {repo_name}').format(repo_name=c.repo.repo_name)}
       %elif c.repo_group:
-        ${_('Current Integrations for repository group: {repo_group_name}').format(repo_group_name=c.repo_group.group_name)}
+        ${_('Repository Group Integrations: {}').format(c.repo_group.group_name)}</h3>
       %else:
           ${_('Current Integrations')}
       %endif
@@ -107,11 +107,9 b''
   %for IntegrationType, integration in c.integrations_list:
         <tr id="integration_${integration.integration_id}">
           <td class="td-enabled">
-            %if integration.enabled:
-            <div class="flag_status approved pull-left"></div>
-            %else:
-            <div class="flag_status rejected pull-left"></div>
-            %endif
+            <div class="pull-left">
+                ${h.bool2icon(integration.enabled)}
+            </div>
           </td>
           <td class="td-description">
             ${integration.name}

rhodecode/templates/admin/my_account/my_account_bookmarks.mako

@@ -25,6 +25,9 b''
                     </div>
          </div>
             </div>
+            <p class="help-block help-block-inline" >
+                ${_('Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker')}
+            </p>
 
             <div class="label">
                 <label for="redirect_url">${_('Redirect URL')}:</label>

rhodecode/templates/admin/my_account/my_account_profile.mako

@@ -5,51 +5,60 b''
         <a href="${h.route_path('my_account_edit')}" class="panel-edit">${_('Edit')}</a>
     </div>
 
-    <div class="panel-body">
-        <div class="fieldset">
-            <div class="left-label">
+    <div class="panel-body fields">
+        <div class="field">
+            <div class="label">
                 ${_('Photo')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 %if c.visual.use_gravatar:
                     ${base.gravatar(c.user.email, 100)}
                 %else:
-                    ${base.gravatar(c.user.email, 20)}
-                    ${_('Avatars are disabled')}
+                        ${base.gravatar(c.user.email, 100)}
                 %endif
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Username')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.username}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('First Name')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.first_name}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Last Name')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.last_name}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Email')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.email or _('Missing email, please update your user email address.')}
             </div>
         </div>
     </div>
+    </div>
 </div>
  No newline at end of file

rhodecode/templates/admin/my_account/my_account_profile_edit.mako

@@ -58,8 +58,7 b''
                         ${base.gravatar(c.user.email, 100)}
                         <p class="help-block">${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a>.</p>
                     %else:
-                        ${base.gravatar(c.user.email, 20)}
-                        ${_('Avatars are disabled')}
+                        ${base.gravatar(c.user.email, 100)}
                     %endif
                 </div>
             </div>

rhodecode/templates/admin/notifications/notifications_show_all.mako

@@ -8,9 +8,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('My Notifications')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='my_account')}
@@ -19,7 +17,8 b''
 <%def name="main()">
 <div class="box">
   <div class="title">
-      ${self.breadcrumbs()}
+      ${_('My Notifications')}
+
       <div class="notifications_buttons">
       %if c.notifications:
           <button id='mark_all_read' class="btn btn-default" type="submit">

rhodecode/templates/admin/permissions/permissions.mako

@@ -18,12 +18,12 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='permissions')}
+</%def>
 
 <%def name="main()">
 <div class="box">
-  <div class="title">
-      ${self.breadcrumbs()}
-  </div>
 
   <div class="sidebar-col-wrapper scw-small">
     ##main

rhodecode/templates/admin/repo_groups/repo_group_add.mako

@@ -20,13 +20,12 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='repository_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-    <!-- box / title -->
-    <div class="title">
-        ${self.breadcrumbs()}
-    </div>
-    <!-- end box / title -->
     ${h.secure_form(h.route_path('repo_group_create'), request=request)}
     <div class="form">
         <!-- fields -->

rhodecode/templates/admin/repo_groups/repo_group_edit.mako

@@ -13,7 +13,7 b''
 </%def>
 
 <%def name="menu_bar_subnav()">
-    ${self.repo_group_menu(active='options')}
+    ${self.repo_group_menu(active='settings')}
 </%def>
 
 <%def name="main_content()">
@@ -23,10 +23,6 b''
 <%def name="main()">
 
 <div class="box">
-  <div class="title">
-    ${self.repo_group_page_title(c.repo_group)}
-  </div>
-
   <div class="sidebar-col-wrapper">
     ##main
     <div class="sidebar">

rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako

@@ -1,10 +1,16 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <%
+ source_repo_id = c.repo_group.changeset_cache.get('source_repo_id')
+
  elems = [
     (_('Repository Group ID'), c.repo_group.group_id, '', ''),
     (_('Owner'), lambda:base.gravatar_with_user(c.repo_group.user.email), '', ''),
     (_('Created on'), h.format_date(c.repo_group.created_on), '', ''),
+    (_('Updated on'), h.format_date(c.repo_group.updated_on), '', ''),
+    (_('Cached Commit date'), (c.repo_group.changeset_cache.get('date')), '', ''),
+    (_('Cached Commit repo_id'), (h.link_to_if(source_repo_id, source_repo_id, h.route_path('repo_summary', repo_name='_{}'.format(source_repo_id)))), '', ''),
+
     (_('Is Personal Group'), c.repo_group.personal or False, '', ''),
 
     (_('Total repositories'), c.repo_group.repositories_recursive_count, '', ''),
@@ -16,7 +22,7 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Repository Group: %s') % c.repo_group.group_name}</h3>
+        <h3 class="panel-title">${_('Repository Group Advanced: {}').format(c.repo_group.name)}</h3>
     </div>
     <div class="panel-body">
         ${base.dt_info_panel(elems)}

rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako

@@ -2,7 +2,7 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Repository Group Permissions')}</h3>
+        <h3 class="panel-title">${_('Repository Group Permissions: {}').format(c.repo_group.name)}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_group_perms_update', repo_group_name=c.repo_group.group_name), request=request)}
@@ -141,7 +141,7 b''
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.admin', checked=_user_group.permission=='group.admin')}</td>
                     <td class="td-componentname">
                         <i class="icon-user-group"></i>
-                        %if h.HasPermissionAny('hg.admin')():
+                        %if c.is_super_admin:
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
                          </a>

rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako

@@ -3,7 +3,7 b''
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Settings for Repository Group: %s') % c.repo_group.name}</h3>
+        <h3 class="panel-title">${_('Repository Group Settings: {}').format(c.repo_group.name)}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name), request=request)}

rhodecode/templates/admin/repo_groups/repo_groups.mako

@@ -8,21 +8,25 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_group_count">0</span> ${_('repository groups')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='repository_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box">
+
     <div class="title">
-        ${self.breadcrumbs()}
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="repo_group_count">0</span> ${_('repository groups')}
+
         <ul class="links">
-            %if h.HasPermissionAny('hg.admin','hg.repogroup.create.true')():
+        %if c.can_create_repo_group:
              <li>
                <a href="${h.route_path('repo_group_new')}" class="btn btn-small btn-success">${_(u'Add Repository Group')}</a>
              </li>
@@ -36,15 +40,32 b''
 
 <script>
 $(document).ready(function() {
-
-    var get_datatable_count = function(){
-      var api = $('#group_list_table').dataTable().api();
-      $('#repo_group_count').text(api.page.info().recordsDisplay);
-    };
+    var $repoGroupsListTable = $('#group_list_table');
 
    // repo group list
-   $('#group_list_table').DataTable({
-      data: ${c.data|n},
+   $repoGroupsListTable.DataTable({
+      processing: true,
+      serverSide: true,
+      ajax: {
+          "url": "${h.route_path('repo_groups_data')}",
+          "dataSrc": function (json) {
+              var filteredCount = json.recordsFiltered;
+              var filteredInactiveCount = json.recordsFilteredInactive;
+              var totalInactive = json.recordsTotalInactive;
+              var total = json.recordsTotal;
+
+              var _text = _gettext(
+                      "{0} of {1} repository groups").format(
+                      filteredCount, total);
+
+              if (total === filteredCount) {
+                  _text = _gettext("{0} repository groups").format(total);
+              }
+              $('#repo_group_count').text(_text);
+              return json.data;
+          },
+      },
+
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
@@ -62,36 +83,34 b''
          { data: {"_": "owner",
                   "sort": "owner"}, title: "${_('Owner')}", className: "td-user" },
          { data: {"_": "action",
-                  "sort": "action"}, title: "${_('Action')}", className: "td-action" }
+                  "sort": "action"}, title: "${_('Action')}", className: "td-action", orderable: false }
       ],
       language: {
           paginate: DEFAULT_GRID_PAGINATION,
+          sProcessing: _gettext('loading...'),
           emptyTable: _gettext("No repository groups available yet.")
       },
-      "initComplete": function( settings, json ) {
-          get_datatable_count();
-          quick_repo_menu();
-      }
     });
 
-     // update the counter when doing search
-    $('#group_list_table').on( 'search.dt', function (e,settings) {
-      get_datatable_count();
+    $repoGroupsListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $repoGroupsListTable.css('opacity', 1);
+    });
+
+    $repoGroupsListTable.on('preXhr.dt', function(e, settings, data){
+        $repoGroupsListTable.css('opacity', 0.3);
     });
 
-    // filter, filter both grids
-    $('#q_filter').on( 'keyup', function () {
-
-      var repo_group_api = $('#group_list_table').dataTable().api();
-      repo_group_api
-        .columns(0)
-        .search(this.value)
-        .draw();
+    // filter
+    $('#q_filter').on('keyup',
+        $.debounce(250, function() {
+            $repoGroupsListTable.DataTable().search(
+                $('#q_filter').val()
+            ).draw();
+        })
+    );
     });
 
-    // refilter table if page load via back button
-    $("#q_filter").trigger('keyup');
-});
 </script>
+
 </%def>
 

rhodecode/templates/admin/repos/repo_add.mako

@@ -26,12 +26,12 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='repositories')}
+</%def>
+
 <%def name="main()">
     <div class="box">
-        <!-- box / title -->
-        <div class="title">
-            ${self.breadcrumbs()}
-        </div>
         <%include file="repo_add_base.mako"/>
     </div>
 </%def>

rhodecode/templates/admin/repos/repo_edit.mako

@@ -20,7 +20,7 b''
 </%def>
 
 <%def name="menu_bar_subnav()">
-    ${self.repo_menu(active='options')}
+    ${self.repo_menu(active='settings')}
 </%def>
 
 <%def name="main_content()">
@@ -34,10 +34,6 b''
 
 <%def name="main()">
 <div class="box">
-  <div class="title">
-      ${self.repo_page_title(c.rhodecode_db_repo)}
-
-  </div>
 
   <div class="sidebar-col-wrapper scw-small">
     <div class="sidebar">

rhodecode/templates/admin/repos/repo_edit_advanced.mako

@@ -7,9 +7,11 b''
     (_('Created on'), h.format_date(c.rhodecode_db_repo.created_on), '', ''),
     (_('Updated on'), h.format_date(c.rhodecode_db_repo.updated_on), '', ''),
     (_('Cached Commit id'), lambda: h.link_to(c.rhodecode_db_repo.changeset_cache.get('short_id'), h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.changeset_cache.get('raw_id'))), '', ''),
+    (_('Cached Commit date'), c.rhodecode_db_repo.changeset_cache.get('date'), '', ''),
     (_('Attached scoped tokens'), len(c.rhodecode_db_repo.scoped_tokens), '', [x.user for x in c.rhodecode_db_repo.scoped_tokens]),
     (_('Pull requests source'), len(c.rhodecode_db_repo.pull_requests_source), '', ['pr_id:{}, repo:{}'.format(x.pull_request_id,x.source_repo.repo_name) for x in c.rhodecode_db_repo.pull_requests_source]),
     (_('Pull requests target'), len(c.rhodecode_db_repo.pull_requests_target), '', ['pr_id:{}, repo:{}'.format(x.pull_request_id,x.target_repo.repo_name) for x in c.rhodecode_db_repo.pull_requests_target]),
+    (_('Attached Artifacts'), len(c.rhodecode_db_repo.artifacts), '', ''),
  ]
 %>
 

rhodecode/templates/admin/repos/repo_edit_permissions.mako

@@ -136,7 +136,7 b''
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.admin', checked=_user_group.permission=='repository.admin')}</td>
                     <td class="td-componentname">
                         <i class="icon-user-group"></i>
-                        %if h.HasPermissionAny('hg.admin')():
+                        %if c.is_super_admin:
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
                          </a>

rhodecode/templates/admin/repos/repos.mako

@@ -8,21 +8,25 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="repo_count">0</span> ${_('repositories')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='repositories')}
+</%def>
+
 <%def name="main()">
 <div class="box">
+
     <div class="title">
-        ${self.breadcrumbs()}
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="repo_count">0</span> ${_('repositories')}
+
         <ul class="links">
-            %if h.HasPermissionAny('hg.admin','hg.create.repository')():
+        %if c.can_create_repo:
              <li>
                <a href="${h.route_path('repo_new')}" class="btn btn-small btn-success">${_(u'Add Repository')}</a>
              </li>
@@ -66,7 +70,7 b''
          { data: {"_": "state",
                   "sort": "state"}, title: "${_('State')}", className: "td-tags td-state" },
          { data: {"_": "action",
-                  "sort": "action"}, title: "${_('Action')}", className: "td-action" }
+                  "sort": "action"}, title: "${_('Action')}", className: "td-action", orderable: false }
       ],
       language: {
           paginate: DEFAULT_GRID_PAGINATION,

rhodecode/templates/admin/settings/settings.mako

@@ -13,11 +13,15 b''
     »
     ${_('Settings')}
 </%def>
-
+##
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='settings')}
+</%def>
+
 <%def name="side_bar_nav()">
   % for navitem in c.navlist:
     <li class="${'active' if c.active in navitem.active_list else ''}">
@@ -32,9 +36,6 b''
 
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.breadcrumbs()}
-    </div>
 
     ##main
     <div class='sidebar-col-wrapper'>

rhodecode/templates/admin/settings/settings_exceptions_browse.mako

@@ -6,18 +6,24 b''
         % if c.exception_list_count == 1:
             ${_('There is {} stored exception.').format(c.exception_list_count)}
         % else:
-            ${_('There are {} stored exceptions.').format(c.exception_list_count)}
+            ${_('There are total {} stored exceptions.').format(c.exception_list_count)}
         % endif
+        <br/>
         ${_('Store directory')}: ${c.exception_store_dir}
 
       ${h.secure_form(h.route_path('admin_settings_exception_tracker_delete_all'), request=request)}
         <div style="margin: 0 0 20px 0" class="fake-space"></div>
-
+        <input type="hidden" name="type_filter", value="${c.type_filter}">
         <div class="field">
             <button class="btn btn-small btn-danger" type="submit"
                     onclick="return confirm('${_('Confirm to delete all exceptions')}');">
                 <i class="icon-remove-sign"></i>
+                % if c.type_filter:
+                    ${_('Delete All `{}`').format(c.type_filter)}
+                % else:
                 ${_('Delete All')}
+                % endif
+
             </button>
         </div>
 
@@ -48,7 +54,9 b''
                 <td><a href="${h.route_path('admin_settings_exception_tracker_show', exception_id=tb['exc_id'])}"><code>${tb['exc_id']}</code></a></td>
                 <td>${h.format_date(tb['exc_utc_date'])}</td>
                 <td>${tb['app_type']}</td>
-                <td>${tb['exc_type']}</td>
+                <td>
+                    <a href="${h.current_route_path(request, type_filter=tb['exc_type'])}">${tb['exc_type']}</a>
+                </td>
             </tr>
             <% cnt -=1 %>
         % endfor

rhodecode/templates/admin/user_groups/user_group_add.mako

@@ -19,13 +19,12 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='user_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box main-content">
-    <!-- box / title -->
-    <div class="title">
-        ${self.breadcrumbs()}
-    </div>
-    <!-- end box / title -->
     ${h.secure_form(h.route_path('user_groups_create'), request=request)}
     <div class="form">
         <!-- fields -->

rhodecode/templates/admin/user_groups/user_group_edit.mako

@@ -20,11 +20,12 b''
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='user_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box">
-  <div class="title">
-      ${self.breadcrumbs()}
-  </div>
 
   ##main
   <div class="sidebar-col-wrapper">

rhodecode/templates/admin/user_groups/user_group_edit_perms.mako

@@ -143,7 +143,7 b''
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'usergroup.admin')}</td>
                     <td class="td-user">
                         <i class="icon-user-group"></i>
-                        %if h.HasPermissionAny('hg.admin')():
+                        %if c.is_super_admin:
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
                          </a>

rhodecode/templates/admin/user_groups/user_groups.mako

@@ -8,22 +8,25 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_group_count">0</span>
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='user_groups')}
+</%def>
+
 <%def name="main()">
 <div class="box">
 
     <div class="title">
-        ${self.breadcrumbs()}
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="user_group_count">0</span>
+
         <ul class="links">
-        %if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')():
+        %if c.can_create_user_group:
           <li>
             <a href="${h.route_path('user_groups_new')}" class="btn btn-small btn-success">${_(u'Add User Group')}</a>
           </li>
@@ -102,7 +105,7 b''
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
-            $('#user_group_list_table').DataTable().search(
+            $userGroupsListTable.DataTable().search(
                 $('#q_filter').val()
             ).draw();
         })

rhodecode/templates/admin/users/user_edit.mako

@@ -13,23 +13,24 b''
     »
     ${h.link_to(_('Users'),h.route_path('users'))}
     »
-    % if c.user.active:
-    ${c.user.username}
-    % else:
-    <strike title="${_('This user is set as disabled')}">${c.user.username}</strike>
-    % endif
-
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='users')}
+</%def>
+
+
 <%def name="main()">
 <div class="box user_settings">
-    <div class="title">
-        ${self.breadcrumbs()}
+  % if not c.user.active:
+    <div class="alert alert-warning text-center">
+        <strong>${_('This user is set as disabled')}</strong>
     </div>
+  % endif
 
     ##main
   <div class="sidebar-col-wrapper">

rhodecode/templates/admin/users/user_edit_advanced.mako

@@ -81,7 +81,7 b''
             </div>
         %endif
             <button class="btn btn-default" type="submit" ${'disabled="disabled"' if c.personal_repo_group else ''}>
-                <i class="icon-folder-close"></i>
+                <i class="icon-repo-group"></i>
                 ${_('Create personal repository group')}
             </button>
         ${h.end_form()}

rhodecode/templates/admin/users/user_edit_ips.mako

@@ -61,9 +61,9 b''
                 </div>
                 <div class="input">
                     ${h.text('new_ip')} ${h.text('description', placeholder=_('Description...'))}
-                    <span class="help-block">${_('Enter comma separated list of ip addresses like 127.0.0.1,\n'
-                     'or use a ip address with a mask 127.0.0.1/24, to create a network range.\n'
-                     'To specify multiple address range use 127.0.0.1-127.0.0.10 syntax')}</span>
+                    <span class="help-block pre-formatting">${_('Enter comma separated list of ip addresses like 10.0.0.1,10.0.0.2.\n'
+                     'Use a ip address with a mask 127.0.0.1/24, to create a network match pattern.\n'
+                     'To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax')}</span>
                 </div>
              </div>
             <div class="buttons">

rhodecode/templates/admin/users/user_edit_profile.mako

@@ -29,8 +29,7 b''
                         ${base.gravatar(c.user.email, 100)}
                         <p class="help-block">${_('Change the avatar at')} <a href="http://gravatar.com">gravatar.com</a>.</p>
                     %else:
-                        ${base.gravatar(c.user.email, 20)}
-                        ${_('Avatars are disabled')}
+                        ${base.gravatar(c.user.email, 100)}
                     %endif
                 </div>
             </div>

rhodecode/templates/admin/users/users.mako

@@ -8,21 +8,24 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    ${h.link_to(_('Admin'),h.route_path('admin_home'))} &raquo; <span id="user_count">0</span>
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
+<%def name="menu_bar_subnav()">
+    ${self.admin_menu(active='users')}
+</%def>
+
 <%def name="main()">
 
 <div class="box">
 
     <div class="title">
-        ${self.breadcrumbs()}
+        <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+        <span id="user_count">0</span>
+
         <ul class="links">
           <li>
             <a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>

rhodecode/templates/base/base.mako

@@ -9,10 +9,12 b''
       <div id="header-inner" class="wrapper">
           <div id="logo">
               <div class="logo-wrapper">
-                  <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                  <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
               </div>
               %if c.rhodecode_name:
-               <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
+               <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+               </div>
               %endif
           </div>
           <!-- MENU BAR NAV -->
@@ -72,22 +74,67 b''
     </div>
 </%def>
 
-<%def name="admin_menu()">
-  <ul class="admin_menu submenu">
-      <li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
-      <li><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
-      <li><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
-      <li><a href="${h.route_path('users')}">${_('Users')}</a></li>
-      <li><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
-      <li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
-      <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
-      <li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
-      <li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
-      <li class="last"><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
+<%def name="admin_menu(active=None)">
+  <%
+    def is_active(selected):
+        if selected == active:
+            return "active"
+  %>
+
+  <div id="context-bar">
+    <div class="wrapper">
+      <div class="title">
+        <div class="title-content">
+          <div class="title-main">
+            % if c.is_super_admin:
+                ${_('Super Admin Panel')}
+            % else:
+                ${_('Delegated Admin Panel')}
+            % endif
+          </div>
+        </div>
+      </div>
+
+    <ul id="context-pages" class="navigation horizontal-list">
+
+        ## super admin case
+        % if c.is_super_admin:
+          <li class="${is_active('audit_logs')}"><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
+          <li class="${is_active('repositories')}"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
+          <li class="${is_active('repository_groups')}"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
+          <li class="${is_active('users')}"><a href="${h.route_path('users')}">${_('Users')}</a></li>
+          <li class="${is_active('user_groups')}"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+          <li class="${is_active('permissions')}"><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
+          <li class="${is_active('authentication')}"><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
+          <li class="${is_active('integrations')}"><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
+          <li class="${is_active('defaults')}"><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
+          <li class="${is_active('settings')}"><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
+
+        ## delegated admin
+        % elif c.is_delegated_admin:
+           <%
+           repositories=c.auth_user.repositories_admin or c.can_create_repo
+           repository_groups=c.auth_user.repository_groups_admin or c.can_create_repo_group
+           user_groups=c.auth_user.user_groups_admin or c.can_create_user_group
+           %>
+
+           %if repositories:
+              <li class="${is_active('repositories')} local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
+           %endif
+           %if repository_groups:
+              <li class="${is_active('repository_groups')} local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
+           %endif
+           %if user_groups:
+              <li class="${is_active('user_groups')} local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+           %endif
+        % endif
   </ul>
+
+    </div>
+    <div class="clear"></div>
+  </div>
 </%def>
 
-
 <%def name="dt_info_panel(elements)">
     <dl class="dl-horizontal">
     %for dt, dd, title, show_items in elements:
@@ -117,7 +164,6 b''
     </dl>
 </%def>
 
-
 <%def name="gravatar(email, size=16)">
   <%
     if (size > 16):
@@ -143,23 +189,9 b''
 </%def>
 
 
-## admin menu used for people that have some admin resources
-<%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
-  <ul class="submenu">
-   %if repositories:
-      <li class="local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
-   %endif
-   %if repository_groups:
-      <li class="local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
-   %endif
-   %if user_groups:
-      <li class="local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
-   %endif
-  </ul>
-</%def>
+<%def name="repo_page_title(repo_instance)">
+<div class="title-content repo-title">
 
-<%def name="repo_page_title(repo_instance)">
-<div class="title-content">
     <div class="title-main">
         ## SVN/HG/GIT icons
         %if h.is_hg(repo_instance):
@@ -182,11 +214,29 b''
         ## repo name with group name
         ${h.breadcrumb_repo_link(repo_instance)}
 
+        ## Context Actions
+        <div class="pull-right">
+            %if c.rhodecode_user.username != h.DEFAULT_USER:
+                <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name, _query=dict(auth_token=c.rhodecode_user.feed_token))}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
+
+                <a href="#WatchRepo" onclick="toggleFollowingRepo(this, templateContext.repo_id); return false" title="${_('Watch this Repository and actions on it in your personalized journal')}" class="btn btn-sm ${('watching' if c.repository_is_user_following else '')}">
+                    % if c.repository_is_user_following:
+                        <i class="icon-eye-off"></i>${_('Unwatch')}
+                    % else:
+                        <i class="icon-eye"></i>${_('Watch')}
+                    % endif
+
+                </a>
+            %else:
+                <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name)}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
+            %endif
+        </div>
+
     </div>
 
     ## FORKED
     %if repo_instance.fork:
-    <p>
+    <p class="discreet">
         <i class="icon-code-fork"></i> ${_('Fork of')}
         ${h.link_to_if(c.has_origin_repo_read_perm,repo_instance.fork.repo_name, h.route_path('repo_summary', repo_name=repo_instance.fork.repo_name))}
     </p>
@@ -194,7 +244,7 b''
 
     ## IMPORTED FROM REMOTE
     %if repo_instance.clone_uri:
-    <p>
+    <p class="discreet">
        <i class="icon-code-fork"></i> ${_('Clone from')}
        <a href="${h.safe_str(h.hide_credentials(repo_instance.clone_uri))}">${h.hide_credentials(repo_instance.clone_uri)}</a>
     </p>
@@ -202,12 +252,12 b''
 
     ## LOCKING STATUS
      %if repo_instance.locked[0]:
-       <p class="locking_locked">
+       <p class="locking_locked discreet">
            <i class="icon-repo-lock"></i>
            ${_('Repository locked by %(user)s') % {'user': h.person_by_id(repo_instance.locked[0])}}
        </p>
      %elif repo_instance.enable_locking:
-         <p class="locking_unlocked">
+         <p class="locking_unlocked discreet">
              <i class="icon-repo-unlock"></i>
              ${_('Repository not locked. Pull repository to lock it.')}
          </p>
@@ -222,78 +272,81 b''
         if selected == active:
             return "active"
     %>
+    % if c.rhodecode_db_repo.archived:
+    <div class="alert alert-warning text-center">
+        <strong>${_('This repository has been archived. It is now read-only.')}</strong>
+    </div>
+    % endif
 
-  <!--- CONTEXT BAR -->
+  <!--- REPO CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
+
+      <div class="title">
+          ${self.repo_page_title(c.rhodecode_db_repo)}
+      </div>
+
       <ul id="context-pages" class="navigation horizontal-list">
         <li class="${is_active('summary')}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li>
-        <li class="${is_active('changelog')}"><a class="menulink" href="${h.route_path('repo_changelog', repo_name=c.repo_name)}"><div class="menulabel">${_('Changelog')}</div></a></li>
+        <li class="${is_active('commits')}"><a class="menulink" href="${h.route_path('repo_commits', repo_name=c.repo_name)}"><div class="menulabel">${_('Commits')}</div></a></li>
         <li class="${is_active('files')}"><a class="menulink" href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.rhodecode_db_repo.landing_rev[1], f_path='')}"><div class="menulabel">${_('Files')}</div></a></li>
         <li class="${is_active('compare')}"><a class="menulink" href="${h.route_path('repo_compare_select',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a></li>
-        <li class="${is_active('search')}"><a class="menulink" href="${h.route_path('search_repo',repo_name=c.repo_name)}"><div class="menulabel">${_('Search')}</div></a></li>
 
         ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()"
         %if c.rhodecode_db_repo.repo_type in ['git','hg']:
           <li class="${is_active('showpullrequest')}">
             <a class="menulink" href="${h.route_path('pullrequest_show_all', repo_name=c.repo_name)}" title="${h.tooltip(_('Show Pull Requests for %s') % c.repo_name)}">
-              %if c.repository_pull_requests:
-                <span class="pr_notifications">${c.repository_pull_requests}</span>
+              <div class="menulabel">
+              %if c.repository_pull_requests == 1:
+                  ${_('Pull Request')} ${c.repository_pull_requests}
+              %else:
+                  ${_('Pull Requests')} ${c.repository_pull_requests} 
               %endif
-              <div class="menulabel">${_('Pull Requests')}</div>
+              </div>
             </a>
           </li>
         %endif
 
+        <li class="${is_active('artifacts')}"><a class="menulink" href="${h.route_path('repo_artifacts_list',repo_name=c.repo_name)}"><div class="menulabel">${_('Artifacts')} (BETA)</div></a></li>
+
+        %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
+            <li class="${is_active('settings')}"><a class="menulink" href="${h.route_path('edit_repo',repo_name=c.repo_name)}"><div class="menulabel">${_('Repository Settings')}</div></a></li>
+        %endif
+
+        ## determine if we have "any" option available
+        <%
+            can_lock = h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking
+            has_actions = (c.rhodecode_user.username != h.DEFAULT_USER and c.rhodecode_db_repo.repo_type in ['git','hg'] ) or can_lock
+        %>
         <li class="${is_active('options')}">
+          % if has_actions:
           <a class="menulink dropdown">
               <div class="menulabel">${_('Options')} <div class="show_more"></div></div>
           </a>
           <ul class="submenu">
-             %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
-                   <li><a href="${h.route_path('edit_repo',repo_name=c.repo_name)}">${_('Repository Settings')}</a></li>
-             %endif
-              %if c.rhodecode_db_repo.fork:
-               <li>
-                   <a title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}"
-                      href="${h.route_path('repo_compare',
-                            repo_name=c.rhodecode_db_repo.fork.repo_name,
-                            source_ref_type=c.rhodecode_db_repo.landing_rev[0],
-                            source_ref=c.rhodecode_db_repo.landing_rev[1],
-                            target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],
-                            target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1],
-                            _query=dict(merge=1))}"
-                    >
-                   ${_('Compare fork')}
-                   </a>
-               </li>
-              %endif
-
-              %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
+                <li><a href="${h.route_path('repo_fork_new',repo_name=c.repo_name)}">${_('Fork this repository')}</a></li>
+                <li><a href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">${_('Create Pull Request')}</a></li>
+                %if can_lock:
                 %if c.rhodecode_db_repo.locked[0]:
-                  <li><a class="locking_del" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Unlock')}</a></li>
+                      <li><a class="locking_del" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Unlock Repository')}</a></li>
                 %else:
-                  <li><a class="locking_add" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Lock')}</a></li>
-                %endif
-              %endif
-              %if c.rhodecode_user.username != h.DEFAULT_USER:
-                %if c.rhodecode_db_repo.repo_type in ['git','hg']:
-                  <li><a href="${h.route_path('repo_fork_new',repo_name=c.repo_name)}">${_('Fork')}</a></li>
-                  <li><a href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">${_('Create Pull Request')}</a></li>
+                      <li><a class="locking_add" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Lock Repository')}</a></li>
                 %endif
               %endif
              </ul>
+          % else:
+            <a class="menulink disabled">
+              <div class="menulabel">${_('Options')}<div class="show_more"></div></div>
+            </a>
+          % endif
         </li>
+
       </ul>
     </div>
     <div class="clear"></div>
   </div>
-    % if c.rhodecode_db_repo.archived:
-    <div class="alert alert-warning text-center">
-        <strong>${_('This repository has been archived. It is now read-only.')}</strong>
-    </div>
-    % endif
-  <!--- END CONTEXT BAR -->
+
+  <!--- REPO END CONTEXT BAR -->
 
 </%def>
 
@@ -301,14 +354,14 b''
 <div class="title-content">
     <div class="title-main">
         ## Repository Group icon
-        <i class="icon-folder-close"></i>
+        <i class="icon-repo-group"></i>
 
         ## repo name with group name
         ${h.breadcrumb_repo_group_link(repo_group_instance)}
     </div>
 
     <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
-    <div class="repo-group-desc">
+    <div class="repo-group-desc discreet">
     ${dt.repo_group_desc(repo_group_instance.description_safe, repo_group_instance.personal, c.visual.stylify_metatags)}
     </div>
 
@@ -321,8 +374,6 b''
         if selected == active:
             return "active"
 
-    is_admin = h.HasPermissionAny('hg.admin')('can create repos index page')
-
     gr_name = c.repo_group.group_name if c.repo_group else None
     # create repositories with write permission on group is set to true
     create_on_write = h.HasPermissionAny('hg.create.write_on_repogroup.true')()
@@ -331,35 +382,49 b''
 
     %>
 
-  <!--- CONTEXT BAR -->
+  <!--- REPO GROUP CONTEXT BAR -->
   <div id="context-bar">
     <div class="wrapper">
+      <div class="title">
+          ${self.repo_group_page_title(c.repo_group)}
+      </div>
+
       <ul id="context-pages" class="navigation horizontal-list">
         <li class="${is_active('home')}"><a class="menulink" href="${h.route_path('repo_group_home', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Group Home')}</div></a></li>
-        <li class="${is_active('search')}"><a class="menulink" href="${h.route_path('search_repo_group', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Search')}</div></a></li>
-
+        % if c.is_super_admin or group_admin:
+            <li class="${is_active('settings')}"><a class="menulink" href="${h.route_path('edit_repo_group',repo_group_name=c.repo_group.group_name)}" title="${_('You have admin right to this group, and can edit it')}"><div class="menulabel">${_('Group Settings')}</div></a></li>
+        % endif
+        ## determine if we have "any" option available
+        <%
+            can_create_repos = c.is_super_admin or group_admin or (group_write and create_on_write)
+            can_create_repo_groups = c.is_super_admin or group_admin
+            has_actions = can_create_repos or can_create_repo_groups
+        %>
         <li class="${is_active('options')}">
+          % if has_actions:
           <a class="menulink dropdown">
               <div class="menulabel">${_('Options')} <div class="show_more"></div></div>
           </a>
           <ul class="submenu">
-                %if is_admin or group_admin:
-                   <li><a href="${h.route_path('edit_repo_group',repo_group_name=c.repo_group.group_name)}" title="${_('You have admin right to this group, and can edit it')}">${_('Group Settings')}</a></li>
-                %endif
-                %if is_admin or group_admin or (group_write and create_on_write):
+                %if can_create_repos:
                     <li><a href="${h.route_path('repo_new',_query=dict(parent_group=c.repo_group.group_id))}">${_('Add Repository')}</a></li>
                 %endif
-                %if is_admin or group_admin:
-                    <li><a href="${h.route_path('repo_group_new',_query=dict(parent_group=c.repo_group.group_id))}">${_(u'Add Parent Group')}</a></li>
+                %if can_create_repo_groups:
+                    <li><a href="${h.route_path('repo_group_new',_query=dict(parent_group=c.repo_group.group_id))}">${_(u'Add Repository Group')}</a></li>
                 %endif
              </ul>
+          % else:
+            <a class="menulink disabled">
+              <div class="menulabel">${_('Options')} <div class="show_more"></div></div>
+            </a>
+          % endif
         </li>
       </ul>
     </div>
     <div class="clear"></div>
   </div>
 
-  <!--- END CONTEXT BAR -->
+  <!--- REPO GROUP CONTEXT BAR -->
 
 </%def>
 
@@ -431,7 +496,7 b''
                               <div>
                                 <a class="bookmark-item" href="${h.route_path('my_account_goto_bookmark', bookmark_id=item.position)}">
                                 <code>${item.position}</code>
-                                <i class="icon-folder-close" title="${_('Repository group')}" style="font-size: 16px"></i>
+                                <i class="icon-repo-group" title="${_('Repository group')}" style="font-size: 14px"></i>
                                 ${(item.title or h.shorter(item.repository_group.group_name, 30))}
                               </a>
                               </div>
@@ -484,10 +549,35 b''
        <li>
         <div class="menulabel main_filter_box">
             <div class="main_filter_input_box">
-                <input class="main_filter_input" id="main_filter" size="15" type="text" name="main_filter" placeholder="${_('search / go to...')}" value=""/>
-            </div>
-            <div class="main_filter_help_box">
+                <ul class="searchItems">
+
+                    % if c.template_context['search_context']['repo_id']:
+                        <li class="searchTag searchTagFilter searchTagHidable" >
+                        ##<a href="${h.route_path('search_repo',repo_name=c.template_context['search_context']['repo_name'])}">
+                            <span class="tag">
+                                This repo
+                                <a href="#removeGoToFilter" onclick="removeGoToFilter(); return false"><i class="icon-cancel-circled"></i></a>
+                            </span>
+                        ##</a>
+                        </li>
+                    % elif c.template_context['search_context']['repo_group_id']:
+                        <li class="searchTag searchTagFilter searchTagHidable">
+                        ##<a href="${h.route_path('search_repo_group',repo_group_name=c.template_context['search_context']['repo_group_name'])}">
+                            <span class="tag">
+                                This group
+                                <a href="#removeGoToFilter" onclick="removeGoToFilter(); return false"><i class="icon-cancel-circled"></i></a>
+                            </span>
+                        ##</a>
+                        </li>
+                    % endif
+
+                    <li class="searchTagInput">
+                        <input class="main_filter_input" id="main_filter" size="25" type="text" name="main_filter" placeholder="${_('search / go to...')}" value="" />
+                    </li>
+                    <li class="searchTag searchTagHelp">
                 <a href="#showFilterHelp" onclick="showMainFilterBox(); return false">?</a>
+                    </li>
+                </ul>
             </div>
         </div>
 
@@ -498,15 +588,31 b''
 
 - Prefix query to allow special search:
 
-   user:admin, to search for usernames
+   user:admin, to search for usernames, always global
+
+   user_group:devops, to search for user groups, always global
+
+   commit:efced4, to search for commits, scoped to repositories or groups
+
+   file:models.py, to search for file paths, scoped to repositories or groups
 
-   user_group:devops, to search for user groups
-
-   commit:efced4, to search for commits
+% if c.template_context['search_context']['repo_id']:
+   For advanced full text search visit: <a href="${h.route_path('search_repo',repo_name=c.template_context['search_context']['repo_name'])}">repository search</a>
+% elif c.template_context['search_context']['repo_group_id']:
+   For advanced full text search visit: <a href="${h.route_path('search_repo_group',repo_group_name=c.template_context['search_context']['repo_group_name'])}">repository group search</a>
+% else:
+   For advanced full text search visit: <a href="${h.route_path('search')}">global search</a>
+% endif
         </div>
        </li>
 
       ## ROOT MENU
+        <li class="${is_active('home')}">
+          <a class="menulink" title="${_('Home')}" href="${h.route_path('home')}">
+            <div class="menulabel">${_('Home')}</div>
+          </a>
+        </li>
+
       %if c.rhodecode_user.username != h.DEFAULT_USER:
         <li class="${is_active('journal')}">
           <a class="menulink" title="${_('Show activity journal')}" href="${h.route_path('journal')}">
@@ -520,33 +626,21 b''
           </a>
         </li>
       %endif
+
         <li class="${is_active('gists')}">
           <a class="menulink childs" title="${_('Show Gists')}" href="${h.route_path('gists_show')}">
             <div class="menulabel">${_('Gists')}</div>
           </a>
         </li>
-      <li class="${is_active('search')}">
-          <a class="menulink" title="${_('Search in repositories you have access to')}" href="${h.route_path('search')}">
-            <div class="menulabel">${_('Search')}</div>
+
+        % if c.is_super_admin or c.is_delegated_admin:
+        <li class="${is_active('admin')}">
+          <a class="menulink childs" title="${_('Admin settings')}" href="${h.route_path('admin_home')}">
+            <div class="menulabel">${_('Admin')} </div>
           </a>
       </li>
-      % if h.HasPermissionAll('hg.admin')('access admin main page'):
-        <li class="${is_active('admin')}">
-          <a class="menulink childs" title="${_('Admin settings')}" href="#" onclick="return false;">
-            <div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
-          </a>
-          ${admin_menu()}
-        </li>
-      % elif c.rhodecode_user.repositories_admin or c.rhodecode_user.repository_groups_admin or c.rhodecode_user.user_groups_admin:
-      <li class="${is_active('admin')}">
-          <a class="menulink childs" title="${_('Delegated Admin settings')}">
-            <div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
-          </a>
-          ${admin_menu_simple(c.rhodecode_user.repositories_admin,
-                              c.rhodecode_user.repository_groups_admin,
-                              c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
-      </li>
       % endif
+
       ## render extra user menu
       ${usermenu(active=(active=='my_account'))}
 
@@ -606,7 +700,7 b''
 
                 if(data){
 
-                    tmpl += '<i class="icon-folder-close"></i> ';
+                    tmpl += '<i class="icon-repo-group"></i> ';
 
                 }
                 tmpl += escapeMarkup(repoGroupName);
@@ -615,20 +709,9 b''
             }(result, escapeMarkup);
         };
 
-
-        var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
-
-            if (value.split(':').length === 2) {
-                value = value.split(':')[1]
-            }
-
-            var searchType = data['type'];
-            var valueDisplay = data['value_display'];
-
             var escapeRegExChars = function (value) {
                 return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
             };
-            var pattern = '(' + escapeRegExChars(value) + ')';
 
             var getRepoIcon = function(repo_type) {
                 if (repo_type === 'hg') {
@@ -643,18 +726,39 b''
                 return ''
             };
 
-            // highlight match
+        var autocompleteMainFilterFormatResult = function (data, value, org_formatter) {
+
+            if (value.split(':').length === 2) {
+                value = value.split(':')[1]
+            }
+
+            var searchType = data['type'];
+            var searchSubType = data['subtype'];
+            var valueDisplay = data['value_display'];
+
+            var pattern = '(' + escapeRegExChars(value) + ')';
+
             valueDisplay = Select2.util.escapeMarkup(valueDisplay);
+
+            // highlight match
+            if (searchType != 'text') {
             valueDisplay = valueDisplay.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
+            }
 
             var icon = '';
 
             if (searchType === 'hint') {
-                icon += '<i class="icon-folder-close"></i> ';
+                icon += '<i class="icon-repo-group"></i> ';
             }
-            // full text search
+            // full text search/hints
             else if (searchType === 'search') {
                 icon += '<i class="icon-more"></i> ';
+                if (searchSubType !== undefined && searchSubType == 'repo') {
+                    valueDisplay += '<div class="pull-right tag">repository</div>';
+                }
+                else if (searchSubType !== undefined && searchSubType == 'repo_group') {
+                    valueDisplay += '<div class="pull-right tag">repo group</div>';
+                }
             }
             // repository
             else if (searchType === 'repo') {
@@ -671,12 +775,13 b''
             }
             // repository groups
             else if (searchType === 'repo_group') {
-                icon += '<i class="icon-folder-close"></i> ';
+                icon += '<i class="icon-repo-group"></i> ';
             }
             // user group
             else if (searchType === 'user_group') {
                 icon += '<i class="icon-group"></i> ';
             }
+            // user
             else if (searchType === 'user') {
                 icon += '<img class="gravatar" src="{0}"/>'.format(data['icon_link']);
             }
@@ -690,6 +795,20 b''
                     icon += '<i class="icon-tag"></i>';
                 }
             }
+            // file
+            else if (searchType === 'file') {
+                var repo_data = data['repo_data'];
+                var repoIcon = getRepoIcon(repo_data['repository_type']);
+                if (repoIcon) {
+                    icon += repoIcon;
+                } else {
+                    icon += '<i class="icon-tag"></i>';
+                }
+            }
+            // generic text
+            else if (searchType === 'text') {
+                icon = '';
+            }
 
             var tmpl = '<div class="ac-container-wrap">{0}{1}</div>';
             return tmpl.format(icon, valueDisplay);
@@ -699,25 +818,53 b''
             if (suggestion.type === "hint") {
                 // we skip action
                 $('#main_filter').focus();
+            }
+            else if (suggestion.type === "text") {
+                // we skip action
+                $('#main_filter').focus();
+
             } else {
               window.location = suggestion['url'];
             }
         };
+
         var autocompleteMainFilterResult = function (suggestion, originalQuery, queryLowerCase) {
             if (queryLowerCase.split(':').length === 2) {
                 queryLowerCase = queryLowerCase.split(':')[1]
             }
+            if (suggestion.type === "text") {
+                // special case we don't want to "skip" display for
+                return true
+            }
             return suggestion.value_display.toLowerCase().indexOf(queryLowerCase) !== -1;
         };
 
+        var cleanContext = {
+            repo_view_type: null,
+
+            repo_id: null,
+            repo_name: "",
+
+            repo_group_id: null,
+            repo_group_name: null
+        };
+        var removeGoToFilter = function () {
+            $('.searchTagHidable').hide();
+            $('#main_filter').autocomplete(
+                'setOptions', {params:{search_context: cleanContext}});
+        };
+
         $('#main_filter').autocomplete({
             serviceUrl: pyroutes.url('goto_switcher_data'),
-            params: {"search_context": templateContext.search_context},
+            params: {
+                "search_context": templateContext.search_context
+            },
             minChars:2,
             maxHeight:400,
             deferRequestBy: 300, //miliseconds
             tabDisabled: true,
-            autoSelectFirst: true,
+            autoSelectFirst: false,
+            containerClass: 'autocomplete-qfilter-suggestions',
             formatResult: autocompleteMainFilterFormatResult,
             lookupFilter: autocompleteMainFilterResult,
             onSelect: function (element, suggestion) {
@@ -736,6 +883,18 b''
             $('#main_filter_help').toggle();
         };
 
+        $('#main_filter').on('keydown.autocomplete', function (e) {
+
+            var BACKSPACE = 8;
+            var el = $(e.currentTarget);
+            if(e.which === BACKSPACE){
+                var inputVal = el.val();
+                if (inputVal === ""){
+                    removeGoToFilter()
+                }
+            }
+        });
+
     </script>
     <script src="${h.asset('js/rhodecode/base/keyboard-bindings.js', ver=c.rhodecode_version_hash)}"></script>
 </%def>

rhodecode/templates/base/root.mako

@@ -7,7 +7,7 b" go_import_header = ''"
 if hasattr(c, 'rhodecode_db_repo'):
     c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type
     c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_rev[1]
-    ## check repo context
+    c.template_context['repo_id'] = c.rhodecode_db_repo.repo_id
     c.template_context['repo_view_type'] = h.get_repo_view_type(request)
 
 if getattr(c, 'repo_group', None):
@@ -29,6 +29,7 b" c.template_context['default_user'] = {"
 c.template_context['search_context'] = {
     'repo_group_id': c.template_context.get('repo_group_id'),
     'repo_group_name': c.template_context.get('repo_group_name'),
+    'repo_id': c.template_context.get('repo_id'),
     'repo_name': c.template_context.get('repo_name'),
     'repo_view_type': c.template_context.get('repo_view_type'),
 }

rhodecode/templates/base/vcs_settings.mako

@@ -133,13 +133,13 b''
 
                 <div class="checkbox">
                     ${h.checkbox('extensions_evolve' + suffix, 'True', **kwargs)}
-                    <label for="extensions_evolve${suffix}">${_('Enable evolve extension')}</label>
+                    <label for="extensions_evolve${suffix}">${_('Enable Evolve and Topic extension')}</label>
                 </div>
                 <div class="label">
                     % if display_globals:
-                        <span class="help-block">${_('Enable evolve extension for all repositories.')}</span>
+                        <span class="help-block">${_('Enable Evolve and Topic extensions for all repositories.')}</span>
                     % else:
-                        <span class="help-block">${_('Enable evolve extension for this repository.')}</span>
+                        <span class="help-block">${_('Enable Evolve and Topic extensions for this repository.')}</span>
                     % endif
                 </div>
 

rhodecode/templates/bookmarks/bookmarks.mako

@@ -8,10 +8,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    <span id="obj_count">0</span> ${_('bookmarks')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -24,7 +21,7 b''
 <%def name="main()">
     <div class="box">
       <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
         %if c.has_references:
           <ul class="links">
             <li>
@@ -33,7 +30,8 b''
           </ul>
         %endif
         %if c.has_references:
-          ${self.breadcrumbs()}
+            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            <span id="obj_count">0</span> ${_('bookmarks')}
         %endif
       </div>
       <table id="obj_list_table" class="display"></table>

rhodecode/templates/branches/branches.mako

@@ -8,10 +8,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    <span id="obj_count">0</span> ${_('branches')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -24,7 +21,7 b''
 <%def name="main()">
     <div class="box">
       <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
         %if c.has_references:
           <ul class="links">
             <li>
@@ -33,7 +30,8 b''
           </ul>
         %endif
         %if c.has_references:
-          ${self.breadcrumbs()}
+            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            <span id="obj_count">0</span> ${_('branches')}
         %endif
       </div>
       <table id="obj_list_table" class="display"></table>

rhodecode/templates/changeset/changeset.mako

@@ -15,7 +15,7 b''
 </%def>
 
 <%def name="menu_bar_subnav()">
-    ${self.repo_menu(active='changelog')}
+    ${self.repo_menu(active='commits')}
 </%def>
 
 <%def name="main()">
@@ -25,17 +25,13 b''
     templateContext.commit_data.commit_id = "${c.commit.raw_id}";
 </script>
 <div class="box">
-    <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
-    </div>
 
   <div id="changeset_compare_view_content"  class="summary changeset">
     <div class="summary-detail">
-      <div class="summary-detail-header">
-          <div class="breadcrumbs files_location">
-            <h4>
-            ${_('Commit')}
-
+        <div class="fieldset">
+          <div class="left-label-summary">
+            <p>${_('Commit')}</p>
+            <div class="right-label-summary">
             <code>
                 ${h.show_id(c.commit)}
             </code>
@@ -57,9 +53,8 b''
                   <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
               % endif
             % endif
-            </h4>
 
-          </div>
+
           <div class="pull-right">
               <span id="parent_link">
                 <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a>
@@ -69,41 +64,44 b''
                 <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a>
               </span>
           </div>
+
       </div>
+            </div>
+          </div>
+
+
 
       <div class="fieldset">
-        <div class="left-label">
-          ${_('Description')}:
-        </div>
-        <div class="right-content">
+        <div class="left-label-summary">
+          <p>${_('Description')}:</p>
+          <div class="right-label-summary">
           <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
           <div id="message_expand" style="display:none;">
             ${_('Expand')}
           </div>
         </div>
       </div>
+      </div>
 
       %if c.statuses:
       <div class="fieldset">
-        <div class="left-label">
-          ${_('Commit status')}:
-        </div>
-        <div class="right-content">
+        <div class="left-label-summary">
+          <p>${_('Commit status')}:</p>
+          <div class="right-label-summary">
           <div class="changeset-status-ico">
             <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div>
           </div>
           <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div>
         </div>
       </div>
+      </div>
       %endif
 
       <div class="fieldset">
-        <div class="left-label">
-          ${_('References')}:
-        </div>
-        <div class="right-content">
+        <div class="left-label-summary">
+          <p>${_('References')}:</p>
+          <div class="right-label-summary">
           <div class="tags">
-
             %if c.commit.merge:
               <span class="mergetag tag">
                <i class="icon-merge"></i>${_('merge')}
@@ -132,12 +130,12 b''
             </div>
           </div>
         </div>
+      </div>
 
       <div class="fieldset">
-        <div class="left-label">
-          ${_('Diff options')}:
-        </div>
-        <div class="right-content">
+        <div class="left-label-summary">
+          <p>${_('Diff options')}:</p>
+          <div class="right-label-summary">
             <div class="diff-actions">
               <a href="${h.route_path('repo_commit_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">
                 ${_('Raw Diff')}
@@ -153,12 +151,12 b''
             </div>
         </div>
       </div>
+      </div>
 
       <div class="fieldset">
-        <div class="left-label">
-          ${_('Comments')}:
-        </div>
-        <div class="right-content">
+        <div class="left-label-summary">
+          <p>${_('Comments')}:</p>
+          <div class="right-label-summary">
             <div class="comments-number">
                 %if c.comments:
                     <a href="#comments">${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>,
@@ -173,12 +171,12 b''
             </div>
         </div>
       </div>
+      </div>
 
       <div class="fieldset">
-        <div class="left-label">
-          ${_('Unresolved TODOs')}:
-        </div>
-        <div class="right-content">
+        <div class="left-label-summary">
+          <p>${_('Unresolved TODOs')}:</p>
+          <div class="right-label-summary">
             <div class="comments-number">
                 % if c.unresolved_comments:
                     % for co in c.unresolved_comments:
@@ -190,21 +188,23 b''
             </div>
         </div>
       </div>
-
-    </div> <!-- end summary-detail -->
+      </div>
 
-    <div id="commit-stats" class="sidebar-right">
-      <div class="summary-detail-header">
-        <h4 class="item">
-          ${_('Author')}
-        </h4>
-      </div>
-        <div class="sidebar-right-content">
+      <div class="fieldset">
+        <div class="left-label-summary">
+          <p>${_('Author')}</p>
+
+          <div class="right-label-summary">
             ${self.gravatar_with_user(c.commit.author)}
             <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
         </div>
-    </div><!-- end sidebar -->
+        </div>
+
+    <div class="clear-fix"></div>
+
+    </div> <!-- end summary-detail -->
   </div> <!-- end summary -->
+  </div>
   <div class="cs_files">
     <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
     ${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])}

rhodecode/templates/changeset/changeset_file_comment.mako

@@ -139,7 +139,7 b''
             ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated
             %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())):
                ## permissions to delete
-               %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
+               %if c.is_super_admin or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
                   ## TODO: dan: add edit comment here
                   <a onclick="return Rhodecode.comments.deleteComment(this);" class="delete-comment"> ${_('Delete')}</a>
                %else:

rhodecode/templates/changeset/changeset_range.mako

@@ -12,48 +12,54 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Commits')} -
-    r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}
-    ...
-    r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
-    ${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
-    ${self.repo_menu(active='changelog')}
+    ${self.repo_menu(active='commits')}
 </%def>
 
 <%def name="main()">
-    <div class="summary-header">
-      <div class="title">
-          ${self.repo_page_title(c.rhodecode_db_repo)}
-      </div>
-    </div>
-
-
+    <div class="box">
     <div class="summary changeset">
         <div class="summary-detail">
           <div class="summary-detail-header">
               <span class="breadcrumbs files_location">
                 <h4>
                     ${_('Commit Range')}
-                    <code>
-                    r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}...r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
-                    </code>
                 </h4>
               </span>
+
+                  <div class="clear-fix"></div>
           </div>
 
           <div class="fieldset">
-            <div class="left-label">
-              ${_('Diff option')}:
+                <div class="left-label-summary">
+                    <p class="spacing">${_('Range')}:</p>
+                    <div class="right-label-summary">
+                        <div class="code-header" >
+                            <div class="compare_header">
+                                <code class="fieldset-text-line">
+                                r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}
+                                ...
+                                r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
+                                ${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
+                                </code>
             </div>
-            <div class="right-content">
+                        </div>
+                    </div>
+                </div>
+              </div>
+
+              <div class="fieldset">
+                <div class="left-label-summary">
+                    <p class="spacing">${_('Diff Option')}:</p>
+                    <div class="right-label-summary">
+                        <div class="code-header" >
+                            <div class="compare_header">
               <div class="btn btn-primary">
                 <a href="${h.route_path('repo_compare',
                 repo_name=c.repo_name,
@@ -62,14 +68,17 b''
                 target_ref_type='rev',
                 target_ref=c.commit_ranges[-1].raw_id)}"
                 >
-                    ${_('Show combined compare')}
+                                    ${_('Show combined diff')}
                 </a>
               </div>
             </div>
           </div>
+                    </div>
+                </div>
+              </div>
 
+              <div class="clear-fix"></div>
         </div> <!-- end summary-detail -->
-
     </div> <!-- end summary -->
 
     <div id="changeset_compare_view_content">
@@ -105,4 +114,6 b''
         %endfor
     </div>
   </div>
+    </div>
+
 </%def>

rhodecode/templates/codeblocks/diffs.mako

@@ -959,7 +959,8 b' def get_comments_for(diff_type, comments'
                         text: _gettext('Toggle Wide Mode diff'),
                         action: function () {
                             updateSticky();
-                            Rhodecode.comments.toggleWideMode(this);
+                            var wide = Rhodecode.comments.toggleWideMode(this);
+                            storeUserSessionAttr('rc_user_session_attr.wide_diff_mode', wide);
                             return null;
                         },
                         url: null,
@@ -1002,6 +1003,11 b' def get_comments_for(diff_type, comments'
                 ]
             };
 
+            // get stored diff mode and pre-enable it
+            if (templateContext.session_attrs.wide_diff_mode === "true") {
+                Rhodecode.comments.toggleWideMode(null);
+            }
+
             $("#diff_menu").select2({
                 minimumResultsForSearch: -1,
                 containerCssClass: "drop-menu",

rhodecode/templates/commits/changelog.mako

@@ -23,17 +23,36 b''
 </%def>
 
 <%def name="menu_bar_subnav()">
-    ${self.repo_menu(active='changelog')}
+    ${self.repo_menu(active='commits')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
+
     <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+        <div id="filter_changelog">
+            ${h.hidden('branch_filter')}
+             %if c.selected_name:
+             <div class="btn btn-default" id="clear_filter" >
+                 ${_('Clear filter')}
+             </div>
+            %endif
+        </div>
+        <div class="pull-left obsolete-toggle">
+            % if h.is_hg(c.rhodecode_repo):
+                % if c.show_hidden:
+                    <a class="action-link" href="${h.current_route_path(request, evolve=0)}">${_('Hide obsolete/hidden')}</a>
+                % else:
+                    <a class="action-link" href="${h.current_route_path(request, evolve=1)}">${_('Show obsolete/hidden')}</a>
+                % endif
+            % else:
+                    <span class="action-link disabled">${_('Show hidden')}</span>
+            % endif
+        </div>
         <ul class="links">
             <li>
-                <a href="#" class="btn btn-small" id="rev_range_container" style="display:none;"></a>
+
                 %if c.rhodecode_db_repo.fork:
                     <span>
                         <a  id="compare_fork_button"
@@ -61,11 +80,6 b''
                     </span>
                 %endif
 
-                ## clear selection
-                <div title="${_('Clear selection')}" class="btn" id="rev_range_clear" style="display:none">
-                    ${_('Clear selection')}
-                </div>
-
             </li>
         </ul>
     </div>
@@ -74,29 +88,7 b''
         <script type="text/javascript" src="${h.asset('js/src/plugins/jquery.commits-graph.js')}"></script>
 
         <div class="graph-header">
-            <div id="filter_changelog">
-                ${h.hidden('branch_filter')}
-                 %if c.selected_name:
-                 <div class="btn btn-default" id="clear_filter" >
-                     ${_('Clear filter')}
-                 </div>
-                %endif
-            </div>
             ${self.breadcrumbs('breadcrumbs_light')}
-            <div class="pull-right">
-                % if h.is_hg(c.rhodecode_repo):
-                    % if c.show_hidden:
-                        <a class="action-link" href="${h.current_route_path(request, evolve=0)}">${_('Hide obsolete/hidden')}</a>
-                    % else:
-                        <a class="action-link" href="${h.current_route_path(request, evolve=1)}">${_('Show obsolete/hidden')}</a>
-                    % endif
-                % else:
-                        <span class="action-link disabled">${_('Show hidden')}</span>
-                % endif
-            </div>
-            <div id="commit-counter" data-total=${c.total_cs} class="pull-right">
-                ${_ungettext('showing %d out of %d commit', 'showing %d out of %d commits', c.showing_commits) % (c.showing_commits, c.total_cs)}
-            </div>
         </div>
 
         <div id="graph">
@@ -104,18 +96,21 b''
               <div id="graph_nodes">
                 <div id="graph_canvas"></div>
             </div>
-            <div id="graph_content" class="main-content graph_full_width">
+            <div id="graph_content" class="graph_full_width">
 
               <div class="table">
                 <table id="changesets" class="rctable">
                     <tr>
                       ## checkbox
-                      <th></th>
-                      <th colspan="2"></th>
+                      <th colspan="4">
+                        ## clear selection
+                        <div title="${_('Clear selection')}" class="btn btn-sm" id="rev_range_clear" style="display:none">
+                            <i class="icon-cancel-circled2"></i>
+                        </div>
+                        <div class="btn btn-sm disabled" disabled="disabled" id="rev_range_more" style="display:none;">${_('Select second commit')}</div>
+                        <a href="#" class="btn btn-success btn-sm" id="rev_range_container" style="display:none;"></a>
+                      </th>
 
-                      <th>${_('Commit')}</th>
-                      ## Mercurial phase/evolve state
-                      <th></th>
                       ## commit message expand arrow
                       <th></th>
                       <th>${_('Commit Message')}</th>
@@ -124,6 +119,8 b''
                       <th>${_('Author')}</th>
 
                       <th>${_('Refs')}</th>
+                      ## comments
+                      <th></th>
                     </tr>
 
                     <tbody class="commits-range">
@@ -135,6 +132,9 b''
             <div class="pagination-wh pagination-left">
             ${c.pagination.pager('$link_previous ~2~ $link_next')}
             </div>
+            <div id="commit-counter" data-total=${c.total_cs} class="pull-right">
+                ${_ungettext('showing %d out of %d commit', 'showing %d out of %d commits', c.showing_commits) % (c.showing_commits, c.total_cs)}
+            </div>
         </div>
 
         <script type="text/javascript">
@@ -144,6 +144,7 b''
             // Create links to commit ranges when range checkboxes are selected
             var $commitCheckboxes = $('.commit-range');
             // cache elements
+            var $commitRangeMore = $('#rev_range_more');
             var $commitRangeContainer = $('#rev_range_container');
             var $commitRangeClear = $('#rev_range_clear');
 
@@ -155,57 +156,68 b''
                     }
                 }
                 var open_new_pull_request = $('#open_new_pull_request');
+
                 if(open_new_pull_request){
                       var selected_changes = selectedCheckboxes.length;
-                      if (selected_changes > 1 || selected_changes == 1 && templateContext.repo_type == 'svn') {
                           open_new_pull_request.hide();
-                      } else {
                           if (selected_changes == 1) {
                              open_new_pull_request.html(_gettext('Open new pull request for selected commit'));
-                          } else if (selected_changes == 0) {
+                    } else {
                              open_new_pull_request.html(_gettext('Open new pull request'));
                           }
                           open_new_pull_request.show();
                       }
-                }
 
                 if (selectedCheckboxes.length>0){
-                    var revEnd = selectedCheckboxes[0].name;
-                    var revStart = selectedCheckboxes[selectedCheckboxes.length-1].name;
-                    var url = pyroutes.url('repo_commit',
-                            {'repo_name': '${c.repo_name}',
-                             'commit_id': revStart+'...'+revEnd});
+                    $('#compare_fork_button').hide();
+                    var commitStart = $(selectedCheckboxes[selectedCheckboxes.length-1]).data();
+
+                    var revStart = commitStart.commitId;
+
+                    var commitEnd = $(selectedCheckboxes[0]).data();
+                    var revEnd = commitEnd.commitId;
 
-                    var link = (revStart == revEnd)
-                        ? _gettext('Show selected commit __S')
-                        : _gettext('Show selected commits __S ... __E');
+                    var lbl_start = '{0}'.format(commitStart.commitIdx, commitStart.shortId);
+                    var lbl_end = '{0}'.format(commitEnd.commitIdx, commitEnd.shortId);
 
-                    link = link.replace('__S', revStart.substr(0,6));
-                    link = link.replace('__E', revEnd.substr(0,6));
+                    var url = pyroutes.url('repo_commit', {'repo_name': '${c.repo_name}', 'commit_id': revStart+'...'+revEnd});
+                    var link = _gettext('Show commit range {0} ... {1}').format(lbl_start, lbl_end);
+
+                    if (selectedCheckboxes.length > 1) {
+                        $commitRangeClear.show();
+                        $commitRangeMore.hide();
 
                     $commitRangeContainer
                         .attr('href',url)
                         .html(link)
                         .show();
 
+
+                    } else {
+                        $commitRangeContainer.hide();
                     $commitRangeClear.show();
-                    var _url = pyroutes.url('pullrequest_new',
-                                    {'repo_name': '${c.repo_name}',
-                                     'commit': revEnd});
+                        $commitRangeMore.show();
+                    }
+
+                    // pull-request link
+                    if (selectedCheckboxes.length == 1){
+                        var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}', 'commit': revEnd});
                     open_new_pull_request.attr('href', _url);
-                    $('#compare_fork_button').hide();
+                    } else {
+                        var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}'});
+                        open_new_pull_request.attr('href', _url);
+                    }
+
                 } else {
                     $commitRangeContainer.hide();
                     $commitRangeClear.hide();
+                    $commitRangeMore.hide();
 
                     %if c.branch_name:
-                        var _url = pyroutes.url('pullrequest_new',
-                                        {'repo_name': '${c.repo_name}',
-                                         'branch':'${c.branch_name}'});
+                        var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}', 'branch':'${c.branch_name}'});
                         open_new_pull_request.attr('href', _url);
                     %else:
-                        var _url = pyroutes.url('pullrequest_new',
-                                        {'repo_name': '${c.repo_name}'});
+                        var _url = pyroutes.url('pullrequest_new', {'repo_name': '${c.repo_name}'});
                         open_new_pull_request.attr('href', _url);
                     %endif
                     $('#compare_fork_button').show();
@@ -241,13 +253,13 b''
 
             $("#clear_filter").on("click", function() {
                 var filter = {'repo_name': '${c.repo_name}'};
-                window.location = pyroutes.url('repo_changelog', filter);
+                window.location = pyroutes.url('repo_commits', filter);
             });
 
             $("#branch_filter").select2({
                 'dropdownAutoWidth': true,
                 'width': 'resolve',
-                'placeholder': "${c.selected_name or _('Filter changelog')}",
+                'placeholder': "${c.selected_name or _('Branch filter')}",
                 containerCssClass: "drop-menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 query: function(query){
@@ -295,7 +307,7 b''
                 else if (data.type == 'book'){
                     filter["bookmark"] = selected;
                 }
-                window.location = pyroutes.url('repo_changelog', filter);
+                window.location = pyroutes.url('repo_commits', filter);
             });
 
             commitsController = new CommitsController();

rhodecode/templates/commits/changelog_elements.mako

@@ -3,7 +3,7 b''
 
 % if c.prev_page:
     <tr>
-        <td colspan="9" class="load-more-commits">
+        <td colspan="10" class="load-more-commits">
             <a class="prev-commits" href="#loadPrevCommits" onclick="commitsController.loadPrev(this, ${c.prev_page}, '${c.branch_name}', '${c.commit_id}', '${c.f_path}');return false">
             ${_('load previous')}
             </a>
@@ -21,10 +21,14 b''
     <tr id="sha_${commit.raw_id}" class="changelogRow container ${'tablerow%s' % (cnt%2)}">
 
     <td class="td-checkbox">
-        ${h.checkbox(commit.raw_id,class_="commit-range")}
+        ${h.checkbox(commit.raw_id,class_="commit-range", **{'data-commit-idx':commit.idx, 'data-commit-id': commit.raw_id, 'data-short-id': commit.short_id})}
     </td>
+    ##
+    <td class="td-graphbox">
+
+    </td>
+
     <td class="td-status">
-
     %if c.statuses.get(commit.raw_id):
       <div class="changeset-status-ico">
         %if c.statuses.get(commit.raw_id)[2]:
@@ -41,44 +45,38 b''
         <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
     %endif
     </td>
-    <td class="td-comments comments-col">
-    %if c.comments.get(commit.raw_id):
-      <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
-          <i class="icon-comment"></i> ${len(c.comments[commit.raw_id])}
-      </a>
-    %endif
-    </td>
+
     <td class="td-hash">
     <code>
 
       <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
         <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span>
       </a>
+
       <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
-    </code>
-    </td>
-    <td class="td-tags tags-col">
-      ## phase
+
+      ## COMMIT PHASES
+
+      ## Draft
       % if hasattr(commit, 'phase'):
           % if commit.phase != 'public':
-              <span class="tag phase-${commit.phase} tooltip" title="${_('Commit phase')}">${commit.phase}</span>
+              <span class="tag phase-${commit.phase} tooltip" title="${_('{} commit phase').format(commit.phase)}">${commit.phase[0].upper()}</span>
           % endif
       % endif
 
       ## obsolete commits
-      % if hasattr(commit, 'obsolete'):
-          % if commit.obsolete:
-              <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
-          % endif
+      % if hasattr(commit, 'obsolete') and commit.obsolete:
+          <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Obsolete Evolve State')}">O</span>
       % endif
 
       ## hidden commits
-      % if hasattr(commit, 'hidden'):
-          % if commit.hidden:
-              <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
+      % if hasattr(commit, 'hidden') and commit.hidden:
+          <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Hidden Evolve State')}">H</span>
           % endif
-      % endif
+
+    </code>
     </td>
+
     <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false">
         <i class="icon-expand-linked"></i>&nbsp;
     </td>
@@ -108,7 +106,7 b''
         ## branch
         %if commit.branch:
           <span class="tag branchtag" title="${h.tooltip(_('Branch %s') % commit.branch)}">
-             <a href="${h.route_path('repo_changelog',repo_name=c.repo_name,_query=dict(branch=commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
+             <a href="${h.route_path('repo_commits',repo_name=c.repo_name,_query=dict(branch=commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
           </span>
         %endif
 
@@ -130,6 +128,18 b''
 
       </div>
     </td>
+
+    <td class="td-comments comments-col">
+        <% cs_comments = c.comments.get(commit.raw_id,[]) %>
+        % if cs_comments:
+            <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % cs_comments[0].comment_id)}">
+                <i class="icon-comment"></i> ${len(cs_comments)}
+            </a>
+        % else:
+            <i class="icon-comment"></i> ${len(cs_comments)}
+        % endif
+    </td>
+
 </tr>
 % endfor
 

rhodecode/templates/commits/changelog_file_history.mako

@@ -3,7 +3,7 b''
 
     <table class="table rctable file_history">
     %for cnt,cs in enumerate(c.pagination):
-        <tr id="chg_${cnt+1}" class="${'tablerow%s' % (cnt%2)}">
+        <tr id="chg_${cnt+1}" class="${('tablerow%s' % (cnt%2))}">
             <td class="td-user">
                 ${base.gravatar_with_user(cs.author, 16)}
             </td>
@@ -33,7 +33,19 b''
                     ${_('Show File')}
                 </a>
             </td>
+            <td class="td-actions">
+                <a href="${h.route_path('repo_compare',repo_name=c.repo_name, source_ref_type="rev", source_ref=cs.raw_id,target_ref_type="rev", target_ref=c.commit_id,_query=dict(merge='1',f_path=c.changelog_for_path))}">
+                    <span title="${'Diff {} vs {}'.format(cs.raw_id[:8],c.commit_id[:8])}">${_('Diff File')}</span>
+                </a>
+            </td>
         </tr>
     %endfor
+        <tr>
+            <td colspan="6">
+                <a id="file_history_overview_full" href="${h.route_path('repo_commits_file',repo_name=c.repo_name, commit_id=c.commit_id, f_path=c.f_path)}">
+               ${_('Show Full History')}
+                </a>
+            </td>
+        </tr>
     </table>
 </div>

rhodecode/templates/compare/compare_diff.mako

@@ -13,9 +13,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-  ${_ungettext('%s commit','%s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -32,10 +30,6 b''
     </script>
 
     <div class="box">
-        <div class="title">
-            ${self.repo_page_title(c.rhodecode_db_repo)}
-        </div>
-
         <div class="summary changeset">
             <div class="summary-detail">
               <div class="summary-detail-header">
@@ -43,24 +37,24 b''
                     <h4>
                         ${_('Compare Commits')}
                         % if c.file_path:
-                        ${_('for file')} <a href="#${'a_' + h.FID('',c.file_path)}">${c.file_path}</a>
+                        ${_('for file')} <a href="#${('a_' + h.FID('',c.file_path))}">${c.file_path}</a>
                         % endif
 
                         % if c.commit_ranges:
                         <code>
-                        r${c.source_commit.idx}:${h.short_id(c.source_commit.raw_id)}...r${c.target_commit.idx}:${h.short_id(c.target_commit.raw_id)}
+                        r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}...r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
                         </code>
                         % endif
                     </h4>
                   </span>
+
+                  <div class="clear-fix"></div>
               </div>
 
               <div class="fieldset">
-                <div class="left-label">
-                  ${_('Target')}:
-                </div>
-                <div class="right-content">
-                    <div>
+                <div class="left-label-summary">
+                    <p class="spacing">${_('Target')}:</p>
+                    <div class="right-label-summary">
                         <div class="code-header" >
                             <div class="compare_header">
                                 ## The hidden elements are replaced with a select2 widget
@@ -72,11 +66,9 b''
               </div>
 
               <div class="fieldset">
-                <div class="left-label">
-                  ${_('Source')}:
-                </div>
-                <div class="right-content">
-                    <div>
+                <div class="left-label-summary">
+                    <p class="spacing">${_('Source')}:</p>
+                    <div class="right-label-summary">
                         <div class="code-header" >
                             <div class="compare_header">
                                 ## The hidden elements are replaced with a select2 widget
@@ -88,17 +80,29 b''
               </div>
 
               <div class="fieldset">
-                <div class="left-label">
-                  ${_('Actions')}:
-                </div>
-                <div class="right-content">
-                    <div>
+                <div class="left-label-summary">
+                    <p class="spacing">${_('Actions')}:</p>
+                    <div class="right-label-summary">
                         <div class="code-header" >
                             <div class="compare_header">
-
                                 <div class="compare-buttons">
                                 % if c.compare_home:
                                   <a id="compare_revs" class="btn btn-primary"> ${_('Compare Commits')}</a>
+                                  %if c.rhodecode_db_repo.fork:
+
+                                       <a class="btn btn-default" title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}"
+                                          href="${h.route_path('repo_compare',
+                                                repo_name=c.rhodecode_db_repo.fork.repo_name,
+                                                source_ref_type=c.rhodecode_db_repo.landing_rev[0],
+                                                source_ref=c.rhodecode_db_repo.landing_rev[1],
+                                                target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],
+                                                target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1],
+                                                _query=dict(merge=1))}"
+                                        >
+                                       ${_('Compare with origin')}
+                                       </a>
+
+                                  %endif
 
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Swap')}</a>
                                   <a class="btn disabled tooltip" disabled="disabled" title="${_('Action unavailable in current view')}">${_('Comment')}</a>
@@ -131,10 +135,9 b''
 
               ## commit status form
               <div class="fieldset" id="compare_changeset_status" style="display: none; margin-bottom: -80px;">
-                <div class="left-label">
-                  ${_('Commit status')}:
-                </div>
-                <div class="right-content">
+                <div class="left-label-summary">
+                    <p class="spacing">${_('Commit status')}:</p>
+                    <div class="right-label-summary">
                     <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
                     ## main comment form and it status
                     <%
@@ -150,7 +153,8 b''
                     </div>
                 </div>
               </div>
-
+              </div>
+              <div class="clear-fix"></div>
             </div> <!-- end summary-detail -->
         </div> <!-- end summary -->
 
@@ -275,8 +279,6 b''
 
         ## table diff data
         <div class="table">
-
-
             % if not c.compare_home:
                 <div id="changeset_compare_view_content">
                     <div class="pull-left">

rhodecode/templates/data_table/_dt_elements.mako

@@ -48,8 +48,8 b''
          </a>
       </li>
       <li>
-         <a title="${_('Changelog')}" href="${h.route_path('repo_changelog',repo_name=repo_name)}">
-         <span>${_('Changelog')}</span>
+         <a title="${_('Commits')}" href="${h.route_path('repo_commits',repo_name=repo_name)}">
+         <span>${_('Commits')}</span>
          </a>
       </li>
       <li>
@@ -205,7 +205,7 b''
 <%def name="repo_group_name(repo_group_name, children_groups=None)">
   <div>
     <a href="${h.route_path('repo_group_home', repo_group_name=repo_group_name)}">
-    <i class="icon-folder-close" title="${_('Repository group')}" style="font-size: 16px"></i>
+    <i class="icon-repo-group" title="${_('Repository group')}" style="font-size: 14px"></i>
       %if children_groups:
           ${h.literal(' &raquo; '.join(children_groups))}
       %else:
@@ -377,6 +377,30 b''
 </%def>
 
 
+## ARTIFACT RENDERERS
+
+<%def name="repo_artifact_uid(repo_name, file_uid)">
+    <code><a href="${h.route_path('repo_artifacts_get', repo_name=repo_name, uid=file_uid)}">${file_uid}</a></code>
+</%def>
+
+<%def name="repo_artifact_uid_action(repo_name, file_uid)">
+    <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${h.route_url('repo_artifacts_get', repo_name=repo_name, uid=file_uid)}" title="${_('Copy the full url')}"></i>
+</%def>
+
+<%def name="repo_artifact_actions(repo_name, file_store_id, file_uid)">
+##  <div class="grid_edit">
+##     <a href="#Edit" title="${_('Edit')}">${_('Edit')}</a>
+##  </div>
+% if h.HasRepoPermissionAny('repository.admin')(c.repo_name):
+    <div class="grid_delete">
+    ${h.secure_form(h.route_path('repo_artifacts_delete', repo_name=repo_name, uid=file_store_id), request=request)}
+      ${h.submit('remove_',_('Delete'),id="remove_artifact_%s" % file_store_id, class_="btn btn-link btn-danger",
+      onclick="return confirm('"+_('Confirm to delete this artifact: %s') % file_uid+"');")}
+    ${h.end_form()}
+ </div>
+% endif
+</%def>
+
 <%def name="markup_form(form_id, form_text='', help_text=None)">
 
   <div class="markup-form">

rhodecode/templates/debug_style/code-block.html

@@ -641,7 +641,7 b' File Edit'
                 <span class="item">1.2 KiB</span>
                 <span class="item last">text/x-python</span>
                 <div class="buttons">
-                  <a class="btn btn-mini" href="/example/changelog/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
+                  <a class="btn btn-mini" href="/example/commits/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
                       <i class="icon-time"></i> history
                   </a>
 

rhodecode/templates/debug_style/tables.html

@@ -425,7 +425,7 b''
             <tr>
               <td>td-active</td>
               <td>Shows active state with icon-true/icon-false.</td>
-              <td class="td-active"><i class="icon-false"></i></td>
+              <td class="td-active"><i class="icon-pr-merge-fail"></i></td>
             </tr>
             <tr>
               <td>td-size</td>

rhodecode/templates/files/base.mako

@@ -1,4 +1,11 b''
 <%def name="refs(commit)">
+    ## Build a cache of refs for selector
+    <script>
+        fileTreeRefs = {
+
+        }
+    </script>
+
     %if commit.merge:
         <span class="mergetag tag">
          <i class="icon-merge">${_('merge')}</i>
@@ -10,6 +17,9 b''
             <span class="booktag tag" title="${h.tooltip(_('Bookmark %s') % book)}">
               <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id,_query=dict(at=book))}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
             </span>
+            <script>
+                fileTreeRefs["${book}"] = {raw_id: "${commit.raw_id}", type:"book", text: "${book}"};
+            </script>
         %endfor
     %endif
 
@@ -17,12 +27,18 b''
         <span class="tagtag tag"  title="${h.tooltip(_('Tag %s') % tag)}">
             <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id,_query=dict(at=tag))}"><i class="icon-tag"></i>${tag}</a>
         </span>
+        <script>
+            fileTreeRefs["${tag}"] = {raw_id: "${commit.raw_id}", type:"tag", text: "${tag}"};
+        </script>
     %endfor
 
     %if commit.branch:
         <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % commit.branch)}">
           <a href="${h.route_path('repo_files:default_path',repo_name=c.repo_name,commit_id=commit.raw_id,_query=dict(at=commit.branch))}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
         </span>
+        <script>
+            fileTreeRefs["${commit.branch}"] = {raw_id: "${commit.raw_id}", type:"branch", text: "${commit.branch}"};
+        </script>
     %endif
 
 </%def>

rhodecode/templates/files/file_authors_box.mako

@@ -1,42 +1,38 b''
 <%namespace name="base" file="/base/base.mako"/>
 
-<div class="summary-detail-header">
-    <h4 class="item">
-        % if c.file_author:
-            ${_('Last Author')}
-        % else:
-            ${h.literal(_ungettext(u'File Author (%s)',u'File Authors (%s)',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }
-        % endif
-    </h4>
-    <a href="#" id="show_authors" class="action_link">${_('Show All')}</a>
-</div>
+% if c.authors:
+
+<table class="sidebar-right-content">
+    % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
+    <tr class="file_author tooltip" title="${h.tooltip(h.author_string(email))}">
 
-% if c.authors:
-<ul class="sidebar-right-content">
-    % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
-    <li class="file_author">
-        <div class="tooltip" title="${h.tooltip(h.author_string(email))}">
+        <td>
+            % if not c.file_author:
           ${base.gravatar(email, 16)}
-          <div class="user">${h.link_to_user(user)}</div>
-
+            % endif
+            <span class="user commit-author">${h.link_to_user(user)}</span>
             % if c.file_author:
-                <span>- ${h.age_component(c.file_last_commit.date)}</span>
+                <span class="commit-date">- ${h.age_component(c.file_last_commit.date)}</span>
+                <a href="#ShowAuthors" onclick="showAuthors(this, ${("1" if c.annotate else "0")}); return false" class="action_link"> - ${_('Load All Authors')}</a>
             % elif c.file_last_commit.author_email==email:
                 <span> (${_('last author')})</span>
             % endif
+        </td>
 
+        <td>
             % if not c.file_author:
-                <span>
+                <code>
                   % if commits == 1:
                     ${commits} ${_('Commit')}
                   % else:
                     ${commits} ${_('Commits')}
                   % endif
-                </span>
+                </code>
+            % endif
+        </td>
+    </tr>
+
+    % endfor
+</table>
             % endif
 
-        </div>
-    </li>
-    % endfor
-</ul>
-% endif

rhodecode/templates/files/files.mako

@@ -1,9 +1,9 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title(*args)">
-    ${_('%s Files') % c.repo_name}
+    ${_('{} Files').format(c.repo_name)}
     %if hasattr(c,'file'):
-        &middot; ${h.safe_unicode(c.file.path) or '\\'}
+        &middot; ${(h.safe_unicode(c.file.path) or '\\')}
     %endif
 
     %if c.rhodecode_name:
@@ -27,113 +27,321 b''
 </%def>
 
 <%def name="main()">
-    <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
-    </div>
+    <script type="text/javascript">
+        var fileSourcePage = ${c.file_source_page};
+        var atRef = '${request.GET.get('at', '')}';
 
-    <div id="pjax-container" class="summary">
+        // global state for fetching metadata
+        metadataRequest = null;
+
+        // global metadata about URL
+        filesUrlData = ${h.files_url_data(request)|n};
+    </script>
+
+    <div>
         <div id="files_data">
             <%include file='files_pjax.mako'/>
         </div>
     </div>
-    <script>
-        var curState = {
-            commit_id: "${c.commit.raw_id}"
+
+    <script type="text/javascript">
+
+        var initFileJS = function () {
+            var state = getFileState();
+
+            // select code link event
+            $("#hlcode").mouseup(getSelectionLink);
+
+            // file history select2 used for history of file, and switch to
+            var initialCommitData = {
+                at_ref: atRef,
+                id: null,
+                text: '${c.commit.raw_id}',
+                type: 'sha',
+                raw_id: '${c.commit.raw_id}',
+                idx: ${c.commit.idx},
+                files_url: null,
         };
 
-        var getState = function(context) {
-            var url = $(location).attr('href');
-            var _base_url = '${h.route_path("repo_files",repo_name=c.repo_name,commit_id='',f_path='')}';
-            var _annotate_url = '${h.route_path("repo_files:annotated",repo_name=c.repo_name,commit_id='',f_path='')}';
-            _base_url = _base_url.replace('//', '/');
-            _annotate_url = _annotate_url.replace('//', '/');
-
-            //extract f_path from url.
-            var parts = url.split(_base_url);
-            if (parts.length != 2) {
-                parts = url.split(_annotate_url);
-                if (parts.length != 2) {
-                    var rev = "tip";
-                    var f_path = "";
-                } else {
-                    var parts2 = parts[1].split('/');
-                    var rev = parts2.shift(); // pop the first element which is the revision
-                    var f_path = parts2.join('/');
-                }
-
-            } else {
-                var parts2 = parts[1].split('/');
-                var rev = parts2.shift(); // pop the first element which is the revision
-                var f_path = parts2.join('/');
+            // check if we have ref info.
+            var selectedRef =  fileTreeRefs[atRef];
+            if (selectedRef !== undefined) {
+                $.extend(initialCommitData, selectedRef)
             }
 
-            var _node_list_url = pyroutes.url('repo_files_nodelist',
-                    {repo_name: templateContext.repo_name,
-                     commit_id: rev, f_path: f_path});
-            var _url_base = pyroutes.url('repo_files',
-                    {repo_name: templateContext.repo_name,
-                     commit_id: rev, f_path:'__FPATH__'});
-            return {
-                url: url,
-                f_path: f_path,
-                rev: rev,
-                commit_id: curState.commit_id,
-                node_list_url: _node_list_url,
-                url_base: _url_base
-            };
-        };
-
-        var metadataRequest = null;
-        var getFilesMetadata = function() {
-            if (metadataRequest && metadataRequest.readyState != 4) {
-                metadataRequest.abort();
-            }
-            if (fileSourcePage) {
-                return false;
-            }
+            var loadUrl = pyroutes.url('repo_file_history', {'repo_name': templateContext.repo_name, 'commit_id': state.commit_id,'f_path': state.f_path});
+            var cacheKey = '__SINGLE_FILE_REFS__';
+            var cachedDataSource = {};
 
-            if ($('#file-tree-wrapper').hasClass('full-load')) {
-                // in case our HTML wrapper has full-load class we don't
-                // trigger the async load of metadata
-                return false;
-            }
-
-            var state = getState('metadata');
-            var url_data = {
-                'repo_name': templateContext.repo_name,
-                'commit_id': state.commit_id,
-                'f_path': state.f_path
-            };
-
-            var url = pyroutes.url('repo_nodetree_full', url_data);
-
-            metadataRequest = $.ajax({url: url});
-
-            metadataRequest.done(function(data) {
-                $('#file-tree').html(data);
-                timeagoActivate();
-            });
-            metadataRequest.fail(function (data, textStatus, errorThrown) {
-                console.log(data);
-                if (data.status != 0) {
-                    alert("Error while fetching metadata.\nError code {0} ({1}).Please consider reloading the page".format(data.status,data.statusText));
+            var loadRefsData = function (query) {
+                $.ajax({
+                    url: loadUrl,
+                    data: {},
+                    dataType: 'json',
+                    type: 'GET',
+                    success: function (data) {
+                        cachedDataSource[cacheKey] = data;
+                        query.callback({results: data.results});
                 }
             });
         };
 
-        var callbacks = function() {
-            var state = getState('callbacks');
-            timeagoActivate();
+            var feedRefsData = function (query, cachedData) {
+                var data = {results: []};
+                //filter results
+                $.each(cachedData.results, function () {
+                    var section = this.text;
+                    var children = [];
+                    $.each(this.children, function () {
+                        if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
+                            children.push(this)
+                        }
+                    });
+                    data.results.push({
+                        'text': section,
+                        'children': children
+                    })
+                });
+
+                query.callback(data);
+            };
+
+            var select2FileHistorySwitcher = function (targetElement, loadUrl, initialData) {
+                var formatResult = function (result, container, query) {
+                    return formatSelect2SelectionRefs(result);
+                };
+
+                var formatSelection = function (data, container) {
+                    var commit_ref = data;
+
+                    var tmpl = '';
+                    if (commit_ref.type === 'sha') {
+                        tmpl = (commit_ref.raw_id || "").substr(0,8);
+                    } else if (commit_ref.type === 'branch') {
+                        tmpl = tmpl.concat('<i class="icon-branch"></i> ');
+                        tmpl = tmpl.concat(escapeHtml(commit_ref.text));
+                    } else if (commit_ref.type === 'tag') {
+                        tmpl = tmpl.concat('<i class="icon-tag"></i> ');
+                        tmpl = tmpl.concat(escapeHtml(commit_ref.text));
+                    } else if (commit_ref.type === 'book') {
+                        tmpl = tmpl.concat('<i class="icon-bookmark"></i> ');
+                        tmpl = tmpl.concat(escapeHtml(commit_ref.text));
+                    }
+                    var idx = commit_ref.idx || 0;
+                    if (idx !== 0) {
+                        tmpl = tmpl.concat('<span class="select-index-number">r{0}</span>'.format(idx));
+                    }
+                    return tmpl
+                };
 
-            // used for history, and switch to
+              $(targetElement).select2({
+                dropdownAutoWidth: true,
+                width: "resolve",
+                containerCssClass: "drop-menu",
+                dropdownCssClass: "drop-menu-dropdown",
+                query: function(query) {
+                  var cachedData = cachedDataSource[cacheKey];
+                  if (cachedData) {
+                    feedRefsData(query, cachedData)
+                  } else {
+                    loadRefsData(query)
+                  }
+                },
+                initSelection: function(element, callback) {
+                  callback(initialData);
+                },
+                formatResult: formatResult,
+                formatSelection: formatSelection
+              });
+
+            };
+
+            select2FileHistorySwitcher('#file_refs_filter', loadUrl, initialCommitData);
+
+            $('#file_refs_filter').on('change', function(e) {
+                var data = $('#file_refs_filter').select2('data');
+                var commit_id = data.id;
+
+                if ("${c.annotate}" === "True") {
+                    var url = pyroutes.url('repo_files:annotated',
+                            {'repo_name': templateContext.repo_name,
+                             'commit_id': commit_id, 'f_path': state.f_path});
+                } else {
+                    var url = pyroutes.url('repo_files',
+                            {'repo_name': templateContext.repo_name,
+                             'commit_id': commit_id, 'f_path': state.f_path});
+                }
+                window.location = url;
+
+            });
+
+            // load file short history
+            $('#file_history_overview').on('click', function(e) {
+                e.preventDefault();
+                path = state.f_path;
+                if (path.indexOf("#") >= 0) {
+                    path = path.slice(0, path.indexOf("#"));
+                }
+                var url = pyroutes.url('repo_commits_file',
+                        {'repo_name': templateContext.repo_name,
+                         'commit_id': state.commit_id, 'f_path': path, 'limit': 6});
+                $('#file_history_container').show();
+                $('#file_history_container').html('<div class="file-history-inner">{0}</div>'.format(_gettext('Loading ...')));
+
+                $.pjax({
+                    url: url,
+                    container: '#file_history_container',
+                    push: false,
+                    timeout: 5000
+                });
+            });
+
+        };
+
+        var initTreeJS = function () {
+            var state = getFileState();
+            getFilesMetadata();
+
+            // fuzzy file filter
+            fileBrowserListeners(state.node_list_url, state.url_base);
+
+            // switch to widget
             var initialCommitData = {
+                at_ref: atRef,
                 id: null,
-                text: '${_("Pick Commit")}',
+                text: '${c.commit.raw_id}',
+                type: 'sha',
+                raw_id: '${c.commit.raw_id}',
+                idx: ${c.commit.idx},
+                files_url: null,
+            };
+
+            // check if we have ref info.
+            var selectedRef =  fileTreeRefs[atRef];
+            if (selectedRef !== undefined) {
+                $.extend(initialCommitData, selectedRef)
+            }
+
+            var loadUrl = pyroutes.url('repo_refs_data', {'repo_name': templateContext.repo_name});
+            var cacheKey = '__ALL_FILE_REFS__';
+            var cachedDataSource = {};
+
+            var loadRefsData = function (query) {
+                $.ajax({
+                    url: loadUrl,
+                    data: {},
+                    dataType: 'json',
+                    type: 'GET',
+                    success: function (data) {
+                        cachedDataSource[cacheKey] = data;
+                        query.callback({results: data.results});
+                    }
+                });
+            };
+
+            var feedRefsData = function (query, cachedData) {
+                var data = {results: []};
+                //filter results
+                $.each(cachedData.results, function () {
+                    var section = this.text;
+                    var children = [];
+                    $.each(this.children, function () {
+                        if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
+                            children.push(this)
+                        }
+                    });
+                    data.results.push({
+                        'text': section,
+                        'children': children
+                    })
+                });
+
+                //push the typed in commit idx
+                if (!isNaN(query.term)) {
+                    var files_url = pyroutes.url('repo_files',
+                                {'repo_name': templateContext.repo_name,
+                                 'commit_id': query.term, 'f_path': state.f_path});
+
+                    data.results.push({
+                        'text': _gettext('go to numeric commit'),
+                        'children': [{
+                            at_ref: null,
+                            id: null,
+                            text: 'r{0}'.format(query.term),
                 type: 'sha',
-                raw_id: null,
-                files_url: null
+                            raw_id: query.term,
+                            idx: query.term,
+                            files_url: files_url,
+                        }]
+                    });
+                }
+                query.callback(data);
+            };
+
+            var select2RefFileSwitcher = function (targetElement, loadUrl, initialData) {
+                var formatResult = function (result, container, query) {
+                    return formatSelect2SelectionRefs(result);
             };
 
+                var formatSelection = function (data, container) {
+                    var commit_ref = data;
+
+                    var tmpl = '';
+                    if (commit_ref.type === 'sha') {
+                        tmpl = (commit_ref.raw_id || "").substr(0,8);
+                    } else if (commit_ref.type === 'branch') {
+                        tmpl = tmpl.concat('<i class="icon-branch"></i> ');
+                        tmpl = tmpl.concat(escapeHtml(commit_ref.text));
+                    } else if (commit_ref.type === 'tag') {
+                        tmpl = tmpl.concat('<i class="icon-tag"></i> ');
+                        tmpl = tmpl.concat(escapeHtml(commit_ref.text));
+                    } else if (commit_ref.type === 'book') {
+                        tmpl = tmpl.concat('<i class="icon-bookmark"></i> ');
+                        tmpl = tmpl.concat(escapeHtml(commit_ref.text));
+                    }
+
+                    var idx = commit_ref.idx || 0;
+                    if (idx !== 0) {
+                        tmpl = tmpl.concat('<span class="select-index-number">r{0}</span>'.format(idx));
+                    }
+                    return tmpl
+                };
+
+              $(targetElement).select2({
+                dropdownAutoWidth: true,
+                width: "resolve",
+                containerCssClass: "drop-menu",
+                dropdownCssClass: "drop-menu-dropdown",
+                query: function(query) {
+
+                  var cachedData = cachedDataSource[cacheKey];
+                  if (cachedData) {
+                    feedRefsData(query, cachedData)
+                  } else {
+                    loadRefsData(query)
+                  }
+                },
+                initSelection: function(element, callback) {
+                  callback(initialData);
+                },
+                formatResult: formatResult,
+                formatSelection: formatSelection
+              });
+
+            };
+
+            select2RefFileSwitcher('#refs_filter', loadUrl, initialCommitData);
+
+            $('#refs_filter').on('change', function(e) {
+                var data = $('#refs_filter').select2('data');
+                window.location = data.files_url
+            });
+
+        };
+
+        $(document).ready(function() {
+            timeagoActivate();
+
             if ($('#trimmed_message_box').height() < 50) {
                 $('#message_expand').hide();
             }
@@ -144,181 +352,18 b''
             });
 
             if (fileSourcePage) {
-                // variants for with source code, not tree view
-
-                // select code link event
-                $("#hlcode").mouseup(getSelectionLink);
-
-                // file history select2
-                select2FileHistorySwitcher('#diff1', initialCommitData, state);
-
-                // show at, diff to actions handlers
-                $('#diff1').on('change', function(e) {
-                    $('#diff_to_commit').removeClass('disabled').removeAttr("disabled");
-                    $('#diff_to_commit').val(_gettext('Diff to Commit ') + e.val.truncateAfter(8, '...'));
-
-                    $('#show_at_commit').removeClass('disabled').removeAttr("disabled");
-                    $('#show_at_commit').val(_gettext('Show at Commit ') + e.val.truncateAfter(8, '...'));
-                });
-
-                $('#diff_to_commit').on('click', function(e) {
-                    var diff1 = $('#diff1').val();
-                    var diff2 = $('#diff2').val();
-
-                    var url_data = {
-                        repo_name: templateContext.repo_name,
-                        source_ref: diff1,
-                        source_ref_type: 'rev',
-                        target_ref: diff2,
-                        target_ref_type: 'rev',
-                        merge: 1,
-                        f_path: state.f_path
-                    };
-                    window.location = pyroutes.url('repo_compare', url_data);
-                });
-
-                $('#show_at_commit').on('click', function(e) {
-                    var diff1 = $('#diff1').val();
-
-                    var annotate = $('#annotate').val();
-                    if (annotate === "True") {
-                        var url = pyroutes.url('repo_files:annotated',
-                                {'repo_name': templateContext.repo_name,
-                                 'commit_id': diff1, 'f_path': state.f_path});
+                initFileJS()
                     } else {
-                        var url = pyroutes.url('repo_files',
-                                {'repo_name': templateContext.repo_name,
-                                 'commit_id': diff1, 'f_path': state.f_path});
-                    }
-                    window.location = url;
-
-                });
-
-                // show more authors
-                $('#show_authors').on('click', function(e) {
-                    e.preventDefault();
-                    var url = pyroutes.url('repo_file_authors',
-                                {'repo_name': templateContext.repo_name,
-                                 'commit_id': state.rev, 'f_path': state.f_path});
-
-                    $.pjax({
-                        url: url,
-                        data: 'annotate=${"1" if c.annotate else "0"}',
-                        container: '#file_authors',
-                        push: false,
-                        timeout: pjaxTimeout
-                    }).complete(function(){
-                        $('#show_authors').hide();
-                    })
-                });
-
-                // load file short history
-                $('#file_history_overview').on('click', function(e) {
-                    e.preventDefault();
-                    path = state.f_path;
-                    if (path.indexOf("#") >= 0) {
-                        path = path.slice(0, path.indexOf("#"));
-                    }
-                    var url = pyroutes.url('repo_changelog_file',
-                            {'repo_name': templateContext.repo_name,
-                             'commit_id': state.rev, 'f_path': path, 'limit': 6});
-                    $('#file_history_container').show();
-                    $('#file_history_container').html('<div class="file-history-inner">{0}</div>'.format(_gettext('Loading ...')));
-
-                    $.pjax({
-                        url: url,
-                        container: '#file_history_container',
-                        push: false,
-                        timeout: pjaxTimeout
-                    })
-                });
-
-            }
-            else {
-                getFilesMetadata();
-
-                // fuzzy file filter
-                fileBrowserListeners(state.node_list_url, state.url_base);
-
-                // switch to widget
-                select2RefSwitcher('#refs_filter', initialCommitData);
-                $('#refs_filter').on('change', function(e) {
-                    var data = $('#refs_filter').select2('data');
-                    curState.commit_id = data.raw_id;
-                    $.pjax({url: data.files_url, container: '#pjax-container', timeout: pjaxTimeout});
-                });
-
-                $("#prev_commit_link").on('click', function(e) {
-                    var data = $(this).data();
-                    curState.commit_id = data.commitId;
-                });
-
-                $("#next_commit_link").on('click', function(e) {
-                    var data = $(this).data();
-                    curState.commit_id = data.commitId;
-                });
-
-                $('#at_rev').on("keypress", function(e) {
-                    /* ENTER PRESSED */
-                    if (e.keyCode === 13) {
-                        var rev = $('#at_rev').val();
-                        // explicit reload page here. with pjax entering bad input
-                        // produces not so nice results
-                        window.location = pyroutes.url('repo_files',
-                                {'repo_name': templateContext.repo_name,
-                                 'commit_id': rev, 'f_path': state.f_path});
-                    }
-                });
-            }
-        };
-
-        var pjaxTimeout = 5000;
-
-        $(document).pjax(".pjax-link", "#pjax-container", {
-            "fragment": "#pjax-content",
-            "maxCacheLength": 1000,
-            "timeout": pjaxTimeout
-        });
-
-        // define global back/forward states
-        var isPjaxPopState = false;
-        $(document).on('pjax:popstate', function() {
-            isPjaxPopState = true;
-        });
-
-        $(document).on('pjax:end', function(xhr, options) {
-            if (isPjaxPopState) {
-                isPjaxPopState = false;
-                callbacks();
-                _NODEFILTER.resetFilter();
+                initTreeJS()
             }
 
-            // run callback for tracking if defined for google analytics etc.
-            // this is used to trigger tracking on pjax
-            if (typeof window.rhodecode_statechange_callback !== 'undefined') {
-                var state = getState('statechange');
-                rhodecode_statechange_callback(state.url, null)
-            }
-        });
-
-        $(document).on('pjax:success', function(event, xhr, options) {
-            if (event.target.id == "file_history_container") {
-                $('#file_history_overview').hide();
-                $('#file_history_overview_full').show();
-                timeagoActivate();
-            } else {
-                callbacks();
-            }
-        });
-
-        $(document).ready(function() {
-            callbacks();
             var search_GET = "${request.GET.get('search','')}";
             if (search_GET === "1") {
-                _NODEFILTER.initFilter();
+                NodeFilter.initFilter();
+                NodeFilter.focus();
             }
         });
 
     </script>
 
-</%def>
+</%def>
  No newline at end of file

rhodecode/templates/files/files_add.mako

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-    ${_('%s Files Add') % c.repo_name}
+    ${_('{} Files Add').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -11,79 +11,64 b''
     ${self.menu_items(active='repositories')}
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Add new file')} @ ${h.show_id(c.commit)} ${_('Branch')}: ${c.commit.branch}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
+
 <div class="box">
-    <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
+    <div class="edit-file-title">
+        <span class="title-heading">${_('Add new file')} @ <code>${h.show_id(c.commit)}</code></span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
-    <div class="edit-file-title">
-        ${self.breadcrumbs()}
-    </div>
-    ${h.secure_form(h.route_path('repo_files_create_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', enctype="multipart/form-data", class_="form-horizontal", request=request)}
+
+    ${h.secure_form(h.route_path('repo_files_create_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
-        <div class="fieldset">
-            <div id="destination-label" class="left-label">
-                ${_('Path')}:
+        <div class="path-items">
+            <ul>
+            <li class="breadcrumb-path">
+                <div>
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
+                </div>
+            </li>
+            <li class="location-path">
+                <input  class="file-name-input input-small" type="text" value="" name="filename" id="filename" placeholder="${_('Filename e.g example.py, or docs/readme.md')}">
+            </li>
+            </ul>
+        </div>
+
             </div>
-            <div class="right-content">
-                <div id="specify-custom-path-container">
-                    <span id="path-breadcrumbs">${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.f_path)}</span>
-                    <a class="custom-path-link" id="specify-custom-path" href="#">${_('Specify Custom Path')}</a>
+
+    <div class="table">
+        <div id="files_data">
+
+            <div id="codeblock" class="codeblock">
+                <div class="editor-items">
+                    <div class="editor-action active show-editor pull-left" onclick="fileEditor.showEditor(); return false">
+                        ${_('Edit')}
                 </div>
-                <div id="remove-custom-path-container" style="display: none;">
-                    ${c.repo_name}/
-                    <input type="input-small" value="${c.f_path}" size="46" name="location" id="location">
-                    <a class="custom-path-link" id="remove-custom-path" href="#">${_('Remove Custom Path')}</a>
+
+                    <div class="editor-action show-preview pull-left"  onclick="fileEditor.showPreview(); return false">
+                        ${_('Preview')}
                 </div>
+
+                    <div class="pull-right">
+                        ${h.dropdownmenu('line_wrap', 'off', [('on', _('Line wraps on')), ('off', _('line wraps off'))], extra_classes=['last-item'])}
+                    </div>
+                    <div class="pull-right">
+                        ${h.dropdownmenu('set_mode','plain',[('plain', _('plain'))], enable_filter=True)}
             </div>
         </div>
-        <div id="filename_container" class="fieldset">
-            <div class="filename-label left-label">
-                ${_('Filename')}:
-            </div>
-            <div class="right-content">
-                <input class="input-small" type="text" value="" size="46" name="filename" id="filename">
-                <p>${_('or')} <a id="upload_file_enable" href="#">${_('Upload File')}</a></p>
-            </div>
-        </div>
-        <div id="upload_file_container" class="fieldset" style="display: none;">
-            <div class="filename-label left-label">
-                ${_('Filename')}:
-            </div>
-            <div class="right-content">
-                <input class="input-small" type="text" value="" size="46" name="filename_upload" id="filename_upload" placeholder="${_('No file selected')}">
-            </div>
-            <div class="filename-label left-label file-upload-label">
-                ${_('Upload file')}:
-            </div>
-            <div class="right-content file-upload-input">
-                <label for="upload_file" class="btn btn-default">Browse</label>
 
-                <input type="file" name="upload_file" id="upload_file">
-                <p>${_('or')} <a id="file_enable" href="#">${_('Create New File')}</a></p>
-            </div>
-        </div>
-    </div>
-    <div class="table">
-        <div id="files_data">
-            <div id="codeblock" class="codeblock">
-            <div class="code-header form" id="set_mode_header">
-                <div class="fields">
-                    ${h.dropdownmenu('set_mode','plain',[('plain',_('plain'))],enable_filter=True)}
-                    <label for="line_wrap">${_('line wraps')}</label>
-                    ${h.dropdownmenu('line_wrap', 'off', [('on', _('on')), ('off', _('off')),])}
-
-                    <div id="render_preview" class="btn btn-small preview hidden" >${_('Preview')}</div>
-                </div>
-            </div>
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" ></textarea>
@@ -95,144 +80,35 b''
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
-            <div id="commit-message-label" class="commit-message-label left-label">
-                ${_('Commit Message')}:
-            </div>
-            <div class="right-content">
                 <div class="message">
                     <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
                 </div>
             </div>
-        </div>
-        <div class="pull-right">
-            ${h.reset('reset',_('Cancel'),class_="btn btn-small")}
+        <div class="pull-left">
             ${h.submit('commit_btn',_('Commit changes'),class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
+
 <script type="text/javascript">
 
-    $('#commit_btn').on('click', function() {
-        var button = $(this);
-        if (button.hasClass('clicked')) {
-            button.attr('disabled', true);
-        } else {
-            button.addClass('clicked');
-        }
-    });
-
-    $('#specify-custom-path').on('click', function(e){
-        e.preventDefault();
-        $('#specify-custom-path-container').hide();
-        $('#remove-custom-path-container').show();
-        $('#destination-label').css('margin-top', '13px');
-    });
-
-    $('#remove-custom-path').on('click', function(e){
-        e.preventDefault();
-        $('#specify-custom-path-container').show();
-        $('#remove-custom-path-container').hide();
-        $('#location').val('${c.f_path}');
-        $('#destination-label').css('margin-top', '0');
-    });
-
-    var hide_upload = function(){
-        $('#files_data').show();
-        $('#upload_file_container').hide();
-        $('#filename_container').show();
-    };
-
-    $('#file_enable').on('click', function(e){
-        e.preventDefault();
-        hide_upload();
-    });
-
-    $('#upload_file_enable').on('click', function(e){
-        e.preventDefault();
-        $('#files_data').hide();
-        $('#upload_file_container').show();
-        $('#filename_container').hide();
-        if (detectIE() && detectIE() <= 9) {
-            $('#upload_file_container .file-upload-input label').hide();
-            $('#upload_file_container .file-upload-input span').hide();
-            $('#upload_file_container .file-upload-input input').show();
-        }
-    });
-
-    $('#upload_file').on('change', function() {
-        if (this.files && this.files[0]) {
-            $('#filename_upload').val(this.files[0].name);
-        }
-    });
-
-    hide_upload();
-
-    var renderer = "";
-    var reset_url = "${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}";
-    var myCodeMirror = initCodeMirror('editor', reset_url, false);
-
+    $(document).ready(function () {
     var modes_select = $('#set_mode');
+        var filename_selector = '#filename';
     fillCodeMirrorOptions(modes_select);
 
-    var filename_selector = '#filename';
-    var callback = function(filename, mimetype, mode){
-        CodeMirrorPreviewEnable(mode);
-    };
+        fileEditor = new FileEditor('#editor');
+
     // on change of select field set mode
-    setCodeMirrorModeFromSelect(
-            modes_select, filename_selector, myCodeMirror, callback);
+        setCodeMirrorModeFromSelect(modes_select, filename_selector, fileEditor.cm, null);
 
     // on entering the new filename set mode, from given extension
-    setCodeMirrorModeFromInput(
-        modes_select, filename_selector, myCodeMirror, callback);
-
-    // if the file is renderable set line wraps automatically
-    if (renderer !== ""){
-        var line_wrap = 'on';
-        $($('#line_wrap option[value="'+line_wrap+'"]')[0]).attr("selected", "selected");
-        setCodeMirrorLineWrap(myCodeMirror, true);
-    }
-
-    // on select line wraps change the editor
-    $('#line_wrap').on('change', function(e){
-        var selected = e.currentTarget;
-        var line_wraps = {'on': true, 'off': false}[selected.value];
-        setCodeMirrorLineWrap(myCodeMirror, line_wraps)
-    });
-
-    // render preview/edit button
-    $('#render_preview').on('click', function(e){
-        if($(this).hasClass('preview')){
-            $(this).removeClass('preview');
-            $(this).html("${_('Edit')}");
-            $('#editor_preview').show();
-            $(myCodeMirror.getWrapperElement()).hide();
+        setCodeMirrorModeFromInput(modes_select, filename_selector, fileEditor.cm, null);
 
-            var possible_renderer = {
-                'rst':'rst',
-                'markdown':'markdown',
-                'gfm': 'markdown'}[myCodeMirror.getMode().name];
-            var _text = myCodeMirror.getValue();
-            var _renderer = possible_renderer || DEFAULT_RENDERER;
-            var post_data = {'text': _text, 'renderer': _renderer, 'csrf_token': CSRF_TOKEN};
-            $('#editor_preview').html(_gettext('Loading ...'));
-            var url = pyroutes.url('repo_commit_comment_preview',
-                    {'repo_name': '${c.repo_name}',
-                     'commit_id': '${c.commit.raw_id}'});
+        $('#filename').focus();
 
-            ajaxPOST(url, post_data, function(o){
-                $('#editor_preview').html(o);
-            })
-        }
-        else{
-            $(this).addClass('preview');
-            $(this).html("${_('Preview')}");
-            $('#editor_preview').hide();
-            $(myCodeMirror.getWrapperElement()).show();
-        }
     });
-    $('#filename').focus();
 
 </script>
 </%def>

rhodecode/templates/files/files_browser.mako

@@ -2,53 +2,60 b''
 <div id="codeblock" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
-            ${h.form(h.current_route_path(request), method='GET', id='at_rev_form')}
+
             <div class="info_box">
-              ${h.hidden('refs_filter')}
+
               <div class="info_box_elem previous">
-                    <a id="prev_commit_link" data-commit-id="${c.prev_commit.raw_id}" class="pjax-link ${'disabled' if c.url_prev == '#' else ''}" href="${c.url_prev}" title="${_('Previous commit')}"><i class="icon-left"></i></a>
+                  <a id="prev_commit_link" data-commit-id="${c.prev_commit.raw_id}" class=" ${('disabled' if c.url_prev == '#' else '')}" href="${c.url_prev}" title="${_('Previous commit')}"><i class="icon-left"></i></a>
               </div>
-              <div class="info_box_elem">${h.text('at_rev',value=c.commit.idx)}</div>
+
+              ${h.hidden('refs_filter')}
+
               <div class="info_box_elem next">
-                    <a id="next_commit_link" data-commit-id="${c.next_commit.raw_id}" class="pjax-link ${'disabled' if c.url_next == '#' else ''}" href="${c.url_next}" title="${_('Next commit')}"><i class="icon-right"></i></a>
+                  <a id="next_commit_link" data-commit-id="${c.next_commit.raw_id}" class=" ${('disabled' if c.url_next == '#' else '')}" href="${c.url_next}" title="${_('Next commit')}"><i class="icon-right"></i></a>
               </div>
             </div>
-            ${h.end_form()}
 
-            <div id="search_activate_id" class="search_activate">
-               <a class="btn btn-default" id="filter_activate" href="javascript:void(0)">${_('Search File List')}</a>
-            </div>
-            <div id="search_deactivate_id"  class="search_activate hidden">
-               <a class="btn btn-default" id="filter_deactivate" href="javascript:void(0)">${_('Close File List')}</a>
-            </div>
             % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
-              <div title="${_('Add New File')}" class="btn btn-primary new-file">
-                <a href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _anchor='edit')}">
-                    ${_('Add File')}</a>
-              </div>
-            % endif
-            % if c.enable_downloads:
-              <% at_path = '{}.zip'.format(request.GET.get('at') or c.commit.raw_id[:6]) %>
-              <div title="${_('Download tree at {}').format(at_path)}" class="btn btn-default new-file">
-                <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname='{}.zip'.format(c.commit.raw_id))}">
-                    ${_('Download tree at {}').format(at_path)}
+              <div>
+                <a class="btn btn-primary new-file" href="${h.route_path('repo_files_upload_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
+                    ${_('Upload File')}
+                </a>
+                <a class="btn btn-primary new-file" href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
+                    ${_('Add File')}
                 </a>
               </div>
             % endif
+
+            % if c.enable_downloads:
+              <% at_path = '{}'.format(request.GET.get('at') or c.commit.raw_id[:6]) %>
+              <div class="btn btn-default new-file">
+                  % if c.f_path == '/':
+                    <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname='{}.zip'.format(c.commit.raw_id))}">
+                        ${_('Download full tree ZIP')}
+                    </a>
+                  % else:
+                    <a href="${h.route_path('repo_archivefile',repo_name=c.repo_name, fname='{}.zip'.format(c.commit.raw_id), _query={'at_path':c.f_path})}">
+                        ${_('Download this tree ZIP')}
+                    </a>
+                  % endif
+              </div>
+            % endif
+
+            <div class="files-quick-filter">
+                <ul class="files-filter-box">
+                    <li class="files-filter-box-path">
+                        <i class="icon-search"></i>
+                    </li>
+                    <li class="files-filter-box-input">
+                        <input onkeydown="NodeFilter.initFilter(event)" class="init" type="text" placeholder="Quick filter" name="filter" size="25" id="node_filter" autocomplete="off">
+                    </li>
+                </ul>
+            </div>
         </div>
 
-        <div class="browser-search">
-            <div class="node-filter">
-                <div class="node_filter_box hidden" id="node_filter_box_loading" >${_('Loading file list...')}</div>
-                <div class="node_filter_box hidden" id="node_filter_box" >
-                    <div class="node-filter-path">${h.get_last_path_part(c.file)}/</div>
-                    <div class="node-filter-input">
-                        <input class="init" type="text" name="filter" size="25" id="node_filter" autocomplete="off">
                     </div>
-                </div>
-            </div>
-        </div>
-    </div>
+
     ## file tree is computed from caches, and filled in
     <div id="file-tree">
     ${c.file_tree |n}

rhodecode/templates/files/files_browser_tree.mako

@@ -1,5 +1,11 b''
-<div id="file-tree-wrapper" class="browser-body ${'full-load' if c.full_load else ''}">
-    <table class="code-browser rctable">
+<%
+    if request.GET.get('at'):
+        query={'at': request.GET.get('at')}
+    else:
+        query=None
+%>
+<div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
+    <table class="code-browser rctable repo_summary">
         <thead>
             <tr>
                 <th>${_('Name')}</th>
@@ -11,19 +17,13 b''
         </thead>
 
         <tbody id="tbody">
-          %if c.file.parent:
-          <tr class="parity0">
-            <td class="td-componentname">
-              <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.file.parent.path)}" class="pjax-link">
-                <i class="icon-directory"></i>..
-              </a>
+        <tr>
+            <td colspan="5">
+
+                ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'), limit_items=True)}
+
             </td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
           </tr>
-          %endif
           %for cnt,node in enumerate(c.file):
           <tr class="parity${cnt%2}">
             <td class="td-componentname">
@@ -38,8 +38,9 b''
                 % endif
               </span>
             % else:
-              <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=h.safe_unicode(node.path))}" class="pjax-link">
-                <i class="${'icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir'}"></i>${node.name}
+
+              <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=h.safe_unicode(node.path), _query=query)}">
+                <i class="${('icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir')}"></i>${node.name}
               </a>
             % endif
             </td>

rhodecode/templates/files/files_delete.mako

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-    ${_('%s Files Delete') % c.repo_name}
+    ${_('{} Files Delete').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -11,32 +11,40 b''
     ${self.menu_items(active='repositories')}
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Delete file')} @ ${h.show_id(c.commit)}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
+
 <div class="box">
-    <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
+    <div class="edit-file-title">
+        <span class="title-heading">${_('Delete file')} @ <code>${h.show_id(c.commit)}</code></span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
-    <div class="edit-file-title">
-        ${self.breadcrumbs()}
-    </div>
-    ${h.secure_form(h.route_path('repo_files_delete_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', class_="form-horizontal", request=request)}
+
+    ${h.secure_form(h.route_path('repo_files_delete_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
-        <div class="fieldset">
-            <div id="destination-label" class="left-label">
-                ${_('Path')}:
+        <div class="path-items">
+            <li class="breadcrumb-path">
+                <div>
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
             </div>
-            <div class="right-content">
-                <span id="path-breadcrumbs">${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.f_path)}</span>
+            </li>
+            <li class="location-path">
+                <input type="hidden" value="${c.f_path}" name="root_path">
+                <input  class="file-name-input input-small" type="text" value="${c.file.name}" name="filename" id="filename" disabled="disabled">
+            </li>
             </div>
-        </div>
+
     </div>
 
     <div id="codeblock" class="codeblock delete-file-preview">
@@ -56,20 +64,26 b''
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
-            <div id="commit-message-label" class="commit-message-label left-label">
-                ${_('Commit Message')}:
-            </div>
-            <div class="right-content">
                 <div class="message">
                     <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
                 </div>
             </div>
-        </div>
-        <div class="pull-right">
-            ${h.reset('reset',_('Cancel'),class_="btn btn-small btn-danger")}
-            ${h.submit('commit',_('Delete File'),class_="btn btn-small btn-danger-action")}
+        <div class="pull-left">
+            ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-danger-action")}
         </div>
     </div>
     ${h.end_form()}
 </div>
+
+
+<script type="text/javascript">
+
+    $(document).ready(function () {
+
+        fileEditor = new FileEditor('#editor');
+
+    });
+
+</script>
+
 </%def>

rhodecode/templates/files/files_edit.mako

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title()">
-    ${_('%s File Edit') % c.repo_name}
+    ${_('{} Files Edit').format(c.repo_name)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
@@ -11,80 +11,65 b''
     ${self.menu_items(active='repositories')}
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Edit file')} @ ${h.show_id(c.commit)}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
-<% renderer = h.renderer_from_filename(c.f_path)%>
+
 <div class="box">
-    <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
+    <div class="edit-file-title">
+        <span class="title-heading">${_('Edit file')} @ <code>${h.show_id(c.commit)}</code></span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
-    <div class="edit-file-title">
-        ${self.breadcrumbs()}
-    </div>
+
+    ${h.secure_form(h.route_path('repo_files_update_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
     <div class="edit-file-fieldset">
-        <div class="fieldset">
-            <div id="destination-label" class="left-label">
-                ${_('Path')}:
+        <div class="path-items">
+            <ul>
+            <li class="breadcrumb-path">
+                <div>
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
+                    <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')}
             </div>
-            <div class="right-content">
-                <div id="specify-custom-path-container">
-                    <span id="path-breadcrumbs">${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.f_path)}</span>
+            </li>
+            <li class="location-path">
+                <input type="hidden" value="${c.f_path}" name="root_path">
+                <input  class="file-name-input input-small" type="text" value="${c.file.name}" name="filename" id="filename" placeholder="${_('Filename e.g example.py, or docs/readme.md')}">
+            </li>
+            </ul>
                 </div>
-            </div>
-        </div>
+
     </div>
 
     <div class="table">
-        ${h.secure_form(h.route_path('repo_files_update_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
+        <div id="files_data">
+
         <div id="codeblock" class="codeblock" >
-        <div class="code-header">
-            <div class="stats">
-                <i class="icon-file"></i>
-                <span class="item">${h.link_to("r%s:%s" % (c.file.commit.idx,h.short_id(c.file.commit.raw_id)),h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file.commit.raw_id))}</span>
-                <span class="item">${h.format_byte_size_binary(c.file.size)}</span>
-                <span class="item last">${c.file.mimetype}</span>
-                <div class="buttons">
-                  <a class="btn btn-mini" href="${h.route_path('repo_changelog_file',repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">
-                      <i class="icon-time"></i> ${_('history')}
-                  </a>
+                <div class="editor-items">
+                    <div class="editor-action active show-editor pull-left" onclick="fileEditor.showEditor(); return false">
+                        ${_('Edit')}
+                    </div>
 
-                  % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
-                   % if not c.file.is_binary:
-                      %if True:
-                        ${h.link_to(_('source'),    h.route_path('repo_files',          repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),class_="btn btn-mini")}
-                      %else:
-                        ${h.link_to(_('annotation'),h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path),class_="btn btn-mini")}
-                      %endif
+                    <div class="editor-action show-preview pull-left"  onclick="fileEditor.showPreview(); return false">
+                        ${_('Preview')}
+                    </div>
 
-                      <a class="btn btn-mini" href="${h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
-                          ${_('raw')}
-                      </a>
-                      <a class="btn btn-mini" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
-                          <i class="icon-archive"></i> ${_('download')}
-                      </a>
-                   % endif
-                  % endif
+                    <div class="pull-right">
+                        ${h.dropdownmenu('line_wrap', 'off', [('on', _('Line wraps on')), ('off', _('line wraps off')),])}
+                    </div>
+                    <div class="pull-right">
+                        ${h.dropdownmenu('set_mode','plain',[('plain', _('plain'))],enable_filter=True)}
                 </div>
             </div>
-            <div class="form">
-                <label for="set_mode">${_('Editing file')}:</label>
-                ${'%s /' % c.file.dir_path if c.file.dir_path else c.file.dir_path}
-                <input id="filename" type="text" name="filename" value="${c.file.name}">
 
-                ${h.dropdownmenu('set_mode','plain',[('plain',_('plain'))],enable_filter=True)}
-                <label for="line_wrap">${_('line wraps')}</label>
-                ${h.dropdownmenu('line_wrap', 'off', [('on', _('on')), ('off', _('off')),])}
-
-                <div id="render_preview" class="btn btn-small preview hidden">${_('Preview')}</div>
-            </div>
-        </div>
             <div id="editor_container">
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" >${h.escape(c.file.content)|n}</textarea>
@@ -92,106 +77,48 b''
             </div>
         </div>
     </div>
+    </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
-            <div id="commit-message-label" class="commit-message-label left-label">
-                ${_('Commit Message')}:
-            </div>
-            <div class="right-content">
                 <div class="message">
                     <textarea id="commit" name="message" placeholder="${c.default_message}"></textarea>
                 </div>
             </div>
-        </div>
-        <div class="pull-right">
-            ${h.reset('reset',_('Cancel'),class_="btn btn-small")}
-            ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-success")}
+        <div class="pull-left">
+            ${h.submit('commit_btn',_('Commit changes'), class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 <script type="text/javascript">
+
 $(document).ready(function(){
-    var renderer = "${renderer}";
-    var reset_url = "${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.file.path)}";
-    var myCodeMirror = initCodeMirror('editor', reset_url);
-
     var modes_select = $('#set_mode');
+    var filename_selector = '#filename';
     fillCodeMirrorOptions(modes_select);
 
+    fileEditor = new FileEditor('#editor');
+
     // try to detect the mode based on the file we edit
-    var mimetype = "${c.file.mimetype}";
-    var detected_mode = detectCodeMirrorMode(
-            "${c.file.name}", mimetype);
+    var detected_mode = detectCodeMirrorMode("${c.file.name}", "${c.file.mimetype}");
 
     if(detected_mode){
-        setCodeMirrorMode(myCodeMirror, detected_mode);
-        $(modes_select).select2("val", mimetype);
-        $(modes_select).change();
-        setCodeMirrorMode(myCodeMirror, detected_mode);
+        setCodeMirrorMode(fileEditor.cm, detected_mode);
+
+        var mimetype = $(modes_select).find("option[mode={0}]".format(detected_mode)).val();
+        $(modes_select).select2("val", mimetype).trigger('change');
     }
 
-    var filename_selector = '#filename';
-    var callback = function(filename, mimetype, mode){
-        CodeMirrorPreviewEnable(mode);
-    };
     // on change of select field set mode
-    setCodeMirrorModeFromSelect(
-            modes_select, filename_selector, myCodeMirror, callback);
+    setCodeMirrorModeFromSelect(modes_select, filename_selector, fileEditor.cm, null);
 
     // on entering the new filename set mode, from given extension
-    setCodeMirrorModeFromInput(
-        modes_select, filename_selector, myCodeMirror, callback);
+    setCodeMirrorModeFromInput(modes_select, filename_selector, fileEditor.cm, null);
 
-    // if the file is renderable set line wraps automatically
-    if (renderer !== ""){
-        var line_wrap = 'on';
-        $($('#line_wrap option[value="'+line_wrap+'"]')[0]).attr("selected", "selected");
-        setCodeMirrorLineWrap(myCodeMirror, true);
-    }
-    // on select line wraps change the editor
-    $('#line_wrap').on('change', function(e){
-        var selected = e.currentTarget;
-        var line_wraps = {'on': true, 'off': false}[selected.value];
-        setCodeMirrorLineWrap(myCodeMirror, line_wraps)
     });
 
-    // render preview/edit button
-    if (mimetype === 'text/x-rst' || mimetype === 'text/plain') {
-        $('#render_preview').removeClass('hidden');
-    }
-    $('#render_preview').on('click', function(e){
-        if($(this).hasClass('preview')){
-            $(this).removeClass('preview');
-            $(this).html("${_('Edit')}");
-            $('#editor_preview').show();
-            $(myCodeMirror.getWrapperElement()).hide();
 
-            var possible_renderer = {
-                'rst':'rst',
-                'markdown':'markdown',
-                'gfm': 'markdown'}[myCodeMirror.getMode().name];
-            var _text = myCodeMirror.getValue();
-            var _renderer = possible_renderer || DEFAULT_RENDERER;
-            var post_data = {'text': _text, 'renderer': _renderer, 'csrf_token': CSRF_TOKEN};
-            $('#editor_preview').html(_gettext('Loading ...'));
-            var url = pyroutes.url('repo_commit_comment_preview',
-                    {'repo_name': '${c.repo_name}',
-                     'commit_id': '${c.commit.raw_id}'});
-            ajaxPOST(url, post_data, function(o){
-                $('#editor_preview').html(o);
-            })
-        }
-        else{
-            $(this).addClass('preview');
-            $(this).html("${_('Preview')}");
-            $('#editor_preview').hide();
-            $(myCodeMirror.getWrapperElement()).show();
-        }
-    });
-
-})
 </script>
 </%def>

rhodecode/templates/files/files_pjax.mako

@@ -1,7 +1,7 b''
 <%def name="title(*args)">
-    ${_('%s Files') % c.repo_name}
+    ${_('{} Files').format(c.repo_name)}
     %if hasattr(c,'file'):
-        &middot; ${h.safe_unicode(c.file.path) or '\\'}
+        &middot; ${(h.safe_unicode(c.file.path) or '\\')}
     %endif
 
     %if c.rhodecode_name:
@@ -9,47 +9,26 b''
     %endif
 </%def>
 
-<div id="pjax-content" data-title="${self.title()}">
+<div>
+
     <div class="summary-detail">
         <div class="summary-detail-header">
-            <div class="breadcrumbs files_location">
-                <h4>
-                    ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path)}
-                    %if c.annotate:
-                    - ${_('annotation')}
-                    %endif
-                </h4>
-            </div>
-            <div  class="btn-collapse" data-toggle="summary-details">
-                ${_('Show More')}
-            </div>
+
         </div><!--end summary-detail-header-->
 
         % if c.file.is_submodule():
             <span class="submodule-dir">Submodule ${h.escape(c.file.name)}</span>
         % elif c.file.is_dir():
-            <%include file='file_tree_detail.mako'/>
+            <%include file='files_tree_header.mako'/>
         % else:
-            <%include file='files_detail.mako'/>
+            <%include file='files_source_header.mako'/>
         % endif
 
     </div> <!--end summary-detail-->
-    <script>
-        // set the pageSource variable
-        var fileSourcePage = ${c.file_source_page};
-    </script>
     % if c.file.is_dir():
-        <div id="commit-stats" class="sidebar-right">
-            <%include file='file_tree_author_box.mako'/>
-        </div>
-
         <%include file='files_browser.mako'/>
     % else:
-        <div id="file_authors" class="sidebar-right">
-            <%include file='file_authors_box.mako'/>
-        </div>
-
         <%include file='files_source.mako'/>
     % endif
 
-</div>
  No newline at end of file
+</div>

rhodecode/templates/files/files_source.mako

@@ -1,71 +1,100 b''
 <%namespace name="sourceblock" file="/codeblocks/source.mako"/>
 
-<div id="codeblock" class="codeblock">
+<div id="codeblock" class="browserblock">
+    <div class="browser-header">
+        <div class="browser-nav">
+            <div class="pull-left">
+                ## loads the history for a file
+                ${h.hidden('file_refs_filter')}
+            </div>
+
+            <div class="pull-right">
+
+            ## Download
+            % if c.lf_node:
+              <a class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
+              ${_('Download largefile')}
+              </a>
+            % else:
+              <a  class="btn btn-default" href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
+              ${_('Download file')}
+              </a>
+            % endif
+
+            %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
+              ## on branch head, can edit files
+              %if c.on_branch_head and c.branch_or_raw_id:
+                  ## binary files are delete only
+                  % if c.file.is_binary:
+                    ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))}
+                    ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")}
+                  % else:
+                    <a  class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
+                        ${_('Edit on branch: ')}<code>${c.branch_name}</code>
+                    </a>
+
+                    <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}">
+                        ${_('Delete')}
+                    </a>
+                  % endif
+              ## not on head, forbid all
+              % else:
+               ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
+               ${h.link_to(_('Delete'), '#Delete', class_="btn btn-default btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
+              % endif
+            %endif
+
+          </div>
+        </div>
+        <div id="file_history_container"></div>
+
+        </div>
+    </div>
+
+    <div class="codeblock">
     <div class="codeblock-header">
-      <div class="stats">
-            <span class="stats-filename">
-                <strong>
-                    <i class="icon-file-text"></i>
-                    ${c.file.unicode_path_safe}
-                </strong>
-            </span>
-            <span class="item last"><i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.f_path}" title="${_('Copy the full path')}"></i></span>
-            <br/>
+        <div class="file-filename">
+            <i class="icon-file"></i> ${c.file}
+        </div>
 
+        <div class="file-stats">
+
+          <div class="stats-info">
+            <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
+
+            <span> | ${h.format_byte_size_binary(c.file.size)}</span>
             % if c.lf_node:
             <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
             % endif
-
-            <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
-            <span> | ${h.format_byte_size_binary(c.file.size)}</span>
             <span> | ${c.file.mimetype} </span>
             <span> | ${h.get_lexer_for_filenode(c.file).__class__.__name__}</span>
-
+          </div>
+        </div>
       </div>
-      <div class="buttons">
-        <a id="file_history_overview" href="#">
+
+      <div class="path clear-fix">
+          <div class="pull-left">
+            ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))}
+          </div>
+
+          <div class="pull-right stats">
+                <a id="file_history_overview" href="#loadHistory">
             ${_('History')}
         </a>
-        <a id="file_history_overview_full" style="display: none" href="${h.route_path('repo_changelog_file',repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">
-           ${_('Show Full History')}
-        </a> |
+                 |
         %if c.annotate:
           ${h.link_to(_('Source'), h.route_path('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
         %else:
           ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
         %endif
          | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))}
-         |
-          % if c.lf_node:
-              <a href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path, _query=dict(lf=1))}">
-              ${_('Download largefile')}
-              </a>
-          % else:
-              <a href="${h.route_path('repo_file_download',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
-              ${_('Download')}
-              </a>
-          % endif
 
-        %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
-           |
-         %if c.on_branch_head and c.branch_or_raw_id and not c.file.is_binary:
-            <a href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _anchor='edit')}">
-              ${_('Edit on Branch:{}').format(c.branch_name)}
-            </a>
-            | <a class="btn-danger btn-link" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _anchor='edit')}">${_('Delete')}
-            </a>
-         %elif c.on_branch_head and c.branch_or_raw_id and c.file.is_binary:
-          ${h.link_to(_('Edit'), '#', class_="btn btn-link disabled tooltip", title=_('Editing binary files not allowed'))}
-           | ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _anchor='edit'),class_="btn-danger btn-link")}
-         %else:
-          ${h.link_to(_('Edit'), '#', class_="btn btn-link disabled tooltip", title=_('Editing files allowed only when on branch head commit'))}
-           | ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-link disabled tooltip", title=_('Deleting files allowed only when on branch head commit'))}
-         %endif
-        %endif
+          </div>
+          <div class="clear-fix"></div>
       </div>
-    </div>
-    <div id="file_history_container"></div>
-    <div class="code-body">
+
+      <div class="code-body clear-fix ">
+
      %if c.file.is_binary:
            <% rendered_binary = h.render_binary(c.repo_name, c.file)%>
            % if rendered_binary:
@@ -106,6 +135,7 b''
         %endif
      %endif
     </div>
+
 </div>
 
 <script type="text/javascript">

rhodecode/templates/files/files_source_header.mako

@@ -1,69 +1,61 b''
+<%namespace name="base" file="/base/base.mako"/>
 <%namespace name="file_base" file="/files/base.mako"/>
 
+<div class="summary">
+  <div class="fieldset">
+    <div class="left-content">
+
+      <div class="left-content-avatar">
+        ${base.gravatar(c.file_last_commit.author_email, 30)}
+      </div>
+
+      <div class="left-content-message">
 <div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Commit Description')}:
-  </div>
-  <div class="commit right-content truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
+        <div class="commit truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
 </div>
 
 <div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Commit Description')}:
+        <div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
   </div>
-  <div class="commit right-content">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
+
+      <div class="fieldset" data-toggle="summary-details">
+        <div class="" id="file_authors">
+          ## loads single author, or ALL
+          <%include file='file_authors_box.mako'/>
+        </div>
+      </div>
 </div>
 
+      <div class="fieldset collapsable-content" data-toggle="summary-details">
+        <div class="left-label-summary-files">
+            <p>${_('File last commit')}</p>
+            <div class="right-label-summary">
+              <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
 
-<div class="fieldset " data-toggle="summary-details">
-  <div class="left-label">
-    ${_('References')}:
+            ${file_base.refs(c.file_last_commit)}
+          </div>
+        </div>
+      </div>
   </div>
+
   <div class="right-content">
-    <div class="tags tags-main">
+      <div data-toggle="summary-details">
+          <div class="tags commit-info tags-main">
       <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
       ${file_base.refs(c.commit)}
     </div>
   </div>
 </div>
 
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('File last commit')}:
+    <div class="clear-fix"></div>
+
+    <div  class="btn-collapse" data-toggle="summary-details">
+        ${_('Show More')}
   </div>
-  <div class="right-content">
-    <div class="tags">
-      <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
 
-      ${file_base.refs(c.file_last_commit)}
-    </div>
   </div>
 </div>
 
-
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Show/Diff file')}:
-  </div>
-  <div class="right-content">
-  ${h.hidden('diff1')}
-  ${h.hidden('diff2',c.commit.raw_id)}
-  ${h.hidden('annotate', c.annotate)}
-  </div>
-</div>
-
-
-<div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Action')}:
-  </div>
-  <div class="right-content">
-  ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
-  ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
-  </div>
-</div>
-
-
 <script>
   collapsableContent();
-</script>
  No newline at end of file
+</script>

rhodecode/templates/files/files_tree_header.mako

@@ -1,27 +1,31 b''
+<%namespace name="base" file="/base/base.mako"/>
 <%namespace name="file_base" file="/files/base.mako"/>
 
+<div class="summary">
+  <div class="fieldset">
+    <div class="left-content">
+
+      <div class="left-content-avatar">
+        ${base.gravatar(c.commit.author_email, 30)}
+      </div>
+
+      <div class="left-content-message">
 <div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Description')}:
-  </div>
-  <div class="commit right-content truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
+          <div class="commit truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
 </div>
 
 <div class="fieldset collapsable-content" data-toggle="summary-details">
-  <div class="left-label">
-    ${_('Description')}:
-  </div>
-  <div class="commit right-content">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
+          <div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
 </div>
 
-
+        <div class="fieldset clear-fix">
+          <span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date"> - ${h.age_component(c.commit.date)}</span>
+        </div>
+      </div>
+    </div>
 
-<div class="fieldset">
-  <div class="left-label">
-    ${_('References')}:
-  </div>
   <div class="right-content">
-    <div class="tags">
+      <div class="tags commit-info">
       <code>
           <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a>
       </code>
@@ -29,9 +33,14 b''
       ${file_base.refs(c.commit)}
     </div>
   </div>
-</div>
+
+    <div class="clear-fix"></div>
 
-
+    <div  class="btn-collapse" data-toggle="summary-details">
+        ${_('Show More')}
+    </div>
+  </div>
+</div>
 <script>
   collapsableContent();
 </script>

rhodecode/templates/forks/fork.mako

@@ -20,10 +20,6 b''
 
 <%def name="main()">
 <div class="box">
-      <div class="title">
-          ${self.repo_page_title(c.rhodecode_db_repo)}
-      </div>
-
     ${h.secure_form(h.route_path('repo_fork_create',repo_name=c.rhodecode_db_repo.repo_name), request=request)}
     <div class="form">
         <!-- fields -->

rhodecode/templates/forks/forks.mako

@@ -8,9 +8,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('Forks')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -23,7 +21,7 b''
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
         <ul class="links">
             <li>
                 <a class="btn btn-small btn-success" href="${h.route_path('repo_fork_new',repo_name=c.repo_name)}">

rhodecode/templates/index_base.mako

@@ -12,32 +12,15 b''
    <div class="box">
         <!-- box / title -->
         <div class="title">
-            % if c.repo_group:
-            ${self.repo_group_page_title(c.repo_group)}
-            ## context actions
-            <div>
-            <ul class="links icon-only-links block-right">
-                <li></li>
-            </ul>
-            </div>
-            % endif
-
             %if c.rhodecode_user.username != h.DEFAULT_USER:
               <div class="block-right">
-                <%
-                    is_admin = h.HasPermissionAny('hg.admin')('can create repos index page')
-                    create_repo = h.HasPermissionAny('hg.create.repository')('can create repository index page')
-                    create_repo_group = h.HasPermissionAny('hg.repogroup.create.true')('can create repository groups index page')
-                    create_user_group = h.HasPermissionAny('hg.usergroup.create.true')('can create user groups index page')
-                %>
-
                 %if not c.repo_group:
                     ## no repository group context here
-                    %if is_admin or create_repo:
+                    %if c.is_super_admin or c.can_create_repo:
                         <a href="${h.route_path('repo_new')}" class="btn btn-small btn-success btn-primary">${_('Add Repository')}</a>
                     %endif
 
-                    %if is_admin or create_repo_group:
+                    %if c.is_super_admin or c.can_create_repo_group:
                         <a href="${h.route_path('repo_group_new')}" class="btn btn-small btn-default">${_(u'Add Repository Group')}</a>
                     %endif
                 %endif
@@ -79,13 +62,16 b''
           order: [[ 0, "asc" ]],
           columns: [
              { data: {"_": "name",
-                      "sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname" },
+                      "sort": "name_raw"}, title: "${_('Name')}", className: "truncate-wrap td-grid-name" },
              { data: 'menu', "bSortable": false, className: "quick_repo_menu" },
              { data: {"_": "desc",
                       "sort": "desc"}, title: "${_('Description')}", className: "td-description" },
              { data: {"_": "last_change",
                       "sort": "last_change_raw",
                       "type": Number}, title: "${_('Last Change')}", className: "td-time" },
+             { data: {"_": "last_changeset",
+                      "sort": "last_changeset_raw",
+                      "type": Number}, title: "", className: "td-hash" },
              { data: {"_": "owner",
                       "sort": "owner"}, title: "${_('Owner')}", className: "td-user" }
           ],
@@ -109,7 +95,7 b''
           pageLength: ${c.visual.dashboard_items},
           columns: [
              { data: {"_": "name",
-                      "sort": "name_raw"}, title: "${_('Name')}", className: "truncate-wrap td-componentname" },
+                      "sort": "name_raw"}, title: "${_('Name')}", className: "truncate-wrap td-grid-name" },
              { data: 'menu', "bSortable": false, className: "quick_repo_menu" },
              { data: {"_": "desc",
                       "sort": "desc"}, title: "${_('Description')}", className: "td-description" },

rhodecode/templates/login.mako

@@ -14,10 +14,12 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
-                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
+                <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+                </div>
                 %endif
             </div>
         </div>

rhodecode/templates/password_reset.mako

@@ -14,10 +14,12 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
-                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
+                <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+                </div>
                 %endif
             </div>
         </div>

rhodecode/templates/pullrequests/pullrequest.mako

@@ -5,9 +5,7 b''
     ${c.repo_name} ${_('New pull request')}
 </%def>
 
-<%def name="breadcrumbs_links()">
-    ${_('New pull request')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -19,13 +17,9 b''
 
 <%def name="main()">
 <div class="box">
-    <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
-    </div>
-
     ${h.secure_form(h.route_path('pullrequest_create', repo_name=c.repo_name, _query=request.GET.mixed()), id='pull_request_form', request=request)}
 
-        ${self.breadcrumbs()}
+        ${_('New pull request')}
 
         <div class="box pr-summary">
 

rhodecode/templates/pullrequests/pullrequest_merge_checks.mako

@@ -28,6 +28,9 b''
                 </span>
             </li>
         % endfor
+        <li>
+            Try <a href="${h.current_route_path(request, force_refresh=1)}">forced recheck</a> of the merge workspace in case current status seems wrong.
+        </li>
     </ul>
     % endif
 

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -38,10 +38,6 b''
 </script>
 <div class="box">
 
-  <div class="title">
-    ${self.repo_page_title(c.rhodecode_db_repo)}
-  </div>
-
   ${self.breadcrumbs()}
 
   <div class="box pr-summary">
@@ -76,7 +72,7 b''
                     ## branch link is only valid if it is a branch
                     <span class="tag">
                       %if c.pull_request.source_ref_parts.type == 'branch':
-                        <a href="${h.route_path('repo_changelog', repo_name=c.pull_request.source_repo.repo_name, _query=dict(branch=c.pull_request.source_ref_parts.name))}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
+                        <a href="${h.route_path('repo_commits', repo_name=c.pull_request.source_repo.repo_name, _query=dict(branch=c.pull_request.source_ref_parts.name))}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
                       %else:
                         ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
                       %endif
@@ -112,7 +108,7 b''
                     ## branch link is only valid if it is a branch
                     <span class="tag">
                       %if c.pull_request.target_ref_parts.type == 'branch':
-                        <a href="${h.route_path('repo_changelog', repo_name=c.pull_request.target_repo.repo_name, _query=dict(branch=c.pull_request.target_ref_parts.name))}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
+                        <a href="${h.route_path('repo_commits', repo_name=c.pull_request.target_repo.repo_name, _query=dict(branch=c.pull_request.target_ref_parts.name))}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
                       %else:
                         ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
                       %endif

rhodecode/templates/pullrequests/pullrequests.mako

@@ -7,9 +7,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -22,63 +20,36 b''
 
 
 <%def name="main()">
+
 <div class="box">
   <div class="title">
-      ${self.repo_page_title(c.rhodecode_db_repo)}
+    <ul class="button-links">
+      <li class="btn ${('active' if c.active=='open' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,         _query={'source':0})}">${_('Opened')}</a></li>
+      <li class="btn ${('active' if c.active=='my' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,           _query={'source':0,'my':1})}">${_('Opened by me')}</a></li>
+      <li class="btn ${('active' if c.active=='awaiting' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,     _query={'source':0,'awaiting_review':1})}">${_('Awaiting review')}</a></li>
+      <li class="btn ${('active' if c.active=='awaiting_my' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,  _query={'source':0,'awaiting_my_review':1})}">${_('Awaiting my review')}</a></li>
+      <li class="btn ${('active' if c.active=='closed' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,       _query={'source':0,'closed':1})}">${_('Closed')}</a></li>
+      <li class="btn ${('active' if c.active=='source' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,       _query={'source':1})}">${_('From this repo')}</a></li>
+    </ul>
 
       <ul class="links">
+        % if c.rhodecode_user.username != h.DEFAULT_USER:
         <li>
-           %if c.rhodecode_user.username != h.DEFAULT_USER:
             <span>
                 <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">
                     ${_('Open new Pull Request')}
                 </a>
             </span>
+        </li>
            %endif
-        </li>
       </ul>
 
-    ${self.breadcrumbs()}
-  </div>
-
-  <div class="sidebar-col-wrapper">
-    ##main
-    <div class="sidebar">
-        <ul class="nav nav-pills nav-stacked">
-          <li class="${'active' if c.active=='open' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,         _query={'source':0})}">${_('Opened')}</a></li>
-          <li class="${'active' if c.active=='my' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,           _query={'source':0,'my':1})}">${_('Opened by me')}</a></li>
-          <li class="${'active' if c.active=='awaiting' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,     _query={'source':0,'awaiting_review':1})}">${_('Awaiting review')}</a></li>
-          <li class="${'active' if c.active=='awaiting_my' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,  _query={'source':0,'awaiting_my_review':1})}">${_('Awaiting my review')}</a></li>
-          <li class="${'active' if c.active=='closed' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,       _query={'source':0,'closed':1})}">${_('Closed')}</a></li>
-          <li class="${'active' if c.active=='source' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name,       _query={'source':1})}">${_('From this repo')}</a></li>
-        </ul>
     </div>
 
     <div class="main-content-full-width">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h3 class="panel-title">
-              %if c.source:
-                  ${_('Pull Requests from %(repo_name)s repository') % {'repo_name': c.repo_name}}
-              %elif c.closed:
-                  ${_('Closed Pull Requests to repository %(repo_name)s') % {'repo_name': c.repo_name}}
-              %elif c.my:
-                  ${_('Pull Requests to %(repo_name)s repository opened by me') % {'repo_name': c.repo_name}}
-              %elif c.awaiting_review:
-                  ${_('Pull Requests to %(repo_name)s repository awaiting review') % {'repo_name': c.repo_name}}
-              %elif c.awaiting_my_review:
-                  ${_('Pull Requests to %(repo_name)s repository awaiting my review') % {'repo_name': c.repo_name}}
-              %else:
-                  ${_('Pull Requests to %(repo_name)s repository') % {'repo_name': c.repo_name}}
-              %endif
-          </h3>
-        </div>
-        <div class="panel-body panel-body-min-height">
           <table id="pull_request_list_table" class="display"></table>
         </div>
-      </div>
-    </div>
-  </div>
+
 </div>
 
 <script type="text/javascript">

rhodecode/templates/register.mako

@@ -14,10 +14,12 b''
         <div id="header-inner" class="title">
             <div id="logo">
                 <div class="logo-wrapper">
-                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-216x60.png')}" alt="RhodeCode"/></a>
+                    <a href="${h.route_path('home')}"><img src="${h.asset('images/rhodecode-logo-white-60x60.png')}" alt="RhodeCode"/></a>
                 </div>
                 %if c.rhodecode_name:
-                <div class="branding">- ${h.branding(c.rhodecode_name)}</div>
+                <div class="branding">
+                   <a href="${h.route_path('home')}">${h.branding(c.rhodecode_name)}</a>
+                </div>
                 %endif
             </div>
         </div>

rhodecode/templates/search/search.mako

@@ -37,9 +37,10 b''
 
 <%def name="menu_bar_subnav()">
     %if c.repo_name:
-        ${self.repo_menu(active='search')}
+        <% active_entry = {'content':'files', 'path':'files', 'commit':'commits'}.get(c.search_type, 'summary')%>
+        ${self.repo_menu(active=active_entry)}
     %elif c.repo_group_name:
-        ${self.repo_group_menu(active='search')}
+        ${self.repo_group_menu(active='home')}
     %endif
 </%def>
 
@@ -56,22 +57,16 b''
 </%def>
 
 <%def name="repo_group_icon()">
-    <i class="icon-folder-close"></i>
+    <i class="icon-repo-group"></i>
 </%def>
 
 <%def name="main()">
 <div class="box">
     %if c.repo_name:
         <!-- box / title -->
-        <div class="title">
-            ${self.repo_page_title(c.rhodecode_db_repo)}
-        </div>
         ${h.form(h.route_path('search_repo',repo_name=c.repo_name),method='get')}
     %elif c.repo_group_name:
         <!-- box / title -->
-        <div class="title">
-            ${self.repo_group_page_title(c.repo_group)}
-        </div>
         ${h.form(h.route_path('search_repo_group',repo_group_name=c.repo_group_name),method='get')}
     %else:
         <!-- box / title -->

rhodecode/templates/search/search_content.mako

@@ -58,65 +58,50 b''
   %>
   ## search results are additionally filtered, and this check is just a safe gate
   % if c.rhodecode_user.is_admin or h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results content check'):
-      <div id="codeblock" class="codeblock">
-        <div class="codeblock-header">
+      <div class="codeblock">
           <h1>
             <% repo_type = entry.get('repo_type') or h.get_repo_type_by_name(entry.get('repository')) %>
             ${search.repo_icon(repo_type)}
             ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
           </h1>
-          ## level 1
-          <div class="file-container">
+
+        <div class="codeblock-header">
 
-            <div class="pull-left">
-                <span class="stats-filename">
-                    <strong>
-                        <i class="icon-file-text"></i>
-                        ${h.link_to(h.literal(entry['f_path']), h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
-                    </strong>
-                </span>
-                <span class="item last">
-                    <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${entry['f_path']}" title="${_('Copy the full path')}"></i>
-                </span>
+            <div class="file-filename">
+                <i class="icon-file"></i> ${entry['f_path'].split('/')[-1]}
             </div>
 
-            <div class="pull-right">
-              <div class="buttons">
-                <a id="file_history_overview_full" href="${h.route_path('repo_changelog_file',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
-                   ${_('Show Full History')}
-                </a>
-                 | ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
-                 | ${h.link_to(_('Raw'), h.route_path('repo_file_raw', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
-                 | ${h.link_to(_('Download'), h.route_path('repo_file_download',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
-              </div>
-            </div>
-
-          </div>
-          ## level 2
-          <div class="file-container">
-
-            <div class="pull-left">
+            <div class="file-stats">
+                <div class="stats-info">
                 <span class="stats-first-item">
-                    %if entry.get('lines'):
                       ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
                       (${len(matching_lines)} ${_ungettext('matched', 'matched', len(matching_lines))})
-                    %endif
                 </span>
-
                 <span>
                     %if entry.get('size'):
                       | ${h.format_byte_size_binary(entry['size'])}
                     %endif
                 </span>
-
                 <span>
                     %if entry.get('mimetype'):
                       | ${entry.get('mimetype', "unknown mimetype")}
                     %endif
                 </span>
             </div>
+            </div>
+        </div>
 
-            <div class="pull-right">
+        <div class="path clear-fix">
+            <div class="pull-left">
+                ${h.files_breadcrumbs(entry['repository'],entry.get('commit_id', 'tip'),entry['f_path'], linkify_last_item=True)}
+            </div>
+
+            <div class="pull-right stats">
+##                     <a id="file_history_overview_full" href="${h.route_path('repo_commits_file',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
+##                        ${_('Show Full History')}
+##                     </a>
+##                     | ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
+##                     | ${h.link_to(_('Raw'), h.route_path('repo_file_raw', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
                 <div class="search-tags">
 
                     <% repo_group = entry.get('repository_group')%>
@@ -135,13 +120,13 b''
                     </span>
                     % endif
                 </div>
+
             </div>
-
+            <div class="clear-fix"></div>
           </div>
 
-        </div>
-        <div class="code-body search-code-body">
 
+        <div class="code-body search-code-body clear-fix">
             ${highlight_text_file(
                 has_matched_content=has_matched_content,
                 file_content=file_content,

rhodecode/templates/summary/components.mako

@@ -1,29 +1,51 b''
+<%namespace name="base" file="/base/base.mako"/>
+
 <%def name="refs_counters(branches, closed_branches, tags, bookmarks)">
-    <span class="branchtag tag">
+    <span class="summary-branchtag summary-tag">
     <a href="${h.route_path('branches_home',repo_name=c.repo_name)}" class="childs">
-      <i class="icon-branch"></i>${_ungettext(
-      '%(num)s Branch','%(num)s Branches', len(branches)) % {'num': len(branches)}}</a>
+      <i class="icon-branch"></i>
+      % if len(branches) == 1:
+          <span>${len(branches)}</span> ${_('Branch')}
+      % else:
+          <span>${len(branches)}</span> ${_('Branches')}
+      % endif
+    </a>
     </span>
 
     %if closed_branches:
-    <span class="branchtag tag">
+    <span class="summary-branchtag summary-tag">
     <a href="${h.route_path('branches_home',repo_name=c.repo_name)}" class="childs">
-      <i class="icon-branch"></i>${_ungettext(
-      '%(num)s Closed Branch', '%(num)s Closed Branches', len(closed_branches)) % {'num': len(closed_branches)}}</a>
+      <i class="icon-branch"></i>
+      % if len(closed_branches) == 1:
+          <span>${len(closed_branches)}</span> ${_('Closed Branch')}
+      % else:
+          <span>${len(closed_branches)}</span> ${_('Closed Branches')}
+      % endif
+      </a>
     </span>
     %endif
 
-    <span class="tagtag tag">
+    <span class="summary-tagtag summary-tag">
     <a href="${h.route_path('tags_home',repo_name=c.repo_name)}" class="childs">
-        <i class="icon-tag"></i>${_ungettext(
-        '%(num)s Tag', '%(num)s Tags', len(tags)) % {'num': len(tags)}}</a>
+        <i class="icon-tag"></i>
+        % if len(tags) == 1:
+            <span>${len(tags)}</span> ${_('Tag')}
+        % else:
+            <span>${len(tags)}</span> ${_('Tags')}
+        % endif
+        </a>
     </span>
 
     %if bookmarks:
-    <span class="booktag tag">
+    <span class="summary-booktag summary-tag">
     <a href="${h.route_path('bookmarks_home',repo_name=c.repo_name)}" class="childs">
-        <i class="icon-bookmark"></i>${_ungettext(
-        '%(num)s Bookmark', '%(num)s Bookmarks', len(bookmarks)) % {'num': len(bookmarks)}}</a>
+        <i class="icon-bookmark"></i>
+        % if len(bookmarks) == 1:
+            <span>${len(bookmarks)}</span> ${_('Bookmark')}
+        % else:
+            <span>${len(bookmarks)}</span> ${_('Bookmarks')}
+        % endif
+        </a>
     </span>
     %endif
 </%def>
@@ -32,19 +54,8 b''
     <% summary = lambda n:{False:'summary-short'}.get(n) %>
 
     <div id="summary-menu-stats" class="summary-detail">
-        <div class="summary-detail-header">
-            <div class="breadcrumbs files_location">
-                <h4>
-                  ${breadcrumbs_links}
-                </h4>
-            </div>
-            <div id="summary_details_expand" class="btn-collapse" data-toggle="summary-details">
-                ${_('Show More')}
-            </div>
-        </div>
-
         <div class="fieldset">
-
+          <div class="left-content">
             <div class="left-clone">
                 <select id="clone_option" name="clone_option">
                     <option value="http" selected="selected">HTTP</option>
@@ -54,6 +65,7 b''
                     % endif
                 </select>
             </div>
+
             <div class="right-clone">
                 <%
                     maybe_disabled = ''
@@ -79,14 +91,9 b''
                 % if maybe_disabled:
                     <p class="help-block">${_('SVN Protocol is disabled. To enable it, see the')} <a href="${h.route_url('enterprise_svn_setup')}" target="_blank">${_('documentation here')}</a>.</p>
                 % endif
-
             </div>
         </div>
 
-        <div class="fieldset">
-          <div class="left-label-summary">
-            &nbsp;
-          </div>
           <div class="right-content">
             <div class="commit-info">
                 <div class="tags">
@@ -103,32 +110,99 b''
                 % endif
 
                 ## commits
-                <span class="tag">
+                <span class="summary-tag">
+                  % if commit_rev == -1:
+                      <i class="icon-history"></i>
                   % if commit_rev == -1:
-                      ${_ungettext('%(num)s Commit', '%(num)s Commits', 0) % {'num': 0}}
+                            <span>0</span> ${_('Commit')}
+                        % else:
+                            <span>0</span> ${_('Commits')}
+                        % endif
                   % else:
-                      <a href="${h.route_path('repo_changelog', repo_name=c.repo_name)}">
-                        ${_ungettext('%(num)s Commit', '%(num)s Commits', commit_rev) % {'num': commit_rev}}</a>
+                      <a href="${h.route_path('repo_commits', repo_name=c.repo_name)}">
+                        <i class="icon-history"></i>
+                        % if commit_rev == 1:
+                            <span>${commit_rev}</span> ${_('Commit')}
+                        % else:
+                            <span>${commit_rev}</span> ${_('Commits')}
+                        % endif
+                        </a>
                   % endif
                 </span>
 
                 ## forks
-                <span class="tag">
+                <span class="summary-tag">
                   <a title="${_('Number of Repository Forks')}" href="${h.route_path('repo_forks_show_all', repo_name=c.repo_name)}">
-                     ${c.repository_forks} ${_ungettext('Fork', 'Forks', c.repository_forks)}</a>
+                     <i class="icon-code-fork"></i>
+                     <span>${c.repository_forks}</span> ${_ungettext('Fork', 'Forks', c.repository_forks)}</a>
                 </span>
-
                 </div>
             </div>
           </div>
         </div>
+        ## owner, description, downloads, statistics
 
+        ## Owner
+        <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
+          <div class="left-label-summary">
+            <p>${_('Owner')}</p>
+            <div class="right-label-summary">
+                ${base.gravatar_with_user(c.rhodecode_db_repo.user.email, 16)}
+            </div>
+
+          </div>
+        </div>
+
+        ## Description
+        <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
+          <div class="left-label-summary">
+            <p>${_('Description')}</p>
+
+            <div class="right-label-summary input ${summary(c.show_stats)}">
+                <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
+                ${dt.repo_desc(c.rhodecode_db_repo.description_safe, c.visual.stylify_metatags)}
+            </div>
+          </div>
+        </div>
+
+        ## Downloads
+        % if show_downloads:
         <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
           <div class="left-label-summary">
-            ${_('Repository size')}:
+              <p>${_('Downloads')}</p>
+
+              <div class="right-label-summary input ${summary(c.show_stats)} downloads">
+                % if c.rhodecode_repo and len(c.rhodecode_repo.commit_ids) == 0:
+                  <span class="disabled">
+                    ${_('There are no downloads yet')}
+                  </span>
+                % elif not c.enable_downloads:
+                    <span class="disabled">
+                        ${_('Downloads are disabled for this repository')}.
+                    </span>
+                    % if c.is_super_admin:
+                       ${h.link_to(_('Enable downloads'),h.route_path('edit_repo',repo_name=c.repo_name, _anchor='repo_enable_downloads'))}
+                    % endif
+                % else:
+                    <span class="enabled">
+                        <a id="archive_link" class="btn btn-small" href="${h.route_path('repo_archivefile',repo_name=c.rhodecode_db_repo.repo_name,fname='tip.zip')}">
+                            <i class="icon-archive"></i> tip.zip
+                            ## replaced by some JS on select
+                        </a>
+                    </span>
+                    ${h.hidden('download_options')}
+                % endif
           </div>
-          <div class="right-content">
-            <div class="commit-info">
+            </div>
+          </div>
+        % endif
+
+        ## Repo size
+        <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
+          <div class="left-label-summary">
+            <p>${_('Repository size')}</p>
+
+            <div class="right-label-summary">
                 <div class="tags">
                    ## repo size
                     % if commit_rev == -1:
@@ -146,66 +220,21 b''
           </div>
         </div>
 
-        <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
-          <div class="left-label-summary">
-            ${_('Description')}:
-          </div>
-          <div class="right-content">
-            <div class="input ${summary(c.show_stats)}">
-                <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
-                ${dt.repo_desc(c.rhodecode_db_repo.description_safe, c.visual.stylify_metatags)}
-            </div>
-          </div>
-        </div>
-
-        % if show_downloads:
-          <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
-            <div class="left-label-summary">
-              ${_('Downloads')}:
-            </div>
-            <div class="right-content">
-              <div class="input ${summary(c.show_stats)} downloads">
-                % if c.rhodecode_repo and len(c.rhodecode_repo.commit_ids) == 0:
-                  <span class="disabled">
-                    ${_('There are no downloads yet')}
-                  </span>
-                % elif not c.enable_downloads:
-                    <span class="disabled">
-                        ${_('Downloads are disabled for this repository')}.
-                    </span>
-                    % if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
-                       ${h.link_to(_('Enable downloads'),h.route_path('edit_repo',repo_name=c.repo_name, _anchor='repo_enable_downloads'))}
-                    % endif
-                % else:
-                    <span class="enabled">
-                        <a id="archive_link" class="btn btn-small" href="${h.route_path('repo_archivefile',repo_name=c.rhodecode_db_repo.repo_name,fname='tip.zip')}">
-                            <i class="icon-archive"></i> tip.zip
-                            ## replaced by some JS on select
-                        </a>
-                    </span>
-                    ${h.hidden('download_options')}
-                % endif
-              </div>
-            </div>
-          </div>
-        % endif
-
         ## Statistics
         <div class="fieldset collapsable-content" data-toggle="summary-details" style="display: none;">
           <div class="left-label-summary">
-            ${_('Statistics')}:
-          </div>
-          <div class="right-content">
-            <div class="input ${summary(c.show_stats)} statistics">
+            <p>${_('Code Statistics')}</p>
+
+            <div class="right-label-summary input ${summary(c.show_stats)} statistics">
               % if c.show_stats:
                 <div id="lang_stats" class="enabled">
-                    ${_('Calculating Code Statistics...')}
+                    <a href="#showSize" onclick="calculateSize(); $('#show-repo-size').hide(); $(this).hide(); return false" id="show-repo-size">Show code statistics</a>
                 </div>
               % else:
                   <span class="disabled">
                       ${_('Statistics are disabled for this repository')}.
                   </span>
-                  % if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
+                  % if c.is_super_admin:
                      ${h.link_to(_('Enable statistics'),h.route_path('edit_repo',repo_name=c.repo_name, _anchor='repo_enable_statistics'))}
                   % endif
               % endif
@@ -214,18 +243,10 b''
           </div>
         </div>
 
+
     </div><!--end summary-detail-->
-</%def>
 
-<%def name="summary_stats(gravatar_function)">
-    <div class="sidebar-right">
-      <div class="summary-detail-header">
-        <h4 class="item">
-             ${_('Owner')}
-        </h4>
+    <div id="summary_details_expand" class="btn-collapse" data-toggle="summary-details">
+            ${_('Show More')}
       </div>
-      <div class="sidebar-right-content">
-        ${gravatar_function(c.rhodecode_db_repo.user.email, 16)}
-      </div>
-    </div><!--end sidebar-right-->
 </%def>

rhodecode/templates/summary/missing_requirements.mako

@@ -3,13 +3,9 b''
 <%namespace name="components" file="/summary/components.mako"/>
 
 <%def name="main()">
-    <div class="title">
-      ${self.repo_page_title(c.rhodecode_db_repo)}
-    </div>
 
   <div id="repo-summary" class="summary">
     ${components.summary_detail(breadcrumbs_links=self.breadcrumbs_links(), show_downloads=False)}
-    ${components.summary_stats(gravatar_function=self.gravatar_with_user)}
   </div><!--end repo-summary-->
 
   <div class="alert alert-dismissable alert-warning">

rhodecode/templates/summary/summary.mako

@@ -9,33 +9,19 b''
 
 <%def name="main()">
 
-<div class="title">
-    ${self.repo_page_title(c.rhodecode_db_repo)}
-    ## Context Action
-    <div>
-        <ul class="links icon-only-links block-right">
-            <li>
-                %if c.rhodecode_user.username != h.DEFAULT_USER:
-                    <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name, _query=dict(auth_token=c.rhodecode_user.feed_token))}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
-                %else:
-                    <a href="${h.route_path('atom_feed_home', repo_name=c.rhodecode_db_repo.repo_name)}" title="${_('RSS Feed')}" class="btn btn-sm"><i class="icon-rss-sign"></i>RSS</a>
-                %endif
-            </li>
-        </ul>
-    </div>
-</div>
-
 <div id="repo-summary" class="summary">
     ${components.summary_detail(breadcrumbs_links=self.breadcrumbs_links(), show_downloads=True)}
-    ${components.summary_stats(gravatar_function=self.gravatar_with_user)}
 </div><!--end repo-summary-->
 
 
 <div class="box" >
     %if not c.repo_commits:
+            <div class="empty-repo">
         <div class="title">
           <h3>${_('Quick start')}</h3>
         </div>
+                <div class="clear-fix"></div>
+            </div>
      %endif
     <div class="table">
         <div id="shortlog_data">
@@ -49,7 +35,9 b''
 <div class="box" >
     <div class="title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_rev[0], c.rhodecode_db_repo.landing_rev[1]))}">
         <h3 class="breadcrumbs">
-            <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_rev[1],f_path=c.readme_file)}">${c.readme_file}</a>
+            <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_rev[1],f_path=c.readme_file)}">
+                ${c.readme_file}
+            </a>
         </h3>
     </div>
     <div class="readme codeblock">

rhodecode/templates/summary/summary_base.mako

@@ -20,8 +20,7 b''
 </%def>
 
 
-<%def name="breadcrumbs_links()">
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 
 <%def name="main()">

rhodecode/templates/summary/summary_commits.mako

@@ -4,12 +4,12 b''
 <table class="rctable repo_summary table_disp">
     <tr>
 
-        <th class="status" colspan="2"></th>
+        <th class="status"></th>
         <th>${_('Commit')}</th>
         <th>${_('Commit message')}</th>
         <th>${_('Age')}</th>
         <th>${_('Author')}</th>
-        <th>${_('Refs')}</th>
+        <th colspan="2">${_('Refs')}</th>
     </tr>
 
 ## to speed up lookups cache some functions before the loop
@@ -37,13 +37,6 b''
                 <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
             %endif
         </td>
-        <td class="td-comments">
-            %if c.comments.get(cs.raw_id,[]):
-            <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
-                <i class="icon-comment"></i> ${len(c.comments[cs.raw_id])}
-            </a>
-            %endif
-        </td>
         <td class="td-commit">
             <code>
                 <a href="${h.route_path('repo_commit', repo_name=c.repo_name, commit_id=cs.raw_id)}">${h.show_id(cs)}</a>
@@ -83,19 +76,34 b''
             ## branch
             %if cs.branch:
              <span class="branchtag tag" title="${h.tooltip(_('Branch %s') % cs.branch)}">
-              <a href="${h.route_path('repo_changelog',repo_name=c.repo_name,_query=dict(branch=cs.branch))}"><i class="icon-code-fork"></i>${h.shorter(cs.branch)}</a>
+              <a href="${h.route_path('repo_commits',repo_name=c.repo_name,_query=dict(branch=cs.branch))}"><i class="icon-code-fork"></i>${h.shorter(cs.branch)}</a>
              </span>
             %endif
           </div>
         </td>
+        <td class="td-comments">
+            <% cs_comments = c.comments.get(cs.raw_id,[]) %>
+            % if cs_comments:
+                <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % cs_comments[0].comment_id)}">
+                    <i class="icon-comment"></i> ${len(cs_comments)}
+                </a>
+            % else:
+                <i class="icon-comment"></i> ${len(cs_comments)}
+            % endif
+        </td>
     </tr>
 %endfor
 
 </table>
 
 <script type="text/javascript">
-  $(document).pjax('#shortlog_data .pager_link','#shortlog_data', {timeout: 2000, scrollTo: false, push: false});
+  $(document).pjax('#shortlog_data .pager_link','#shortlog_data', {timeout: 5000, scrollTo: false, push: false});
   $(document).on('pjax:success', function(){ timeagoActivate(); });
+  $(document).on('pjax:timeout', function(event) {
+    // Prevent default timeout redirection behavior
+    event.preventDefault()
+  })
+
 </script>
 
 <div class="pagination-wh pagination-left">
@@ -106,40 +114,54 b''
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 <div class="quick_start">
   <div class="fieldset">
-    <div class="left-label">${_('Add or upload files directly via RhodeCode:')}</div>
-    <div class="right-content">
-      <div id="add_node_id" class="add_node">
-          <a href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=0, f_path='', _anchor='edit')}" class="btn btn-default">${_('Add New File')}</a>
+    <p><b>${_('Add or upload files directly via RhodeCode:')}</b></p>
+    <div class="pull-left">
+        <a href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=0, f_path='')}" class="btn btn-default">${_('Add New File')}</a>
       </div>
+    <div class="pull-left">
+        <a href="${h.route_path('repo_files_upload_file',repo_name=c.repo_name,commit_id=0, f_path='')}" class="btn btn-default">${_('Upload New File')}</a>
     </div>
     %endif
   </div>
 
-  %if not h.is_svn(c.rhodecode_repo):
   <div class="fieldset">
-    <div class="left-label">${_('Push new repo:')}</div>
-    <div class="right-content">
+<p><b>${_('Push new repo:')}</b></p>
       <pre>
-${c.rhodecode_repo.alias} clone ${c.clone_repo_url}
-${c.rhodecode_repo.alias} add README # add first file
-${c.rhodecode_repo.alias} commit -m "Initial" # commit with message
-${c.rhodecode_repo.alias} push ${'origin master' if h.is_git(c.rhodecode_repo) else ''} # push changes back
+%if h.is_git(c.rhodecode_repo):
+git clone ${c.clone_repo_url}
+git add README # add first file
+git commit -m "Initial commit" # commit with message
+git remote add origin ${c.clone_repo_url}
+git push -u origin master # push changes back to default master branch
+%elif h.is_hg(c.rhodecode_repo):
+hg clone ${c.clone_repo_url}
+hg add README # add first file
+hg commit -m "Initial commit" # commit with message
+hg push ${c.clone_repo_url}
+%elif h.is_svn(c.rhodecode_repo):
+svn co ${c.clone_repo_url}
+svn add README # add first file
+svn commit -m "Initial commit"
+svn commit  # send changes back to the server
+%endif
       </pre>
     </div>
-  </div>
+
   <div class="fieldset">
-    <div class="left-label">${_('Existing repository?')}</div>
-    <div class="right-content">
+<p><b>${_('Existing repository?')}</b></p>
       <pre>
       %if h.is_git(c.rhodecode_repo):
 git remote add origin ${c.clone_repo_url}
 git push -u origin master
-      %else:
+%elif h.is_hg(c.rhodecode_repo):
 hg push ${c.clone_repo_url}
+%elif h.is_svn(c.rhodecode_repo):
+svn co ${c.clone_repo_url}
       %endif
       </pre>
+
     </div>
+
+
   </div>
   %endif
-</div>
-%endif

rhodecode/templates/tags/tags.mako

@@ -8,10 +8,7 b''
     %endif
 </%def>
 
-<%def name="breadcrumbs_links()">
-    <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
-    <span id="obj_count">0</span> ${_('tags')}
-</%def>
+<%def name="breadcrumbs_links()"></%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
@@ -24,7 +21,7 b''
 <%def name="main()">
     <div class="box">
       <div class="title">
-        ${self.repo_page_title(c.rhodecode_db_repo)}
+
         %if c.has_references:
           <ul class="links">
             <li>
@@ -33,7 +30,8 b''
           </ul>
         %endif
         %if c.has_references:
-          ${self.breadcrumbs()}
+            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
+            <span id="obj_count">0</span> ${_('tags')}
         %endif
       </div>
       <table id="obj_list_table" class="display"></table>

rhodecode/templates/user_group/profile.mako

@@ -3,23 +3,24 b''
 <div class="panel panel-default user-profile">
     <div class="panel-heading">
         <h3 class="panel-title">${_('User group profile')}</h3>
-        %if h.HasPermissionAny('hg.admin')():
+        %if c.is_super_admin:
             ${h.link_to(_('Edit'), h.route_path('edit_user_group', user_group_id=c.user_group.users_group_id), class_='panel-edit')}
         %endif
     </div>
 
-    <div class="panel-body user-profile-content">
-
-        <div class="fieldset">
-            <div class="left-label">
+    <div class="panel-body user-profile-content fields">
+        <div class="field">
+            <div class="label">
                 ${_('Group Name')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user_group.users_group_name}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Owner')}:
             </div>
             <div class="group_member">
@@ -28,20 +29,24 b''
 
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        <div class="field">
+            <div class="label">
                 ${_('Active')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user_group.users_group_active}
             </div>
         </div>
+        </div>
         % if not c.anonymous:
-            <div class="fieldset">
-                <div class="left-label">
+        <div class="field">
+                <div class="label">
                     ${_('Members')}:
                 </div>
-                <div class="right-content">
+
+            <div class="input">
+                <div class="text-as-placeholder">
                 <table id="group_members_placeholder" class="rctable group_members">
                     <th>${_('Username')}</th>
                     % if c.group_members:
@@ -65,6 +70,7 b''
                 </table>
                 </div>
             </div>
+        </div>
         % endif
     </div>
 </div>
  No newline at end of file

rhodecode/templates/users/user_profile.mako

@@ -3,55 +3,64 b''
 <div class="panel panel-default user-profile">
     <div class="panel-heading">
         <h3 class="panel-title">${_('User Profile')}</h3>
-        %if h.HasPermissionAny('hg.admin')():
+        %if c.is_super_admin:
             ${h.link_to(_('Edit'), h.route_path('user_edit', user_id=c.user.user_id), class_='panel-edit')}
         %endif
     </div>
 
-    <div class="panel-body user-profile-content">
-        <div class="fieldset">
-            <div class="left-label">
+    <div class="panel-body user-profile-content fields">
+        <div class="field">
+            <div class="label">
                 ${_('Photo')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 %if c.visual.use_gravatar:
                     ${base.gravatar(c.user.email, 100)}
                 %else:
-                    ${base.gravatar(c.user.email, 20)}
-                    ${_('Avatars are disabled')}
+                    ${base.gravatar(c.user.email, 100)}
                 %endif
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Username')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.username}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('First name')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.first_name}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Last name')}:
             </div>
-            <div class="right-content">
+            <div class="input">
+                <div class="text-as-placeholder">
                 ${c.user.last_name}
             </div>
         </div>
-        <div class="fieldset">
-            <div class="left-label">
+        </div>
+        <div class="field">
+            <div class="label">
                 ${_('Email')}:
             </div>
-            <div class="right-content">
-                ${c.user.email or _('Missing email, please update your user email address.')}
+            <div class="input">
+                <div class="text-as-placeholder">
+                    ${(c.user.email or _('Missing email, please update your user email address.'))}
+                </div>
             </div>
         </div>
     </div>

rhodecode/tests/fixtures/git_node_history_response.json

@@ -1,1 +1,1 b''
-{"results": [{"text": "Changesets", "children": [{"text": "r625:ead8f28a4bc2", "id": "ead8f28a4bc2f45ecfb148a6b8a89758b9654a84"}, {"text": "r535:c093f94d6d35", "id": "c093f94d6d358f13c55a687da66c30c41cca4153"}, {"text": "r534:559f640ec08b", "id": "559f640ec08b2a14c4a9ac863d8ca273545b8885"}, {"text": "r490:02a940b4ee37", "id": "02a940b4ee371ec64ef5b4c4870a5c89dc7fb98a"}, {"text": "r464:b45a4153a2d7", "id": "b45a4153a2d7adb8a78b63d35d39fac44a4320a6"}, {"text": "r460:0a54e66b9450", "id": "0a54e66b94502409074b163cd93c1233dcc0413f"}, {"text": "r457:a7bf2f6bf3d5", "id": "a7bf2f6bf3d5273da4bcd2032a891acae5a45e2b"}, {"text": "r456:7266de0154b4", "id": "7266de0154b4da7c42ba3d788876056dbf116b5a"}, {"text": "r455:666de4ee6507", "id": "666de4ee65074cd3e37ea01e75f65bd3e4c336bb"}, {"text": "r453:91acc599141c", "id": "91acc599141c87f03e0e3551dcaacf4492632e58"}, {"text": "r442:40a2d5d71b75", "id": "40a2d5d71b758e7eafc84a324ed55142cba22f42"}, {"text": "r440:d1f898326327", "id": "d1f898326327e20524fe22417c22d71064fe54a1"}, {"text": "r420:162a36830c23", "id": "162a36830c23ccf1bf1873157fd0c8d0dfc7c817"}, {"text": "r345:c994f0de03b2", "id": "c994f0de03b2a0aa848a04fc2c0d7e737dba31fc"}, {"text": "r340:5d3d4d2c262e", "id": "5d3d4d2c262e17b247d405feceeb09ff7408c940"}, {"text": "r334:4d4278a6390e", "id": "4d4278a6390e42f4fc777ecf1b9b628e77da8e22"}, {"text": "r298:00dffb625166", "id": "00dffb62516650bc5050d818eb47ea1ca207954d"}, {"text": "r297:47b6be9a812e", "id": "47b6be9a812ec3ed0384001a458a759f0f583fe2"}, {"text": "r289:1589fed841cd", "id": "1589fed841cd9ef33155f8560727809ac3ada2c8"}, {"text": "r285:afafd0ee2821", "id": "afafd0ee28218ab979678213cb96e9e4dbd7359b"}, {"text": "r284:639b115ed2b0", "id": "639b115ed2b02017824005b5ae66282c6e25eba8"}, {"text": "r283:fcf7562d7305", "id": "fcf7562d7305affc94fe20dc89a34aefd2b8aa1e"}, {"text": "r256:ec8cbdb5f364", "id": "ec8cbdb5f364fce7843cbf148c3d95d86f935339"}, {"text": "r255:0d74d2e2bdf3", "id": "0d74d2e2bdf3dcd5ee9fe4fcfe9016c5c6486f35"}, {"text": "r243:6894ad7d8223", "id": "6894ad7d8223b1e6853e9fdaa2c38d3f0cef1e38"}, {"text": "r231:31b3f4b599fa", "id": "31b3f4b599fae5f12cf438c73403679cdf923d75"}, {"text": "r220:3d2515dd21fb", "id": "3d2515dd21fb34fe6c5d0029075a863f3e92f5f6"}, {"text": "r186:f804e27aa496", "id": "f804e27aa4961f2e327f2a10ee373235df20ee21"}, {"text": "r182:7f00513785a1", "id": "7f00513785a13f273a4387ef086bb795b37f013c"}, {"text": "r181:6efcdc61028c", "id": "6efcdc61028c8edd1c787b3439fae71b77a17357"}, {"text": "r175:6c0ce52b229a", "id": "6c0ce52b229aa978889e91b38777f800e85f330b"}, {"text": "r165:09788a0b8a54", "id": "09788a0b8a5455e9678c3959214246574e546d4f"}, {"text": "r163:0164ee729def", "id": "0164ee729def0a253d6dcb594b5ee2a52fef4748"}, {"text": "r140:33fa32233551", "id": "33fa3223355104431402a888fa77a4e9956feb3e"}, {"text": "r126:fa014c12c26d", "id": "fa014c12c26d10ba682fadb78f2a11c24c8118e1"}, {"text": "r111:e686b958768e", "id": "e686b958768ee96af8029fe19c6050b1a8dd3b2b"}, {"text": "r109:ab5721ca0a08", "id": "ab5721ca0a081f26bf43d9051e615af2cc99952f"}, {"text": "r108:c877b68d18e7", "id": "c877b68d18e792a66b7f4c529ea02c8f80801542"}, {"text": "r107:4313566d2e41", "id": "4313566d2e417cb382948f8d9d7c765330356054"}, {"text": "r104:6c2303a79367", "id": "6c2303a793671e807d1cfc70134c9ca0767d98c2"}, {"text": "r102:54386793436c", "id": "54386793436c938cff89326944d4c2702340037d"}, {"text": "r101:54000345d2e7", "id": "54000345d2e78b03a99d561399e8e548de3f3203"}, {"text": "r99:1c6b3677b37e", "id": "1c6b3677b37ea064cb4b51714d8f7498f93f4b2b"}, {"text": "r93:2d03ca750a44", "id": "2d03ca750a44440fb5ea8b751176d1f36f8e8f46"}, {"text": "r92:2a08b128c206", "id": "2a08b128c206db48c2f0b8f70df060e6db0ae4f8"}, {"text": "r91:30c26513ff1e", "id": "30c26513ff1eb8e5ce0e1c6b477ee5dc50e2f34b"}, {"text": "r82:ac71e9503c2c", "id": "ac71e9503c2ca95542839af0ce7b64011b72ea7c"}, {"text": "r81:12669288fd13", "id": "12669288fd13adba2a9b7dd5b870cc23ffab92d2"}, {"text": "r76:5a0c84f3e6fe", "id": "5a0c84f3e6fe3473e4c8427199d5a6fc71a9b382"}, {"text": "r73:12f2f5e2b38e", "id": "12f2f5e2b38e6ff3fbdb5d722efed9aa72ecb0d5"}, {"text": "r61:5eab1222a7cd", "id": "5eab1222a7cd4bfcbabc218ca6d04276d4e27378"}, {"text": "r60:f50f42baeed5", "id": "f50f42baeed5af6518ef4b0cb2f1423f3851a941"}, {"text": "r59:d7e390a45f6a", "id": "d7e390a45f6aa96f04f5e7f583ad4f867431aa25"}, {"text": "r58:f15c21f97864", "id": "f15c21f97864b4f071cddfbf2750ec2e23859414"}, {"text": "r57:e906ef056cf5", "id": "e906ef056cf539a4e4e5fc8003eaf7cf14dd8ade"}, {"text": "r56:ea2b108b48aa", "id": "ea2b108b48aa8f8c9c4a941f66c1a03315ca1c3b"}, {"text": "r50:84dec09632a4", "id": "84dec09632a4458f79f50ddbbd155506c460b4f9"}, {"text": "r48:0115510b70c7", "id": "0115510b70c7229dbc5dc49036b32e7d91d23acd"}, {"text": "r46:2a13f185e452", "id": "2a13f185e4525f9d4b59882791a2d397b90d5ddc"}, {"text": "r30:3bf1c5868e57", "id": "3bf1c5868e570e39569d094f922d33ced2fa3b2b"}, {"text": "r26:b8d040125747", "id": "b8d04012574729d2c29886e53b1a43ef16dd00a1"}, {"text": "r24:6970b057cffe", "id": "6970b057cffe4aab0a792aa634c89f4bebf01441"}, {"text": "r8:dd80b0f6cf50", "id": "dd80b0f6cf5052f17cc738c2951c4f2070200d7f"}, {"text": "r7:ff7ca51e58c5", "id": "ff7ca51e58c505fec0dd2491de52c622bb7a806b"}]}, {"text": "Branches", "children": [{"text": "master", "id": "fd627b9e0dd80b47be81af07c4a98518244ed2f7"}]}, {"text": "Tags", "children": [{"text": "v0.2.2", "id": "137fea89f304a42321d40488091ee2ed419a3686"}, {"text": "v0.2.1", "id": "5051d0fa344d4408a2659d9a0348eb2d41868ecf"}, {"text": "v0.2.0", "id": "599ba911aa24d2981225f3966eb659dfae9e9f30"}, {"text": "v0.1.9", "id": "341d28f0eec5ddf0b6b77871e13c2bbd6bec685c"}, {"text": "v0.1.8", "id": "74ebce002c088b8a5ecf40073db09375515ecd68"}, {"text": "v0.1.7", "id": "4d78bf73b5c22c82b68f902f138f7881b4fffa2c"}, {"text": "v0.1.6", "id": "0205cb3f44223fb3099d12a77a69c81b798772d9"}, {"text": "v0.1.5", "id": "6c0ce52b229aa978889e91b38777f800e85f330b"}, {"text": "v0.1.4", "id": "7d735150934cd7645ac3051903add952390324a5"}, {"text": "v0.1.3", "id": "5a3a8fb005554692b16e21dee62bf02667d8dc3e"}, {"text": "v0.1.2", "id": "0ba5f8a4660034ff25c0cac2a5baabf5d2791d63"}, {"text": "v0.1.11", "id": "c60f01b77c42dce653d6b1d3b04689862c261929"}, {"text": "v0.1.10", "id": "10cddef6b794696066fb346434014f0a56810218"}, {"text": "v0.1.1", "id": "e6ea6d16e2f26250124a1f4b4fe37a912f9d86a0"}]}], "more": false}
+{"results": [{"text": "Changesets", "children": [{"text": "r625:ead8f28a4bc2", "type": "sha", "id": "ead8f28a4bc2f45ecfb148a6b8a89758b9654a84"}, {"text": "r535:c093f94d6d35", "type": "sha", "id": "c093f94d6d358f13c55a687da66c30c41cca4153"}, {"text": "r534:559f640ec08b", "type": "sha", "id": "559f640ec08b2a14c4a9ac863d8ca273545b8885"}, {"text": "r490:02a940b4ee37", "type": "sha", "id": "02a940b4ee371ec64ef5b4c4870a5c89dc7fb98a"}, {"text": "r464:b45a4153a2d7", "type": "sha", "id": "b45a4153a2d7adb8a78b63d35d39fac44a4320a6"}, {"text": "r460:0a54e66b9450", "type": "sha", "id": "0a54e66b94502409074b163cd93c1233dcc0413f"}, {"text": "r457:a7bf2f6bf3d5", "type": "sha", "id": "a7bf2f6bf3d5273da4bcd2032a891acae5a45e2b"}, {"text": "r456:7266de0154b4", "type": "sha", "id": "7266de0154b4da7c42ba3d788876056dbf116b5a"}, {"text": "r455:666de4ee6507", "type": "sha", "id": "666de4ee65074cd3e37ea01e75f65bd3e4c336bb"}, {"text": "r453:91acc599141c", "type": "sha", "id": "91acc599141c87f03e0e3551dcaacf4492632e58"}, {"text": "r442:40a2d5d71b75", "type": "sha", "id": "40a2d5d71b758e7eafc84a324ed55142cba22f42"}, {"text": "r440:d1f898326327", "type": "sha", "id": "d1f898326327e20524fe22417c22d71064fe54a1"}, {"text": "r420:162a36830c23", "type": "sha", "id": "162a36830c23ccf1bf1873157fd0c8d0dfc7c817"}, {"text": "r345:c994f0de03b2", "type": "sha", "id": "c994f0de03b2a0aa848a04fc2c0d7e737dba31fc"}, {"text": "r340:5d3d4d2c262e", "type": "sha", "id": "5d3d4d2c262e17b247d405feceeb09ff7408c940"}, {"text": "r334:4d4278a6390e", "type": "sha", "id": "4d4278a6390e42f4fc777ecf1b9b628e77da8e22"}, {"text": "r298:00dffb625166", "type": "sha", "id": "00dffb62516650bc5050d818eb47ea1ca207954d"}, {"text": "r297:47b6be9a812e", "type": "sha", "id": "47b6be9a812ec3ed0384001a458a759f0f583fe2"}, {"text": "r289:1589fed841cd", "type": "sha", "id": "1589fed841cd9ef33155f8560727809ac3ada2c8"}, {"text": "r285:afafd0ee2821", "type": "sha", "id": "afafd0ee28218ab979678213cb96e9e4dbd7359b"}, {"text": "r284:639b115ed2b0", "type": "sha", "id": "639b115ed2b02017824005b5ae66282c6e25eba8"}, {"text": "r283:fcf7562d7305", "type": "sha", "id": "fcf7562d7305affc94fe20dc89a34aefd2b8aa1e"}, {"text": "r256:ec8cbdb5f364", "type": "sha", "id": "ec8cbdb5f364fce7843cbf148c3d95d86f935339"}, {"text": "r255:0d74d2e2bdf3", "type": "sha", "id": "0d74d2e2bdf3dcd5ee9fe4fcfe9016c5c6486f35"}, {"text": "r243:6894ad7d8223", "type": "sha", "id": "6894ad7d8223b1e6853e9fdaa2c38d3f0cef1e38"}, {"text": "r231:31b3f4b599fa", "type": "sha", "id": "31b3f4b599fae5f12cf438c73403679cdf923d75"}, {"text": "r220:3d2515dd21fb", "type": "sha", "id": "3d2515dd21fb34fe6c5d0029075a863f3e92f5f6"}, {"text": "r186:f804e27aa496", "type": "sha", "id": "f804e27aa4961f2e327f2a10ee373235df20ee21"}, {"text": "r182:7f00513785a1", "type": "sha", "id": "7f00513785a13f273a4387ef086bb795b37f013c"}, {"text": "r181:6efcdc61028c", "type": "sha", "id": "6efcdc61028c8edd1c787b3439fae71b77a17357"}, {"text": "r175:6c0ce52b229a", "type": "sha", "id": "6c0ce52b229aa978889e91b38777f800e85f330b"}, {"text": "r165:09788a0b8a54", "type": "sha", "id": "09788a0b8a5455e9678c3959214246574e546d4f"}, {"text": "r163:0164ee729def", "type": "sha", "id": "0164ee729def0a253d6dcb594b5ee2a52fef4748"}, {"text": "r140:33fa32233551", "type": "sha", "id": "33fa3223355104431402a888fa77a4e9956feb3e"}, {"text": "r126:fa014c12c26d", "type": "sha", "id": "fa014c12c26d10ba682fadb78f2a11c24c8118e1"}, {"text": "r111:e686b958768e", "type": "sha", "id": "e686b958768ee96af8029fe19c6050b1a8dd3b2b"}, {"text": "r109:ab5721ca0a08", "type": "sha", "id": "ab5721ca0a081f26bf43d9051e615af2cc99952f"}, {"text": "r108:c877b68d18e7", "type": "sha", "id": "c877b68d18e792a66b7f4c529ea02c8f80801542"}, {"text": "r107:4313566d2e41", "type": "sha", "id": "4313566d2e417cb382948f8d9d7c765330356054"}, {"text": "r104:6c2303a79367", "type": "sha", "id": "6c2303a793671e807d1cfc70134c9ca0767d98c2"}, {"text": "r102:54386793436c", "type": "sha", "id": "54386793436c938cff89326944d4c2702340037d"}, {"text": "r101:54000345d2e7", "type": "sha", "id": "54000345d2e78b03a99d561399e8e548de3f3203"}, {"text": "r99:1c6b3677b37e", "type": "sha", "id": "1c6b3677b37ea064cb4b51714d8f7498f93f4b2b"}, {"text": "r93:2d03ca750a44", "type": "sha", "id": "2d03ca750a44440fb5ea8b751176d1f36f8e8f46"}, {"text": "r92:2a08b128c206", "type": "sha", "id": "2a08b128c206db48c2f0b8f70df060e6db0ae4f8"}, {"text": "r91:30c26513ff1e", "type": "sha", "id": "30c26513ff1eb8e5ce0e1c6b477ee5dc50e2f34b"}, {"text": "r82:ac71e9503c2c", "type": "sha", "id": "ac71e9503c2ca95542839af0ce7b64011b72ea7c"}, {"text": "r81:12669288fd13", "type": "sha", "id": "12669288fd13adba2a9b7dd5b870cc23ffab92d2"}, {"text": "r76:5a0c84f3e6fe", "type": "sha", "id": "5a0c84f3e6fe3473e4c8427199d5a6fc71a9b382"}, {"text": "r73:12f2f5e2b38e", "type": "sha", "id": "12f2f5e2b38e6ff3fbdb5d722efed9aa72ecb0d5"}, {"text": "r61:5eab1222a7cd", "type": "sha", "id": "5eab1222a7cd4bfcbabc218ca6d04276d4e27378"}, {"text": "r60:f50f42baeed5", "type": "sha", "id": "f50f42baeed5af6518ef4b0cb2f1423f3851a941"}, {"text": "r59:d7e390a45f6a", "type": "sha", "id": "d7e390a45f6aa96f04f5e7f583ad4f867431aa25"}, {"text": "r58:f15c21f97864", "type": "sha", "id": "f15c21f97864b4f071cddfbf2750ec2e23859414"}, {"text": "r57:e906ef056cf5", "type": "sha", "id": "e906ef056cf539a4e4e5fc8003eaf7cf14dd8ade"}, {"text": "r56:ea2b108b48aa", "type": "sha", "id": "ea2b108b48aa8f8c9c4a941f66c1a03315ca1c3b"}, {"text": "r50:84dec09632a4", "type": "sha", "id": "84dec09632a4458f79f50ddbbd155506c460b4f9"}, {"text": "r48:0115510b70c7", "type": "sha", "id": "0115510b70c7229dbc5dc49036b32e7d91d23acd"}, {"text": "r46:2a13f185e452", "type": "sha", "id": "2a13f185e4525f9d4b59882791a2d397b90d5ddc"}, {"text": "r30:3bf1c5868e57", "type": "sha", "id": "3bf1c5868e570e39569d094f922d33ced2fa3b2b"}, {"text": "r26:b8d040125747", "type": "sha", "id": "b8d04012574729d2c29886e53b1a43ef16dd00a1"}, {"text": "r24:6970b057cffe", "type": "sha", "id": "6970b057cffe4aab0a792aa634c89f4bebf01441"}, {"text": "r8:dd80b0f6cf50", "type": "sha", "id": "dd80b0f6cf5052f17cc738c2951c4f2070200d7f"}, {"text": "r7:ff7ca51e58c5", "type": "sha", "id": "ff7ca51e58c505fec0dd2491de52c622bb7a806b"}]}, {"text": "Branches", "children": [{"text": "master", "type": "branch", "id": "fd627b9e0dd80b47be81af07c4a98518244ed2f7"}]}, {"text": "Tags", "children": [{"text": "v0.2.2", "type": "tag", "id": "137fea89f304a42321d40488091ee2ed419a3686"}, {"text": "v0.2.1", "type": "tag", "id": "5051d0fa344d4408a2659d9a0348eb2d41868ecf"}, {"text": "v0.2.0", "type": "tag", "id": "599ba911aa24d2981225f3966eb659dfae9e9f30"}, {"text": "v0.1.9", "type": "tag", "id": "341d28f0eec5ddf0b6b77871e13c2bbd6bec685c"}, {"text": "v0.1.8", "type": "tag", "id": "74ebce002c088b8a5ecf40073db09375515ecd68"}, {"text": "v0.1.7", "type": "tag", "id": "4d78bf73b5c22c82b68f902f138f7881b4fffa2c"}, {"text": "v0.1.6", "type": "tag", "id": "0205cb3f44223fb3099d12a77a69c81b798772d9"}, {"text": "v0.1.5", "type": "tag", "id": "6c0ce52b229aa978889e91b38777f800e85f330b"}, {"text": "v0.1.4", "type": "tag", "id": "7d735150934cd7645ac3051903add952390324a5"}, {"text": "v0.1.3", "type": "tag", "id": "5a3a8fb005554692b16e21dee62bf02667d8dc3e"}, {"text": "v0.1.2", "type": "tag", "id": "0ba5f8a4660034ff25c0cac2a5baabf5d2791d63"}, {"text": "v0.1.11", "type": "tag", "id": "c60f01b77c42dce653d6b1d3b04689862c261929"}, {"text": "v0.1.10", "type": "tag", "id": "10cddef6b794696066fb346434014f0a56810218"}, {"text": "v0.1.1", "type": "tag", "id": "e6ea6d16e2f26250124a1f4b4fe37a912f9d86a0"}]}], "more": false}

rhodecode/tests/fixtures/hg_node_history_response.json

@@ -1,1 +1,1 b''
-{"results": [{"text": "Changesets", "children": [{"text": "r648:dbec37a0d5ca (default)", "id": "dbec37a0d5cab8ff39af4cfc4a4cd3996e4acfc6"}, {"text": "r639:1d20ed9eda94 (default)", "id": "1d20ed9eda9482d46ff0a6af5812550218b3ff15"}, {"text": "r547:0173395e8227 (default)", "id": "0173395e822797f098799ed95c1a81b6a547a9ad"}, {"text": "r546:afbb45ade933 (default)", "id": "afbb45ade933a8182f1d8ec5d4d1bb2de2572043"}, {"text": "r502:6f093e30cac3 (default)", "id": "6f093e30cac34e6b4b11275a9f22f80c5d7ad1f7"}, {"text": "r476:c7e2212dd2ae (default)", "id": "c7e2212dd2ae975d1d06534a3d7e317165c06960"}, {"text": "r472:45477506df79 (default)", "id": "45477506df79f701bf69419aac3e1f0fed3c5bcf"}, {"text": "r469:5fc76cb25d11 (default)", "id": "5fc76cb25d11e07c60de040f78b8cd265ff10d53"}, {"text": "r468:b073433cf899 (default)", "id": "b073433cf8994969ee5cd7cce84cbe587bb880b2"}, {"text": "r467:7a74dbfcacd1 (default)", "id": "7a74dbfcacd1dbcb58bb9c860b2f29fbb22c4c96"}, {"text": "r465:71ee52cc4d62 (default)", "id": "71ee52cc4d629096bdbee036325975dac2af4501"}, {"text": "r452:a5b217d26c5f (default)", "id": "a5b217d26c5f111e72bae4de672b084ee0fbf75c"}, {"text": "r450:47aedd538bf6 (default)", "id": "47aedd538bf616eedcb0e7d630ea476df0e159c7"}, {"text": "r432:8e4915fa32d7 (default)", "id": "8e4915fa32d727dcbf09746f637a5f82e539511e"}, {"text": "r356:25213a5fbb04 (default)", "id": "25213a5fbb048dff8ba65d21e466a835536e5b70"}, {"text": "r351:23debcedddc1 (default)", "id": "23debcedddc1c23c14be33e713e7786d4a9de471"}, {"text": "r342:61e25b2a90a1 (default)", "id": "61e25b2a90a19e7fffd75dea1e4c7e20df526bbe"}, {"text": "r318:fb95b340e0d0 (webvcs)", "id": "fb95b340e0d03fa51f33c56c991c08077c99303e"}, {"text": "r303:bda35e0e564f (default)", "id": "bda35e0e564fbbc5cd26fe0a37fb647a254c99fe"}, {"text": "r302:97ff74896d7d (default)", "id": "97ff74896d7dbf3115a337a421d44b55154acc89"}, {"text": "r293:cec3473c3fdb (default)", "id": "cec3473c3fdb9599c98067182a075b49bde570f9"}, {"text": "r289:0e86c43eef86 (default)", "id": "0e86c43eef866a013a587666a877c879899599bb"}, {"text": "r288:91a27c312808 (default)", "id": "91a27c312808100cf20a602f78befbbff9d89bfd"}, {"text": "r287:400e36a1670a (default)", "id": "400e36a1670a57d11e3edcb5b07bf82c30006d0b"}, {"text": "r261:014fb17dfc95 (default)", "id": "014fb17dfc95b0995e838c565376bf9a993e230a"}, {"text": "r260:cca7aebbc4d6 (default)", "id": "cca7aebbc4d6125798446b11e69dc8847834a982"}, {"text": "r258:14cdb2957c01 (workdir)", "id": "14cdb2957c011a5feba36f50d960d9832ba0f0c1"}, {"text": "r245:34df20118ed7 (default)", "id": "34df20118ed74b5987d22a579e8a60e903da5bf8"}, {"text": "r233:0375d9042a64 (workdir)", "id": "0375d9042a64a1ac1641528f0f0668f9a339e86d"}, {"text": "r222:94aa45fc1806 (workdir)", "id": "94aa45fc1806c04d4ba640933edf682c22478453"}, {"text": "r188:7ed99bc73881 (default)", "id": "7ed99bc738818879941e3ce20243f8856a7cfc84"}, {"text": "r184:1e85975528bc (default)", "id": "1e85975528bcebe853732a9e5fb8dbf4461f6bb2"}, {"text": "r183:ed30beddde7b (default)", "id": "ed30beddde7bbddb26042625be19bcd11576c1dd"}, {"text": "r177:a6664e18181c (default)", "id": "a6664e18181c6fc81b751a8d01474e7e1a3fe7fc"}, {"text": "r167:8911406ad776 (default)", "id": "8911406ad776fdd3d0b9932a2e89677e57405a48"}, {"text": "r165:aa957ed78c35 (default)", "id": "aa957ed78c35a1541f508d2ec90e501b0a9e3167"}, {"text": "r140:48e11b73e94c (default)", "id": "48e11b73e94c0db33e736eaeea692f990cb0b5f1"}, {"text": "r126:adf3cbf48329 (default)", "id": "adf3cbf483298563b968a6c673cd5bde5f7d5eea"}, {"text": "r113:6249fd0fb2cf (git)", "id": "6249fd0fb2cfb1411e764129f598e2cf0de79a6f"}, {"text": "r109:75feb4c33e81 (default)", "id": "75feb4c33e81186c87eac740cee2447330288412"}, {"text": "r108:9a4dc232ecdc (default)", "id": "9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d"}, {"text": "r107:595cce4efa21 (default)", "id": "595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d"}, {"text": "r104:4a8bd421fbc2 (default)", "id": "4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da"}, {"text": "r102:57be63fc8f85 (default)", "id": "57be63fc8f85e65a0106a53187f7316f8c487ffa"}, {"text": "r101:5530bd87f7e2 (git)", "id": "5530bd87f7e2e124a64d07cb2654c997682128be"}, {"text": "r99:e516008b1c93 (default)", "id": "e516008b1c93f142263dc4b7961787cbad654ce1"}, {"text": "r93:41f43fc74b8b (default)", "id": "41f43fc74b8b285984554532eb105ac3be5c434f"}, {"text": "r92:cc66b61b8455 (default)", "id": "cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e"}, {"text": "r91:73ab5b616b32 (default)", "id": "73ab5b616b3271b0518682fb4988ce421de8099f"}, {"text": "r82:e0da75f308c0 (default)", "id": "e0da75f308c0f18f98e9ce6257626009fdda2b39"}, {"text": "r81:fb2e41e0f081 (default)", "id": "fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611"}, {"text": "r76:602ae2f5e7ad (default)", "id": "602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028"}, {"text": "r73:a066b25d5df7 (default)", "id": "a066b25d5df7016b45a41b7e2a78c33b57adc235"}, {"text": "r61:637a933c9059 (web)", "id": "637a933c905958ce5151f154147c25c1c7b68832"}, {"text": "r60:0c21004effeb (web)", "id": "0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc"}, {"text": "r59:a1f39c56d3f1 (web)", "id": "a1f39c56d3f1d52d5fb5920370a2a2716cd9a444"}, {"text": "r58:97d32df05c71 (web)", "id": "97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f"}, {"text": "r57:08eaf1451771 (web)", "id": "08eaf14517718dccea4b67755a93368341aca919"}, {"text": "r56:22f71ad26526 (web)", "id": "22f71ad265265a53238359c883aa976e725aa07d"}, {"text": "r49:97501f02b7b4 (web)", "id": "97501f02b7b4330924b647755663a2d90a5e638d"}, {"text": "r47:86ede6754f2b (web)", "id": "86ede6754f2b27309452bb11f997386ae01d0e5a"}, {"text": "r45:014c40c0203c (web)", "id": "014c40c0203c423dc19ecf94644f7cac9d4cdce0"}, {"text": "r30:ee87846a61c1 (default)", "id": "ee87846a61c12153b51543bf860e1026c6d3dcba"}, {"text": "r26:9bb326a04ae5 (default)", "id": "9bb326a04ae5d98d437dece54be04f830cf1edd9"}, {"text": "r24:536c1a194283 (default)", "id": "536c1a19428381cfea92ac44985304f6a8049569"}, {"text": "r8:dc5d2c0661b6 (default)", "id": "dc5d2c0661b61928834a785d3e64a3f80d3aad9c"}, {"text": "r7:3803844fdbd3 (default)", "id": "3803844fdbd3b711175fc3da9bdacfcd6d29a6fb"}]}, {"text": "Branches", "children": [{"text": "default", "id": "2062ec7beeeaf9f44a1c25c41479565040b930b2"}, {"text": "stable", "id": "4f7e2131323e0749a740c0a56ab68ae9269c562a"}]}, {"text": "Tags", "children": [{"text": "v0.2.0", "id": "2c96c02def9a7c997f33047761a53943e6254396"}, {"text": "v0.1.9", "id": "8680b1d1cee3aa3c1ab3734b76ee164bbedbc5c9"}, {"text": "v0.1.8", "id": "ecb25ba9c96faf1e65a0bc3fd914918420a2f116"}, {"text": "v0.1.7", "id": "f67633a2894edaf28513706d558205fa93df9209"}, {"text": "v0.1.6", "id": "02b38c0eb6f982174750c0e309ff9faddc0c7e12"}, {"text": "v0.1.5", "id": "a6664e18181c6fc81b751a8d01474e7e1a3fe7fc"}, {"text": "v0.1.4", "id": "fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200"}, {"text": "v0.1.3", "id": "17544fbfcd33ffb439e2b728b5d526b1ef30bfcf"}, {"text": "v0.1.2", "id": "a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720"}, {"text": "v0.1.11", "id": "fef5bfe1dc17611d5fb59a7f6f95c55c3606f933"}, {"text": "v0.1.10", "id": "92831aebf2f8dd4879e897024b89d09af214df1c"}, {"text": "v0.1.1", "id": "eb3a60fc964309c1a318b8dfe26aa2d1586c85ae"}, {"text": "tip", "id": "2062ec7beeeaf9f44a1c25c41479565040b930b2"}]}], "more": false}
+{"results": [{"text": "Changesets", "children": [{"text": "r648:dbec37a0d5ca (default)", "type": "sha", "id": "dbec37a0d5cab8ff39af4cfc4a4cd3996e4acfc6"}, {"text": "r639:1d20ed9eda94 (default)", "type": "sha", "id": "1d20ed9eda9482d46ff0a6af5812550218b3ff15"}, {"text": "r547:0173395e8227 (default)", "type": "sha", "id": "0173395e822797f098799ed95c1a81b6a547a9ad"}, {"text": "r546:afbb45ade933 (default)", "type": "sha", "id": "afbb45ade933a8182f1d8ec5d4d1bb2de2572043"}, {"text": "r502:6f093e30cac3 (default)", "type": "sha", "id": "6f093e30cac34e6b4b11275a9f22f80c5d7ad1f7"}, {"text": "r476:c7e2212dd2ae (default)", "type": "sha", "id": "c7e2212dd2ae975d1d06534a3d7e317165c06960"}, {"text": "r472:45477506df79 (default)", "type": "sha", "id": "45477506df79f701bf69419aac3e1f0fed3c5bcf"}, {"text": "r469:5fc76cb25d11 (default)", "type": "sha", "id": "5fc76cb25d11e07c60de040f78b8cd265ff10d53"}, {"text": "r468:b073433cf899 (default)", "type": "sha", "id": "b073433cf8994969ee5cd7cce84cbe587bb880b2"}, {"text": "r467:7a74dbfcacd1 (default)", "type": "sha", "id": "7a74dbfcacd1dbcb58bb9c860b2f29fbb22c4c96"}, {"text": "r465:71ee52cc4d62 (default)", "type": "sha", "id": "71ee52cc4d629096bdbee036325975dac2af4501"}, {"text": "r452:a5b217d26c5f (default)", "type": "sha", "id": "a5b217d26c5f111e72bae4de672b084ee0fbf75c"}, {"text": "r450:47aedd538bf6 (default)", "type": "sha", "id": "47aedd538bf616eedcb0e7d630ea476df0e159c7"}, {"text": "r432:8e4915fa32d7 (default)", "type": "sha", "id": "8e4915fa32d727dcbf09746f637a5f82e539511e"}, {"text": "r356:25213a5fbb04 (default)", "type": "sha", "id": "25213a5fbb048dff8ba65d21e466a835536e5b70"}, {"text": "r351:23debcedddc1 (default)", "type": "sha", "id": "23debcedddc1c23c14be33e713e7786d4a9de471"}, {"text": "r342:61e25b2a90a1 (default)", "type": "sha", "id": "61e25b2a90a19e7fffd75dea1e4c7e20df526bbe"}, {"text": "r318:fb95b340e0d0 (webvcs)", "type": "sha", "id": "fb95b340e0d03fa51f33c56c991c08077c99303e"}, {"text": "r303:bda35e0e564f (default)", "type": "sha", "id": "bda35e0e564fbbc5cd26fe0a37fb647a254c99fe"}, {"text": "r302:97ff74896d7d (default)", "type": "sha", "id": "97ff74896d7dbf3115a337a421d44b55154acc89"}, {"text": "r293:cec3473c3fdb (default)", "type": "sha", "id": "cec3473c3fdb9599c98067182a075b49bde570f9"}, {"text": "r289:0e86c43eef86 (default)", "type": "sha", "id": "0e86c43eef866a013a587666a877c879899599bb"}, {"text": "r288:91a27c312808 (default)", "type": "sha", "id": "91a27c312808100cf20a602f78befbbff9d89bfd"}, {"text": "r287:400e36a1670a (default)", "type": "sha", "id": "400e36a1670a57d11e3edcb5b07bf82c30006d0b"}, {"text": "r261:014fb17dfc95 (default)", "type": "sha", "id": "014fb17dfc95b0995e838c565376bf9a993e230a"}, {"text": "r260:cca7aebbc4d6 (default)", "type": "sha", "id": "cca7aebbc4d6125798446b11e69dc8847834a982"}, {"text": "r258:14cdb2957c01 (workdir)", "type": "sha", "id": "14cdb2957c011a5feba36f50d960d9832ba0f0c1"}, {"text": "r245:34df20118ed7 (default)", "type": "sha", "id": "34df20118ed74b5987d22a579e8a60e903da5bf8"}, {"text": "r233:0375d9042a64 (workdir)", "type": "sha", "id": "0375d9042a64a1ac1641528f0f0668f9a339e86d"}, {"text": "r222:94aa45fc1806 (workdir)", "type": "sha", "id": "94aa45fc1806c04d4ba640933edf682c22478453"}, {"text": "r188:7ed99bc73881 (default)", "type": "sha", "id": "7ed99bc738818879941e3ce20243f8856a7cfc84"}, {"text": "r184:1e85975528bc (default)", "type": "sha", "id": "1e85975528bcebe853732a9e5fb8dbf4461f6bb2"}, {"text": "r183:ed30beddde7b (default)", "type": "sha", "id": "ed30beddde7bbddb26042625be19bcd11576c1dd"}, {"text": "r177:a6664e18181c (default)", "type": "sha", "id": "a6664e18181c6fc81b751a8d01474e7e1a3fe7fc"}, {"text": "r167:8911406ad776 (default)", "type": "sha", "id": "8911406ad776fdd3d0b9932a2e89677e57405a48"}, {"text": "r165:aa957ed78c35 (default)", "type": "sha", "id": "aa957ed78c35a1541f508d2ec90e501b0a9e3167"}, {"text": "r140:48e11b73e94c (default)", "type": "sha", "id": "48e11b73e94c0db33e736eaeea692f990cb0b5f1"}, {"text": "r126:adf3cbf48329 (default)", "type": "sha", "id": "adf3cbf483298563b968a6c673cd5bde5f7d5eea"}, {"text": "r113:6249fd0fb2cf (git)", "type": "sha", "id": "6249fd0fb2cfb1411e764129f598e2cf0de79a6f"}, {"text": "r109:75feb4c33e81 (default)", "type": "sha", "id": "75feb4c33e81186c87eac740cee2447330288412"}, {"text": "r108:9a4dc232ecdc (default)", "type": "sha", "id": "9a4dc232ecdc763ef2e98ae2238cfcbba4f6ad8d"}, {"text": "r107:595cce4efa21 (default)", "type": "sha", "id": "595cce4efa21fda2f2e4eeb4fe5f2a6befe6fa2d"}, {"text": "r104:4a8bd421fbc2 (default)", "type": "sha", "id": "4a8bd421fbc2dfbfb70d85a3fe064075ab2c49da"}, {"text": "r102:57be63fc8f85 (default)", "type": "sha", "id": "57be63fc8f85e65a0106a53187f7316f8c487ffa"}, {"text": "r101:5530bd87f7e2 (git)", "type": "sha", "id": "5530bd87f7e2e124a64d07cb2654c997682128be"}, {"text": "r99:e516008b1c93 (default)", "type": "sha", "id": "e516008b1c93f142263dc4b7961787cbad654ce1"}, {"text": "r93:41f43fc74b8b (default)", "type": "sha", "id": "41f43fc74b8b285984554532eb105ac3be5c434f"}, {"text": "r92:cc66b61b8455 (default)", "type": "sha", "id": "cc66b61b8455b264a7a8a2d8ddc80fcfc58c221e"}, {"text": "r91:73ab5b616b32 (default)", "type": "sha", "id": "73ab5b616b3271b0518682fb4988ce421de8099f"}, {"text": "r82:e0da75f308c0 (default)", "type": "sha", "id": "e0da75f308c0f18f98e9ce6257626009fdda2b39"}, {"text": "r81:fb2e41e0f081 (default)", "type": "sha", "id": "fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611"}, {"text": "r76:602ae2f5e7ad (default)", "type": "sha", "id": "602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028"}, {"text": "r73:a066b25d5df7 (default)", "type": "sha", "id": "a066b25d5df7016b45a41b7e2a78c33b57adc235"}, {"text": "r61:637a933c9059 (web)", "type": "sha", "id": "637a933c905958ce5151f154147c25c1c7b68832"}, {"text": "r60:0c21004effeb (web)", "type": "sha", "id": "0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc"}, {"text": "r59:a1f39c56d3f1 (web)", "type": "sha", "id": "a1f39c56d3f1d52d5fb5920370a2a2716cd9a444"}, {"text": "r58:97d32df05c71 (web)", "type": "sha", "id": "97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f"}, {"text": "r57:08eaf1451771 (web)", "type": "sha", "id": "08eaf14517718dccea4b67755a93368341aca919"}, {"text": "r56:22f71ad26526 (web)", "type": "sha", "id": "22f71ad265265a53238359c883aa976e725aa07d"}, {"text": "r49:97501f02b7b4 (web)", "type": "sha", "id": "97501f02b7b4330924b647755663a2d90a5e638d"}, {"text": "r47:86ede6754f2b (web)", "type": "sha", "id": "86ede6754f2b27309452bb11f997386ae01d0e5a"}, {"text": "r45:014c40c0203c (web)", "type": "sha", "id": "014c40c0203c423dc19ecf94644f7cac9d4cdce0"}, {"text": "r30:ee87846a61c1 (default)", "type": "sha", "id": "ee87846a61c12153b51543bf860e1026c6d3dcba"}, {"text": "r26:9bb326a04ae5 (default)", "type": "sha", "id": "9bb326a04ae5d98d437dece54be04f830cf1edd9"}, {"text": "r24:536c1a194283 (default)", "type": "sha", "id": "536c1a19428381cfea92ac44985304f6a8049569"}, {"text": "r8:dc5d2c0661b6 (default)", "type": "sha", "id": "dc5d2c0661b61928834a785d3e64a3f80d3aad9c"}, {"text": "r7:3803844fdbd3 (default)", "type": "sha", "id": "3803844fdbd3b711175fc3da9bdacfcd6d29a6fb"}]}, {"text": "Branches", "children": [{"text": "default", "type": "branch", "id": "2062ec7beeeaf9f44a1c25c41479565040b930b2"}, {"text": "stable", "type": "branch", "id": "4f7e2131323e0749a740c0a56ab68ae9269c562a"}]}, {"text": "Tags", "children": [{"text": "v0.2.0", "type": "tag", "id": "2c96c02def9a7c997f33047761a53943e6254396"}, {"text": "v0.1.9", "type": "tag", "id": "8680b1d1cee3aa3c1ab3734b76ee164bbedbc5c9"}, {"text": "v0.1.8", "type": "tag", "id": "ecb25ba9c96faf1e65a0bc3fd914918420a2f116"}, {"text": "v0.1.7", "type": "tag", "id": "f67633a2894edaf28513706d558205fa93df9209"}, {"text": "v0.1.6", "type": "tag", "id": "02b38c0eb6f982174750c0e309ff9faddc0c7e12"}, {"text": "v0.1.5", "type": "tag", "id": "a6664e18181c6fc81b751a8d01474e7e1a3fe7fc"}, {"text": "v0.1.4", "type": "tag", "id": "fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200"}, {"text": "v0.1.3", "type": "tag", "id": "17544fbfcd33ffb439e2b728b5d526b1ef30bfcf"}, {"text": "v0.1.2", "type": "tag", "id": "a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720"}, {"text": "v0.1.11", "type": "tag", "id": "fef5bfe1dc17611d5fb59a7f6f95c55c3606f933"}, {"text": "v0.1.10", "type": "tag", "id": "92831aebf2f8dd4879e897024b89d09af214df1c"}, {"text": "v0.1.1", "type": "tag", "id": "eb3a60fc964309c1a318b8dfe26aa2d1586c85ae"}, {"text": "tip", "type": "tag", "id": "2062ec7beeeaf9f44a1c25c41479565040b930b2"}]}], "more": false}
  No newline at end of file

rhodecode/tests/fixtures/svn_node_history_branches.json

@@ -1,1 +1,1 b''
-{"more": false, "results": [{"text": "Changesets", "children": [{"text": "r15:16", "id": "16"}, {"text": "r12:13", "id": "13"}, {"text": "r7:8", "id": "8"}, {"text": "r3:4", "id": "4"}, {"text": "r2:3", "id": "3"}]}, {"text": "Branches", "children": [{"text": "branches/add-docs", "id": "branches/add-docs/example.py@26"}, {"text": "branches/argparse", "id": "branches/argparse/example.py@26"}, {"text": "trunk", "id": "trunk/example.py@26"}]}, {"text": "Tags", "children": [{"text": "tags/v0.1", "id": "tags/v0.1/example.py@26"}, {"text": "tags/v0.2", "id": "tags/v0.2/example.py@26"}, {"text": "tags/v0.3", "id": "tags/v0.3/example.py@26"}, {"text": "tags/v0.5", "id": "tags/v0.5/example.py@26"}]}]}
  No newline at end of file
+{"results": [{"text": "Changesets", "children": [{"text": "r15:16", "type": "sha", "id": "16"}, {"text": "r12:13", "type": "sha", "id": "13"}, {"text": "r7:8", "type": "sha", "id": "8"}, {"text": "r3:4", "type": "sha", "id": "4"}, {"text": "r2:3", "type": "sha", "id": "3"}]}, {"text": "Branches", "children": [{"text": "branches/add-docs", "type": "branch", "id": "branches/add-docs/example.py@26"}, {"text": "branches/argparse", "type": "branch", "id": "branches/argparse/example.py@26"}, {"text": "trunk", "type": "branch", "id": "trunk/example.py@26"}]}, {"text": "Tags", "children": [{"text": "tags/v0.1", "type": "tag", "id": "tags/v0.1/example.py@26"}, {"text": "tags/v0.2", "type": "tag", "id": "tags/v0.2/example.py@26"}, {"text": "tags/v0.3", "type": "tag", "id": "tags/v0.3/example.py@26"}, {"text": "tags/v0.5", "type": "tag", "id": "tags/v0.5/example.py@26"}]}], "more": false}
  No newline at end of file

rhodecode/tests/fixtures/svn_node_history_response.json

@@ -1,1 +1,1 b''
-{"results": [{"text": "Changesets", "children": [{"text": "r382:383", "id": "383"}, {"text": "r323:324", "id": "324"}, {"text": "r322:323", "id": "323"}, {"text": "r299:300", "id": "300"}, {"text": "r277:278", "id": "278"}, {"text": "r273:274", "id": "274"}, {"text": "r270:271", "id": "271"}, {"text": "r269:270", "id": "270"}, {"text": "r263:264", "id": "264"}, {"text": "r261:262", "id": "262"}, {"text": "r251:252", "id": "252"}, {"text": "r208:209", "id": "209"}, {"text": "r202:203", "id": "203"}, {"text": "r173:174", "id": "174"}, {"text": "r172:173", "id": "173"}, {"text": "r171:172", "id": "172"}, {"text": "r145:146", "id": "146"}, {"text": "r144:145", "id": "145"}, {"text": "r140:141", "id": "141"}, {"text": "r134:135", "id": "135"}, {"text": "r107:108", "id": "108"}, {"text": "r106:107", "id": "107"}, {"text": "r100:101", "id": "101"}, {"text": "r94:95", "id": "95"}, {"text": "r85:86", "id": "86"}, {"text": "r73:74", "id": "74"}, {"text": "r72:73", "id": "73"}, {"text": "r71:72", "id": "72"}, {"text": "r69:70", "id": "70"}, {"text": "r67:68", "id": "68"}, {"text": "r63:64", "id": "64"}, {"text": "r62:63", "id": "63"}, {"text": "r61:62", "id": "62"}, {"text": "r50:51", "id": "51"}, {"text": "r49:50", "id": "50"}, {"text": "r48:49", "id": "49"}, {"text": "r47:48", "id": "48"}, {"text": "r46:47", "id": "47"}, {"text": "r45:46", "id": "46"}, {"text": "r41:42", "id": "42"}, {"text": "r39:40", "id": "40"}, {"text": "r37:38", "id": "38"}, {"text": "r25:26", "id": "26"}, {"text": "r23:24", "id": "24"}, {"text": "r8:9", "id": "9"}, {"text": "r7:8", "id": "8"}]}, {"text": "Branches", "children": []}, {"text": "Tags", "children": []}], "more": false}
  No newline at end of file
+{"results": [{"text": "Changesets", "children": [{"text": "r382:383", "type": "sha", "id": "383"}, {"text": "r323:324", "type": "sha", "id": "324"}, {"text": "r322:323", "type": "sha", "id": "323"}, {"text": "r299:300", "type": "sha", "id": "300"}, {"text": "r277:278", "type": "sha", "id": "278"}, {"text": "r273:274", "type": "sha", "id": "274"}, {"text": "r270:271", "type": "sha", "id": "271"}, {"text": "r269:270", "type": "sha", "id": "270"}, {"text": "r263:264", "type": "sha", "id": "264"}, {"text": "r261:262", "type": "sha", "id": "262"}, {"text": "r251:252", "type": "sha", "id": "252"}, {"text": "r208:209", "type": "sha", "id": "209"}, {"text": "r202:203", "type": "sha", "id": "203"}, {"text": "r173:174", "type": "sha", "id": "174"}, {"text": "r172:173", "type": "sha", "id": "173"}, {"text": "r171:172", "type": "sha", "id": "172"}, {"text": "r145:146", "type": "sha", "id": "146"}, {"text": "r144:145", "type": "sha", "id": "145"}, {"text": "r140:141", "type": "sha", "id": "141"}, {"text": "r134:135", "type": "sha", "id": "135"}, {"text": "r107:108", "type": "sha", "id": "108"}, {"text": "r106:107", "type": "sha", "id": "107"}, {"text": "r100:101", "type": "sha", "id": "101"}, {"text": "r94:95", "type": "sha", "id": "95"}, {"text": "r85:86", "type": "sha", "id": "86"}, {"text": "r73:74", "type": "sha", "id": "74"}, {"text": "r72:73", "type": "sha", "id": "73"}, {"text": "r71:72", "type": "sha", "id": "72"}, {"text": "r69:70", "type": "sha", "id": "70"}, {"text": "r67:68", "type": "sha", "id": "68"}, {"text": "r63:64", "type": "sha", "id": "64"}, {"text": "r62:63", "type": "sha", "id": "63"}, {"text": "r61:62", "type": "sha", "id": "62"}, {"text": "r50:51", "type": "sha", "id": "51"}, {"text": "r49:50", "type": "sha", "id": "50"}, {"text": "r48:49", "type": "sha", "id": "49"}, {"text": "r47:48", "type": "sha", "id": "48"}, {"text": "r46:47", "type": "sha", "id": "47"}, {"text": "r45:46", "type": "sha", "id": "46"}, {"text": "r41:42", "type": "sha", "id": "42"}, {"text": "r39:40", "type": "sha", "id": "40"}, {"text": "r37:38", "type": "sha", "id": "38"}, {"text": "r25:26", "type": "sha", "id": "26"}, {"text": "r23:24", "type": "sha", "id": "24"}, {"text": "r8:9", "type": "sha", "id": "9"}, {"text": "r7:8", "type": "sha", "id": "8"}]}, {"text": "Branches", "children": []}, {"text": "Tags", "children": []}], "more": false}
  No newline at end of file

rhodecode/tests/functional/test_delegated_admin.py

@@ -30,10 +30,13 b' def route_path(name, params=None, **kwar'
 
     base_url = {
         'home': '/',
+        'admin_home': ADMIN_PREFIX,
         'repos':
             ADMIN_PREFIX + '/repos',
         'repo_groups':
             ADMIN_PREFIX + '/repo_groups',
+        'repo_groups_data':
+            ADMIN_PREFIX + '/repo_groups_data',
         'user_groups':
             ADMIN_PREFIX + '/user_groups',
         'user_groups_data':
@@ -50,32 +53,27 b' fixture = Fixture()'
 
 class TestAdminDelegatedUser(TestController):
 
-    def test_regular_user_cannot_see_admin_interfaces(
-            self, user_util, xhr_header):
+    def test_regular_user_cannot_see_admin_interfaces(self, user_util, xhr_header):
         user = user_util.create_user(password='qweqwe')
+        user_util.inherit_default_user_permissions(user.username, False)
+
         self.log_user(user.username, 'qweqwe')
 
-        # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(route_path('home'))
-
-        assert_response = response.assert_response()
-
-        assert_response.no_element_exists('li.local-admin-repos')
-        assert_response.no_element_exists('li.local-admin-repo-groups')
-        assert_response.no_element_exists('li.local-admin-user-groups')
+        # user doesn't have any access to resources so main admin page should 404
+        self.app.get(route_path('admin_home'), status=404)
 
         response = self.app.get(route_path('repos'), status=200)
         response.mustcontain('data: []')
 
-        response = self.app.get(route_path('repo_groups'), status=200)
-        response.mustcontain('data: []')
+        response = self.app.get(route_path('repo_groups_data'),
+                                status=200, extra_environ=xhr_header)
+        assert response.json['data'] == []
 
         response = self.app.get(route_path('user_groups_data'),
                                 status=200, extra_environ=xhr_header)
         assert response.json['data'] == []
 
-    def test_regular_user_can_see_admin_interfaces_if_owner(
-            self, user_util, xhr_header):
+    def test_regular_user_can_see_admin_interfaces_if_owner(self, user_util, xhr_header):
         user = user_util.create_user(password='qweqwe')
         username = user.username
 
@@ -89,20 +87,21 b' class TestAdminDelegatedUser(TestControl'
         user_group_name = user_group.users_group_name
 
         self.log_user(username, 'qweqwe')
-        # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(route_path('home'))
+
+        response = self.app.get(route_path('admin_home'))
 
         assert_response = response.assert_response()
 
-        assert_response.one_element_exists('li.local-admin-repos')
-        assert_response.one_element_exists('li.local-admin-repo-groups')
-        assert_response.one_element_exists('li.local-admin-user-groups')
+        assert_response.element_contains('td.delegated-admin-repos', '1')
+        assert_response.element_contains('td.delegated-admin-repo-groups', '1')
+        assert_response.element_contains('td.delegated-admin-user-groups', '1')
 
         # admin interfaces have visible elements
         response = self.app.get(route_path('repos'), status=200)
         response.mustcontain('"name_raw": "{}"'.format(repo_name))
 
-        response = self.app.get(route_path('repo_groups'), status=200)
+        response = self.app.get(route_path('repo_groups_data'),
+                                extra_environ=xhr_header, status=200)
         response.mustcontain('"name_raw": "{}"'.format(repo_group_name))
 
         response = self.app.get(route_path('user_groups_data'),
@@ -132,19 +131,20 b' class TestAdminDelegatedUser(TestControl'
 
         self.log_user(username, 'qweqwe')
         # check if in home view, such user doesn't see the "admin" menus
-        response = self.app.get(route_path('home'))
+        response = self.app.get(route_path('admin_home'))
 
         assert_response = response.assert_response()
 
-        assert_response.one_element_exists('li.local-admin-repos')
-        assert_response.one_element_exists('li.local-admin-repo-groups')
-        assert_response.one_element_exists('li.local-admin-user-groups')
+        assert_response.element_contains('td.delegated-admin-repos', '1')
+        assert_response.element_contains('td.delegated-admin-repo-groups', '1')
+        assert_response.element_contains('td.delegated-admin-user-groups', '1')
 
         # admin interfaces have visible elements
         response = self.app.get(route_path('repos'), status=200)
         response.mustcontain('"name_raw": "{}"'.format(repo_name))
 
-        response = self.app.get(route_path('repo_groups'), status=200)
+        response = self.app.get(route_path('repo_groups_data'),
+                                extra_environ=xhr_header, status=200)
         response.mustcontain('"name_raw": "{}"'.format(repo_group_name))
 
         response = self.app.get(route_path('user_groups_data'),

rhodecode/tests/lib/middleware/test_simplegit.py

@@ -121,7 +121,8 b' def test_get_config(user_util, baseapp, '
     expected_config.update({
         'git_update_server_info': False,
         'git_lfs_enabled': False,
-        'git_lfs_store_path': git_config['git_lfs_store_path']
+        'git_lfs_store_path': git_config['git_lfs_store_path'],
+        'git_lfs_http_scheme': 'http'
     })
 
     assert git_config == expected_config

rhodecode/tests/lib/middleware/test_simplevcs.py

@@ -69,7 +69,7 b' class StubVCSController(simplevcs.Simple'
             return self.stub_response_body
         return fake_app
 
-    def _create_config(self, extras, repo_name):
+    def _create_config(self, extras, repo_name, scheme='http'):
         return None
 
 

rhodecode/tests/lib/test_encrypt.py

@@ -22,6 +22,7 b' import pytest'
 
 from rhodecode.lib.encrypt import (
     AESCipher, SignatureVerificationError, InvalidDecryptedValue)
+from rhodecode.lib.encrypt2 import (Encryptor, InvalidToken)
 
 
 class TestEncryptModule(object):
@@ -74,3 +75,59 b' class TestEncryptModule(object):'
         assert isinstance(AESCipher(
             'differentsecret', hmac=True, strict_verification=False
         ).decrypt(enc), InvalidDecryptedValue)
+
+
+class TestEncryptModule2(object):
+
+    @pytest.mark.parametrize(
+        "key, text",
+        [
+            ('a', 'short'),
+            ('a'*64, 'too long(trimmed to 32)'),
+            ('a'*32, 'just enough'),
+            ('ąćęćę', 'non asci'),
+            ('$asa$asa', 'special $ used'),
+        ]
+    )
+    def test_encryption(self, key, text):
+        enc = Encryptor(key).encrypt(text)
+        assert Encryptor(key).decrypt(enc) == text
+
+    def test_encryption_with_bad_key(self):
+        key = 'secretstring'
+        text = 'ihatemysql'
+        enc = Encryptor(key).encrypt(text)
+
+        assert Encryptor('differentsecret').decrypt(enc) == ''
+
+    def test_encryption_with_bad_key_raises(self):
+        key = 'secretstring'
+        text = 'ihatemysql'
+        enc = Encryptor(key).encrypt(text)
+
+        with pytest.raises(InvalidToken) as e:
+            Encryptor('differentsecret').decrypt(enc, safe=False)
+
+        assert 'InvalidToken' in str(e)
+
+    def test_encryption_with_bad_format_data(self):
+        key = 'secret'
+        text = 'ihatemysql'
+        enc = Encryptor(key).encrypt(text)
+        enc = '$xyz' + enc[3:]
+
+        with pytest.raises(ValueError) as e:
+            Encryptor(key).decrypt(enc, safe=False)
+
+        assert 'Encrypted Data has invalid format' in str(e)
+
+    def test_encryption_with_bad_data(self):
+        key = 'secret'
+        text = 'ihatemysql'
+        enc = Encryptor(key).encrypt(text)
+        enc = enc[:-5]
+
+        with pytest.raises(InvalidToken) as e:
+            Encryptor(key).decrypt(enc, safe=False)
+
+        assert 'InvalidToken' in str(e)

rhodecode/tests/lib/test_helpers.py

@@ -40,27 +40,52 b' def test_urlify_text(url, expected_url):'
 
 
 @pytest.mark.parametrize('repo_name, commit_id, path, expected_result', [
+    # Simple case 1
+    ('repo', 'commit', 'a/b',
+     '<a href="/repo/files/commit/"><i class="icon-home"></i></a>'
+     ' / '
+     '<a href="/repo/files/commit/a">a</a>'
+     ' / '
+     'b'),
+
+    # Simple case
     ('rX<X', 'cX<X', 'pX<X/aX<X/bX<X',
-     '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/">rX&lt;X</a>/'
-     '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/pX%3CX">pX&lt;X</a>/'
-     '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/pX%3CX/aX%3CX">aX&lt;X'
-     '</a>/bX&lt;X'),
+     '<a href="/rX%3CX/files/cX%3CX/"><i class="icon-home"></i></a>'
+     ' / '
+     '<a href="/rX%3CX/files/cX%3CX/pX%3CX">pX&lt;X</a>'
+     ' / '
+     '<a href="/rX%3CX/files/cX%3CX/pX%3CX/aX%3CX">aX&lt;X</a>'
+     ' / '
+     'bX&lt;X'),
+
     # Path with only one segment
     ('rX<X', 'cX<X', 'pX<X',
-     '<a class="pjax-link" href="/rX%3CX/files/cX%3CX/">rX&lt;X</a>/pX&lt;X'),
+     '<a href="/rX%3CX/files/cX%3CX/"><i class="icon-home"></i></a>'
+     ' / '
+     'pX&lt;X'),
+
     # Empty path
-    ('rX<X', 'cX<X', '', 'rX&lt;X'),
+    ('rX<X', 'cX<X', '',
+     '<i class="icon-home"></i>'),
+
+    # simple quote
     ('rX"X', 'cX"X', 'pX"X/aX"X/bX"X',
-     '<a class="pjax-link" href="/rX%22X/files/cX%22X/">rX&#34;X</a>/'
-     '<a class="pjax-link" href="/rX%22X/files/cX%22X/pX%22X">pX&#34;X</a>/'
-     '<a class="pjax-link" href="/rX%22X/files/cX%22X/pX%22X/aX%22X">aX&#34;X'
-     '</a>/bX&#34;X'),
-], ids=['simple', 'one_segment', 'empty_path', 'simple_quote'])
+     '<a href="/rX%22X/files/cX%22X/"><i class="icon-home"></i></a>'
+     ' / '
+     '<a href="/rX%22X/files/cX%22X/pX%22X">pX&#34;X</a>'
+     ' / '
+     '<a href="/rX%22X/files/cX%22X/pX%22X/aX%22X">aX&#34;X</a>'
+     ' / '
+     'bX&#34;X'),
+
+], ids=['simple1', 'simple2', 'one_segment', 'empty_path', 'simple_quote'])
 def test_files_breadcrumbs_xss(
         repo_name, commit_id, path, app, expected_result):
     result = helpers.files_breadcrumbs(repo_name, commit_id, path)
     # Expect it to encode all path fragments properly. This is important
     # because it returns an instance of `literal`.
+    if path != '':
+        expected_result = expected_result + helpers.files_icon.format(helpers.escape(path))
     assert result == expected_result
 
 

rhodecode/tests/models/settings/test_vcs_settings.py

@@ -501,8 +501,8 b' class TestCreateOrUpdateUi(object):'
 
     def test_update(self, repo_stub, settings_util):
         model = VcsSettingsModel(repo=repo_stub.repo_name)
-
-        largefiles, phases, evolve = model.HG_SETTINGS
+        # care about only 3 first settings
+        largefiles, phases, evolve = model.HG_SETTINGS[:3]
 
         section = 'test-section'
         key = 'test-key'
@@ -531,10 +531,11 b' class TestCreateOrUpdateRepoHgSettings(o'
         with mock.patch.object(model, '_create_or_update_ui') as create_mock:
             model.create_or_update_repo_hg_settings(self.FORM_DATA)
         expected_calls = [
-            mock.call(model.repo_settings, 'extensions', 'largefiles',
-                      active=False, value=''),
-            mock.call(model.repo_settings, 'extensions', 'evolve',
-                      active=False, value=''),
+            mock.call(model.repo_settings, 'extensions', 'largefiles', active=False, value=''),
+            mock.call(model.repo_settings, 'extensions', 'evolve', active=False, value=''),
+            mock.call(model.repo_settings, 'experimental', 'evolution', active=False, value=''),
+            mock.call(model.repo_settings, 'experimental', 'evolution.exchange', active=False, value='no'),
+            mock.call(model.repo_settings, 'extensions', 'topic', active=False, value=''),
             mock.call(model.repo_settings, 'phases', 'publish', value='False'),
         ]
         assert expected_calls == create_mock.call_args_list
@@ -589,17 +590,16 b' class TestCreateOrUpdateGlobalHgSettings'
         with mock.patch.object(model, '_create_or_update_ui') as create_mock:
             model.create_or_update_global_hg_settings(self.FORM_DATA)
         expected_calls = [
-            mock.call(model.global_settings, 'extensions', 'largefiles',
-                      active=False, value=''),
-            mock.call(model.global_settings, 'largefiles', 'usercache',
-                      value='/example/largefiles-store'),
-            mock.call(model.global_settings, 'phases', 'publish',
-                      value='False'),
-            mock.call(model.global_settings, 'extensions', 'hgsubversion',
-                      active=False),
-            mock.call(model.global_settings, 'extensions', 'evolve',
-                      active=False, value='')
+            mock.call(model.global_settings, 'extensions', 'largefiles', active=False, value=''),
+            mock.call(model.global_settings, 'largefiles', 'usercache', value='/example/largefiles-store'),
+            mock.call(model.global_settings, 'phases', 'publish', value='False'),
+            mock.call(model.global_settings, 'extensions', 'hgsubversion', active=False),
+            mock.call(model.global_settings, 'extensions', 'evolve', active=False, value=''),
+            mock.call(model.global_settings, 'experimental', 'evolution', active=False, value=''),
+            mock.call(model.global_settings, 'experimental', 'evolution.exchange', active=False, value='no'),
+            mock.call(model.global_settings, 'extensions', 'topic', active=False, value=''),
         ]
+
         assert expected_calls == create_mock.call_args_list
 
     @pytest.mark.parametrize('field_to_remove', FORM_DATA.keys())
@@ -625,10 +625,8 b' class TestCreateOrUpdateGlobalGitSetting'
         with mock.patch.object(model, '_create_or_update_ui') as create_mock:
             model.create_or_update_global_git_settings(self.FORM_DATA)
         expected_calls = [
-            mock.call(model.global_settings, 'vcs_git_lfs', 'enabled',
-                      active=False, value=False),
-            mock.call(model.global_settings, 'vcs_git_lfs', 'store_location',
-                      value='/example/lfs-store'),
+            mock.call(model.global_settings, 'vcs_git_lfs', 'enabled', active=False, value=False),
+            mock.call(model.global_settings, 'vcs_git_lfs', 'store_location', value='/example/lfs-store'),
         ]
         assert expected_calls == create_mock.call_args_list
 

rhodecode/tests/models/test_pullrequest.py

@@ -512,7 +512,7 b' def test_outdated_comments('
     (MergeFailureReason.HG_SOURCE_HAS_MORE_BRANCHES,
      'This pull request cannot be merged because the source contains more branches than the target.'),
     (MergeFailureReason.HG_TARGET_HAS_MULTIPLE_HEADS,
-     'This pull request cannot be merged because the target has multiple heads: `a,b,c`.'),
+     'This pull request cannot be merged because the target `ref_name` has multiple heads: `a,b,c`.'),
     (MergeFailureReason.TARGET_IS_LOCKED,
      'This pull request cannot be merged because the target repository is locked by user:123.'),
     (MergeFailureReason.MISSING_TARGET_REF,

rhodecode/tests/models/test_scm.py

@@ -129,20 +129,19 b' def test_strip_with_single_heads(backend'
     assert commit_ids['b'] not in rest_commit_ids
 
 
-def test_get_nodes_returns_unicode_flat(backend_random):
-    repo = backend_random.repo
-    directories, files = scm.ScmModel().get_nodes(
-        repo.repo_name, repo.get_commit(commit_idx=0).raw_id,
-        flat=True)
+def test_get_nodes_returns_unicode_flat(backend):
+    repo = backend.repo
+    commit_id = repo.get_commit(commit_idx=0).raw_id
+    directories, files = scm.ScmModel().get_nodes(repo.repo_name, commit_id, flat=True)
     assert_contains_only_unicode(directories)
     assert_contains_only_unicode(files)
 
 
-def test_get_nodes_returns_unicode_non_flat(backend_random):
-    repo = backend_random.repo
-    directories, files = scm.ScmModel().get_nodes(
-        repo.repo_name, repo.get_commit(commit_idx=0).raw_id,
-        flat=False)
+def test_get_nodes_returns_unicode_non_flat(backend):
+    repo = backend.repo
+    commit_id = repo.get_commit(commit_idx=0).raw_id
+
+    directories, files = scm.ScmModel().get_nodes(repo.repo_name, commit_id, flat=False)
     # johbo: Checking only the names for now, since that is the critical
     # part.
     assert_contains_only_unicode([d['name'] for d in directories])

rhodecode/tests/plugin.py

@@ -631,7 +631,9 b' class Backend(object):'
         commits = commits or [
             {'message': 'Commit %s of %s' % (x, self.repo_name)}
             for x in range(number_of_commits)]
-        self._add_commits_to_repo(repo.scm_instance(), commits)
+        vcs_repo = repo.scm_instance()
+        vcs_repo.count()
+        self._add_commits_to_repo(vcs_repo, commits)
         if heads:
             self.pull_heads(repo, heads)
 
@@ -1224,7 +1226,7 b' class UserUtility(object):'
         return user_group
 
     def grant_user_permission(self, user_name, permission_name):
-        self._inherit_default_user_permissions(user_name, False)
+        self.inherit_default_user_permissions(user_name, False)
         self.user_permissions.append((user_name, permission_name))
 
     def grant_user_permission_to_repo_group(
@@ -1276,10 +1278,10 b' class UserUtility(object):'
         return permission
 
     def revoke_user_permission(self, user_name, permission_name):
-        self._inherit_default_user_permissions(user_name, True)
+        self.inherit_default_user_permissions(user_name, True)
         UserModel().revoke_perm(user_name, permission_name)
 
-    def _inherit_default_user_permissions(self, user_name, value):
+    def inherit_default_user_permissions(self, user_name, value):
         user = UserModel().get_by_username(user_name)
         user.inherit_default_permissions = value
         Session().add(user)
@@ -1884,3 +1886,17 b' def repo_groups(request):'
         fixture.destroy_repo_group(parent_group)
 
     return zombie_group, parent_group, child_group
+
+
[e-mail](scope="session")
+def tmp_path_factory(request):
+    """Return a :class:`_pytest.tmpdir.TempPathFactory` instance for the test session.
+    """
+
+    class TempPathFactory:
+
+        def mktemp(self, basename):
+            import tempfile
+            return tempfile.mktemp(basename)
+
+    return TempPathFactory()

rhodecode/tests/utils.py

@@ -48,9 +48,9 b' log = logging.getLogger(__name__)'
 
 
 class CustomTestResponse(TestResponse):
+
     def _save_output(self, out):
-        f = tempfile.NamedTemporaryFile(
-            delete=False, prefix='rc-test-', suffix='.html')
+        f = tempfile.NamedTemporaryFile(delete=False, prefix='rc-test-', suffix='.html')
         f.write(out)
         return f.name
 
@@ -63,6 +63,7 b' class CustomTestResponse(TestResponse):'
 
             assert string in res
         """
+        print_body = kw.pop('print_body', False)
         if 'no' in kw:
             no = kw['no']
             del kw['no']
@@ -79,18 +80,20 b' class CustomTestResponse(TestResponse):'
         for s in strings:
             if not s in self:
                 print_stderr("Actual response (no %r):" % s)
+                print_stderr("body output saved as `%s`" % f)
+                if print_body:
                 print_stderr(str(self))
                 raise IndexError(
-                    "Body does not contain string %r, output saved as %s" % (
-                    s, f))
+                    "Body does not contain string %r, body output saved as %s" % (s, f))
 
         for no_s in no:
             if no_s in self:
                 print_stderr("Actual response (has %r)" % no_s)
+                print_stderr("body output saved as `%s`" % f)
+                if print_body:
                 print_stderr(str(self))
                 raise IndexError(
-                    "Body contains bad string %r, output saved as %s" % (
-                    no_s, f))
+                    "Body contains bad string %r, body output saved as %s" % (no_s, f))
 
     def assert_response(self):
         return AssertResponse(self)
@@ -99,8 +102,7 b' class CustomTestResponse(TestResponse):'
         """
         This returns the session from a response object.
         """
-
-        from pyramid_beaker import session_factory_from_settings
+        from rhodecode.lib.rc_beaker import session_factory_from_settings
         session = session_factory_from_settings(self.test_app._pyramid_settings)
         return session(self.request)
 
@@ -390,6 +392,7 b' def is_url_reachable(url):'
     try:
         urllib2.urlopen(url)
     except urllib2.URLError:
+        log.exception('URL Reach error')
         return False
     return True
 

rhodecode/tests/vcs/conftest.py

@@ -148,7 +148,6 b' def _add_commits_to_repo(repo, commits):'
             author=unicode(commit['author']),
             date=commit['date'],
             branch=commit.get('branch'))
-
     return tip
 
 

rhodecode/tests/vcs/test_archives.py

@@ -97,7 +97,7 b' class TestArchives(BackendTestMixin):'
         metafile = out.read('.archival.txt')
 
         raw_id = self.tip.raw_id
-        assert 'rev:%s' % raw_id in metafile
+        assert 'commit_id:%s' % raw_id in metafile
 
         for x in range(5):
             node_path = '%d/file_%d.txt' % (x, x)

rhodecode/tests/vcs/test_commits.py

@@ -35,7 +35,7 b' from rhodecode.tests import get_new_dir'
 from rhodecode.tests.vcs.conftest import BackendTestMixin
 
 
-class TestBaseChangeset:
+class TestBaseChangeset(object):
 
     def test_is_deprecated(self):
         from rhodecode.lib.vcs.backends.base import BaseChangeset
@@ -159,8 +159,7 b' class TestCommitsInNonEmptyRepo(BackendT'
             parents=[initial],
             branch=DEFAULT_BRANCH,)
 
-        default_branch_commits = self.repo.get_commits(
-            branch_name=DEFAULT_BRANCH)
+        default_branch_commits = self.repo.get_commits(branch_name=DEFAULT_BRANCH)
         assert docs_branch_commit1 not in list(default_branch_commits)
         assert docs_branch_commit2 not in list(default_branch_commits)
 
@@ -177,6 +176,10 b' class TestCommitsInNonEmptyRepo(BackendT'
         commit_indexes = [c.idx for c in commits]
         assert commit_indexes == [1, 2, 3, 7, 12, 15]
 
+    def test_get_commit_by_index(self):
+        for idx in [1, 2, 3, 4]:
+            assert idx == self.repo.get_commit(commit_idx=idx).idx
+
     def test_get_commit_by_branch(self):
         for branch, commit_id in self.repo.branches.iteritems():
             assert commit_id == self.repo.get_commit(branch).raw_id

rhodecode/tests/vcs/test_git.py

@@ -41,60 +41,41 b' from rhodecode.tests.vcs.conftest import'
 pytestmark = pytest.mark.backends("git")
 
 
-def repo_path_generator():
-    """
-    Return a different path to be used for cloning repos.
-    """
-    i = 0
-    while True:
-        i += 1
-        yield '%s-%d' % (TEST_GIT_REPO_CLONE, i)
-
-
-REPO_PATH_GENERATOR = repo_path_generator()
-
-
-class TestGitRepository:
-
-    # pylint: disable=protected-access
-
-    def __check_for_existing_repo(self):
-        if os.path.exists(TEST_GIT_REPO_CLONE):
-            self.fail('Cannot test git clone repo as location %s already '
-                      'exists. You should manually remove it first.'
-                      % TEST_GIT_REPO_CLONE)
+class TestGitRepository(object):
 
     @pytest.fixture(autouse=True)
     def prepare(self, request, baseapp):
         self.repo = GitRepository(TEST_GIT_REPO, bare=True)
 
-    def get_clone_repo(self):
+    def get_clone_repo(self, tmp_path_factory):
         """
         Return a non bare clone of the base repo.
         """
-        clone_path = next(REPO_PATH_GENERATOR)
+        clone_path = tmp_path_factory.mktemp('clone-url')
         repo_clone = GitRepository(
             clone_path, create=True, src_url=self.repo.path, bare=False)
 
         return repo_clone
 
-    def get_empty_repo(self, bare=False):
+    def get_empty_repo(self, tmp_path_factory, bare=False):
         """
         Return a non bare empty repo.
         """
-        return GitRepository(next(REPO_PATH_GENERATOR), create=True, bare=bare)
+        clone_path = tmp_path_factory.mktemp('empty-repo')
+        return GitRepository(clone_path, create=True, bare=bare)
 
     def test_wrong_repo_path(self):
         wrong_repo_path = '/tmp/errorrepo_git'
         with pytest.raises(RepositoryError):
             GitRepository(wrong_repo_path)
 
-    def test_repo_clone(self):
-        self.__check_for_existing_repo()
+    def test_repo_clone(self, tmp_path_factory):
         repo = GitRepository(TEST_GIT_REPO)
+        clone_path = tmp_path_factory.mktemp('_') + '_' + TEST_GIT_REPO_CLONE
         repo_clone = GitRepository(
-            TEST_GIT_REPO_CLONE,
+            clone_path,
             src_url=TEST_GIT_REPO, create=True, do_workspace_checkout=True)
+
         assert len(repo.commit_ids) == len(repo_clone.commit_ids)
         # Checking hashes of commits should be enough
         for commit in repo.get_commits():
@@ -106,9 +87,10 b' class TestGitRepository:'
             GitRepository(
                 TEST_GIT_REPO_CLONE + '_wo_create', src_url=TEST_GIT_REPO)
 
-    def test_repo_clone_with_update(self):
+    def test_repo_clone_with_update(self, tmp_path_factory):
         repo = GitRepository(TEST_GIT_REPO)
-        clone_path = TEST_GIT_REPO_CLONE + '_with_update'
+        clone_path = tmp_path_factory.mktemp('_') + '_' + TEST_GIT_REPO_CLONE + '_update'
+
         repo_clone = GitRepository(
             clone_path,
             create=True, src_url=TEST_GIT_REPO, do_workspace_checkout=True)
@@ -118,9 +100,9 b' class TestGitRepository:'
         fpath = os.path.join(clone_path, 'MANIFEST.in')
         assert os.path.isfile(fpath)
 
-    def test_repo_clone_without_update(self):
+    def test_repo_clone_without_update(self, tmp_path_factory):
         repo = GitRepository(TEST_GIT_REPO)
-        clone_path = TEST_GIT_REPO_CLONE + '_without_update'
+        clone_path = tmp_path_factory.mktemp('_') + '_' + TEST_GIT_REPO_CLONE + '_without_update'
         repo_clone = GitRepository(
             clone_path,
             create=True, src_url=TEST_GIT_REPO, do_workspace_checkout=False)
@@ -131,9 +113,9 b' class TestGitRepository:'
         assert not repo_clone.bare
         assert not os.path.isfile(fpath)
 
-    def test_repo_clone_into_bare_repo(self):
+    def test_repo_clone_into_bare_repo(self, tmp_path_factory):
         repo = GitRepository(TEST_GIT_REPO)
-        clone_path = TEST_GIT_REPO_CLONE + '_bare.git'
+        clone_path = tmp_path_factory.mktemp('_') + '_' + TEST_GIT_REPO_CLONE + '_bare.git'
         repo_clone = GitRepository(
             clone_path, create=True, src_url=repo.path, bare=True)
         assert repo_clone.bare
@@ -275,8 +257,8 b' TODO: To be written...'
     def test_head(self):
         assert self.repo.head == self.repo.get_commit().raw_id
 
-    def test_checkout_with_create(self):
-        repo_clone = self.get_clone_repo()
+    def test_checkout_with_create(self, tmp_path_factory):
+        repo_clone = self.get_clone_repo(tmp_path_factory)
 
         new_branch = 'new_branch'
         assert repo_clone._current_branch() == 'master'
@@ -288,22 +270,22 b' TODO: To be written...'
         assert set(repo_clone.branches) == {'master', new_branch}
         assert repo_clone._current_branch() == new_branch
 
-    def test_checkout(self):
-        repo_clone = self.get_clone_repo()
+    def test_checkout(self, tmp_path_factory):
+        repo_clone = self.get_clone_repo(tmp_path_factory)
 
         repo_clone._checkout('new_branch', create=True)
         repo_clone._checkout('master')
 
         assert repo_clone._current_branch() == 'master'
 
-    def test_checkout_same_branch(self):
-        repo_clone = self.get_clone_repo()
+    def test_checkout_same_branch(self, tmp_path_factory):
+        repo_clone = self.get_clone_repo(tmp_path_factory)
 
         repo_clone._checkout('master')
         assert repo_clone._current_branch() == 'master'
 
-    def test_checkout_branch_already_exists(self):
-        repo_clone = self.get_clone_repo()
+    def test_checkout_branch_already_exists(self, tmp_path_factory):
+        repo_clone = self.get_clone_repo(tmp_path_factory)
 
         with pytest.raises(RepositoryError):
             repo_clone._checkout('master', create=True)
@@ -316,32 +298,32 b' TODO: To be written...'
         with pytest.raises(RepositoryError):
             self.repo._current_branch()
 
-    def test_current_branch_empty_repo(self):
-        repo = self.get_empty_repo()
+    def test_current_branch_empty_repo(self, tmp_path_factory):
+        repo = self.get_empty_repo(tmp_path_factory)
         assert repo._current_branch() is None
 
-    def test_local_clone(self):
-        clone_path = next(REPO_PATH_GENERATOR)
+    def test_local_clone(self, tmp_path_factory):
+        clone_path = tmp_path_factory.mktemp('test-local-clone')
         self.repo._local_clone(clone_path, 'master')
         repo_clone = GitRepository(clone_path)
 
         assert self.repo.commit_ids == repo_clone.commit_ids
 
-    def test_local_clone_with_specific_branch(self):
-        source_repo = self.get_clone_repo()
+    def test_local_clone_with_specific_branch(self, tmp_path_factory):
+        source_repo = self.get_clone_repo(tmp_path_factory)
 
         # Create a new branch in source repo
         new_branch_commit = source_repo.commit_ids[-3]
         source_repo._checkout(new_branch_commit)
         source_repo._checkout('new_branch', create=True)
 
-        clone_path = next(REPO_PATH_GENERATOR)
+        clone_path = tmp_path_factory.mktemp('git-clone-path-1')
         source_repo._local_clone(clone_path, 'new_branch')
         repo_clone = GitRepository(clone_path)
 
         assert source_repo.commit_ids[:-3 + 1] == repo_clone.commit_ids
 
-        clone_path = next(REPO_PATH_GENERATOR)
+        clone_path = tmp_path_factory.mktemp('git-clone-path-2')
         source_repo._local_clone(clone_path, 'master')
         repo_clone = GitRepository(clone_path)
 
@@ -351,9 +333,9 b' TODO: To be written...'
         with pytest.raises(RepositoryError):
             self.repo._local_clone(self.repo.path, 'master')
 
-    def test_local_fetch(self):
-        target_repo = self.get_empty_repo()
-        source_repo = self.get_clone_repo()
+    def test_local_fetch(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
+        source_repo = self.get_clone_repo(tmp_path_factory)
 
         # Create a new branch in source repo
         master_commit = source_repo.commit_ids[-1]
@@ -367,8 +349,8 b' TODO: To be written...'
         target_repo._local_fetch(source_repo.path, 'master')
         assert target_repo._last_fetch_heads() == [master_commit]
 
-    def test_local_fetch_from_bare_repo(self):
-        target_repo = self.get_empty_repo()
+    def test_local_fetch_from_bare_repo(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
         target_repo._local_fetch(self.repo.path, 'master')
 
         master_commit = self.repo.commit_ids[-1]
@@ -378,15 +360,15 b' TODO: To be written...'
         with pytest.raises(ValueError):
             self.repo._local_fetch(self.repo.path, 'master')
 
-    def test_local_fetch_branch_does_not_exist(self):
-        target_repo = self.get_empty_repo()
+    def test_local_fetch_branch_does_not_exist(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
 
         with pytest.raises(RepositoryError):
             target_repo._local_fetch(self.repo.path, 'new_branch')
 
-    def test_local_pull(self):
-        target_repo = self.get_empty_repo()
-        source_repo = self.get_clone_repo()
+    def test_local_pull(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
+        source_repo = self.get_clone_repo(tmp_path_factory)
 
         # Create a new branch in source repo
         master_commit = source_repo.commit_ids[-1]
@@ -406,9 +388,9 b' TODO: To be written...'
         with pytest.raises(RepositoryError):
             self.repo._local_pull(self.repo.path, 'master')
 
-    def test_local_merge(self):
-        target_repo = self.get_empty_repo()
-        source_repo = self.get_clone_repo()
+    def test_local_merge(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
+        source_repo = self.get_clone_repo(tmp_path_factory)
 
         # Create a new branch in source repo
         master_commit = source_repo.commit_ids[-1]
@@ -449,8 +431,8 b' TODO: To be written...'
         assert not os.path.exists(
             os.path.join(target_repo.path, '.git', 'MERGE_HEAD'))
 
-    def test_local_merge_into_empty_repo(self):
-        target_repo = self.get_empty_repo()
+    def test_local_merge_into_empty_repo(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
 
         # This is required as one cannot do a -ff-only merge in an empty repo.
         target_repo._local_fetch(self.repo.path, 'master')
@@ -464,8 +446,8 b' TODO: To be written...'
             self.repo._local_merge(
                 'merge_message', 'user name', '[e-mail]', None)
 
-    def test_local_push_non_bare(self):
-        target_repo = self.get_empty_repo()
+    def test_local_push_non_bare(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
 
         pushed_branch = 'pushed_branch'
         self.repo._local_push('master', target_repo.path, pushed_branch)
@@ -479,8 +461,8 b' TODO: To be written...'
         assert (target_repo.branches[pushed_branch] ==
                 self.repo.branches['master'])
 
-    def test_local_push_bare(self):
-        target_repo = self.get_empty_repo(bare=True)
+    def test_local_push_bare(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory, bare=True)
 
         pushed_branch = 'pushed_branch'
         self.repo._local_push('master', target_repo.path, pushed_branch)
@@ -494,8 +476,8 b' TODO: To be written...'
         assert (target_repo.branches[pushed_branch] ==
                 self.repo.branches['master'])
 
-    def test_local_push_non_bare_target_branch_is_checked_out(self):
-        target_repo = self.get_clone_repo()
+    def test_local_push_non_bare_target_branch_is_checked_out(self, tmp_path_factory):
+        target_repo = self.get_clone_repo(tmp_path_factory)
 
         pushed_branch = 'pushed_branch'
         # Create a new branch in source repo
@@ -515,8 +497,8 b' TODO: To be written...'
         with pytest.raises(RepositoryError):
             self.repo._local_push('master', target_repo.path, 'master')
 
-    def test_hooks_can_be_enabled_via_env_variable_for_local_push(self):
-        target_repo = self.get_empty_repo(bare=True)
+    def test_hooks_can_be_enabled_via_env_variable_for_local_push(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory, bare=True)
 
         with mock.patch.object(self.repo, 'run_git_command') as run_mock:
             self.repo._local_push(
@@ -540,8 +522,8 b' TODO: To be written...'
             f.write('\n'.join(script_lines))
         os.chmod(hook_path, 0o755)
 
-    def test_local_push_does_not_execute_hook(self):
-        target_repo = self.get_empty_repo()
+    def test_local_push_does_not_execute_hook(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory)
 
         pushed_branch = 'pushed_branch'
         self._add_failing_hook(target_repo.path, 'pre-receive')
@@ -556,8 +538,8 b' TODO: To be written...'
         assert (target_repo.branches[pushed_branch] ==
                 self.repo.branches['master'])
 
-    def test_local_push_executes_hook(self):
-        target_repo = self.get_empty_repo(bare=True)
+    def test_local_push_executes_hook(self, tmp_path_factory):
+        target_repo = self.get_empty_repo(tmp_path_factory, bare=True)
         self._add_failing_hook(target_repo.path, 'pre-receive', bare=True)
         with pytest.raises(RepositoryError):
             self.repo._local_push(
@@ -1087,27 +1069,32 b' class TestGitSpecificWithRepo(BackendTes'
             'base')
 
     def test_get_diff_runs_git_command_with_hashes(self):
+        comm1 = self.repo[0]
+        comm2 = self.repo[1]
         self.repo.run_git_command = mock.Mock(return_value=['', ''])
-        self.repo.get_diff(self.repo[0], self.repo[1])
+        self.repo.get_diff(comm1, comm2)
+
         self.repo.run_git_command.assert_called_once_with(
             ['diff', '-U3', '--full-index', '--binary', '-p', '-M',
-             '--abbrev=40', self.repo._get_commit_id(0),
-             self.repo._get_commit_id(1)])
+             '--abbrev=40', comm1.raw_id, comm2.raw_id])
 
     def test_get_diff_runs_git_command_with_str_hashes(self):
+        comm2 = self.repo[1]
         self.repo.run_git_command = mock.Mock(return_value=['', ''])
-        self.repo.get_diff(self.repo.EMPTY_COMMIT, self.repo[1])
+        self.repo.get_diff(self.repo.EMPTY_COMMIT, comm2)
         self.repo.run_git_command.assert_called_once_with(
             ['show', '-U3', '--full-index', '--binary', '-p', '-M',
-             '--abbrev=40', self.repo._get_commit_id(1)])
+             '--abbrev=40', comm2.raw_id])
 
     def test_get_diff_runs_git_command_with_path_if_its_given(self):
+        comm1 = self.repo[0]
+        comm2 = self.repo[1]
         self.repo.run_git_command = mock.Mock(return_value=['', ''])
-        self.repo.get_diff(self.repo[0], self.repo[1], 'foo')
+        self.repo.get_diff(comm1, comm2, 'foo')
         self.repo.run_git_command.assert_called_once_with(
             ['diff', '-U3', '--full-index', '--binary', '-p', '-M',
-             '--abbrev=40', self.repo._get_commit_id(0),
-             self.repo._get_commit_id(1), '--', 'foo'])
+             '--abbrev=40', self.repo._lookup_commit(0),
+             comm2.raw_id, '--', 'foo'])
 
 
 @pytest.mark.usefixtures("vcs_repository_support")

rhodecode/tests/vcs/test_hg_vcsserver_cache_invalidation.py

@@ -70,10 +70,13 b' class TestMercurialRemoteRepoInvalidatio'
             tags[name] = raw_id
 
         repo = backend_hg.repo.scm_instance()
+
         with patch.object(repo, '_remote') as remote:
+            repo.tags = tags
             remote.lookup.return_value = ('commit-id', 'commit-idx')
             remote.tags.return_value = tags
             remote._get_tags.return_value = tags
+            remote.is_empty.return_value = False
             remote.tag.side_effect = add_tag
 
             # Invoke method.

rhodecode/tests/vcs/test_inmemory.py

@@ -79,9 +79,17 b' class TestInMemoryCommit(BackendTestMixi'
         self.commit()
         self.assert_succesful_commit(nodes)
 
-    @pytest.mark.skip_backends(
-        'svn', reason="Svn does not support commits on branches.")
-    def test_add_on_branch(self, nodes):
+    @pytest.mark.backends("hg")
+    def test_add_on_branch_hg(self, nodes):
+        for node in nodes:
+            self.imc.add(node)
+        self.commit(branch=u'stable')
+        self.assert_succesful_commit(nodes)
+
+    @pytest.mark.backends("git")
+    def test_add_on_branch_git(self, nodes):
+        self.repo._checkout('stable', create=True)
+
         for node in nodes:
             self.imc.add(node)
         self.commit(branch=u'stable')

rhodecode/tests/vcs_operations/test_vcs_operations.py

@@ -54,6 +54,20 b' class TestVCSOperations(object):'
             'hg clone', clone_url, tmpdir.strpath)
         _check_proper_clone(stdout, stderr, 'hg')
 
+    def test_clone_hg_repo_by_admin_pull_protocol(self, rc_web_server, tmpdir):
+        clone_url = rc_web_server.repo_clone_url(HG_REPO)
+        stdout, stderr = Command('/tmp').execute(
+            'hg clone --pull', clone_url, tmpdir.strpath)
+        _check_proper_clone(stdout, stderr, 'hg')
+
+    def test_clone_hg_repo_by_admin_pull_stream_protocol(self, rc_web_server, tmpdir):
+        clone_url = rc_web_server.repo_clone_url(HG_REPO)
+        stdout, stderr = Command('/tmp').execute(
+            'hg clone --pull --stream', clone_url, tmpdir.strpath)
+        assert 'files to transfer,' in stdout
+        assert 'transferred 1.' in stdout
+        assert '114 files updated,' in stdout
+
     def test_clone_git_repo_by_admin(self, rc_web_server, tmpdir):
         clone_url = rc_web_server.repo_clone_url(GIT_REPO)
         cmd = Command('/tmp')

rhodecode/tests/vcs_operations/test_vcs_operations_special.py

@@ -46,6 +46,7 b' class TestVCSOperationsSpecial(object):'
         cmd.execute('git clone', clone_url)
 
         repo = GitRepository(os.path.join(tmpdir.strpath, empty_repo.repo_name))
+        repo._checkout('test', create=True)
         repo.in_memory_commit.add(FileNode('file', content=''))
         repo.in_memory_commit.commit(
             message='Commit on branch test',

rhodecode/tweens.py

@@ -92,6 +92,7 b' def junk_form_data_detector(request):'
 
 def sanity_check_factory(handler, registry):
     def sanity_check(request):
+        log.debug('Checking current URL sanity for bad data')
         try:
             junk_encoding_detector(request)
             bad_url_data_detector(request)
@@ -113,5 +114,5 b' def includeme(config):'
                           'pyramid.events.NewRequest')
     config.add_subscriber('rhodecode.subscribers.add_request_user_context',
                           'pyramid.events.ContextFound')
+    config.add_tween('rhodecode.tweens.vcs_detection_tween_factory')
     config.add_tween('rhodecode.tweens.sanity_check_factory')
-    config.add_tween('rhodecode.tweens.vcs_detection_tween_factory')

docs/admin/setting-repo-perms.rst

@@ -1,26 +0,0 b''
-.. _permissions-info-add-group-ref:
-
-Repository Administration
-=========================
-
-Repository permissions in |RCE| can be managed in a number of different ways.
-This overview should give you an insight into how you could adopt particular
-settings for your needs:
-
-* Global |repo| permissions: This allows you to set the default permissions
-  for each new |repo| created within |RCE|, see :ref:`repo-default-ref`. All
-  |repos| created will inherit these permissions unless explicitly configured.
-* Individual |repo| permissions: To set individual |repo| permissions,
-  see :ref:`set-repo-perms`.
-* Repository Group permissions: This allows you to define the permissions for
-  a group, and all |repos| created within that group will inherit the same
-  permissions.
-
-.. toctree::
-
-    repo-perm-steps
-    repo-extra-fields
-    repo-hooks
-    repo-issue-tracker
-    repo-vcs
-

rhodecode/templates/files/file_tree_author_box.mako

@@ -1,12 +0,0 b''
-<%namespace name="base" file="/base/base.mako"/>
-
-<div class="summary-detail-header">
-  <h4 class="item">
-    ${_('Commit Author')}
-  </h4>
-</div>
-<div class="sidebar-right-content">
-    ${base.gravatar_with_user(c.commit.author)}
-    <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div>
-</div>
-