merge with rc1

rhodecode/bin/ldap_sync.conf

@@ -0,0 +1,11 b''
+[default]
+api_url = http://your.rhodecode.server:5000/_admin/api
+api_user = admin
+api_key = XXXXXXXXXXXX
+
+ldap_uri = ldap://your.ldap.server:389
+ldap_user = cn=rhodecode,ou=binders,dc=linaro,dc=org
+ldap_key = XXXXXXXXX
+base_dn = dc=linaro,dc=org
+
+sync_users = True
  No newline at end of file

rhodecode/bin/ldap_sync.py

@@ -0,0 +1,237 b''
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import ldap
+import urllib2
+import uuid
+import json
+
+from ConfigParser import ConfigParser
+
+config = ConfigParser()
+config.read('ldap_sync.conf')
+
+
+class InvalidResponseIDError(Exception):
+    """ Request and response don't have the same UUID. """
+
+
+class RhodecodeResponseError(Exception):
+    """ Response has an error, something went wrong with request execution. """
+
+
+class UserAlreadyInGroupError(Exception):
+    """ User is already a member of the target group. """
+
+
+class UserNotInGroupError(Exception):
+    """ User is not a member of the target group. """
+
+
+class RhodecodeAPI():
+
+    def __init__(self, url, key):
+        self.url = url
+        self.key = key
+
+    def get_api_data(self, uid, method, args):
+        """Prepare dict for API post."""
+        return {
+            "id": uid,
+            "api_key": self.key,
+            "method": method,
+            "args": args
+        }
+
+    def rhodecode_api_post(self, method, args):
+        """Send a generic API post to Rhodecode.
+
+        This will generate the UUID for validation check after the
+        response is returned. Handle errors and get the result back.
+        """
+        uid = str(uuid.uuid1())
+        data = self.get_api_data(uid, method, args)
+
+        data = json.dumps(data)
+        headers = {'content-type': 'text/plain'}
+        req = urllib2.Request(self.url, data, headers)
+
+        response = urllib2.urlopen(req)
+        response = json.load(response)
+
+        if uid != response["id"]:
+            raise InvalidResponseIDError("UUID does not match.")
+
+        if response["error"] != None:
+            raise RhodecodeResponseError(response["error"])
+
+        return response["result"]
+
+    def create_group(self, name, active=True):
+        """Create the Rhodecode user group."""
+        args = {
+            "group_name": name,
+            "active": str(active)
+        }
+        self.rhodecode_api_post("create_users_group", args)
+
+    def add_membership(self, group, username):
+        """Add specific user to a group."""
+        args = {
+            "usersgroupid": group,
+            "userid": username
+        }
+        result = self.rhodecode_api_post("add_user_to_users_group", args)
+        if not result["success"]:
+            raise UserAlreadyInGroupError("User %s already in group %s." %
+                                          (username, group))
+
+    def remove_membership(self, group, username):
+        """Remove specific user from a group."""
+        args = {
+            "usersgroupid": group,
+            "userid": username
+        }
+        result = self.rhodecode_api_post("remove_user_from_users_group", args)
+        if not result["success"]:
+            raise UserNotInGroupError("User %s not in group %s." %
+                                      (username, group))
+
+    def get_group_members(self, name):
+        """Get the list of member usernames from a user group."""
+        args = {"usersgroupid": name}
+        members = self.rhodecode_api_post("get_users_group", args)['members']
+        member_list = []
+        for member in members:
+            member_list.append(member["username"])
+        return member_list
+
+    def get_group(self, name):
+        """Return group info."""
+        args = {"usersgroupid": name}
+        return self.rhodecode_api_post("get_users_group", args)
+
+    def get_user(self, username):
+        """Return user info."""
+        args = {"userid": username}
+        return self.rhodecode_api_post("get_user", args)
+
+
+class LdapClient():
+
+    def __init__(self, uri, user, key, base_dn):
+        self.client = ldap.initialize(uri, trace_level=0)
+        self.client.set_option(ldap.OPT_REFERRALS, 0)
+        self.client.simple_bind(user, key)
+        self.base_dn = base_dn
+
+    def __del__(self):
+        self.client.unbind()
+
+    def get_groups(self):
+        """Get all the groups in form of dict {group_name: group_info,...}."""
+        searchFilter = "objectClass=groupOfUniqueNames"
+        result = self.client.search_s(self.base_dn, ldap.SCOPE_SUBTREE,
+                                      searchFilter)
+
+        groups = {}
+        for group in result:
+            groups[group[1]['cn'][0]] = group[1]
+
+        return groups
+
+    def get_group_users(self, groups, group):
+        """Returns all the users belonging to a single group.
+
+        Based on the list of groups and memberships, returns all the
+        users belonging to a single group, searching recursively.
+        """
+        users = []
+        for member in groups[group]["uniqueMember"]:
+            member = self.parse_member_string(member)
+            if member[0] == "uid":
+                users.append(member[1])
+            elif member[0] == "cn":
+                users += self.get_group_users(groups, member[1])
+
+        return users
+
+    def parse_member_string(self, member):
+        """Parses the member string and returns a touple of type and name.
+
+        Unique member can be either user or group. Users will have 'uid' as
+        prefix while groups will have 'cn'.
+        """
+        member = member.split(",")[0]
+        return member.split('=')
+
+
+class LdapSync(object):
+
+    def __init__(self):
+        self.ldap_client = LdapClient(config.get("default", "ldap_uri"),
+                                      config.get("default", "ldap_user"),
+                                      config.get("default", "ldap_key"),
+                                      config.get("default", "base_dn"))
+        self.rhodocode_api = RhodecodeAPI(config.get("default", "api_url"),
+                                          config.get("default", "api_key"))
+
+    def update_groups_from_ldap(self):
+        """Add all the groups from LDAP to Rhodecode."""
+        added = existing = 0
+        groups = self.ldap_client.get_groups()
+        for group in groups:
+            try:
+                self.rhodecode_api.create_group(group)
+                added += 1
+            except Exception:
+                existing += 1
+
+        return added, existing
+
+    def update_memberships_from_ldap(self, group):
+        """Update memberships in rhodecode based on the LDAP groups."""
+        groups = self.ldap_client.get_groups()
+        group_users = self.ldap_client.get_group_users(groups, group)
+
+        # Delete memberships first from each group which are not part
+        # of the group any more.
+        rhodecode_members = self.rhodecode_api.get_group_members(group)
+        for rhodecode_member in rhodecode_members:
+            if rhodecode_member not in group_users:
+                try:
+                    self.rhodocode_api.remove_membership(group,
+                                                         rhodecode_member)
+                except UserNotInGroupError:
+                    pass
+
+        # Add memberships.
+        for member in group_users:
+            try:
+                self.rhodecode_api.add_membership(group, member)
+            except UserAlreadyInGroupError:
+                # TODO: handle somehow maybe..
+                pass
+
+
+if __name__ == '__main__':
+    sync = LdapSync()
+    print sync.update_groups_from_ldap()
+
+    for gr in sync.ldap_client.get_groups():
+        # TODO: exception when user does not exist during add membership...
+        # How should we handle this.. Either sync users as well at this step,
+        # or just ignore those who don't exist. If we want the second case,
+        # we need to find a way to recognize the right exception (we always get
+        # RhodecodeResponseError with no error code so maybe by return msg (?)
+        sync.update_memberships_from_ldap(gr)

CONTRIBUTORS

@@ -33,3 +33,4 b' List of contributors to RhodeCode projec'
     Philip Jameson <[e-mail]>
     Mads Kiilerich <[e-mail]>
     Dan Sheridan <[e-mail]>
+    Dennis Brakhane <[e-mail]>

README.rst

@@ -75,7 +75,7 b' RhodeCode Features'
 - Supports http/https, LDAP, AD, proxy-pass authentication.
 - Full permissions (private/read/write/admin) together with IP restrictions for each repository,
   additional explicit forking and repository creation permissions.
-- Users groups for easier permission management
+- User groups for easier permission management
 - Repository groups let you group repos and manage them easier.
 - Users can fork other users repos, and compare them at any time.
 - Integrates easily with other systems, with custom created mappers you can connect it to almost

development.ini

@@ -25,7 +25,7 b' pdebug = false'
 #smtp_port = 
 #smtp_use_tls = false
 #smtp_use_ssl = true
-# Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth = 
 
 [server:main]
@@ -41,43 +41,76 b' pdebug = false'
 
 #use = egg:Paste#http
 
-#WAITRESS
+## WAITRESS
 threads = 5
+## 100GB
+max_request_body_size = 107374182400
 use = egg:waitress#main
 
 host = 0.0.0.0
 port = 5000
 
-[filter:proxy-prefix]
-# prefix middleware for rc
-use = egg:PasteDeploy#prefix
-prefix = /<your-prefix>
+## prefix middleware for rc
+#[filter:proxy-prefix]
+#use = egg:PasteDeploy#prefix
+#prefix = /<your-prefix>
 
 [app:main]
 use = egg:rhodecode
+## enable proxy prefix middleware
 #filter-with = proxy-prefix
+
 full_stack = true
 static_files = true
-# Optional Languages
-# en, fr, ja, pt_BR, zh_CN, zh_TW, pl
+## Optional Languages
+## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
-app_instance_uuid = rc-develop
+
+## uncomment and set this path to use archive download cache
+#archive_cache_dir = /tmp/tarballcache
+
+## change this to unique ID for security
+app_instance_uuid = rc-production
+
+## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
-vcs_full_cache = True
+
+## use cache version of scm repo everywhere
+vcs_full_cache = true
+
+## force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
+
+## use Strict-Transport-Security headers
+use_htsts = false
+
+## number of commits stats will parse on each iteration
 commit_parse_limit = 25
-# number of items displayed in lightweight dashboard before paginating
+
+## number of items displayed in lightweight dashboard before paginating is shown
 dashboard_items = 100
+
+## use gravatar service to display avatars
 use_gravatar = true
 
+## path to git executable
+git_path = git
+
+## git rev filter option, --all is the default filter, if you need to
+## hide all refs in changelog switch this to --branches --tags
+git_rev_filter=--all
+
 ## RSS feed options
-
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 
+## options for showing and identifying changesets
+show_sha_length = 12
+show_revision_number = true
+
 
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
@@ -89,8 +122,11 b' rss_include_diff = false'
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 
+
+## container auth options
 container_auth_enabled = false
 proxypass_auth_enabled = false
+
 ## default encoding used to convert from and to unicode
 ## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
@@ -146,6 +182,11 b' instance_id ='
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 
+## locking return code. When repository is locked return this HTTP code. 2XX
+## codes don't break the transactions while 4XX codes do
+lock_ret_code = 423
+
+
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
@@ -170,7 +211,7 b' celeryd.concurrency = 2'
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 
-#tasks will never be sent to the queue, but executed locally instead.
+## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 
 ####################################
@@ -226,18 +267,19 b' beaker.cache.sql_cache_long.key_length ='
 
 
 beaker.session.key = rhodecode
-## secure cookie requires AES python libraries ##
-#beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
-#beaker.session.validate_key = 9712sds2212c--zxc123
+## secure cookie requires AES python libraries
+#beaker.session.encrypt_key = <key_for_encryption>
+#beaker.session.validate_key = <validation_key>
+
 ## sets session as invalid if it haven't been accessed for given amount of time
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
 
-## uncomment for https secure cookie ##
+## uncomment for https secure cookie
 beaker.session.secure = false
 
-## auto save the session to not to use .save() ##
+## auto save the session to not to use .save()
 beaker.session.auto = False
 
 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -252,57 +294,57 b' beaker.session.auto = False'
 ### [errormator] ###
 ####################
 
-# Errormator is tailored to work with RhodeCode, see 
-# http://errormator.com for details how to obtain an account
-# you must install python package `errormator_client` to make it work
+## Errormator is tailored to work with RhodeCode, see 
+## http://errormator.com for details how to obtain an account
+## you must install python package `errormator_client` to make it work
 
-# errormator enabled
-errormator = true
+## errormator enabled
+errormator = false
 
 errormator.server_url = https://api.errormator.com
 errormator.api_key = YOUR_API_KEY
 
-# TWEAK AMOUNT OF INFO SENT HERE
+## TWEAK AMOUNT OF INFO SENT HERE
 
-# enables 404 error logging (default False)
+## enables 404 error logging (default False)
 errormator.report_404 = false
 
-# time in seconds after request is considered being slow (default 1)
+## time in seconds after request is considered being slow (default 1)
 errormator.slow_request_time = 1
 
-# record slow requests in application
-# (needs to be enabled for slow datastore recording and time tracking)
+## record slow requests in application
+## (needs to be enabled for slow datastore recording and time tracking)
 errormator.slow_requests = true
 
-# enable hooking to application loggers
+## enable hooking to application loggers
 # errormator.logging = true
 
-# minimum log level for log capture
+## minimum log level for log capture
 # errormator.logging.level = WARNING
 
-# send logs only from erroneous/slow requests
-# (saves API quota for intensive logging)
+## send logs only from erroneous/slow requests
+## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 
-# list of additonal keywords that should be grabbed from environ object 
-# can be string with comma separated list of words in lowercase
-# (by default client will always send following info:
-# 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
-# start with HTTP* this list be extended with additional keywords here
+## list of additonal keywords that should be grabbed from environ object 
+## can be string with comma separated list of words in lowercase
+## (by default client will always send following info:
+## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
+## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist = 
 
 
-# list of keywords that should be blanked from request object 
-# can be string with comma separated list of words in lowercase
-# (by default client will always blank keys that contain following words 
-# 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
-# this list be extended with additional keywords set here
+## list of keywords that should be blanked from request object 
+## can be string with comma separated list of words in lowercase
+## (by default client will always blank keys that contain following words 
+## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
+## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 
 
-# list of namespaces that should be ignores when gathering log entries
-# can be string with comma separated list of namespaces
-# (by default the client ignores own entries: errormator_client.client)
+## list of namespaces that should be ignores when gathering log entries
+## can be string with comma separated list of namespaces
+## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =  
 
 
@@ -310,8 +352,8 b' errormator.log_namespace_blacklist ='
 ### [sentry] ###
 ################
 
-# sentry is a alternative open source error aggregator
-# you must install python packages `sentry` and `raven` to enable 
+## sentry is a alternative open source error aggregator
+## you must install python packages `sentry` and `raven` to enable 
 
 sentry.dsn = YOUR_DNS
 sentry.servers =
@@ -371,7 +413,7 b' handlers = console'
 level = DEBUG
 handlers = 
 qualname = routes.middleware
-# "level = DEBUG" logs the route matched and routing variables.
+## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 
 [logger_beaker]

docs/api/api.rst

@@ -152,11 +152,34 b' OUTPUT::'
     error :  null
 
 
+invalidate_cache
+----------------
+
+Invalidate cache for repository.
+This command can be executed only using api_key belonging to user with admin
+rights or regular user that have write or admin or write access to repository.
+
+INPUT::
+
+    id : <id_for_response>
+    api_key : "<api_key>"
+    method :  "invalidate_cache"
+    args :    {
+                "repoid" : "<reponame or repo_id>"
+              }
+
+OUTPUT::
+
+    id : <id_given_in_input>
+    result : "Cache for repository `<reponame>` was invalidated: invalidated cache keys: <list_of_cache_keys>"
+    error :  null
+
 lock
 ----
 
 Set locking state on given repository by given user. If userid param is skipped
-, then it is set to id of user whos calling this method.
+, then it is set to id of user whos calling this method. If locked param is skipped
+then function shows current lock state of given repo.
 This command can be executed only using api_key belonging to user with admin 
 rights or regular user that have admin or write access to repository.
 
@@ -168,7 +191,7 b' INPUT::'
     args :    {
                 "repoid" : "<reponame or repo_id>"
                 "userid" : "<user_id or username = Optional(=apiuser)>",
-                "locked" : "<bool true|false>"
+                "locked" : "<bool true|false = Optional(=None)>"
               }
 
 OUTPUT::
@@ -236,6 +259,7 b' OUTPUT::'
     result: None if user does not exist or 
             {
                 "user_id" :     "<user_id>",
+                "api_key" :     "<api_key>",
                 "username" :    "<username>",
                 "firstname":    "<firstname>",
                 "lastname" :    "<lastname>",
@@ -413,7 +437,7 b' OUTPUT::'
 get_users_group
 ---------------
 
-Gets an existing users group. This command can be executed only using api_key
+Gets an existing user group. This command can be executed only using api_key
 belonging to user with admin rights.
 
 
@@ -423,7 +447,7 b' INPUT::'
     api_key : "<api_key>"
     method :  "get_users_group"
     args :    {
-                "usersgroupid" : "<users group id or name>"
+                "usersgroupid" : "<user group id or name>"
               }
 
 OUTPUT::
@@ -456,7 +480,7 b' OUTPUT::'
 get_users_groups
 ----------------
 
-Lists all existing users groups. This command can be executed only using 
+Lists all existing user groups. This command can be executed only using
 api_key belonging to user with admin rights.
 
 
@@ -484,7 +508,7 b' OUTPUT::'
 create_users_group
 ------------------
 
-Creates new users group. This command can be executed only using api_key
+Creates new user group. This command can be executed only using api_key
 belonging to user with admin rights
 
 
@@ -502,7 +526,7 b' OUTPUT::'
 
     id : <id_given_in_input>
     result: {
-              "msg": "created new users group `<groupname>`",
+              "msg": "created new user group `<groupname>`",
               "users_group": {
                      "users_group_id" : "<id>",
                      "group_name" :     "<groupname>",
@@ -515,7 +539,7 b' OUTPUT::'
 add_user_to_users_group
 -----------------------
 
-Adds a user to a users group. If user exists in that group success will be 
+Adds a user to a user group. If user exists in that group success will be
 `false`. This command can be executed only using api_key
 belonging to user with admin rights
 
@@ -526,7 +550,7 b' INPUT::'
     api_key : "<api_key>"
     method :  "add_user_users_group"
     args:     {
-                "usersgroupid" : "<users group id or name>",
+                "usersgroupid" : "<user group id or name>",
                 "userid" : "<user_id or username>",
               }
 
@@ -535,7 +559,7 b' OUTPUT::'
     id : <id_given_in_input>
     result: {
               "success": True|False # depends on if member is in group
-              "msg": "added member `<username>` to users group `<groupname>` | 
+              "msg": "added member `<username>` to user group `<groupname>` |
                       User is already in that group"
             }
     error:  null
@@ -544,7 +568,7 b' OUTPUT::'
 remove_user_from_users_group
 ----------------------------
 
-Removes a user from a users group. If user is not in given group success will
+Removes a user from a user group. If user is not in given group success will
 be `false`. This command can be executed only 
 using api_key belonging to user with admin rights
 
@@ -555,7 +579,7 b' INPUT::'
     api_key : "<api_key>"
     method :  "remove_user_from_users_group"
     args:     {
-                "usersgroupid" : "<users group id or name>",
+                "usersgroupid" : "<user group id or name>",
                 "userid" : "<user_id or username>",
               }
 
@@ -564,7 +588,7 b' OUTPUT::'
     id : <id_given_in_input>
     result: {
               "success":  True|False,  # depends on if member is in group
-              "msg": "removed member <username> from users group <groupname> | 
+              "msg": "removed member <username> from user group <groupname> |
                       User wasn't in group"
             }
     error:  null
@@ -639,6 +663,22 b' OUTPUT::'
                                   },
                                   …
                                 ]
+                 "followers":   [
+                                  {
+                                    "user_id" :     "<user_id>",
+                                    "username" :    "<username>",
+                                    "firstname":    "<firstname>",
+                                    "lastname" :    "<lastname>",
+                                    "email" :       "<email>",
+                                    "emails":       "<list_of_all_additional_emails>",
+                                    "ip_addresses": "<list_of_ip_addresses_for_user>",
+                                    "active" :      "<bool>",
+                                    "admin" :       "<bool>",
+                                    "ldap_dn" :     "<ldap_dn>",
+                                    "last_login":   "<last_login>",
+                                  },
+                                  …
+                 ]
             }
     error:  null
 
@@ -808,8 +848,10 b' OUTPUT::'
 delete_repo
 -----------
 
-Deletes a repository. This command can be executed only using api_key belonging to user with admin 
-rights or regular user that have admin access to repository.
+Deletes a repository. This command can be executed only using api_key belonging
+to user with admin rights or regular user that have admin access to repository.
+When `forks` param is set it's possible to detach or delete forks of deleting
+repository
 
 
 INPUT::
@@ -818,7 +860,8 b' INPUT::'
     api_key : "<api_key>"
     method :  "delete_repo"
     args:     {
-                "repoid" : "<reponame or repo_id>"
+                "repoid" : "<reponame or repo_id>",
+                "forks"  : "`delete` or `detach` = Optional(None)"
               }
 
 OUTPUT::
@@ -890,7 +933,7 b' OUTPUT::'
 grant_users_group_permission
 ----------------------------
 
-Grant permission for users group on given repository, or update
+Grant permission for user group on given repository, or update
 existing one if found. This command can be executed only using 
 api_key belonging to user with admin rights.
 
@@ -902,7 +945,7 b' INPUT::'
     method :  "grant_users_group_permission"
     args:     {
                 "repoid" : "<reponame or repo_id>"
-                "usersgroupid" : "<users group id or name>"
+                "usersgroupid" : "<user group id or name>"
                 "perm" : "(repository.(none|read|write|admin))",
               }
 
@@ -919,7 +962,7 b' OUTPUT::'
 revoke_users_group_permission
 -----------------------------
 
-Revoke permission for users group on given repository.This command can be 
+Revoke permission for user group on given repository.This command can be
 executed only using api_key belonging to user with admin rights.
 
 INPUT::
@@ -929,7 +972,7 b' INPUT::'
     method  : "revoke_users_group_permission"
     args:     {
                 "repoid" : "<reponame or repo_id>"
-                "usersgroupid" : "<users group id or name>"
+                "usersgroupid" : "<user group id or name>"
               }
 
 OUTPUT::
@@ -939,4 +982,4 b' OUTPUT::'
               "msg" : "Revoked perm for group: `<usersgroupname>` in repo: `<reponame>`",
               "success": true
             }
-    error:  null
  No newline at end of file
+    error:  null

docs/api/models.rst

@@ -32,4 +32,4 b' The :mod:`models` Module'
    :members:      
    
 .. automodule:: rhodecode.model.users_group
-   :members:   
  No newline at end of file
+   :members:

docs/changelog.rst

@@ -4,6 +4,82 b''
 Changelog
 =========
 
+1.6.0rc1 (**2013-04-07**)
+-------------------------
+
+news
+++++
+ 
+ - Redesign UI, with lots of small improvements.
+ - Group management delegation. Group admin can manage a group, and repos
+   under it, admin can create child groups inside group he manages.
+ - Repository extra fields. Optional unlimited extra fields can be defined for
+   each repository to store custom data.
+ - API get_repo call includes repo followers now.
+ - Large amounts of improvements in pull requests.
+ - #734 repo switcher is available in all pages.
+ - #733 API invalidate_cache function.
+ - Added option to turn on HSTS headers when using SSL.
+ - #83 show repo size on summary page.
+ - #745 added show full diff link into to big diff message.
+ - Deprecated RSS links - ATOM is the present and the future.
+ - Add option to define custom lexers for custom extensions for code highlight
+   in rcextension module.
+ - Git executable is now configurable via .ini files.
+ - #689 repositories now has optional detach/delete option for connected forks.
+ - Obfuscate password when cloning a remote repo with credentials.
+ - #788 tarball cache. zip or compressed tarballs can be optionally cached for
+   faster serving.
+ - Speed up of last_changeset extraction in VCS.
+ - API get_locks function.
+ - Configurable HTTP codes for repository locking.
+ - Possible to use closed branches in ?branch= in changelog.
+ - Linaro's ldap sync scripts.
+ - #797 git refs filter is now configurable via .ini file.
+ - New ishell paster command for easier administrative tasks.
+ 
+fixes
++++++
+
+ - #654 switch to handles `/` in branch/tag/bookmark names.
+ - #572 moved out password reset tasks from celery.
+ - #730 filter out repo groups choices to only ones that you have write+ access.
+ - #462 disable file editing when not on branch head.
+ - #731 update-repoinfo sometimes failed to update data when changesets were
+   initial commits.
+ - #749,#805 and #516 Removed duplication of repo settings for rhodecode admins
+   and repo admins. 
+ - Global permission update with "overwrite existing settings" shouldn't 
+   override private repositories.
+ - #642 added recursion limit for stats gathering.
+ - #739 Delete/Edit repositories should only point to admin links if the user
+   is an super admin.
+ - Fixed escaping of html in "patch" view for GIT repos.
+ - #747 load changeset cache after forking to refresh lightweight dashboard caches.
+ - Quick repo list: public/private icon control should only control icons,
+   not repo visibility.
+ - #746 UnicodeDedode errors on feed controllers.
+ - #756 cleanup repos didn't properly compose paths of repos to be cleaned up.
+ - #763 gravatar helper function should fallback into default image if somehow
+   email provided is empty.
+ - Fixes #762, LDAP and container created users are now activated based on
+   the registration settings in permissions.
+ - Cleanup would recurse into every leaf and could thus not be used on lots of
+   large repositories.
+ - Better detection of deleting groups with subgroups inside.
+ - Fixed issue with renaming repos group together with changing parents with
+   multiple nested trees.
+ - #594 web interface file committing executes push hooks.
+ - Disallow cloning from different URI's that http[s]/svn/git/hg.
+ - Handling of RhodeCode extra params in consistent way.
+ - Don't normalize path if it's empty on adding a file through web interface.
+ - #808 missing changesets and files should return 404 not redirect
+ - #809 added url quote in clone url.
+ - Fixed issues with importing non-ascii repo names.
+ - Automatically assign instance_id for host and process if it has been set to *
+ - Fixed multiple IP addresses in each of extracted IP.
+ - Lot of other small bug fixes and improvements.
+  
 1.5.4 (**2013-03-13**)
 ----------------------
 
@@ -21,7 +97,7 b' fixes'
 - fixes #762 user global activation flag is also respected for LDAP created
   accounts
 - use password obfuscate when clonning a remote repo with credentials inside	
-- fixed issue with renaming repos group together with changing parents
+- fixed issue with renaming repository group together with changing parents
 - disallow cloning from file:/// URIs
 - handle all cases with multiple IP addresses in proxy headers
 
@@ -95,6 +171,7 b' fixes'
 - fixed changeset status labels, they now select radio buttons
 - #682 translation difficult for multi-line text
 - #683 fixed difference between messages about not mapped repositories
+- email: fail nicely when no SMTP server has been configured
 
 1.5.0 (**2012-12-12**)
 ----------------------
@@ -147,8 +224,8 b' fixes'
   When this is used together with mercurial internal translation system
   it can lead to UnicodeDecodeErrors
 - fixes #645 Fix git handler when doing delete remote branch
-- implements #649 added two seperate method for author and commiter to VCS
-  changeset class switch author for git backed to be the real author not commiter
+- implements #649 added two seperate method for author and committer to VCS
+  changeset class switch author for git backed to be the real author not committer
 - fix issue #504 RhodeCode is showing different versions of README on
   different summary page loads
 - implemented #658 Changing username in LDAP-Mode should not be allowed.
@@ -204,7 +281,7 b' news'
 fixes
 +++++
 
-- fixed #570 explicit users group permissions can overwrite owner permissions
+- fixed #570 explicit user group permissions can overwrite owner permissions
 - fixed #578 set proper PATH with current Python for Git
   hooks to execute within same Python as RhodeCode 
 - fixed issue with Git bare repos that ends with .git in name
@@ -226,7 +303,7 b' news'
 fixes
 +++++
 
-- fixed visual permissions check on repos groups inside groups
+- fixed visual permissions check on repository groups inside groups
 - fixed issues with non-ascii search terms in search, and indexers
 - fixed parsing of page number in GET parameters
 - fixed issues with generating pull-request overview for repos with
@@ -393,7 +470,7 b' news'
 - created rcextensions module with additional mappings (ref #322) and
   post push/pull/create repo hooks callbacks
 - implemented #377 Users view for his own permissions on account page
-- #399 added inheritance of permissions for users group on repos groups
+- #399 added inheritance of permissions for user group on repository groups
 - #401 repository group is automatically pre-selected when adding repos 
   inside a repository group
 - added alternative HTTP 403 response when client failed to authenticate. Helps 
@@ -528,7 +605,7 b' fixes'
   and groups
 - fixes #271 rare JSON serialization problem with statistics
 - fixes #337 missing validation check for conflicting names of a group with a
-  repositories group
+  repository group
 - #340 fixed session problem for mysql and celery tasks
 - fixed #331 RhodeCode mangles repository names if the a repository group 
   contains the "full path" to the repositories
@@ -587,7 +664,7 b' 1.2.3 (**2011-11-02**)'
 news
 ++++
 
-- added option to manage repos group for non admin users
+- added option to manage repository group for non admin users
 - added following API methods for get_users, create_user, get_users_groups, 
   get_users_group, create_users_group, add_user_to_users_groups, get_repos, 
   get_repo, create_repo, add_user_to_repo
@@ -662,7 +739,7 b' news'
 - implemented #93 customizable changelog on combined revision ranges - 
   equivalent of githubs compare view 
 - implemented #108 extended and more powerful LDAP configuration
-- implemented #56 users groups
+- implemented #56 user groups
 - major code rewrites optimized codes for speed and memory usage
 - raw and diff downloads are now in git format
 - setup command checks for write access to given path

docs/index.rst

@@ -61,4 +61,4 b' Other topics'
 .. _git: http://git-scm.com/
 .. _celery: http://celeryproject.org/
 .. _Sphinx: http://sphinx.pocoo.org/
-.. _vcs: http://pypi.python.org/pypi/vcs
  No newline at end of file
+.. _vcs: http://pypi.python.org/pypi/vcs

docs/setup.rst

@@ -478,7 +478,7 b' Changing default encoding'
 
 By default RhodeCode uses utf8 encoding, starting from 1.3 series this
 can be changed, simply edit default_encoding in .ini file to desired one.
-This affects many parts in rhodecode including commiters names, filenames,
+This affects many parts in rhodecode including committers names, filenames,
 encoding of commit messages. In addition RhodeCode can detect if `chardet`
 library is installed. If `chardet` is detected RhodeCode will fallback to it
 when there are encode/decode errors.
@@ -652,7 +652,7 b' Add the following at the end of the .ini'
     prefix = /<someprefix>
 
 
-then change <someprefix> into your choosen prefix
+then change <someprefix> into your chosen prefix
 
 Apache's WSGI config
 --------------------

docs/theme/nature/static/pygments.css

@@ -51,4 +51,4 b''
 .vc { color: #ff99ff } /* Name.Variable.Class */
 .vg { color: #ff99ff } /* Name.Variable.Global */
 .vi { color: #ff99ff } /* Name.Variable.Instance */
-.il { color: #009999 } /* Literal.Number.Integer.Long */
  No newline at end of file
+.il { color: #009999 } /* Literal.Number.Integer.Long */

docs/usage/backup.rst

@@ -23,4 +23,4 b' Database'
 When using sqlite just copy rhodecode.db.
 Any other database engine requires a manual backup operation.
 
-Database backup will contain all gathered statistics
  No newline at end of file
+Database backup will contain all gathered statistics

docs/usage/general.rst

@@ -38,7 +38,7 b' Compare view from changelog'
 Checkboxes in compare view allow users to view combined compare view. You can
 only show the range between the first and last checkbox (no cherry pick).
 Clicking more than one checkbox will activate a link in top saying
-`Show selected changes <from-rev> -> <to-rev>` clicking this will bring
+`Show selected changesets <from-rev> -> <to-rev>` clicking this will bring
 compare view. In this view also it's possible to switch to combined compare.
 
 Compare view is also available from the journal on pushes having more than
@@ -105,7 +105,7 b' Currently it support following options:'
 
 .. note::
 
-    * `svn -> hg` cloning requires `hgsubversion` library to be installed.*
+    - *`svn -> hg` cloning requires `hgsubversion` library to be installed.*
 
 If you need to clone repositories that are protected via basic auth, you
 might pass the url with stored credentials inside eg.

docs/usage/git_support.rst

@@ -52,4 +52,4 b' file **rhodecode/__init__.py** and comme'
    }
 
 .. _waitress: http://pypi.python.org/pypi/waitress
-.. _gunicorn: http://pypi.python.org/pypi/gunicorn
  No newline at end of file
+.. _gunicorn: http://pypi.python.org/pypi/gunicorn

docs/usage/locking.rst

@@ -38,4 +38,4 b' every initial clone and every pull gives'
 the exclusive right to do a push.
 
 
-Each repo can be manually unlocked by admin from the repo settings menu.
  No newline at end of file
+Each repo can be manually unlocked by admin from the repo settings menu.

docs/usage/performance.rst

@@ -13,7 +13,8 b' the best performance.'
   more important to have faster disk than faster CPU.
 
 * Slowness on initial page can be easily fixed by grouping repositories, and/or
-  increasing cache size (see below)
+  increasing cache size (see below), that includes using lightweight dashboard
+  option and vcs_full_cache setting in .ini file
 
 
 Follow these few steps to improve performance of RhodeCode system.
@@ -41,10 +42,21 b' 2. Switch from sqlite to postgres or mys'
     
 3. Scale RhodeCode horizontally
 
-    - running two or more instances on the same server can speed up things a lot
-    - load balance using round robin or ip hash
-    - you need to handle consistent user session storage by switching to 
-      db sessions, client side sessions or sharing session data folder across 
-      instances. See http://beaker.readthedocs.org/ docs for details.
-    - remember that each instance needs it's own .ini file and unique
-      `instance_id` set in them
  No newline at end of file
+    Scaling horizontally can give huge performance increase when dealing with
+    large traffic (large amount of users, CI servers etc). RhodeCode can be
+    scaled horizontally on one (recommended) or multiple machines. In order
+    to scale horizontally you need to do the following:
+
+    - each instance needs it's own .ini file and unique `instance_id` set in them
+    - each instance `data` storage needs to be configured to be stored on a
+      shared disk storage, preferably together with repositories. This `data`
+      dir contains template caches, sessions, whoosh index and it's used for
+      tasks locking (so it's safe across multiple instances). Set the
+      `cache_dir`, `index_dir`, `beaker.cache.data_dir`, `beaker.cache.lock_dir`
+      variables in each .ini file to shared location across RhodeCode instances
+    - if celery is used each instance should run separate celery instance, but
+      the message broken should be common to all of them (ex one rabbitmq
+      shared server)
+    - load balance using round robin or ip hash, recommended is writing LB rules
+      that will separate regular user traffic from automated processes like CI
+      servers or build bots.

docs/usage/subrepos.rst

@@ -34,4 +34,4 b' Next we can edit the subrepo data, and p'
 both of repositories.
 
 see http://mercurial.aragost.com/kick-start/en/subrepositories/ for more
-information about subrepositories   
  No newline at end of file
+information about subrepositories

init.d/rhodecode-daemon2

@@ -14,17 +14,17 b''
 ### END INIT INFO
 
 APP_NAME="rhodecode"
-APP_HOMEDIR="marcink/python_workspace"
-APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
+APP_HOMEDIR="opt"
+APP_PATH="/$APP_HOMEDIR/$APP_NAME"
 
 CONF_NAME="production.ini"
 
 PID_PATH="$APP_PATH/$APP_NAME.pid"
 LOG_PATH="$APP_PATH/$APP_NAME.log"
 
-PYTHON_PATH="/home/$APP_HOMEDIR/v-env"
+PYTHON_PATH="/$APP_HOMEDIR/$APP_NAME-venv"
 
-RUN_AS="marcink"
+RUN_AS="root"
 
 DAEMON="$PYTHON_PATH/bin/paster"
 
@@ -55,7 +55,21 b' stop() {'
   fi
 }
 
+status() {
+  echo -n "Checking status of $APP_NAME ... "
+  pid=`cat $PID_PATH`
+  status=`ps ax | grep $pid | grep -ve grep`
+  if [ "$?" -eq 0 ]; then
+    echo "running"
+  else
+    echo "NOT running"
+  fi
+}
+ 
 case "$1" in
+  status)
+   status
+    ;;
   start)
     start
     ;;
@@ -73,4 +87,4 b' case "$1" in'
   *)
     echo "Usage: $0 {start|stop|restart}"
     exit 1
-esac
+esac
  No newline at end of file

production.ini

@@ -25,7 +25,7 b' pdebug = false'
 #smtp_port = 
 #smtp_use_tls = false
 #smtp_use_ssl = true
-# Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth = 
 
 [server:main]
@@ -41,43 +41,76 b' pdebug = false'
 
 #use = egg:Paste#http
 
-#WAITRESS
+## WAITRESS
 threads = 5
+## 100GB
+max_request_body_size = 107374182400
 use = egg:waitress#main
 
 host = 127.0.0.1
 port = 8001
 
-[filter:proxy-prefix]
-# prefix middleware for rc
-use = egg:PasteDeploy#prefix
-prefix = /<your-prefix>
+## prefix middleware for rc
+#[filter:proxy-prefix]
+#use = egg:PasteDeploy#prefix
+#prefix = /<your-prefix>
 
 [app:main]
 use = egg:rhodecode
+## enable proxy prefix middleware
 #filter-with = proxy-prefix
+
 full_stack = true
 static_files = true
-# Optional Languages
-# en, fr, ja, pt_BR, zh_CN, zh_TW, pl
+## Optional Languages
+## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
+
+## uncomment and set this path to use archive download cache
+#archive_cache_dir = /tmp/tarballcache
+
+## change this to unique ID for security
 app_instance_uuid = rc-production
+
+## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
-vcs_full_cache = True
+
+## use cache version of scm repo everywhere
+vcs_full_cache = true
+
+## force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
-commit_parse_limit = 50
-# number of items displayed in lightweight dashboard before paginating
+
+## use Strict-Transport-Security headers
+use_htsts = false
+
+## number of commits stats will parse on each iteration
+commit_parse_limit = 25
+
+## number of items displayed in lightweight dashboard before paginating is shown
 dashboard_items = 100
+
+## use gravatar service to display avatars
 use_gravatar = true
 
+## path to git executable
+git_path = git
+
+## git rev filter option, --all is the default filter, if you need to
+## hide all refs in changelog switch this to --branches --tags
+git_rev_filter=--all
+
 ## RSS feed options
-
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 
+## options for showing and identifying changesets
+show_sha_length = 12
+show_revision_number = true
+
 
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
@@ -89,8 +122,11 b' rss_include_diff = false'
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 
+
+## container auth options
 container_auth_enabled = false
 proxypass_auth_enabled = false
+
 ## default encoding used to convert from and to unicode
 ## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
@@ -146,6 +182,11 b' instance_id ='
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 
+## locking return code. When repository is locked return this HTTP code. 2XX
+## codes don't break the transactions while 4XX codes do
+lock_ret_code = 423
+
+
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
@@ -170,7 +211,7 b' celeryd.concurrency = 2'
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 
-#tasks will never be sent to the queue, but executed locally instead.
+## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 
 ####################################
@@ -226,18 +267,19 b' beaker.cache.sql_cache_long.key_length ='
 
 
 beaker.session.key = rhodecode
-## secure cookie requires AES python libraries ##
-#beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
-#beaker.session.validate_key = 9712sds2212c--zxc123
+## secure cookie requires AES python libraries
+#beaker.session.encrypt_key = <key_for_encryption>
+#beaker.session.validate_key = <validation_key>
+
 ## sets session as invalid if it haven't been accessed for given amount of time
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
 
-## uncomment for https secure cookie ##
+## uncomment for https secure cookie
 beaker.session.secure = false
 
-## auto save the session to not to use .save() ##
+## auto save the session to not to use .save()
 beaker.session.auto = False
 
 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -252,57 +294,57 b' beaker.session.auto = False'
 ### [errormator] ###
 ####################
 
-# Errormator is tailored to work with RhodeCode, see 
-# http://errormator.com for details how to obtain an account
-# you must install python package `errormator_client` to make it work
+## Errormator is tailored to work with RhodeCode, see 
+## http://errormator.com for details how to obtain an account
+## you must install python package `errormator_client` to make it work
 
-# errormator enabled
-errormator = true
+## errormator enabled
+errormator = false
 
 errormator.server_url = https://api.errormator.com
 errormator.api_key = YOUR_API_KEY
 
-# TWEAK AMOUNT OF INFO SENT HERE
+## TWEAK AMOUNT OF INFO SENT HERE
 
-# enables 404 error logging (default False)
+## enables 404 error logging (default False)
 errormator.report_404 = false
 
-# time in seconds after request is considered being slow (default 1)
+## time in seconds after request is considered being slow (default 1)
 errormator.slow_request_time = 1
 
-# record slow requests in application
-# (needs to be enabled for slow datastore recording and time tracking)
+## record slow requests in application
+## (needs to be enabled for slow datastore recording and time tracking)
 errormator.slow_requests = true
 
-# enable hooking to application loggers
+## enable hooking to application loggers
 # errormator.logging = true
 
-# minimum log level for log capture
+## minimum log level for log capture
 # errormator.logging.level = WARNING
 
-# send logs only from erroneous/slow requests
-# (saves API quota for intensive logging)
+## send logs only from erroneous/slow requests
+## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 
-# list of additonal keywords that should be grabbed from environ object 
-# can be string with comma separated list of words in lowercase
-# (by default client will always send following info:
-# 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
-# start with HTTP* this list be extended with additional keywords here
+## list of additonal keywords that should be grabbed from environ object 
+## can be string with comma separated list of words in lowercase
+## (by default client will always send following info:
+## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
+## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist = 
 
 
-# list of keywords that should be blanked from request object 
-# can be string with comma separated list of words in lowercase
-# (by default client will always blank keys that contain following words 
-# 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
-# this list be extended with additional keywords set here
+## list of keywords that should be blanked from request object 
+## can be string with comma separated list of words in lowercase
+## (by default client will always blank keys that contain following words 
+## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
+## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 
 
-# list of namespaces that should be ignores when gathering log entries
-# can be string with comma separated list of namespaces
-# (by default the client ignores own entries: errormator_client.client)
+## list of namespaces that should be ignores when gathering log entries
+## can be string with comma separated list of namespaces
+## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =  
 
 
@@ -310,8 +352,8 b' errormator.log_namespace_blacklist ='
 ### [sentry] ###
 ################
 
-# sentry is a alternative open source error aggregator
-# you must install python packages `sentry` and `raven` to enable 
+## sentry is a alternative open source error aggregator
+## you must install python packages `sentry` and `raven` to enable 
 
 sentry.dsn = YOUR_DNS
 sentry.servers =
@@ -371,7 +413,7 b' handlers = console'
 level = DEBUG
 handlers = 
 qualname = routes.middleware
-# "level = DEBUG" logs the route matched and routing variables.
+## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 
 [logger_beaker]

rhodecode/__init__.py

@@ -26,7 +26,7 b''
 import sys
 import platform
 
-VERSION = (1, 5, 4)
+VERSION = (1, 6, 0, 'rc1')
 
 try:
     from rhodecode.lib import get_current_revision
@@ -38,7 +38,7 b' except ImportError:'
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])) +
                '.'.join(VERSION[3:]))
-__dbversion__ = 10  # defines current db version for migrations
+__dbversion__ = 11  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'GPLv3'
 __py_version__ = sys.version_info

rhodecode/bin/rhodecode_api.py

@@ -238,7 +238,7 b' def main(argv=None):'
 
     try:
         margs = dict(map(lambda s: s.split(':', 1), other))
-    except:
+    except Exception:
         sys.stderr.write('Error parsing arguments \n')
         sys.exit()
 

rhodecode/config/deployment.ini_tmpl

@@ -25,7 +25,7 b' pdebug = false'
 #smtp_port = 
 #smtp_use_tls = false
 #smtp_use_ssl = true
-# Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
+## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth = 
 
 [server:main]
@@ -41,43 +41,76 b' pdebug = false'
 
 #use = egg:Paste#http
 
-#WAITRESS
+## WAITRESS
 threads = 5
+## 100GB
+max_request_body_size = 107374182400
 use = egg:waitress#main
 
 host = 127.0.0.1
 port = 5000
 
-[filter:proxy-prefix]
-# prefix middleware for rc
-use = egg:PasteDeploy#prefix
-prefix = /<your-prefix>
+## prefix middleware for rc
+#[filter:proxy-prefix]
+#use = egg:PasteDeploy#prefix
+#prefix = /<your-prefix>
 
 [app:main]
 use = egg:rhodecode
+## enable proxy prefix middleware
 #filter-with = proxy-prefix
+
 full_stack = true
 static_files = true
-# Optional Languages
-# en, fr, ja, pt_BR, zh_CN, zh_TW, pl
+## Optional Languages
+## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
+
+## uncomment and set this path to use archive download cache
+#archive_cache_dir = /tmp/tarballcache
+
+## change this to unique ID for security
 app_instance_uuid = ${app_instance_uuid}
+
+## cut off limit for large diffs (size in bytes)
 cut_off_limit = 256000
-vcs_full_cache = True
+
+## use cache version of scm repo everywhere
+vcs_full_cache = true
+
+## force https in RhodeCode, fixes https redirects, assumes it's always https
 force_https = false
-commit_parse_limit = 50
-# number of items displayed in lightweight dashboard before paginating
+
+## use Strict-Transport-Security headers
+use_htsts = false
+
+## number of commits stats will parse on each iteration
+commit_parse_limit = 25
+
+## number of items displayed in lightweight dashboard before paginating is shown
 dashboard_items = 100
+
+## use gravatar service to display avatars
 use_gravatar = true
 
+## path to git executable
+git_path = git
+
+## git rev filter option, --all is the default filter, if you need to
+## hide all refs in changelog switch this to --branches --tags
+git_rev_filter=--all
+
 ## RSS feed options
-
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 
+## options for showing and identifying changesets
+show_sha_length = 12
+show_revision_number = true
+
 
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
@@ -89,8 +122,11 b' rss_include_diff = false'
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
 
+
+## container auth options
 container_auth_enabled = false
 proxypass_auth_enabled = false
+
 ## default encoding used to convert from and to unicode
 ## can be also a comma seperated list of encoding in case of mixed encodings
 default_encoding = utf8
@@ -146,6 +182,11 b' instance_id ='
 ## handling that. Set this variable to 403 to return HTTPForbidden
 auth_ret_code =
 
+## locking return code. When repository is locked return this HTTP code. 2XX
+## codes don't break the transactions while 4XX codes do
+lock_ret_code = 423
+
+
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
@@ -170,7 +211,7 b' celeryd.concurrency = 2'
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 
-#tasks will never be sent to the queue, but executed locally instead.
+## tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 
 ####################################
@@ -226,18 +267,19 b' beaker.cache.sql_cache_long.key_length ='
 
 
 beaker.session.key = rhodecode
-## secure cookie requires AES python libraries ##
-#beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
-#beaker.session.validate_key = 9712sds2212c--zxc123
+## secure cookie requires AES python libraries
+#beaker.session.encrypt_key = <key_for_encryption>
+#beaker.session.validate_key = <validation_key>
+
 ## sets session as invalid if it haven't been accessed for given amount of time
 beaker.session.timeout = 2592000
 beaker.session.httponly = true
 #beaker.session.cookie_path = /<your-prefix>
 
-## uncomment for https secure cookie ##
+## uncomment for https secure cookie
 beaker.session.secure = false
 
-## auto save the session to not to use .save() ##
+## auto save the session to not to use .save()
 beaker.session.auto = False
 
 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -252,57 +294,57 b' beaker.session.auto = False'
 ### [errormator] ###
 ####################
 
-# Errormator is tailored to work with RhodeCode, see 
-# http://errormator.com for details how to obtain an account
-# you must install python package `errormator_client` to make it work
+## Errormator is tailored to work with RhodeCode, see 
+## http://errormator.com for details how to obtain an account
+## you must install python package `errormator_client` to make it work
 
-# errormator enabled
-errormator = true
+## errormator enabled
+errormator = false
 
 errormator.server_url = https://api.errormator.com
 errormator.api_key = YOUR_API_KEY
 
-# TWEAK AMOUNT OF INFO SENT HERE
+## TWEAK AMOUNT OF INFO SENT HERE
 
-# enables 404 error logging (default False)
+## enables 404 error logging (default False)
 errormator.report_404 = false
 
-# time in seconds after request is considered being slow (default 1)
+## time in seconds after request is considered being slow (default 1)
 errormator.slow_request_time = 1
 
-# record slow requests in application
-# (needs to be enabled for slow datastore recording and time tracking)
+## record slow requests in application
+## (needs to be enabled for slow datastore recording and time tracking)
 errormator.slow_requests = true
 
-# enable hooking to application loggers
+## enable hooking to application loggers
 # errormator.logging = true
 
-# minimum log level for log capture
+## minimum log level for log capture
 # errormator.logging.level = WARNING
 
-# send logs only from erroneous/slow requests
-# (saves API quota for intensive logging)
+## send logs only from erroneous/slow requests
+## (saves API quota for intensive logging)
 errormator.logging_on_error = false
 
-# list of additonal keywords that should be grabbed from environ object 
-# can be string with comma separated list of words in lowercase
-# (by default client will always send following info:
-# 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
-# start with HTTP* this list be extended with additional keywords here
+## list of additonal keywords that should be grabbed from environ object 
+## can be string with comma separated list of words in lowercase
+## (by default client will always send following info:
+## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that 
+## start with HTTP* this list be extended with additional keywords here
 errormator.environ_keys_whitelist = 
 
 
-# list of keywords that should be blanked from request object 
-# can be string with comma separated list of words in lowercase
-# (by default client will always blank keys that contain following words 
-# 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
-# this list be extended with additional keywords set here
+## list of keywords that should be blanked from request object 
+## can be string with comma separated list of words in lowercase
+## (by default client will always blank keys that contain following words 
+## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
+## this list be extended with additional keywords set here
 errormator.request_keys_blacklist =
 
 
-# list of namespaces that should be ignores when gathering log entries
-# can be string with comma separated list of namespaces
-# (by default the client ignores own entries: errormator_client.client)
+## list of namespaces that should be ignores when gathering log entries
+## can be string with comma separated list of namespaces
+## (by default the client ignores own entries: errormator_client.client)
 errormator.log_namespace_blacklist =  
 
 
@@ -310,8 +352,8 b' errormator.log_namespace_blacklist ='
 ### [sentry] ###
 ################
 
-# sentry is a alternative open source error aggregator
-# you must install python packages `sentry` and `raven` to enable 
+## sentry is a alternative open source error aggregator
+## you must install python packages `sentry` and `raven` to enable 
 
 sentry.dsn = YOUR_DNS
 sentry.servers =
@@ -381,7 +423,7 b' handlers = console'
 level = DEBUG
 handlers = 
 qualname = routes.middleware
-# "level = DEBUG" logs the route matched and routing variables.
+## "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 
 [logger_beaker]

rhodecode/config/environment.py

@@ -20,6 +20,7 b' from rhodecode.lib.auth import set_avail'
 from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config,\
     load_rcextensions, check_git_version
 from rhodecode.lib.utils2 import engine_from_config, str2bool
+from rhodecode.lib.db_manage import DbManage
 from rhodecode.model import init_model
 from rhodecode.model.scm import ScmModel
 
@@ -88,7 +89,7 b' def load_environment(global_conf, app_co'
 
     #check git version
     check_git_version()
-
+    DbManage.check_waitress()
     # MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
     sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
@@ -100,6 +101,12 b' def load_environment(global_conf, app_co'
     set_available_permissions(config)
     config['base_path'] = repos_path
     set_rhodecode_config(config)
+
+    instance_id = rhodecode.CONFIG.get('instance_id')
+    if instance_id == '*':
+        instance_id = '%s-%s' % (os.uname()[1], os.getpid())
+        rhodecode.CONFIG['instance_id'] = instance_id
+
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
 

rhodecode/config/middleware.py

@@ -15,6 +15,7 b' from rhodecode.lib.middleware.simplehg i'
 from rhodecode.lib.middleware.simplegit import SimpleGit
 from rhodecode.lib.middleware.https_fixup import HttpsFixup
 from rhodecode.config.environment import load_environment
+from rhodecode.lib.middleware.wrapper import RequestWrapper
 
 
 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
@@ -55,7 +56,7 b' def make_app(global_conf, full_stack=Tru'
 
         from rhodecode.lib.middleware.sentry import Sentry
         from rhodecode.lib.middleware.errormator import Errormator
-        if Errormator:
+        if Errormator and asbool(config['app_conf'].get('errormator')):
             app = Errormator(app, config)
         elif Sentry:
             app = Sentry(app, config)
@@ -67,7 +68,7 b' def make_app(global_conf, full_stack=Tru'
         # need any pylons stack middleware in them
         app = SimpleHg(app, config)
         app = SimpleGit(app, config)
-
+        app = RequestWrapper(app, config)
         # Display error documents for 401, 403, 404 status codes (and
         # 500 when debug is disabled)
         if asbool(config['debug']):

rhodecode/config/rcextensions/__init__.py

@@ -6,6 +6,14 b''
 # build by pygments
 EXTRA_MAPPINGS = {}
 
+# additional lexer definitions for custom files
+# it's overrides pygments lexers, and uses defined name of lexer to colorize the
+# files. Format is {'ext': 'lexer_name'}
+# List of lexers can be printed running:
+# python -c "import pprint;from pygments import lexers;pprint.pprint([(x[0], x[1]) for x in lexers.get_all_lexers()]);"
+
+EXTRA_LEXERS = {}
+
 #==============================================================================
 # WHOOSH INDEX EXTENSIONS
 #==============================================================================

rhodecode/config/routing.py

@@ -41,21 +41,32 b' def make_map(config):'
             if len(by_id) == 2 and by_id[1].isdigit() and by_id[0] == '':
                 repo_name = Repository.get(by_id[1]).repo_name
                 match_dict['repo_name'] = repo_name
-        except:
+        except Exception:
             pass
 
         return is_valid_repo(repo_name, config['base_path'])
 
     def check_group(environ, match_dict):
         """
-        check for valid repositories group for proper 404 handling
+        check for valid repository group for proper 404 handling
 
         :param environ:
         :param match_dict:
         """
         repos_group_name = match_dict.get('group_name')
+        return is_valid_repos_group(repos_group_name, config['base_path'])
 
-        return is_valid_repos_group(repos_group_name, config['base_path'])
+    def check_group_skip_path(environ, match_dict):
+        """
+        check for valid repository group for proper 404 handling, but skips
+        verification of existing path
+
+        :param environ:
+        :param match_dict:
+        """
+        repos_group_name = match_dict.get('group_name')
+        return is_valid_repos_group(repos_group_name, config['base_path'],
+                                    skip_path_check=True)
 
     def check_int(environ, match_dict):
         return match_dict.get('id').isdigit()
@@ -93,19 +104,14 b' def make_map(config):'
         m.connect("formatted_repos", "/repos.{format}",
              action="index",
             conditions=dict(method=["GET"]))
-        m.connect("new_repo", "/repos/new",
-             action="new", conditions=dict(method=["GET"]))
-        m.connect("formatted_new_repo", "/repos/new.{format}",
-             action="new", conditions=dict(method=["GET"]))
+        m.connect("new_repo", "/create_repository",
+                  action="create_repository", conditions=dict(method=["GET"]))
         m.connect("/repos/{repo_name:.*?}",
              action="update", conditions=dict(method=["PUT"],
                                               function=check_repo))
         m.connect("/repos/{repo_name:.*?}",
              action="delete", conditions=dict(method=["DELETE"],
                                               function=check_repo))
-        m.connect("edit_repo", "/repos/{repo_name:.*?}/edit",
-             action="edit", conditions=dict(method=["GET"],
-                                            function=check_repo))
         m.connect("formatted_edit_repo", "/repos/{repo_name:.*?}.{format}/edit",
              action="edit", conditions=dict(method=["GET"],
                                             function=check_repo))
@@ -115,6 +121,11 b' def make_map(config):'
         m.connect("formatted_repo", "/repos/{repo_name:.*?}.{format}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
+        #add repo perm member
+        m.connect('set_repo_perm_member', "/set_repo_perm_member/{repo_name:.*?}",
+             action="set_repo_perm_member",
+             conditions=dict(method=["POST"], function=check_repo))
+
         #ajax delete repo perm user
         m.connect('delete_repo_user', "/repos_delete_user/{repo_name:.*?}",
              action="delete_perm_user",
@@ -145,6 +156,18 b' def make_map(config):'
         m.connect('repo_locking', "/repo_locking/{repo_name:.*?}",
                   action="repo_locking", conditions=dict(method=["PUT"],
                                                       function=check_repo))
+        m.connect('toggle_locking', "/locking_toggle/{repo_name:.*?}",
+                  action="toggle_locking", conditions=dict(method=["GET"],
+                                                      function=check_repo))
+
+        #repo fields
+        m.connect('create_repo_fields', "/repo_fields/{repo_name:.*?}/new",
+                  action="create_repo_field", conditions=dict(method=["PUT"],
+                                                      function=check_repo))
+
+        m.connect('delete_repo_fields', "/repo_fields/{repo_name:.*?}/{field_id}",
+                  action="delete_repo_field", conditions=dict(method=["DELETE"],
+                                                      function=check_repo))
 
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/repos_groups') as m:
@@ -158,33 +181,34 b' def make_map(config):'
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_repos_group", "/repos_groups/new.{format}",
                   action="new", conditions=dict(method=["GET"]))
-        m.connect("update_repos_group", "/repos_groups/{id}",
+        m.connect("update_repos_group", "/repos_groups/{group_name:.*?}",
                   action="update", conditions=dict(method=["PUT"],
-                                                   function=check_int))
-        m.connect("delete_repos_group", "/repos_groups/{id}",
+                                                   function=check_group))
+        m.connect("delete_repos_group", "/repos_groups/{group_name:.*?}",
                   action="delete", conditions=dict(method=["DELETE"],
-                                                   function=check_int))
-        m.connect("edit_repos_group", "/repos_groups/{id:.*?}/edit",
-                  action="edit", conditions=dict(method=["GET"],))
-        m.connect("formatted_edit_repos_group",
-                  "/repos_groups/{id}.{format}/edit",
+                                                   function=check_group_skip_path))
+        m.connect("edit_repos_group", "/repos_groups/{group_name:.*?}/edit",
                   action="edit", conditions=dict(method=["GET"],
-                                                 function=check_int))
-        m.connect("repos_group", "/repos_groups/{id}",
+                                                 function=check_group))
+        m.connect("formatted_edit_repos_group",
+                  "/repos_groups/{group_name:.*?}.{format}/edit",
+                  action="edit", conditions=dict(method=["GET"],
+                                                 function=check_group))
+        m.connect("repos_group", "/repos_groups/{group_name:.*?}",
                   action="show", conditions=dict(method=["GET"],
-                                                 function=check_int))
-        m.connect("formatted_repos_group", "/repos_groups/{id}.{format}",
+                                                 function=check_group))
+        m.connect("formatted_repos_group", "/repos_groups/{group_name:.*?}.{format}",
                   action="show", conditions=dict(method=["GET"],
-                                                 function=check_int))
-        # ajax delete repos group perm user
+                                                 function=check_group))
+        # ajax delete repository group perm user
         m.connect('delete_repos_group_user_perm',
-                  "/delete_repos_group_user_perm/{group_name:.*}",
+                  "/delete_repos_group_user_perm/{group_name:.*?}",
              action="delete_repos_group_user_perm",
              conditions=dict(method=["DELETE"], function=check_group))
 
-        # ajax delete repos group perm users_group
+        # ajax delete repository group perm users_group
         m.connect('delete_repos_group_users_group_perm',
-                  "/delete_repos_group_users_group_perm/{group_name:.*}",
+                  "/delete_repos_group_users_group_perm/{group_name:.*?}",
                   action="delete_repos_group_users_group_perm",
                   conditions=dict(method=["DELETE"], function=check_group))
 
@@ -227,7 +251,7 b' def make_map(config):'
         m.connect("user_ips_delete", "/users_ips/{id}",
                   action="delete_ip", conditions=dict(method=["DELETE"]))
 
-    #ADMIN USERS GROUPS REST ROUTES
+    #ADMIN USER GROUPS REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/users_groups') as m:
         m.connect("users_groups", "/users_groups",
@@ -308,8 +332,6 b' def make_map(config):'
                   action="my_account", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account_update", "/my_account_update",
                   action="my_account_update", conditions=dict(method=["PUT"]))
-        m.connect("admin_settings_create_repository", "/create_repository",
-                  action="create_repository", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_repos", "/my_account/repos",
                   action="my_account_my_repos", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_pullrequests", "/my_account/pull_requests",
@@ -389,8 +411,13 b' def make_map(config):'
 
     #SEARCH
     rmap.connect('search', '%s/search' % ADMIN_PREFIX, controller='search',)
-    rmap.connect('search_repo', '%s/search/{search_repo:.*}' % ADMIN_PREFIX,
-                  controller='search')
+    rmap.connect('search_repo_admin', '%s/search/{repo_name:.*}' % ADMIN_PREFIX,
+                 controller='search',
+                 conditions=dict(function=check_repo))
+    rmap.connect('search_repo', '/{repo_name:.*?}/search',
+                 controller='search',
+                 conditions=dict(function=check_repo),
+                 )
 
     #LOGIN/LOGOUT/REGISTER/SIGN IN
     rmap.connect('login_home', '%s/login' % ADMIN_PREFIX, controller='login')
@@ -423,6 +450,10 b' def make_map(config):'
                 controller='summary',
                 conditions=dict(function=check_repo))
 
+    rmap.connect('repo_size', '/{repo_name:.*?}/repo_size',
+                controller='summary', action='repo_size',
+                conditions=dict(function=check_repo))
+
     rmap.connect('repos_group_home', '/{group_name:.*}',
                 controller='admin/repos_groups', action="show_by_name",
                 conditions=dict(function=check_group))
@@ -431,6 +462,17 b' def make_map(config):'
                 controller='changeset', revision='tip',
                 conditions=dict(function=check_repo))
 
+    # no longer user, but kept for routes to work
+    rmap.connect("_edit_repo", "/{repo_name:.*?}/edit",
+                 controller='admin/repos', action="edit",
+                 conditions=dict(method=["GET"], function=check_repo)
+                 )
+
+    rmap.connect("edit_repo", "/{repo_name:.*?}/settings",
+                 controller='admin/repos', action="edit",
+                 conditions=dict(method=["GET"], function=check_repo)
+                 )
+
     #still working url for backward compat.
     rmap.connect('raw_changeset_home_depraced',
                  '/{repo_name:.*?}/raw-changeset/{revision}',
@@ -471,8 +513,8 b' def make_map(config):'
                  controller='compare', action='index',
                  conditions=dict(function=check_repo),
                  requirements=dict(
-                            org_ref_type='(branch|book|tag|rev|org_ref_type)',
-                            other_ref_type='(branch|book|tag|rev|other_ref_type)')
+                            org_ref_type='(branch|book|tag|rev|__other_ref_type__)',
+                            other_ref_type='(branch|book|tag|rev|__org_ref_type__)')
                  )
 
     rmap.connect('pullrequest_home',
@@ -518,7 +560,7 b' def make_map(config):'
                 controller='pullrequests', action='delete_comment',
                 conditions=dict(function=check_repo, method=["DELETE"]))
 
-    rmap.connect('summary_home', '/{repo_name:.*?}/summary',
+    rmap.connect('summary_home_summary', '/{repo_name:.*?}/summary',
                 controller='summary', conditions=dict(function=check_repo))
 
     rmap.connect('shortlog_home', '/{repo_name:.*?}/shortlog',
@@ -548,6 +590,10 b' def make_map(config):'
                 controller='files', revision='tip', f_path='',
                 conditions=dict(function=check_repo))
 
+    rmap.connect('files_home_nopath', '/{repo_name:.*?}/files/{revision}',
+                controller='files', revision='tip', f_path='',
+                conditions=dict(function=check_repo))
+
     rmap.connect('files_history_home',
                  '/{repo_name:.*?}/history/{revision}/{f_path:.*}',
                  controller='files', action='history', revision='tip', f_path='',
@@ -591,22 +637,6 b' def make_map(config):'
                 controller='files', action='nodelist',
                 conditions=dict(function=check_repo))
 
-    rmap.connect('repo_settings_delete', '/{repo_name:.*?}/settings',
-                controller='settings', action="delete",
-                conditions=dict(method=["DELETE"], function=check_repo))
-
-    rmap.connect('repo_settings_update', '/{repo_name:.*?}/settings',
-                controller='settings', action="update",
-                conditions=dict(method=["PUT"], function=check_repo))
-
-    rmap.connect('repo_settings_home', '/{repo_name:.*?}/settings',
-                controller='settings', action='index',
-                conditions=dict(function=check_repo))
-
-    rmap.connect('toggle_locking', "/{repo_name:.*?}/locking_toggle",
-                 controller='settings', action="toggle_locking",
-                 conditions=dict(method=["GET"], function=check_repo))
-
     rmap.connect('repo_fork_create_home', '/{repo_name:.*?}/fork',
                 controller='forks', action='fork_create',
                 conditions=dict(function=check_repo, method=["POST"]))

rhodecode/controllers/admin/admin.py

@@ -130,7 +130,7 b' class AdminController(BaseController):'
         c.search_term = request.GET.get('filter')
         try:
             users_log = _journal_filter(users_log, c.search_term)
-        except:
+        except Exception:
             # we want this to crash for now
             raise
 

rhodecode/controllers/admin/defaults.py

@@ -107,7 +107,7 b' class DefaultsController(BaseController)'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of defaults'),
+            h.flash(_('Error occurred during update of defaults'),
                     category='error')
 
         return redirect(url('defaults'))

rhodecode/controllers/admin/ldap_settings.py

@@ -123,7 +123,7 b' class LdapSettingsController(BaseControl'
                         Session().add(setting)
 
                 Session().commit()
-                h.flash(_('Ldap settings updated successfully'),
+                h.flash(_('LDAP settings updated successfully'),
                         category='success')
                 if not ldap_active:
                     #if ldap is missing send an info to user
@@ -144,7 +144,7 b' class LdapSettingsController(BaseControl'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of ldap settings'),
+            h.flash(_('Error occurred during update of ldap settings'),
                     category='error')
 
         return redirect(url('ldap_home'))

rhodecode/controllers/admin/notifications.py

@@ -28,7 +28,7 b' import traceback'
 
 from pylons import request
 from pylons import tmpl_context as c, url
-from pylons.controllers.util import redirect
+from pylons.controllers.util import redirect, abort
 
 from webhelpers.paginate import Page
 
@@ -117,7 +117,7 b' class NotificationsController(BaseContro'
                     Session().commit()
                     return 'ok'
         except Exception:
-            Session.rollback()
+            Session().rollback()
             log.error(traceback.format_exc())
         return 'fail'
 
@@ -139,7 +139,7 b' class NotificationsController(BaseContro'
                     Session().commit()
                     return 'ok'
         except Exception:
-            Session.rollback()
+            Session().rollback()
             log.error(traceback.format_exc())
         return 'fail'
 
@@ -149,8 +149,9 b' class NotificationsController(BaseContro'
         c.user = self.rhodecode_user
         no = Notification.get(notification_id)
 
-        owner = all(un.user.user_id == c.rhodecode_user.user_id
+        owner = any(un.user.user_id == c.rhodecode_user.user_id
                     for un in no.notifications_to_users)
+
         if no and (h.HasPermissionAny('hg.admin', 'repository.admin')() or owner):
             unotification = NotificationModel()\
                             .get_user_notification(c.user.user_id, no)
@@ -158,14 +159,14 b' class NotificationsController(BaseContro'
             # if this association to user is not valid, we don't want to show
             # this message
             if unotification:
-                if unotification.read is False:
+                if not unotification.read:
                     unotification.mark_as_read()
                     Session().commit()
                 c.notification = no
 
                 return render('admin/notifications/show_notification.html')
 
-        return redirect(url('notifications'))
+        return abort(403)
 
     def edit(self, notification_id, format='html'):
         """GET /_admin/notifications/id/edit: Form to edit an existing item"""

rhodecode/controllers/admin/permissions.py

@@ -67,11 +67,11 b' class PermissionsController(BaseControll'
                                     ('group.admin', _('Admin'),)]
         self.register_choices = [
             ('hg.register.none',
-                _('disabled')),
+                _('Disabled')),
             ('hg.register.manual_activate',
-                _('allowed with manual account activation')),
+                _('Allowed with manual account activation')),
             ('hg.register.auto_activate',
-                _('allowed with automatic account activation')), ]
+                _('Allowed with automatic account activation')), ]
 
         self.create_choices = [('hg.create.none', _('Disabled')),
                                ('hg.create.repository', _('Enabled'))]
@@ -139,7 +139,7 b' class PermissionsController(BaseControll'
                     encoding="UTF-8")
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during update of permissions'),
+                h.flash(_('Error occurred during update of permissions'),
                         category='error')
 
         return redirect(url('edit_permission', id=id))

rhodecode/controllers/admin/repos.py

@@ -28,7 +28,7 b' import traceback'
 import formencode
 from formencode import htmlfill
 
-from webob.exc import HTTPInternalServerError
+from webob.exc import HTTPInternalServerError, HTTPForbidden
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
@@ -37,23 +37,25 b' from sqlalchemy.exc import IntegrityErro'
 import rhodecode
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
-    HasPermissionAnyDecorator, HasRepoPermissionAllDecorator
-from rhodecode.lib.base import BaseController, render
+    HasPermissionAnyDecorator, HasRepoPermissionAllDecorator, NotAnonymous,\
+    HasPermissionAny, HasReposGroupPermissionAny, HasRepoPermissionAnyDecorator
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
 from rhodecode.lib.helpers import get_token
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User, Repository, UserFollowing, RepoGroup,\
-    RhodeCodeSetting
-from rhodecode.model.forms import RepoForm
-from rhodecode.model.scm import ScmModel
+    RhodeCodeSetting, RepositoryField
+from rhodecode.model.forms import RepoForm, RepoFieldForm, RepoPermsForm
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.compat import json
 from sqlalchemy.sql.expression import func
+from rhodecode.lib.exceptions import AttachedForksError
 
 log = logging.getLogger(__name__)
 
 
-class ReposController(BaseController):
+class ReposController(BaseRepoController):
     """
     REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
@@ -61,14 +63,15 b' class ReposController(BaseController):'
     #     map.resource('repo', 'repos')
 
     @LoginRequired()
-    @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def __before__(self):
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         super(ReposController, self).__before__()
 
     def __load_defaults(self):
-        c.repo_groups = RepoGroup.groups_choices(check_perms=True)
+        acl_groups = GroupList(RepoGroup.query().all(),
+                               perm_set=['group.write', 'group.admin'])
+        c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
 
         repo_model = RepoModel()
@@ -116,6 +119,9 b' class ReposController(BaseController):'
             c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                             c.repo_last_rev) * 100)
 
+        c.repo_fields = RepositoryField.query()\
+            .filter(RepositoryField.repository == db_repo).all()
+
         defaults = RepoModel()._get_defaults(repo_name)
 
         c.repos_list = [('', _('--REMOVE FORK--'))]
@@ -136,13 +142,14 b' class ReposController(BaseController):'
                         .all()
 
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
-                                                   admin=True)
+                                                   admin=True,
+                                                   super_user_actions=True)
         #json used to render the grid
         c.data = json.dumps(repos_data)
 
         return render('admin/repos/repos.html')
 
-    @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
+    @NotAnonymous()
     def create(self):
         """
         POST /repos: Create a new item"""
@@ -154,14 +161,17 b' class ReposController(BaseController):'
             form_result = RepoForm(repo_groups=c.repo_groups_choices,
                                    landing_revs=c.landing_revs_choices)()\
                             .to_python(dict(request.POST))
+
             new_repo = RepoModel().create(form_result,
                                           self.rhodecode_user.user_id)
             if form_result['clone_uri']:
-                h.flash(_('created repository %s from %s') \
+                h.flash(_('Created repository %s from %s') \
                     % (form_result['repo_name'], form_result['clone_uri']),
                     category='success')
             else:
-                h.flash(_('created repository %s') % form_result['repo_name'],
+                repo_url = h.link_to(form_result['repo_name'],
+                    h.url('summary_home', repo_name=form_result['repo_name_full']))
+                h.flash(h.literal(_('Created repository %s') % repo_url),
                     category='success')
 
             if request.POST.get('user_created'):
@@ -175,16 +185,8 b' class ReposController(BaseController):'
                               self.sa)
             Session().commit()
         except formencode.Invalid, errors:
-
-            c.new_repo = errors.value['repo_name']
-
-            if request.POST.get('user_created'):
-                r = render('admin/repos/repo_add_create_repository.html')
-            else:
-                r = render('admin/repos/repo_add.html')
-
             return htmlfill.render(
-                r,
+                render('admin/repos/repo_add.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
@@ -192,21 +194,41 b' class ReposController(BaseController):'
 
         except Exception:
             log.error(traceback.format_exc())
-            msg = _('error occurred during creation of repository %s') \
+            msg = _('Error creating repository %s') \
                     % form_result.get('repo_name')
             h.flash(msg, category='error')
+            if c.rhodecode_user.is_admin:
             return redirect(url('repos'))
+            return redirect(url('home'))
         #redirect to our new repo !
         return redirect(url('summary_home', repo_name=new_repo.repo_name))
 
-    @HasPermissionAllDecorator('hg.admin')
-    def new(self, format='html'):
-        """GET /repos/new: Form to create a new item"""
+    @NotAnonymous()
+    def create_repository(self):
+        """GET /_admin/create_repository: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
+        parent_group = request.GET.get('parent_group')
+        if not HasPermissionAny('hg.admin', 'hg.create.repository')():
+            #you're not super admin nor have global create permissions,
+            #but maybe you have at least write permission to a parent group ?
+            _gr = RepoGroup.get(parent_group)
+            gr_name = _gr.group_name if _gr else None
+            if not HasReposGroupPermissionAny('group.admin', 'group.write')(group_name=gr_name):
+                raise HTTPForbidden
+
+        acl_groups = GroupList(RepoGroup.query().all(),
+                               perm_set=['group.write', 'group.admin'])
+        c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
+        c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
+        choices, c.landing_revs = ScmModel().get_repo_landing_revs()
+
         c.new_repo = repo_name_slug(new_repo)
-        self.__load_defaults()
+
         ## apply the defaults from defaults page
         defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
+        if parent_group:
+            defaults.update({'repo_group': parent_group})
+
         return htmlfill.render(
             render('admin/repos/repo_add.html'),
             defaults=defaults,
@@ -215,7 +237,7 b' class ReposController(BaseController):'
             encoding="UTF-8"
         )
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def update(self, repo_name):
         """
         PUT /repos/repo_name: Update an existing item"""
@@ -259,11 +281,11 b' class ReposController(BaseController):'
 
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of repository %s') \
+            h.flash(_('Error occurred during update of repository %s') \
                     % repo_name, category='error')
         return redirect(url('edit_repo', repo_name=changed_name))
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def delete(self, repo_name):
         """
         DELETE /repos/repo_name: Delete an existing item"""
@@ -280,25 +302,27 b' class ReposController(BaseController):'
             h.not_mapped_error(repo_name)
             return redirect(url('repos'))
         try:
+            _forks = repo.forks.count()
+            handle_forks = None
+            if _forks and request.POST.get('forks'):
+                do = request.POST['forks']
+                if do == 'detach_forks':
+                    handle_forks = 'detach'
+                    h.flash(_('Detached %s forks') % _forks, category='success')
+                elif do == 'delete_forks':
+                    handle_forks = 'delete'
+                    h.flash(_('Deleted %s forks') % _forks, category='success')
+            repo_model.delete(repo, forks=handle_forks)
             action_logger(self.rhodecode_user, 'admin_deleted_repo',
                               repo_name, self.ip_addr, self.sa)
-            repo_model.delete(repo)
             invalidate_cache('get_repo_cached_%s' % repo_name)
-            h.flash(_('deleted repository %s') % repo_name, category='success')
+            h.flash(_('Deleted repository %s') % repo_name, category='success')
             Session().commit()
-        except IntegrityError, e:
-            if e.message.find('repositories_fork_id_fkey') != -1:
-                log.error(traceback.format_exc())
-                h.flash(_('Cannot delete %s it still contains attached '
-                          'forks') % repo_name,
-                        category='warning')
-            else:
-                log.error(traceback.format_exc())
-                h.flash(_('An error occurred during '
-                          'deletion of %s') % repo_name,
-                        category='error')
+        except AttachedForksError:
+            h.flash(_('Cannot delete %s it still contains attached forks')
+                        % repo_name, category='warning')
 
-        except Exception, e:
+        except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of %s') % repo_name,
                     category='error')
@@ -306,6 +330,42 b' class ReposController(BaseController):'
         return redirect(url('repos'))
 
     @HasRepoPermissionAllDecorator('repository.admin')
+    def set_repo_perm_member(self, repo_name):
+        form = RepoPermsForm()().to_python(request.POST)
+
+        perms_new = form['perms_new']
+        perms_updates = form['perms_updates']
+        cur_repo = repo_name
+
+        # update permissions
+        for member, perm, member_type in perms_updates:
+            if member_type == 'user':
+                # this updates existing one
+                RepoModel().grant_user_permission(
+                    repo=cur_repo, user=member, perm=perm
+                )
+            else:
+                RepoModel().grant_users_group_permission(
+                    repo=cur_repo, group_name=member, perm=perm
+                )
+        # set new permissions
+        for member, perm, member_type in perms_new:
+            if member_type == 'user':
+                RepoModel().grant_user_permission(
+                    repo=cur_repo, user=member, perm=perm
+                )
+            else:
+                RepoModel().grant_users_group_permission(
+                    repo=cur_repo, group_name=member, perm=perm
+                )
+        #TODO: implement this
+        #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
+        #              repo_name, self.ip_addr, self.sa)
+        Session().commit()
+        h.flash(_('Repository permissions updated'), category='success')
+        return redirect(url('edit_repo', repo_name=repo_name))
+
+    @HasRepoPermissionAllDecorator('repository.admin')
     def delete_perm_user(self, repo_name):
         """
         DELETE an existing repository permission user
@@ -315,6 +375,9 b' class ReposController(BaseController):'
         try:
             RepoModel().revoke_user_permission(repo=repo_name,
                                                user=request.POST['user_id'])
+            #TODO: implement this
+            #action_logger(self.rhodecode_user, 'admin_revoked_repo_permissions',
+            #              repo_name, self.ip_addr, self.sa)
             Session().commit()
         except Exception:
             log.error(traceback.format_exc())
@@ -325,7 +388,7 b' class ReposController(BaseController):'
     @HasRepoPermissionAllDecorator('repository.admin')
     def delete_perm_users_group(self, repo_name):
         """
-        DELETE an existing repository permission users group
+        DELETE an existing repository permission user group
 
         :param repo_name:
         """
@@ -338,11 +401,11 b' class ReposController(BaseController):'
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of repository'
-                      ' users groups'),
+                      ' user groups'),
                     category='error')
             raise HTTPInternalServerError()
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_stats(self, repo_name):
         """
         DELETE an existing repository statistics
@@ -359,7 +422,7 b' class ReposController(BaseController):'
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_cache(self, repo_name):
         """
         INVALIDATE existing repository cache
@@ -376,7 +439,7 b' class ReposController(BaseController):'
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_locking(self, repo_name):
         """
         Unlock repository when it is locked !
@@ -396,7 +459,34 b' class ReposController(BaseController):'
                     category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
+    def toggle_locking(self, repo_name):
+        """
+        Toggle locking of repository by simple GET call to url
+
+        :param repo_name:
+        """
+
+        try:
+            repo = Repository.get_by_repo_name(repo_name)
+
+            if repo.enable_locking:
+                if repo.locked[0]:
+                    Repository.unlock(repo)
+                    action = _('Unlocked')
+                else:
+                    Repository.lock(repo, c.rhodecode_user.user_id)
+                    action = _('Locked')
+
+                h.flash(_('Repository has been %s') % action,
+                        category='success')
+        except Exception, e:
+            log.error(traceback.format_exc())
+            h.flash(_('An error occurred during unlocking'),
+                    category='error')
+        return redirect(url('summary_home', repo_name=repo_name))
+
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_public_journal(self, repo_name):
         """
         Set's this repository to be visible in public journal,
@@ -415,7 +505,7 b' class ReposController(BaseController):'
                 h.flash(_('Updated repository visibility in public journal'),
                         category='success')
                 Session().commit()
-            except:
+            except Exception:
                 h.flash(_('An error occurred during setting this'
                           ' repository in public journal'),
                         category='error')
@@ -424,7 +514,7 b' class ReposController(BaseController):'
             h.flash(_('Token mismatch'), category='error')
         return redirect(url('edit_repo', repo_name=repo_name))
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_pull(self, repo_name):
         """
         Runs task to update given repository with remote changes,
@@ -441,7 +531,7 b' class ReposController(BaseController):'
 
         return redirect(url('edit_repo', repo_name=repo_name))
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def repo_as_fork(self, repo_name):
         """
         Mark given repository as a fork of another
@@ -468,7 +558,7 b' class ReposController(BaseController):'
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
 
-    @HasPermissionAllDecorator('hg.admin')
+    @HasRepoPermissionAllDecorator('repository.admin')
     def edit(self, repo_name, format='html'):
         """GET /repos/repo_name/edit: Form to edit an existing item"""
         # url('edit_repo', repo_name=ID)
@@ -480,3 +570,37 b' class ReposController(BaseController):'
             encoding="UTF-8",
             force_defaults=False
         )
+
+    @HasPermissionAllDecorator('hg.admin')
+    def create_repo_field(self, repo_name):
+        try:
+            form_result = RepoFieldForm()().to_python(dict(request.POST))
+            new_field = RepositoryField()
+            new_field.repository = Repository.get_by_repo_name(repo_name)
+            new_field.field_key = form_result['new_field_key']
+            new_field.field_type = form_result['new_field_type']  # python type
+            new_field.field_value = form_result['new_field_value']  # set initial blank value
+            new_field.field_desc = form_result['new_field_desc']
+            new_field.field_label = form_result['new_field_label']
+            Session().add(new_field)
+            Session().commit()
+
+        except Exception, e:
+            log.error(traceback.format_exc())
+            msg = _('An error occurred during creation of field')
+            if isinstance(e, formencode.Invalid):
+                msg += ". " + e.msg
+            h.flash(msg, category='error')
+        return redirect(url('edit_repo', repo_name=repo_name))
+
+    @HasPermissionAllDecorator('hg.admin')
+    def delete_repo_field(self, repo_name, field_id):
+        field = RepositoryField.get_or_404(field_id)
+        try:
+            Session().delete(field)
+            Session().commit()
+        except Exception, e:
+            log.error(traceback.format_exc())
+            msg = _('An error occurred during removal of field')
+            h.flash(msg, category='error')
+        return redirect(url('edit_repo', repo_name=repo_name))

rhodecode/controllers/admin/repos_groups.py

@@ -3,7 +3,7 b''
     rhodecode.controllers.admin.repos_groups
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Repositories groups controller for RhodeCode
+    Repository groups controller for RhodeCode
 
     :created_on: Mar 23, 2010
     :author: marcink
@@ -30,7 +30,7 b' import formencode'
 from formencode import htmlfill
 
 from pylons import request, tmpl_context as c, url
-from pylons.controllers.util import redirect
+from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 
 from sqlalchemy.exc import IntegrityError
@@ -39,7 +39,8 b' import rhodecode'
 from rhodecode.lib import helpers as h
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
-    HasReposGroupPermissionAnyDecorator
+    HasReposGroupPermissionAnyDecorator, HasReposGroupPermissionAll,\
+    HasPermissionAll
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import RepoGroup, Repository
 from rhodecode.model.repos_group import ReposGroupModel
@@ -47,8 +48,9 b' from rhodecode.model.forms import ReposG'
 from rhodecode.model.meta import Session
 from rhodecode.model.repo import RepoModel
 from webob.exc import HTTPInternalServerError, HTTPNotFound
-from rhodecode.lib.utils2 import str2bool
+from rhodecode.lib.utils2 import str2bool, safe_int
 from sqlalchemy.sql.expression import func
+from rhodecode.model.scm import GroupList
 
 log = logging.getLogger(__name__)
 
@@ -63,10 +65,21 b' class ReposGroupsController(BaseControll'
     def __before__(self):
         super(ReposGroupsController, self).__before__()
 
-    def __load_defaults(self):
-        c.repo_groups = RepoGroup.groups_choices()
+    def __load_defaults(self, allow_empty_group=False, exclude_group_ids=[]):
+        if HasPermissionAll('hg.admin')('group edit'):
+            #we're global admin, we're ok and we can create TOP level groups
+            allow_empty_group = True
+
+        #override the choices for this form, we need to filter choices
+        #and display only those we have ADMIN right
+        groups_with_admin_rights = GroupList(RepoGroup.query().all(),
+                                             perm_set=['group.admin'])
+        c.repo_groups = RepoGroup.groups_choices(groups=groups_with_admin_rights,
+                                                 show_empty_group=allow_empty_group)
+        # exclude filtered ids
+        c.repo_groups = filter(lambda x: x[0] not in exclude_group_ids,
+                               c.repo_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
-
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
@@ -77,7 +90,6 b' class ReposGroupsController(BaseControll'
 
         :param group_id:
         """
-        self.__load_defaults()
         repo_group = RepoGroup.get_or_404(group_id)
         data = repo_group.get_dict()
         data['group_name'] = repo_group.name
@@ -94,34 +106,46 b' class ReposGroupsController(BaseControll'
 
         return data
 
-    @HasPermissionAnyDecorator('hg.admin')
+    def _revoke_perms_on_yourself(self, form_result):
+        _up = filter(lambda u: c.rhodecode_user.username == u[0],
+                     form_result['perms_updates'])
+        _new = filter(lambda u: c.rhodecode_user.username == u[0],
+                      form_result['perms_new'])
+        if _new and _new[0][1] != 'group.admin' or _up and _up[0][1] != 'group.admin':
+            return True
+        return False
+
     def index(self, format='html'):
         """GET /repos_groups: All items in the collection"""
         # url('repos_groups')
+        group_iter = GroupList(RepoGroup.query().all(), perm_set=['group.admin'])
         sk = lambda g: g.parents[0].group_name if g.parents else g.group_name
-        c.groups = sorted(RepoGroup.query().all(), key=sk)
+        c.groups = sorted(group_iter, key=sk)
         return render('admin/repos_groups/repos_groups_show.html')
 
-    @HasPermissionAnyDecorator('hg.admin')
     def create(self):
         """POST /repos_groups: Create a new item"""
         # url('repos_groups')
+
         self.__load_defaults()
+
+        # permissions for can create group based on parent_id are checked
+        # here in the Form
         repos_group_form = ReposGroupForm(available_groups =
-                                          c.repo_groups_choices)()
+                                map(lambda k: unicode(k[0]), c.repo_groups))()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
             ReposGroupModel().create(
                     group_name=form_result['group_name'],
                     group_description=form_result['group_description'],
-                    parent=form_result['group_parent_id']
+                    parent=form_result['group_parent_id'],
+                    owner=self.rhodecode_user.user_id
             )
             Session().commit()
-            h.flash(_('created repos group %s') \
+            h.flash(_('Created repository group %s') \
                     % form_result['group_name'], category='success')
             #TODO: in futureaction_logger(, '', '', '', self.sa)
         except formencode.Invalid, errors:
-
             return htmlfill.render(
                 render('admin/repos_groups/repos_groups_add.html'),
                 defaults=errors.value,
@@ -130,42 +154,73 b' class ReposGroupsController(BaseControll'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during creation of repos group %s') \
+            h.flash(_('Error occurred during creation of repository group %s') \
                     % request.POST.get('group_name'), category='error')
+        parent_group_id = form_result['group_parent_id']
+        #TODO: maybe we should get back to the main view, not the admin one
+        return redirect(url('repos_groups', parent_group=parent_group_id))
 
-        return redirect(url('repos_groups'))
-
-    @HasPermissionAnyDecorator('hg.admin')
     def new(self, format='html'):
         """GET /repos_groups/new: Form to create a new item"""
         # url('new_repos_group')
+        if HasPermissionAll('hg.admin')('group create'):
+            #we're global admin, we're ok and we can create TOP level groups
+            pass
+        else:
+            # we pass in parent group into creation form, thus we know
+            # what would be the group, we can check perms here !
+            group_id = safe_int(request.GET.get('parent_group'))
+            group = RepoGroup.get(group_id) if group_id else None
+            group_name = group.group_name if group else None
+            if HasReposGroupPermissionAll('group.admin')(group_name, 'group create'):
+                pass
+            else:
+                return abort(403)
+
         self.__load_defaults()
         return render('admin/repos_groups/repos_groups_add.html')
 
-    @HasPermissionAnyDecorator('hg.admin')
-    def update(self, id):
-        """PUT /repos_groups/id: Update an existing item"""
+    @HasReposGroupPermissionAnyDecorator('group.admin')
+    def update(self, group_name):
+        """PUT /repos_groups/group_name: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
-        #    h.form(url('repos_group', id=ID),
+        #    h.form(url('repos_group', group_name=GROUP_NAME),
         #           method='put')
-        # url('repos_group', id=ID)
+        # url('repos_group', group_name=GROUP_NAME)
 
-        self.__load_defaults()
-        c.repos_group = RepoGroup.get(id)
+        c.repos_group = ReposGroupModel()._get_repos_group(group_name)
+        if HasPermissionAll('hg.admin')('group edit'):
+            #we're global admin, we're ok and we can create TOP level groups
+            allow_empty_group = True
+        elif not c.repos_group.parent_group:
+            allow_empty_group = True
+        else:
+            allow_empty_group = False
+        self.__load_defaults(allow_empty_group=allow_empty_group,
+                             exclude_group_ids=[c.repos_group.group_id])
 
         repos_group_form = ReposGroupForm(
             edit=True,
             old_data=c.repos_group.get_dict(),
-            available_groups=c.repo_groups_choices
+            available_groups=c.repo_groups_choices,
+            can_create_in_root=allow_empty_group,
         )()
         try:
             form_result = repos_group_form.to_python(dict(request.POST))
-            ReposGroupModel().update(id, form_result)
+            if not c.rhodecode_user.is_admin:
+                if self._revoke_perms_on_yourself(form_result):
+                    msg = _('Cannot revoke permission for yourself as admin')
+                    h.flash(msg, category='warning')
+                    raise Exception('revoke admin permission on self')
+
+            new_gr = ReposGroupModel().update(group_name, form_result)
             Session().commit()
-            h.flash(_('updated repos group %s') \
+            h.flash(_('Updated repository group %s') \
                     % form_result['group_name'], category='success')
+            # we now have new name !
+            group_name = new_gr.group_name
             #TODO: in future action_logger(, '', '', '', self.sa)
         except formencode.Invalid, errors:
 
@@ -177,61 +232,60 b' class ReposGroupsController(BaseControll'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of repos group %s') \
+            h.flash(_('Error occurred during update of repository group %s') \
                     % request.POST.get('group_name'), category='error')
 
-        return redirect(url('edit_repos_group', id=id))
+        return redirect(url('edit_repos_group', group_name=group_name))
 
-    @HasPermissionAnyDecorator('hg.admin')
-    def delete(self, id):
-        """DELETE /repos_groups/id: Delete an existing item"""
+    @HasReposGroupPermissionAnyDecorator('group.admin')
+    def delete(self, group_name):
+        """DELETE /repos_groups/group_name: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
-        #    h.form(url('repos_group', id=ID),
+        #    h.form(url('repos_group', group_name=GROUP_NAME),
         #           method='delete')
-        # url('repos_group', id=ID)
+        # url('repos_group', group_name=GROUP_NAME)
 
-        gr = RepoGroup.get(id)
+        gr = c.repos_group = ReposGroupModel()._get_repos_group(group_name)
         repos = gr.repositories.all()
         if repos:
             h.flash(_('This group contains %s repositores and cannot be '
-                      'deleted') % len(repos),
-                    category='error')
+                      'deleted') % len(repos), category='warning')
+            return redirect(url('repos_groups'))
+
+        children = gr.children.all()
+        if children:
+            h.flash(_('This group contains %s subgroups and cannot be deleted'
+                      % (len(children))), category='warning')
             return redirect(url('repos_groups'))
 
         try:
-            ReposGroupModel().delete(id)
+            ReposGroupModel().delete(group_name)
             Session().commit()
-            h.flash(_('removed repos group %s') % gr.group_name,
+            h.flash(_('Removed repository group %s') % group_name,
                     category='success')
             #TODO: in future action_logger(, '', '', '', self.sa)
-        except IntegrityError, e:
-            if str(e.message).find('groups_group_parent_id_fkey') != -1:
-                log.error(traceback.format_exc())
-                h.flash(_('Cannot delete this group it still contains '
-                          'subgroups'),
-                        category='warning')
-            else:
-                log.error(traceback.format_exc())
-                h.flash(_('error occurred during deletion of repos '
-                          'group %s') % gr.group_name, category='error')
-
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during deletion of repos '
-                      'group %s') % gr.group_name, category='error')
+            h.flash(_('Error occurred during deletion of repos '
+                      'group %s') % group_name, category='error')
 
         return redirect(url('repos_groups'))
 
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def delete_repos_group_user_perm(self, group_name):
         """
-        DELETE an existing repositories group permission user
+        DELETE an existing repository group permission user
 
         :param group_name:
         """
         try:
+            if not c.rhodecode_user.is_admin:
+                if c.rhodecode_user.user_id == safe_int(request.POST['user_id']):
+                    msg = _('Cannot revoke permission for yourself as admin')
+                    h.flash(msg, category='warning')
+                    raise Exception('revoke admin permission on self')
             recursive = str2bool(request.POST.get('recursive', False))
             ReposGroupModel().delete_permission(
                 repos_group=group_name, obj=request.POST['user_id'],
@@ -247,7 +301,7 b' class ReposGroupsController(BaseControll'
     @HasReposGroupPermissionAnyDecorator('group.admin')
     def delete_repos_group_users_group_perm(self, group_name):
         """
-        DELETE an existing repositories group permission users group
+        DELETE an existing repository group permission user group
 
         :param group_name:
         """
@@ -262,7 +316,7 b' class ReposGroupsController(BaseControll'
         except Exception:
             log.error(traceback.format_exc())
             h.flash(_('An error occurred during deletion of group'
-                      ' users groups'),
+                      ' user groups'),
                     category='error')
             raise HTTPInternalServerError()
 
@@ -279,11 +333,11 b' class ReposGroupsController(BaseControll'
 
     @HasReposGroupPermissionAnyDecorator('group.read', 'group.write',
                                          'group.admin')
-    def show(self, id, format='html'):
-        """GET /repos_groups/id: Show a specific item"""
-        # url('repos_group', id=ID)
+    def show(self, group_name, format='html'):
+        """GET /repos_groups/group_name: Show a specific item"""
+        # url('repos_group', group_name=GROUP_NAME)
 
-        c.group = RepoGroup.get_or_404(id)
+        c.group = c.repos_group = ReposGroupModel()._get_repos_group(group_name)
         c.group_repos = c.group.repositories.all()
 
         #overwrite our cached list with current filter
@@ -291,15 +345,15 b' class ReposGroupsController(BaseControll'
         c.repo_cnt = 0
 
         groups = RepoGroup.query().order_by(RepoGroup.group_name)\
-            .filter(RepoGroup.group_parent_id == id).all()
+            .filter(RepoGroup.group_parent_id == c.group.group_id).all()
         c.groups = self.scm_model.get_repos_groups(groups)
 
-        if c.visual.lightweight_dashboard is False:
+        if not c.visual.lightweight_dashboard:
             c.repos_list = self.scm_model.get_repos(all_repos=gr_filter)
         ## lightweight version of dashboard
         else:
             c.repos_list = Repository.query()\
-                            .filter(Repository.group_id == id)\
+                            .filter(Repository.group_id == c.group.group_id)\
                             .order_by(func.lower(Repository.repo_name))\
                             .all()
 
@@ -310,17 +364,25 b' class ReposGroupsController(BaseControll'
 
         return render('admin/repos_groups/repos_groups.html')
 
-    @HasPermissionAnyDecorator('hg.admin')
-    def edit(self, id, format='html'):
-        """GET /repos_groups/id/edit: Form to edit an existing item"""
-        # url('edit_repos_group', id=ID)
+    @HasReposGroupPermissionAnyDecorator('group.admin')
+    def edit(self, group_name, format='html'):
+        """GET /repos_groups/group_name/edit: Form to edit an existing item"""
+        # url('edit_repos_group', group_name=GROUP_NAME)
 
-        c.repos_group = ReposGroupModel()._get_repos_group(id)
-        defaults = self.__load_data(c.repos_group.group_id)
+        c.repos_group = ReposGroupModel()._get_repos_group(group_name)
+        #we can only allow moving empty group if it's already a top-level
+        #group, ie has no parents, or we're admin
+        if HasPermissionAll('hg.admin')('group edit'):
+            #we're global admin, we're ok and we can create TOP level groups
+            allow_empty_group = True
+        elif not c.repos_group.parent_group:
+            allow_empty_group = True
+        else:
+            allow_empty_group = False
 
-        # we need to exclude this group from the group list for editing
-        c.repo_groups = filter(lambda x: x[0] != c.repos_group.group_id,
-                               c.repo_groups)
+        self.__load_defaults(allow_empty_group=allow_empty_group,
+                             exclude_group_ids=[c.repos_group.group_id])
+        defaults = self.__load_data(c.repos_group.group_id)
 
         return htmlfill.render(
             render('admin/repos_groups/repos_groups_edit.html'),

rhodecode/controllers/admin/settings.py

@@ -37,7 +37,8 b' from pylons.i18n.translation import _'
 
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
-    HasPermissionAnyDecorator, NotAnonymous
+    HasPermissionAnyDecorator, NotAnonymous, HasPermissionAny,\
+    HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.celerylib import tasks, run_task
 from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \
@@ -46,7 +47,7 b' from rhodecode.model.db import RhodeCode'
     RhodeCodeSetting, PullRequest, PullRequestReviewers
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import User
@@ -54,6 +55,7 b' from rhodecode.model.notification import'
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils2 import str2bool, safe_unicode
 from rhodecode.lib.compat import json
+from webob.exc import HTTPForbidden
 log = logging.getLogger(__name__)
 
 
@@ -165,7 +167,7 b' class SettingsController(BaseController)'
 
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during updating '
+                h.flash(_('Error occurred during updating '
                           'application settings'),
                           category='error')
 
@@ -204,6 +206,11 b' class SettingsController(BaseController)'
                     form_result['rhodecode_lightweight_dashboard']
                 Session().add(sett4)
 
+                sett4 = RhodeCodeSetting.get_by_name_or_create('repository_fields')
+                sett4.app_settings_value = \
+                    form_result['rhodecode_repository_fields']
+                Session().add(sett4)
+
                 Session().commit()
                 set_rhodecode_config(config)
                 h.flash(_('Updated visualisation settings'),
@@ -211,7 +218,7 b' class SettingsController(BaseController)'
 
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during updating '
+                h.flash(_('Error occurred during updating '
                           'visualisation settings'),
                         category='error')
 
@@ -229,9 +236,6 b' class SettingsController(BaseController)'
                 )
 
             try:
-                # fix namespaces for hooks and extensions
-                _f = lambda s: s.replace('.', '_')
-
                 sett = RhodeCodeUi.get_by_key('push_ssl')
                 sett.ui_value = form_result['web_push_ssl']
                 Session().add(sett)
@@ -242,23 +246,19 b' class SettingsController(BaseController)'
 
                 #HOOKS
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE)
-                sett.ui_active = form_result[_f('hooks_%s' %
-                                                RhodeCodeUi.HOOK_UPDATE)]
+                sett.ui_active = form_result['hooks_changegroup_update']
                 Session().add(sett)
 
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_REPO_SIZE)
-                sett.ui_active = form_result[_f('hooks_%s' %
-                                                RhodeCodeUi.HOOK_REPO_SIZE)]
+                sett.ui_active = form_result['hooks_changegroup_repo_size']
                 Session().add(sett)
 
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PUSH)
-                sett.ui_active = form_result[_f('hooks_%s' %
-                                                RhodeCodeUi.HOOK_PUSH)]
+                sett.ui_active = form_result['hooks_changegroup_push_logger']
                 Session().add(sett)
 
                 sett = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_PULL)
-                sett.ui_active = form_result[_f('hooks_%s' %
-                                                 RhodeCodeUi.HOOK_PULL)]
+                sett.ui_active = form_result['hooks_outgoing_pull_logger']
 
                 Session().add(sett)
 
@@ -269,7 +269,7 b' class SettingsController(BaseController)'
                     sett = RhodeCodeUi()
                     sett.ui_key = 'largefiles'
                     sett.ui_section = 'extensions'
-                sett.ui_active = form_result[_f('extensions_largefiles')]
+                sett.ui_active = form_result['extensions_largefiles']
                 Session().add(sett)
 
                 sett = RhodeCodeUi.get_by_key('hgsubversion')
@@ -279,7 +279,7 b' class SettingsController(BaseController)'
                     sett.ui_key = 'hgsubversion'
                     sett.ui_section = 'extensions'
 
-                sett.ui_active = form_result[_f('extensions_hgsubversion')]
+                sett.ui_active = form_result['extensions_hgsubversion']
                 Session().add(sett)
 
 #                sett = RhodeCodeUi.get_by_key('hggit')
@@ -289,7 +289,7 b' class SettingsController(BaseController)'
 #                    sett.ui_key = 'hggit'
 #                    sett.ui_section = 'extensions'
 #
-#                sett.ui_active = form_result[_f('extensions_hggit')]
+#                sett.ui_active = form_result['extensions_hggit']
 #                Session().add(sett)
 
                 Session().commit()
@@ -298,7 +298,7 b' class SettingsController(BaseController)'
 
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during updating '
+                h.flash(_('Error occurred during updating '
                           'application settings'), category='error')
 
         if setting_id == 'hooks':
@@ -324,7 +324,7 b' class SettingsController(BaseController)'
                 Session().commit()
             except Exception:
                 log.error(traceback.format_exc())
-                h.flash(_('error occurred during hook creation'),
+                h.flash(_('Error occurred during hook creation'),
                         category='error')
 
             return redirect(url('admin_edit_setting', setting_id='hooks'))
@@ -402,6 +402,8 b' class SettingsController(BaseController)'
         # url('admin_settings_my_account')
 
         c.user = User.get(self.rhodecode_user.user_id)
+        c.perm_user = AuthUser(user_id=self.rhodecode_user.user_id,
+                               ip_addr=self.ip_addr)
         c.ldap_dn = c.user.ldap_dn
 
         if c.user.username == 'default':
@@ -433,6 +435,8 b' class SettingsController(BaseController)'
         # url('admin_settings_my_account_update', id=ID)
         uid = self.rhodecode_user.user_id
         c.user = User.get(self.rhodecode_user.user_id)
+        c.perm_user = AuthUser(user_id=self.rhodecode_user.user_id,
+                               ip_addr=self.ip_addr)
         c.ldap_dn = c.user.ldap_dn
         email = self.rhodecode_user.email
         _form = UserForm(edit=True,
@@ -460,45 +464,32 b' class SettingsController(BaseController)'
             return render('admin/users/user_edit_my_account.html')
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of user %s') \
+            h.flash(_('Error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
 
         return redirect(url('my_account'))
 
     @NotAnonymous()
     def my_account_my_pullrequests(self):
-        c.my_pull_requests = PullRequest.query()\
+        c.show_closed = request.GET.get('pr_show_closed')
+
+        def _filter(pr):
+            s = sorted(pr, key=lambda o: o.created_on, reverse=True)
+            if not c.show_closed:
+                s = filter(lambda p: p.status != PullRequest.STATUS_CLOSED, s)
+            return s
+
+        c.my_pull_requests = _filter(PullRequest.query()\
                                 .filter(PullRequest.user_id ==
                                         self.rhodecode_user.user_id)\
-                                .all()
-        c.participate_in_pull_requests = \
-            [x.pull_request for x in PullRequestReviewers.query()\
-                                    .filter(PullRequestReviewers.user_id ==
-                                            self.rhodecode_user.user_id)\
-                                    .all()]
-        return render('admin/users/user_edit_my_account_pullrequests.html')
-
-    @NotAnonymous()
-    @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
-    def create_repository(self):
-        """GET /_admin/create_repository: Form to create a new item"""
+                                .all())
 
-        c.repo_groups = RepoGroup.groups_choices(check_perms=True)
-        c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
-        choices, c.landing_revs = ScmModel().get_repo_landing_revs()
-
-        new_repo = request.GET.get('repo', '')
-        c.new_repo = repo_name_slug(new_repo)
+        c.participate_in_pull_requests = _filter([
+                    x.pull_request for x in PullRequestReviewers.query()\
+                    .filter(PullRequestReviewers.user_id ==
+                            self.rhodecode_user.user_id).all()])
 
-        ## apply the defaults from defaults page
-        defaults = RhodeCodeSetting.get_default_repo_settings(strip_prefix=True)
-        return htmlfill.render(
-            render('admin/repos/repo_add_create_repository.html'),
-            defaults=defaults,
-            errors={},
-            prefix_error=False,
-            encoding="UTF-8"
-        )
+        return render('admin/users/user_edit_my_account_pullrequests.html')
 
     def _get_hg_ui_settings(self):
         ret = RhodeCodeUi.query().all()

rhodecode/controllers/admin/users.py

@@ -99,9 +99,9 b' class UsersController(BaseController):'
                 "lastname": user.lastname,
                 "last_login": h.fmt_date(user.last_login),
                 "last_login_raw": datetime_to_time(user.last_login),
-                "active": h.bool2icon(user.active),
-                "admin": h.bool2icon(user.admin),
-                "ldap": h.bool2icon(bool(user.ldap_dn)),
+                "active": h.boolicon(user.active),
+                "admin": h.boolicon(user.admin),
+                "ldap": h.boolicon(bool(user.ldap_dn)),
                 "action": user_actions(user.user_id, user.username),
             })
 
@@ -127,7 +127,7 b' class UsersController(BaseController):'
             usr = form_result['username']
             action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr,
                           None, self.ip_addr, self.sa)
-            h.flash(_('created user %s') % usr,
+            h.flash(_('Created user %s') % usr,
                     category='success')
             Session().commit()
         except formencode.Invalid, errors:
@@ -139,7 +139,7 b' class UsersController(BaseController):'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during creation of user %s') \
+            h.flash(_('Error occurred during creation of user %s') \
                     % request.POST.get('username'), category='error')
         return redirect(url('users'))
 
@@ -195,7 +195,7 b' class UsersController(BaseController):'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of user %s') \
+            h.flash(_('Error occurred during update of user %s') \
                     % form_result.get('username'), category='error')
         return redirect(url('edit_user', id=id))
 
@@ -211,7 +211,7 b' class UsersController(BaseController):'
         try:
             UserModel().delete(usr)
             Session().commit()
-            h.flash(_('successfully deleted user'), category='success')
+            h.flash(_('Successfully deleted user'), category='success')
         except (UserOwnsReposException, DefaultUserException), e:
             h.flash(e, category='warning')
         except Exception:

rhodecode/controllers/admin/users_groups.py

@@ -3,7 +3,7 b''
     rhodecode.controllers.admin.users_groups
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Users Groups crud controller for pylons
+    User Groups crud controller for pylons
 
     :created_on: Jan 25, 2011
     :author: marcink
@@ -33,16 +33,16 b' from pylons.controllers.util import abor'
 from pylons.i18n.translation import _
 
 from rhodecode.lib import helpers as h
-from rhodecode.lib.exceptions import UsersGroupsAssignedException
+from rhodecode.lib.exceptions import UserGroupsAssignedException
 from rhodecode.lib.utils2 import safe_unicode, str2bool
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 
-from rhodecode.model.users_group import UsersGroupModel
+from rhodecode.model.users_group import UserGroupModel
 
-from rhodecode.model.db import User, UsersGroup, UsersGroupToPerm,\
-    UsersGroupRepoToPerm, UsersGroupRepoGroupToPerm
-from rhodecode.model.forms import UsersGroupForm
+from rhodecode.model.db import User, UserGroup, UserGroupToPerm,\
+    UserGroupRepoToPerm, UserGroupRepoGroupToPerm
+from rhodecode.model.forms import UserGroupForm
 from rhodecode.model.meta import Session
 from rhodecode.lib.utils import action_logger
 from sqlalchemy.orm import joinedload
@@ -67,23 +67,23 b' class UsersGroupsController(BaseControll'
     def index(self, format='html'):
         """GET /users_groups: All items in the collection"""
         # url('users_groups')
-        c.users_groups_list = UsersGroup().query().all()
+        c.users_groups_list = UserGroup().query().all()
         return render('admin/users_groups/users_groups.html')
 
     def create(self):
         """POST /users_groups: Create a new item"""
         # url('users_groups')
 
-        users_group_form = UsersGroupForm()()
+        users_group_form = UserGroupForm()()
         try:
             form_result = users_group_form.to_python(dict(request.POST))
-            UsersGroupModel().create(name=form_result['users_group_name'],
+            UserGroupModel().create(name=form_result['users_group_name'],
                                      active=form_result['users_group_active'])
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_created_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
-            h.flash(_('created users group %s') % gr, category='success')
+            h.flash(_('Created user group %s') % gr, category='success')
             Session().commit()
         except formencode.Invalid, errors:
             return htmlfill.render(
@@ -94,7 +94,7 b' class UsersGroupsController(BaseControll'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during creation of users group %s') \
+            h.flash(_('Error occurred during creation of user group %s') \
                     % request.POST.get('users_group_name'), category='error')
 
         return redirect(url('users_groups'))
@@ -110,31 +110,33 b' class UsersGroupsController(BaseControll'
             'repositories_groups': {}
         }
 
-        ugroup_repo_perms = UsersGroupRepoToPerm.query()\
-            .options(joinedload(UsersGroupRepoToPerm.permission))\
-            .options(joinedload(UsersGroupRepoToPerm.repository))\
-            .filter(UsersGroupRepoToPerm.users_group_id == id)\
+        ugroup_repo_perms = UserGroupRepoToPerm.query()\
+            .options(joinedload(UserGroupRepoToPerm.permission))\
+            .options(joinedload(UserGroupRepoToPerm.repository))\
+            .filter(UserGroupRepoToPerm.users_group_id == id)\
             .all()
 
         for gr in ugroup_repo_perms:
             c.users_group.permissions['repositories'][gr.repository.repo_name]  \
                 = gr.permission.permission_name
 
-        ugroup_group_perms = UsersGroupRepoGroupToPerm.query()\
-            .options(joinedload(UsersGroupRepoGroupToPerm.permission))\
-            .options(joinedload(UsersGroupRepoGroupToPerm.group))\
-            .filter(UsersGroupRepoGroupToPerm.users_group_id == id)\
+        ugroup_group_perms = UserGroupRepoGroupToPerm.query()\
+            .options(joinedload(UserGroupRepoGroupToPerm.permission))\
+            .options(joinedload(UserGroupRepoGroupToPerm.group))\
+            .filter(UserGroupRepoGroupToPerm.users_group_id == id)\
             .all()
 
         for gr in ugroup_group_perms:
             c.users_group.permissions['repositories_groups'][gr.group.group_name] \
                 = gr.permission.permission_name
 
-        c.group_members_obj = [x.user for x in c.users_group.members]
+        c.group_members_obj = sorted((x.user for x in c.users_group.members),
+                                     key=lambda u: u.username.lower())
         c.group_members = [(x.user_id, x.username) for x in
                            c.group_members_obj]
-        c.available_members = [(x.user_id, x.username) for x in
-                               User.query().all()]
+        c.available_members = sorted(((x.user_id, x.username) for x in
+                                      User.query().all()),
+                                     key=lambda u: u[1].lower())
 
     def update(self, id):
         """PUT /users_groups/id: Update an existing item"""
@@ -145,26 +147,26 b' class UsersGroupsController(BaseControll'
         #           method='put')
         # url('users_group', id=ID)
 
-        c.users_group = UsersGroup.get_or_404(id)
+        c.users_group = UserGroup.get_or_404(id)
         self._load_data(id)
 
         available_members = [safe_unicode(x[0]) for x in c.available_members]
 
-        users_group_form = UsersGroupForm(edit=True,
+        users_group_form = UserGroupForm(edit=True,
                                           old_data=c.users_group.get_dict(),
                                           available_members=available_members)()
 
         try:
             form_result = users_group_form.to_python(request.POST)
-            UsersGroupModel().update(c.users_group, form_result)
+            UserGroupModel().update(c.users_group, form_result)
             gr = form_result['users_group_name']
             action_logger(self.rhodecode_user,
                           'admin_updated_users_group:%s' % gr,
                           None, self.ip_addr, self.sa)
-            h.flash(_('updated users group %s') % gr, category='success')
+            h.flash(_('Updated user group %s') % gr, category='success')
             Session().commit()
         except formencode.Invalid, errors:
-            ug_model = UsersGroupModel()
+            ug_model = UserGroupModel()
             defaults = errors.value
             e = errors.error_dict or {}
             defaults.update({
@@ -183,7 +185,7 b' class UsersGroupsController(BaseControll'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('error occurred during update of users group %s') \
+            h.flash(_('Error occurred during update of user group %s') \
                     % request.POST.get('users_group_name'), category='error')
 
         return redirect(url('edit_users_group', id=id))
@@ -196,16 +198,16 b' class UsersGroupsController(BaseControll'
         #    h.form(url('users_group', id=ID),
         #           method='delete')
         # url('users_group', id=ID)
-        usr_gr = UsersGroup.get_or_404(id)
+        usr_gr = UserGroup.get_or_404(id)
         try:
-            UsersGroupModel().delete(usr_gr)
+            UserGroupModel().delete(usr_gr)
             Session().commit()
-            h.flash(_('successfully deleted users group'), category='success')
-        except UsersGroupsAssignedException, e:
+            h.flash(_('Successfully deleted user group'), category='success')
+        except UserGroupsAssignedException, e:
             h.flash(e, category='error')
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('An error occurred during deletion of users group'),
+            h.flash(_('An error occurred during deletion of user group'),
                     category='error')
         return redirect(url('users_groups'))
 
@@ -217,10 +219,10 b' class UsersGroupsController(BaseControll'
         """GET /users_groups/id/edit: Form to edit an existing item"""
         # url('edit_users_group', id=ID)
 
-        c.users_group = UsersGroup.get_or_404(id)
+        c.users_group = UserGroup.get_or_404(id)
         self._load_data(id)
 
-        ug_model = UsersGroupModel()
+        ug_model = UserGroupModel()
         defaults = c.users_group.get_dict()
         defaults.update({
             'create_repo_perm': ug_model.has_perm(c.users_group,
@@ -240,37 +242,37 b' class UsersGroupsController(BaseControll'
         """PUT /users_perm/id: Update an existing item"""
         # url('users_group_perm', id=ID, method='put')
 
-        users_group = UsersGroup.get_or_404(id)
+        users_group = UserGroup.get_or_404(id)
         grant_create_perm = str2bool(request.POST.get('create_repo_perm'))
         grant_fork_perm = str2bool(request.POST.get('fork_repo_perm'))
         inherit_perms = str2bool(request.POST.get('inherit_default_permissions'))
 
-        usersgroup_model = UsersGroupModel()
+        usergroup_model = UserGroupModel()
 
         try:
             users_group.inherit_default_permissions = inherit_perms
             Session().add(users_group)
 
             if grant_create_perm:
-                usersgroup_model.revoke_perm(id, 'hg.create.none')
-                usersgroup_model.grant_perm(id, 'hg.create.repository')
-                h.flash(_("Granted 'repository create' permission to users group"),
+                usergroup_model.revoke_perm(id, 'hg.create.none')
+                usergroup_model.grant_perm(id, 'hg.create.repository')
+                h.flash(_("Granted 'repository create' permission to user group"),
                         category='success')
             else:
-                usersgroup_model.revoke_perm(id, 'hg.create.repository')
-                usersgroup_model.grant_perm(id, 'hg.create.none')
-                h.flash(_("Revoked 'repository create' permission to users group"),
+                usergroup_model.revoke_perm(id, 'hg.create.repository')
+                usergroup_model.grant_perm(id, 'hg.create.none')
+                h.flash(_("Revoked 'repository create' permission to user group"),
                         category='success')
 
             if grant_fork_perm:
-                usersgroup_model.revoke_perm(id, 'hg.fork.none')
-                usersgroup_model.grant_perm(id, 'hg.fork.repository')
-                h.flash(_("Granted 'repository fork' permission to users group"),
+                usergroup_model.revoke_perm(id, 'hg.fork.none')
+                usergroup_model.grant_perm(id, 'hg.fork.repository')
+                h.flash(_("Granted 'repository fork' permission to user group"),
                         category='success')
             else:
-                usersgroup_model.revoke_perm(id, 'hg.fork.repository')
-                usersgroup_model.grant_perm(id, 'hg.fork.none')
-                h.flash(_("Revoked 'repository fork' permission to users group"),
+                usergroup_model.revoke_perm(id, 'hg.fork.repository')
+                usergroup_model.grant_perm(id, 'hg.fork.none')
+                h.flash(_("Revoked 'repository fork' permission to user group"),
                         category='success')
 
             Session().commit()

rhodecode/controllers/api/api.py

@@ -27,20 +27,22 b''
 
 import traceback
 import logging
-from pylons.controllers.util import abort
 
 from rhodecode.controllers.api import JSONRPCController, JSONRPCError
 from rhodecode.lib.auth import PasswordGenerator, AuthUser, \
     HasPermissionAllDecorator, HasPermissionAnyDecorator, \
     HasPermissionAnyApi, HasRepoPermissionAnyApi
 from rhodecode.lib.utils import map_groups, repo2db_mapper
+from rhodecode.lib.utils2 import str2bool, time_to_datetime, safe_int
+from rhodecode.lib import helpers as h
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
-from rhodecode.model.users_group import UsersGroupModel
+from rhodecode.model.users_group import UserGroupModel
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.db import Repository, RhodeCodeSetting, UserIpMap
+from rhodecode.lib.compat import json
 
 log = logging.getLogger(__name__)
 
@@ -121,13 +123,13 b' def get_repo_or_error(repoid):'
 
 def get_users_group_or_error(usersgroupid):
     """
-    Get users group by id or name or return JsonRPCError if not found
+    Get user group by id or name or return JsonRPCError if not found
 
     :param userid:
     """
-    users_group = UsersGroupModel().get_group(usersgroupid)
+    users_group = UserGroupModel().get_group(usersgroupid)
     if users_group is None:
-        raise JSONRPCError('users group `%s` does not exist' % usersgroupid)
+        raise JSONRPCError('user group `%s` does not exist' % usersgroupid)
     return users_group
 
 
@@ -202,7 +204,34 b' class ApiController(JSONRPCController):'
                 'Error occurred during rescan repositories action'
             )
 
-    def lock(self, apiuser, repoid, locked, userid=Optional(OAttr('apiuser'))):
+    def invalidate_cache(self, apiuser, repoid):
+        """
+        Dispatch cache invalidation action on given repo
+
+        :param apiuser:
+        :param repoid:
+        """
+        repo = get_repo_or_error(repoid)
+        if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
+            # check if we have admin permission for this repo !
+            if HasRepoPermissionAnyApi('repository.admin',
+                                       'repository.write')(user=apiuser,
+                                            repo_name=repo.repo_name) is False:
+                raise JSONRPCError('repository `%s` does not exist' % (repoid))
+
+        try:
+            invalidated_keys = ScmModel().mark_for_invalidation(repo.repo_name)
+            Session().commit()
+            return ('Cache for repository `%s` was invalidated: '
+                    'invalidated cache keys: %s' % (repoid, invalidated_keys))
+        except Exception:
+            log.error(traceback.format_exc())
+            raise JSONRPCError(
+                'Error occurred during cache invalidation action'
+            )
+
+    def lock(self, apiuser, repoid, locked=Optional(None),
+             userid=Optional(OAttr('apiuser'))):
         """
         Set locking state on particular repository by given user, if
         this command is runned by non-admin account userid is set to user
@@ -230,8 +259,26 b' class ApiController(JSONRPCController):'
 
         if isinstance(userid, Optional):
             userid = apiuser.user_id
+
         user = get_user_or_error(userid)
-        locked = bool(locked)
+
+        if isinstance(locked, Optional):
+            lockobj = Repository.getlock(repo)
+
+            if lockobj[0] is None:
+                return ('Repo `%s` not locked. Locked=`False`.'
+                        % (repo.repo_name))
+            else:
+                userid, time_ = lockobj
+                user = get_user_or_error(userid)
+
+                return ('Repo `%s` locked by `%s`. Locked=`True`. '
+                        'Locked since: `%s`'
+                    % (repo.repo_name, user.username,
+                       json.dumps(time_to_datetime(time_))))
+
+        else:
+            locked = str2bool(locked)
         try:
             if locked:
                 Repository.lock(repo, user.user_id)
@@ -246,6 +293,44 b' class ApiController(JSONRPCController):'
                 'Error occurred locking repository `%s`' % repo.repo_name
             )
 
+    def get_locks(self, apiuser, userid=Optional(OAttr('apiuser'))):
+        """
+        Get all locks for given userid, if
+        this command is runned by non-admin account userid is set to user
+        who is calling this method, thus returning locks for himself
+
+        :param apiuser:
+        :param userid:
+        """
+        if HasPermissionAnyApi('hg.admin')(user=apiuser):
+            pass
+        else:
+            #make sure normal user does not pass someone else userid,
+            #he is not allowed to do that
+            if not isinstance(userid, Optional) and userid != apiuser.user_id:
+                raise JSONRPCError(
+                    'userid is not the same as your user'
+                )
+        ret = []
+        if isinstance(userid, Optional):
+            user = None
+        else:
+            user = get_user_or_error(userid)
+
+        #show all locks
+        for r in Repository.getAll():
+            userid, time_ = r.locked
+            if time_:
+                _api_data = r.get_api_data()
+                # if we use userfilter just show the locks for this user
+                if user:
+                    if safe_int(userid) == user.user_id:
+                        ret.append(_api_data)
+                else:
+                    ret.append(_api_data)
+
+        return ret
+
     @HasPermissionAllDecorator('hg.admin')
     def show_ip(self, apiuser, userid):
         """
@@ -423,7 +508,7 b' class ApiController(JSONRPCController):'
     @HasPermissionAllDecorator('hg.admin')
     def get_users_group(self, apiuser, usersgroupid):
         """"
-        Get users group by name or id
+        Get user group by name or id
 
         :param apiuser:
         :param usersgroupid:
@@ -442,13 +527,13 b' class ApiController(JSONRPCController):'
     @HasPermissionAllDecorator('hg.admin')
     def get_users_groups(self, apiuser):
         """"
-        Get all users groups
+        Get all user groups
 
         :param apiuser:
         """
 
         result = []
-        for users_group in UsersGroupModel().get_all():
+        for users_group in UserGroupModel().get_all():
             result.append(users_group.get_api_data())
         return result
 
@@ -462,15 +547,15 b' class ApiController(JSONRPCController):'
         :param active:
         """
 
-        if UsersGroupModel().get_by_name(group_name):
-            raise JSONRPCError("users group `%s` already exist" % group_name)
+        if UserGroupModel().get_by_name(group_name):
+            raise JSONRPCError("user group `%s` already exist" % group_name)
 
         try:
             active = Optional.extract(active)
-            ug = UsersGroupModel().create(name=group_name, active=active)
+            ug = UserGroupModel().create(name=group_name, active=active)
             Session().commit()
             return dict(
-                msg='created new users group `%s`' % group_name,
+                msg='created new user group `%s`' % group_name,
                 users_group=ug.get_api_data()
             )
         except Exception:
@@ -480,7 +565,7 b' class ApiController(JSONRPCController):'
     @HasPermissionAllDecorator('hg.admin')
     def add_user_to_users_group(self, apiuser, usersgroupid, userid):
         """"
-        Add a user to a users group
+        Add a user to a user group
 
         :param apiuser:
         :param usersgroupid:
@@ -490,9 +575,9 b' class ApiController(JSONRPCController):'
         users_group = get_users_group_or_error(usersgroupid)
 
         try:
-            ugm = UsersGroupModel().add_user_to_group(users_group, user)
+            ugm = UserGroupModel().add_user_to_group(users_group, user)
             success = True if ugm != True else False
-            msg = 'added member `%s` to users group `%s`' % (
+            msg = 'added member `%s` to user group `%s`' % (
                         user.username, users_group.users_group_name
                     )
             msg = msg if success else 'User is already in that group'
@@ -505,7 +590,7 b' class ApiController(JSONRPCController):'
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to add member to users group `%s`' % (
+                'failed to add member to user group `%s`' % (
                     users_group.users_group_name
                 )
             )
@@ -523,9 +608,9 b' class ApiController(JSONRPCController):'
         users_group = get_users_group_or_error(usersgroupid)
 
         try:
-            success = UsersGroupModel().remove_user_from_group(users_group,
+            success = UserGroupModel().remove_user_from_group(users_group,
                                                                user)
-            msg = 'removed member `%s` from users group `%s`' % (
+            msg = 'removed member `%s` from user group `%s`' % (
                         user.username, users_group.users_group_name
                     )
             msg = msg if success else "User wasn't in group"
@@ -534,7 +619,7 b' class ApiController(JSONRPCController):'
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to remove member from users group `%s`' % (
+                'failed to remove member from user group `%s`' % (
                         users_group.users_group_name
                     )
             )
@@ -555,6 +640,7 b' class ApiController(JSONRPCController):'
                 raise JSONRPCError('repository `%s` does not exist' % (repoid))
 
         members = []
+        followers = []
         for user in repo.repo_to_perm:
             perm = user.permission.permission_name
             user = user.user
@@ -571,8 +657,12 b' class ApiController(JSONRPCController):'
             users_group_data['permission'] = perm
             members.append(users_group_data)
 
+        for user in repo.followers:
+            followers.append(user.user.get_api_data())
+
         data = repo.get_api_data()
         data['members'] = members
+        data['followers'] = followers
         return data
 
     def get_repos(self, apiuser):
@@ -763,12 +853,13 b' class ApiController(JSONRPCController):'
                                                             fork_name)
             )
 
-    def delete_repo(self, apiuser, repoid):
+    def delete_repo(self, apiuser, repoid, forks=Optional(None)):
         """
         Deletes a given repository
 
         :param apiuser:
         :param repoid:
+        :param forks: detach or delete, what do do with attached forks for repo
         """
         repo = get_repo_or_error(repoid)
 
@@ -779,10 +870,23 b' class ApiController(JSONRPCController):'
                  raise JSONRPCError('repository `%s` does not exist' % (repoid))
 
         try:
-            RepoModel().delete(repo)
+            handle_forks = Optional.extract(forks)
+            _forks_msg = ''
+            _forks = [f for f in repo.forks]
+            if handle_forks == 'detach':
+                _forks_msg = ' ' + _('Detached %s forks') % len(_forks)
+            elif handle_forks == 'delete':
+                _forks_msg = ' ' + _('Deleted %s forks') % len(_forks)
+            elif _forks:
+                raise JSONRPCError(
+                    'Cannot delete `%s` it still contains attached forks'
+                    % repo.repo_name
+                )
+
+            RepoModel().delete(repo, forks=forks)
             Session().commit()
             return dict(
-                msg='Deleted repository `%s`' % repo.repo_name,
+                msg='Deleted repository `%s`%s' % (repo.repo_name, _forks_msg),
                 success=True
             )
         except Exception:
@@ -859,7 +963,7 b' class ApiController(JSONRPCController):'
     def grant_users_group_permission(self, apiuser, repoid, usersgroupid,
                                      perm):
         """
-        Grant permission for users group on given repository, or update
+        Grant permission for user group on given repository, or update
         existing one if found
 
         :param apiuser:
@@ -878,7 +982,7 b' class ApiController(JSONRPCController):'
 
             Session().commit()
             return dict(
-                msg='Granted perm: `%s` for users group: `%s` in '
+                msg='Granted perm: `%s` for user group: `%s` in '
                     'repo: `%s`' % (
                     perm.permission_name, users_group.users_group_name,
                     repo.repo_name
@@ -888,7 +992,7 b' class ApiController(JSONRPCController):'
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to edit permission for users group: `%s` in '
+                'failed to edit permission for user group: `%s` in '
                 'repo: `%s`' % (
                     usersgroupid, repo.repo_name
                 )
@@ -897,7 +1001,7 b' class ApiController(JSONRPCController):'
     @HasPermissionAllDecorator('hg.admin')
     def revoke_users_group_permission(self, apiuser, repoid, usersgroupid):
         """
-        Revoke permission for users group on given repository
+        Revoke permission for user group on given repository
 
         :param apiuser:
         :param repoid:
@@ -912,7 +1016,7 b' class ApiController(JSONRPCController):'
 
             Session().commit()
             return dict(
-                msg='Revoked perm for users group: `%s` in repo: `%s`' % (
+                msg='Revoked perm for user group: `%s` in repo: `%s`' % (
                     users_group.users_group_name, repo.repo_name
                 ),
                 success=True
@@ -920,7 +1024,7 b' class ApiController(JSONRPCController):'
         except Exception:
             log.error(traceback.format_exc())
             raise JSONRPCError(
-                'failed to edit permission for users group: `%s` in '
+                'failed to edit permission for user group: `%s` in '
                 'repo: `%s`' % (
                     users_group.users_group_name, repo.repo_name
                 )

rhodecode/controllers/changelog.py

@@ -86,8 +86,8 b' class ChangelogController(BaseRepoContro'
             c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
-            h.flash(str(e), category='warning')
-            return redirect(url('home'))
+            h.flash(str(e), category='error')
+            return redirect(url('changelog_home', repo_name=c.repo_name))
 
         self._graph(c.rhodecode_repo, collection, c.total_cs, c.size, p)
 

rhodecode/controllers/changeset.py

@@ -26,7 +26,7 b''
 import logging
 import traceback
 from collections import defaultdict
-from webob.exc import HTTPForbidden, HTTPBadRequest
+from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound
 
 from pylons import tmpl_context as c, url, request, response
 from pylons.i18n.translation import _
@@ -71,7 +71,7 b' def get_ignore_ws(fid, GET):'
     if ig_ws:
         try:
             return int(ig_ws[0].split(':')[-1])
-        except:
+        except Exception:
             pass
     return ig_ws_global
 
@@ -80,21 +80,21 b' def _ignorews_url(GET, fileid=None):'
     fileid = str(fileid) if fileid else None
     params = defaultdict(list)
     _update_with_GET(params, GET)
-    lbl = _('show white space')
+    lbl = _('Show white space')
     ig_ws = get_ignore_ws(fileid, GET)
     ln_ctx = get_line_ctx(fileid, GET)
     # global option
     if fileid is None:
         if ig_ws is None:
             params['ignorews'] += [1]
-            lbl = _('ignore white space')
+            lbl = _('Ignore white space')
         ctx_key = 'context'
         ctx_val = ln_ctx
     # per file options
     else:
         if ig_ws is None:
             params[fileid] += ['WS:1']
-            lbl = _('ignore white space')
+            lbl = _('Ignore white space')
 
         ctx_key = fileid
         ctx_val = 'C:%s' % ln_ctx
@@ -124,7 +124,7 b' def get_line_ctx(fid, GET):'
 
     try:
         return int(retval)
-    except:
+    except Exception:
         return 3
 
 
@@ -203,8 +203,8 b' class ChangesetController(BaseRepoContro'
 
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
-            h.flash(str(e), category='warning')
-            return redirect(url('home'))
+            h.flash(str(e), category='error')
+            raise HTTPNotFound()
 
         c.changes = OrderedDict()
 
@@ -329,7 +329,7 b' class ChangesetController(BaseRepoContro'
             text = text or (_('Status change -> %s')
                             % ChangesetStatus.get_status_lbl(status))
 
-        comm = ChangesetCommentsModel().create(
+        c.co = comm = ChangesetCommentsModel().create(
             text=text,
             repo=c.rhodecode_db_repo.repo_id,
             user=c.rhodecode_user.user_id,
@@ -371,12 +371,11 b' class ChangesetController(BaseRepoContro'
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             return redirect(h.url('changeset_home', repo_name=repo_name,
                                   revision=revision))
-
+        #only ajax below
         data = {
            'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
         }
         if comm:
-            c.co = comm
             data.update(comm.get_dict())
             data.update({'rendered_text':
                          render('changeset/changeset_comment_block.html')})

rhodecode/controllers/compare.py

@@ -3,7 +3,7 b''
     rhodecode.controllers.compare
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    compare controller for pylons showoing differences between two
+    compare controller for pylons showing differences between two
     repos, branches, bookmarks or tips
 
     :created_on: May 6, 2012
@@ -40,7 +40,6 b' from rhodecode.lib import diffs'
 from rhodecode.model.db import Repository
 from rhodecode.model.pull_request import PullRequestModel
 from webob.exc import HTTPBadRequest
-from rhodecode.lib.utils2 import str2bool
 from rhodecode.lib.diffs import LimitedDiffContainer
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 
@@ -84,80 +83,85 b' class CompareController(BaseRepoControll'
             raise HTTPBadRequest()
 
     def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
-
+        # org_ref will be evaluated in org_repo
         org_repo = c.rhodecode_db_repo.repo_name
         org_ref = (org_ref_type, org_ref)
+        # other_ref will be evaluated in other_repo
         other_ref = (other_ref_type, other_ref)
-        other_repo = request.GET.get('repo', org_repo)
-        incoming_changesets = str2bool(request.GET.get('bundle', False))
-        c.fulldiff = fulldiff = request.GET.get('fulldiff')
-        rev_start = request.GET.get('rev_start')
-        rev_end = request.GET.get('rev_end')
-
-        c.swap_url = h.url('compare_url', repo_name=other_repo,
+        other_repo = request.GET.get('other_repo', org_repo)
+        # If merge is True:
+        #   Show what org would get if merged with other:
+        #   List changesets that are ancestors of other but not of org.
+        #   New changesets in org is thus ignored.
+        #   Diff will be from common ancestor, and merges of org to other will thus be ignored.
+        # If merge is False:
+        #   Make a raw diff from org to other, no matter if related or not.
+        #   Changesets in one and not in the other will be ignored
+        merge = bool(request.GET.get('merge'))
+        # fulldiff disables cut_off_limit
+        c.fulldiff = request.GET.get('fulldiff')
+        # partial uses compare_cs.html template directly
+        partial = request.environ.get('HTTP_X_PARTIAL_XHR')
+        # as_form puts hidden input field with changeset revisions
+        c.as_form = partial and request.GET.get('as_form')
+        # swap url for compare_diff page - never partial and never as_form
+        c.swap_url = h.url('compare_url',
+            repo_name=other_repo,
               org_ref_type=other_ref[0], org_ref=other_ref[1],
+            other_repo=org_repo,
               other_ref_type=org_ref[0], other_ref=org_ref[1],
-              repo=org_repo, as_form=request.GET.get('as_form'),
-              bundle=incoming_changesets)
+            merge=merge or '')
 
-        c.org_repo = org_repo = Repository.get_by_repo_name(org_repo)
-        c.other_repo = other_repo = Repository.get_by_repo_name(other_repo)
+        org_repo = Repository.get_by_repo_name(org_repo)
+        other_repo = Repository.get_by_repo_name(other_repo)
 
-        if c.org_repo is None:
+        if org_repo is None:
             log.error('Could not find org repo %s' % org_repo)
             raise HTTPNotFound
-        if c.other_repo is None:
+        if other_repo is None:
             log.error('Could not find other repo %s' % other_repo)
             raise HTTPNotFound
 
-        if c.org_repo != c.other_repo and h.is_git(c.rhodecode_repo):
+        if org_repo != other_repo and h.is_git(org_repo):
             log.error('compare of two remote repos not available for GIT REPOS')
             raise HTTPNotFound
 
-        if c.org_repo.scm_instance.alias != c.other_repo.scm_instance.alias:
+        if org_repo.scm_instance.alias != other_repo.scm_instance.alias:
             log.error('compare of two different kind of remote repos not available')
             raise HTTPNotFound
 
-        partial = request.environ.get('HTTP_X_PARTIAL_XHR')
         self.__get_cs_or_redirect(rev=org_ref, repo=org_repo, partial=partial)
         self.__get_cs_or_redirect(rev=other_ref, repo=other_repo, partial=partial)
 
-        if rev_start and rev_end:
-            #replace our org_ref with given CS
-            org_ref = ('rev', rev_start)
-            other_ref = ('rev', rev_end)
+        c.org_repo = org_repo
+        c.other_repo = other_repo
+        c.org_ref = org_ref[1]
+        c.other_ref = other_ref[1]
+        c.org_ref_type = org_ref[0]
+        c.other_ref_type = other_ref[0]
 
-        c.cs_ranges, discovery_data = PullRequestModel().get_compare_data(
-                                    org_repo, org_ref, other_repo, other_ref,
-                                    )
+        c.cs_ranges, c.ancestor = PullRequestModel().get_compare_data(
+            org_repo, org_ref, other_repo, other_ref, merge)
 
         c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
                                                    c.cs_ranges])
-        c.target_repo = c.repo_name
-        # defines that we need hidden inputs with changesets
-        c.as_form = request.GET.get('as_form', False)
         if partial:
+            assert c.ancestor
             return render('compare/compare_cs.html')
 
-        c.org_ref = org_ref[1]
-        c.other_ref = other_ref[1]
+        if c.ancestor:
+            assert merge
+            # case we want a simple diff without incoming changesets,
+            # previewing what will be merged.
+            # Make the diff on the other repo (which is known to have other_ref)
+            log.debug('Using ancestor %s as org_ref instead of %s'
+                      % (c.ancestor, org_ref))
+            org_ref = ('rev', c.ancestor)
+            org_repo = other_repo
 
-        if not incoming_changesets and c.cs_ranges and c.org_repo != c.other_repo:
-            # case we want a simple diff without incoming changesets, just
-            # for review purposes. Make the diff on the forked repo, with
-            # revision that is common ancestor
-            _org_ref = org_ref
-            org_ref = ('rev', getattr(c.cs_ranges[0].parents[0]
-                                      if c.cs_ranges[0].parents
-                                      else EmptyChangeset(), 'raw_id'))
-            log.debug('Changed org_ref from %s to %s' % (_org_ref, org_ref))
-            other_repo = org_repo
+        diff_limit = self.cut_off_limit if not c.fulldiff else None
 
-        diff_limit = self.cut_off_limit if not fulldiff else None
-
-        _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref,
-                             discovery_data,
-                             remote_compare=incoming_changesets)
+        _diff = diffs.differ(org_repo, org_ref, other_repo, other_ref)
 
         diff_processor = diffs.DiffProcessor(_diff or '', format='gitdiff',
                                              diff_limit=diff_limit)

rhodecode/controllers/error.py

@@ -91,7 +91,7 b' class ErrorController(BaseController):'
             [400, 401, 403, 404, 500]'''
         try:
             code = int(code)
-        except:
+        except Exception:
             code = 500
 
         if code == 400:

rhodecode/controllers/feed.py

@@ -88,9 +88,8 b' class FeedController(BaseRepoController)'
 
     def __get_desc(self, cs):
         desc_msg = []
-        desc_msg.append('%s %s %s<br/>' % (h.person(cs.author),
-                                           _('commited on'),
-                                           h.fmt_date(cs.date)))
+        desc_msg.append((_('%s committed on %s')
+                         % (h.person(cs.author), h.fmt_date(cs.date))) + '<br/>')
         #branches, tags, bookmarks
         if cs.branch:
             desc_msg.append('branch: %s<br/>' % cs.branch)
@@ -103,7 +102,7 b' class FeedController(BaseRepoController)'
         # rev link
         _url = url('changeset_home', repo_name=cs.repository.name,
                    revision=cs.raw_id, qualified=True)
-        desc_msg.append('changesest: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
+        desc_msg.append('changeset: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
 
         desc_msg.append('<pre>')
         desc_msg.append(cs.message)

rhodecode/controllers/files.py

@@ -27,6 +27,7 b' import os'
 import logging
 import traceback
 import tempfile
+import shutil
 
 from pylons import request, response, tmpl_context as c, url
 from pylons.i18n.translation import _
@@ -55,6 +56,7 b' from rhodecode.model.db import Repositor'
 
 from rhodecode.controllers.changeset import anchor_url, _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
+from webob.exc import HTTPNotFound
 
 
 log = logging.getLogger(__name__)
@@ -83,14 +85,14 b' class FilesController(BaseRepoController'
             url_ = url('files_add_home',
                        repo_name=c.repo_name,
                        revision=0, f_path='')
-            add_new = '<a href="%s">[%s]</a>' % (url_, _('click here to add new file'))
+            add_new = h.link_to(_('Click here to add new file'), url_)
             h.flash(h.literal(_('There are no files yet %s') % add_new),
                     category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
 
-        except RepositoryError, e:
-            h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
+        except RepositoryError, e:  # including ChangesetDoesNotExistError
+            h.flash(str(e), category='error')
+            raise HTTPNotFound()
 
     def __get_filenode_or_redirect(self, repo_name, cs, path):
         """
@@ -107,9 +109,8 b' class FilesController(BaseRepoController'
             if file_node.is_dir():
                 raise RepositoryError('given path is a directory')
         except RepositoryError, e:
-            h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name,
-                           revision=cs.raw_id))
+            h.flash(str(e), category='error')
+            raise HTTPNotFound()
 
         return file_node
 
@@ -121,13 +122,12 b' class FilesController(BaseRepoController'
         post_revision = request.POST.get('at_rev', None)
         if post_revision:
             cs = self.__get_cs_or_redirect(post_revision, repo_name)
-            redirect(url('files_home', repo_name=c.repo_name,
-                         revision=cs.raw_id, f_path=f_path))
 
         c.changeset = self.__get_cs_or_redirect(revision, repo_name)
         c.branch = request.GET.get('branch', None)
         c.f_path = f_path
         c.annotate = annotate
+        c.changeset = self.__get_cs_or_redirect(revision, repo_name)
         cur_rev = c.changeset.revision
 
         # prev link
@@ -160,6 +160,9 b' class FilesController(BaseRepoController'
                 c.file_changeset = (c.changeset
                                     if c.changeset.revision < file_last_cs.revision
                                     else file_last_cs)
+                #determine if we're on branch head
+                _branches = c.rhodecode_repo.branches
+                c.on_branch_head = revision in _branches.keys() + _branches.values()
                 _hist = []
                 c.file_history = []
                 if c.load_full_history:
@@ -171,9 +174,8 b' class FilesController(BaseRepoController'
             else:
                 c.authors = c.file_history = []
         except RepositoryError, e:
-            h.flash(str(e), category='warning')
-            redirect(h.url('files_home', repo_name=repo_name,
-                           revision='tip'))
+            h.flash(str(e), category='error')
+            raise HTTPNotFound()
 
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('files/files_ypjax.html')
@@ -260,7 +262,7 b' class FilesController(BaseRepoController'
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     def edit(self, repo_name, revision, f_path):
-        repo = Repository.get_by_repo_name(repo_name)
+        repo = c.rhodecode_db_repo
         if repo.enable_locking and repo.locked[0]:
             h.flash(_('This repository is has been locked by %s on %s')
                 % (h.person_by_id(repo.locked[0]),
@@ -269,6 +271,17 b' class FilesController(BaseRepoController'
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip'))
 
+        # check if revision is a branch identifier- basically we cannot
+        # create multiple heads via file editing
+        _branches = repo.scm_instance.branches
+        # check if revision is a branch name or branch hash
+        if revision not in _branches.keys() + _branches.values():
+            h.flash(_('You can only edit files with revision '
+                      'being a valid branch '), category='warning')
+            return redirect(h.url('files_home',
+                                  repo_name=repo_name, revision='tip',
+                                  f_path=f_path))
+
         r_post = request.POST
 
         c.cs = self.__get_cs_or_redirect(revision, repo_name)
@@ -277,7 +290,7 b' class FilesController(BaseRepoController'
         if c.file.is_binary:
             return redirect(url('files_home', repo_name=c.repo_name,
                          revision=c.cs.raw_id, f_path=f_path))
-
+        c.default_message = _('Edited file %s via RhodeCode') % (f_path)
         c.f_path = f_path
 
         if r_post:
@@ -289,20 +302,17 b' class FilesController(BaseRepoController'
             mode = detect_mode(first_line, 0)
             content = convert_line_endings(r_post.get('content'), mode)
 
-            message = r_post.get('message') or (_('Edited %s via RhodeCode')
-                                                % (f_path))
+            message = r_post.get('message') or c.default_message
             author = self.rhodecode_user.full_contact
 
             if content == old_content:
-                h.flash(_('No changes'),
-                    category='warning')
+                h.flash(_('No changes'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
-
             try:
                 self.scm_model.commit_change(repo=c.rhodecode_repo,
                                              repo_name=repo_name, cs=c.cs,
-                                             user=self.rhodecode_user,
+                                             user=self.rhodecode_user.user_id,
                                              author=author, message=message,
                                              content=content, f_path=f_path)
                 h.flash(_('Successfully committed to %s') % f_path,
@@ -334,26 +344,22 b' class FilesController(BaseRepoController'
                                          redirect_after=False)
         if c.cs is None:
             c.cs = EmptyChangeset(alias=c.rhodecode_repo.alias)
-
+        c.default_message = (_('Added file via RhodeCode'))
         c.f_path = f_path
 
         if r_post:
             unix_mode = 0
             content = convert_line_endings(r_post.get('content'), unix_mode)
 
-            message = r_post.get('message') or (_('Added %s via RhodeCode')
-                                                % (f_path))
+            message = r_post.get('message') or c.default_message
+            filename = r_post.get('filename')
             location = r_post.get('location')
-            filename = r_post.get('filename')
             file_obj = r_post.get('upload_file', None)
 
             if file_obj is not None and hasattr(file_obj, 'filename'):
                 filename = file_obj.filename
                 content = file_obj.file
 
-            node_path = os.path.join(location, filename)
-            author = self.rhodecode_user.full_contact
-
             if not content:
                 h.flash(_('No content'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
@@ -362,16 +368,26 b' class FilesController(BaseRepoController'
                 h.flash(_('No filename'), category='warning')
                 return redirect(url('changeset_home', repo_name=c.repo_name,
                                     revision='tip'))
+            if location.startswith('/') or location.startswith('.') or '../' in location:
+                h.flash(_('Location must be relative path and must not '
+                          'contain .. in path'), category='warning')
+                return redirect(url('changeset_home', repo_name=c.repo_name,
+                                    revision='tip'))
+            if location:
+                location = os.path.normpath(location)
+            filename = os.path.basename(filename)
+            node_path = os.path.join(location, filename)
+            author = self.rhodecode_user.full_contact
 
             try:
                 self.scm_model.create_node(repo=c.rhodecode_repo,
                                            repo_name=repo_name, cs=c.cs,
-                                           user=self.rhodecode_user,
+                                           user=self.rhodecode_user.user_id,
                                            author=author, message=message,
                                            content=content, f_path=node_path)
                 h.flash(_('Successfully committed to %s') % node_path,
                         category='success')
-            except NodeAlreadyExistsError, e:
+            except (NodeError, NodeAlreadyExistsError), e:
                 h.flash(_(e), category='error')
             except Exception:
                 log.error(traceback.format_exc())
@@ -400,8 +416,8 b' class FilesController(BaseRepoController'
 
         try:
             dbrepo = RepoModel().get_by_repo_name(repo_name)
-            if dbrepo.enable_downloads is False:
-                return _('downloads disabled')
+            if not dbrepo.enable_downloads:
+                return _('Downloads disabled')
 
             if c.rhodecode_repo.alias == 'hg':
                 # patch and reset hooks section of UI config to not run any
@@ -417,10 +433,39 b' class FilesController(BaseRepoController'
             return _('Empty repository')
         except (ImproperArchiveTypeError, KeyError):
             return _('Unknown archive type')
+        # archive cache
+        from rhodecode import CONFIG
+        rev_name = cs.raw_id[:12]
+        archive_name = '%s-%s%s' % (safe_str(repo_name.replace('/', '_')),
+                                    safe_str(rev_name), ext)
 
+        use_cached_archive = False  # defines if we use cached version of archive
+        archive_cache_enabled = CONFIG.get('archive_cache_dir')
+        if not subrepos and archive_cache_enabled:
+            #check if we it's ok to write
+            if not os.path.isdir(CONFIG['archive_cache_dir']):
+                os.makedirs(CONFIG['archive_cache_dir'])
+            cached_archive_path = os.path.join(CONFIG['archive_cache_dir'], archive_name)
+            if os.path.isfile(cached_archive_path):
+                log.debug('Found cached archive in %s' % cached_archive_path)
+                fd, archive = None, cached_archive_path
+                use_cached_archive = True
+            else:
+                log.debug('Archive %s is not yet cached' % (archive_name))
+
+        if not use_cached_archive:
+            #generate new archive
+            try:
         fd, archive = tempfile.mkstemp()
         t = open(archive, 'wb')
+                log.debug('Creating new temp archive in %s' % archive)
         cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos)
+                if archive_cache_enabled:
+                    #if we generated the archive and use cache rename that
+                    log.debug('Storing new archive in %s' % cached_archive_path)
+                    shutil.move(archive, cached_archive_path)
+                    archive = cached_archive_path
+            finally:
         t.close()
 
         def get_chunked_archive(archive):
@@ -429,13 +474,15 b' class FilesController(BaseRepoController'
                 data = stream.read(16 * 1024)
                 if not data:
                     stream.close()
+                    if fd:  # fd means we used temporary file
                     os.close(fd)
+                    if not archive_cache_enabled:
+                        log.debug('Destroing temp archive %s' % archive)
                     os.remove(archive)
                     break
                 yield data
 
-        response.content_disposition = str('attachment; filename=%s-%s%s' \
-                                           % (repo_name, revision[:12], ext))
+        response.content_disposition = str('attachment; filename=%s' % (archive_name))
         response.content_type = str(content_type)
         return get_chunked_archive(archive)
 
@@ -474,6 +521,9 b' class FilesController(BaseRepoController'
                 c.changeset_1 = c.rhodecode_repo.get_changeset(diff1)
                 try:
                     node1 = c.changeset_1.get_node(f_path)
+                    if node1.is_dir():
+                        raise NodeError('%s path is a %s not a file'
+                                        % (node1, type(node1)))
                 except NodeDoesNotExistError:
                     c.changeset_1 = EmptyChangeset(cs=diff1,
                                                    revision=c.changeset_1.revision,
@@ -487,6 +537,9 b' class FilesController(BaseRepoController'
                 c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)
                 try:
                     node2 = c.changeset_2.get_node(f_path)
+                    if node2.is_dir():
+                        raise NodeError('%s path is a %s not a file'
+                                        % (node2, type(node2)))
                 except NodeDoesNotExistError:
                     c.changeset_2 = EmptyChangeset(cs=diff2,
                                                    revision=c.changeset_2.revision,

rhodecode/controllers/forks.py

@@ -38,10 +38,11 b' from rhodecode.lib.auth import LoginRequ'
     NotAnonymous, HasRepoPermissionAny, HasPermissionAllDecorator,\
     HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
-from rhodecode.model.db import Repository, RepoGroup, UserFollowing, User
+from rhodecode.model.db import Repository, RepoGroup, UserFollowing, User,\
+    RhodeCodeUi
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.forms import RepoForkForm
-from rhodecode.model.scm import ScmModel
+from rhodecode.model.scm import ScmModel, GroupList
 from rhodecode.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
@@ -54,7 +55,9 b' class ForksController(BaseRepoController'
         super(ForksController, self).__before__()
 
     def __load_defaults(self):
-        c.repo_groups = RepoGroup.groups_choices(check_perms=True)
+        acl_groups = GroupList(RepoGroup.query().all(),
+                               perm_set=['group.write', 'group.admin'])
+        c.repo_groups = RepoGroup.groups_choices(groups=acl_groups)
         c.repo_groups_choices = map(lambda k: unicode(k[0]), c.repo_groups)
         choices, c.landing_revs = ScmModel().get_repo_landing_revs()
         c.landing_revs_choices = choices
@@ -93,9 +96,16 b' class ForksController(BaseRepoController'
             c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                             c.repo_last_rev) * 100)
 
+        c.can_update = RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE).ui_active
+
         defaults = RepoModel()._get_defaults(repo_name)
+        # alter the description to indicate a fork
+        defaults['description'] = ('fork of repository: %s \n%s'
+                                   % (defaults['repo_name'],
+                                      defaults['description']))
         # add suffix to fork
         defaults['repo_name'] = '%s-fork' % defaults['repo_name']
+
         return defaults
 
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -152,11 +162,18 b' class ForksController(BaseRepoController'
         try:
             form_result = _form.to_python(dict(request.POST))
 
+            # an approximation that is better than nothing
+            if not RhodeCodeUi.get_by_key(RhodeCodeUi.HOOK_UPDATE).ui_active:
+                form_result['update_after_clone'] = False
+
             # create fork is done sometimes async on celery, db transaction
             # management is handled there.
             RepoModel().create_fork(form_result, self.rhodecode_user.user_id)
-            h.flash(_('forked %s repository as %s') \
-                      % (repo_name, form_result['repo_name']),
+            fork_url = h.link_to(form_result['repo_name_full'],
+                    h.url('summary_home', repo_name=form_result['repo_name_full']))
+
+            h.flash(h.literal(_('Forked repository %s as %s') \
+                      % (repo_name, fork_url)),
                     category='success')
         except formencode.Invalid, errors:
             c.new_repo = errors.value['repo_name']
@@ -172,4 +189,4 b' class ForksController(BaseRepoController'
             h.flash(_('An error occurred during repository forking %s') %
                     repo_name, category='error')
 
-        return redirect(url('home'))
+        return redirect(h.url('summary_home', repo_name=repo_name))

rhodecode/controllers/home.py

@@ -52,7 +52,7 b' class HomeController(BaseController):'
         c.groups = self.scm_model.get_repos_groups()
         c.group = None
 
-        if c.visual.lightweight_dashboard is False:
+        if not c.visual.lightweight_dashboard:
             c.repos_list = self.scm_model.get_repos()
         ## lightweight version of dashboard
         else:
@@ -81,7 +81,7 b' class HomeController(BaseController):'
     def branch_tag_switcher(self, repo_name):
         if request.is_xhr:
             c.rhodecode_db_repo = Repository.get_by_repo_name(c.repo_name)
+            if c.rhodecode_db_repo:
             c.rhodecode_repo = c.rhodecode_db_repo.scm_instance
             return render('/switch_to_list.html')
-        else:
             raise HTTPBadRequest()

rhodecode/controllers/journal.py

@@ -207,7 +207,7 b' class JournalController(BaseController):'
             #filter
             try:
                 journal = _journal_filter(journal, c.search_term)
-            except:
+            except Exception:
                 # we want this to crash for now
                 raise
             journal = journal.filter(filtering_criterion)\
@@ -231,7 +231,7 b' class JournalController(BaseController):'
                                                 self.rhodecode_user.user_id)
                     Session.commit()
                     return 'ok'
-                except:
+                except Exception:
                     raise HTTPBadRequest()
 
             repo_id = request.POST.get('follows_repo_id')
@@ -241,7 +241,7 b' class JournalController(BaseController):'
                                                 self.rhodecode_user.user_id)
                     Session.commit()
                     return 'ok'
-                except:
+                except Exception:
                     raise HTTPBadRequest()
 
         log.debug('token mismatch %s vs %s' % (cur_token, token))

rhodecode/controllers/login.py

@@ -76,7 +76,7 b' class LoginController(BaseController):'
                 Session().commit()
 
                 # If they want to be remembered, update the cookie
-                if c.form_result['remember'] is not False:
+                if c.form_result['remember']:
                     _year = (datetime.datetime.now() +
                              datetime.timedelta(seconds=60 * 60 * 24 * 365))
                     session._set_cookie_expires(_year)

rhodecode/controllers/pullrequests.py

@@ -38,6 +38,7 b' from rhodecode.lib.compat import json'
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
     NotAnonymous
+from rhodecode.lib.helpers import Page
 from rhodecode.lib import helpers as h
 from rhodecode.lib import diffs
 from rhodecode.lib.utils import action_logger, jsonify
@@ -52,6 +53,8 b' from rhodecode.model.repo import RepoMod'
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.forms import PullRequestForm
+from mercurial import scmutil
+from rhodecode.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
 
@@ -67,34 +70,68 b' class PullrequestsController(BaseRepoCon'
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
 
-    def _get_repo_refs(self, repo):
-        hist_l = []
+    def _get_repo_refs(self, repo, rev=None, branch_rev=None):
+        """return a structure with repo's interesting changesets, suitable for
+        the selectors in pullrequest.html"""
 
-        branches_group = ([('branch:%s:%s' % (k, v), k) for
-                         k, v in repo.branches.iteritems()], _("Branches"))
-        bookmarks_group = ([('book:%s:%s' % (k, v), k) for
-                         k, v in repo.bookmarks.iteritems()], _("Bookmarks"))
-        tags_group = ([('tag:%s:%s' % (k, v), k) for
-                         k, v in repo.tags.iteritems()], _("Tags"))
-
-        hist_l.append(bookmarks_group)
-        hist_l.append(branches_group)
-        hist_l.append(tags_group)
+        # list named branches that has been merged to this named branch - it should probably merge back
+        peers = []
+        if branch_rev:
+            # not restricting to merge() would also get branch point and be better
+            # (especially because it would get the branch point) ... but is currently too expensive
+            revs = ["sort(parents(branch(id('%s')) and merge()) - branch(id('%s')))" %
+                    (branch_rev, branch_rev)]
+            otherbranches = {}
+            for i in scmutil.revrange(repo._repo, revs):
+                cs = repo.get_changeset(i)
+                otherbranches[cs.branch] = cs.raw_id
+            for branch, node in otherbranches.iteritems():
+                selected = 'branch:%s:%s' % (branch, node)
+                peers.append((selected, branch))
 
-        return hist_l
+        selected = None
+        branches = []
+        for branch, branchrev in repo.branches.iteritems():
+            n = 'branch:%s:%s' % (branch, branchrev)
+            branches.append((n, branch))
+            if rev == branchrev:
+                selected = n
+        bookmarks = []
+        for bookmark, bookmarkrev in repo.bookmarks.iteritems():
+            n = 'book:%s:%s' % (bookmark, bookmarkrev)
+            bookmarks.append((n, bookmark))
+            if rev == bookmarkrev:
+                selected = n
+        tags = []
+        for tag, tagrev in repo.tags.iteritems():
+            n = 'tag:%s:%s' % (tag, tagrev)
+            tags.append((n, tag))
+            if rev == tagrev and tag != 'tip': # tip is not a real tag - and its branch is better
+                selected = n
 
-    def _get_default_rev(self, repo):
-        """
-        Get's default revision to do compare on pull request
+        # prio 1: rev was selected as existing entry above
 
-        :param repo:
-        """
-        repo = repo.scm_instance
-        if 'default' in repo.branches:
-            return 'default'
-        else:
-            #if repo doesn't have default branch return first found
-            return repo.branches.keys()[0]
+        # prio 2: create special entry for rev; rev _must_ be used
+        specials = []
+        if rev and selected is None:
+            selected = 'rev:%s:%s' % (rev, rev)
+            specials = [(selected, '%s: %s' % (_("Changeset"), rev[:12]))]
+
+        # prio 3: most recent peer branch
+        if peers and not selected:
+            selected = peers[0][0][0]
+
+        # prio 4: tip revision
+        if not selected:
+            selected = 'tag:tip:%s' % repo.tags['tip']
+
+        groups = [(specials, _("Special")),
+                  (peers, _("Peer branches")),
+                  (bookmarks, _("Bookmarks")),
+                  (branches, _("Branches")),
+                  (tags, _("Tags")),
+                  ]
+        return [g for g in groups if g[0]], selected
 
     def _get_is_allowed_change_status(self, pull_request):
         owner = self.rhodecode_user.user_id == pull_request.user_id
@@ -105,6 +142,15 b' class PullrequestsController(BaseRepoCon'
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.repo_name = repo_name
+        p = safe_int(request.params.get('page', 1), 1)
+
+        c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=10)
+
+        c.pullrequest_data = render('/pullrequests/pullrequest_data.html')
+
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
+            return c.pullrequest_data
+
         return render('/pullrequests/pullrequest_show_all.html')
 
     @NotAnonymous()
@@ -122,59 +168,51 b' class PullrequestsController(BaseRepoCon'
                     category='warning')
             redirect(url('summary_home', repo_name=org_repo.repo_name))
 
+        org_rev = request.GET.get('rev_end')
+        # rev_start is not directly useful - its parent could however be used
+        # as default for other and thus give a simple compare view
+        #other_rev = request.POST.get('rev_start')
+
+        c.org_repos = []
+        c.org_repos.append((org_repo.repo_name, org_repo.repo_name))
+        c.default_org_repo = org_repo.repo_name
+        c.org_refs, c.default_org_ref = self._get_repo_refs(org_repo.scm_instance, org_rev)
+
+        c.other_repos = []
         other_repos_info = {}
 
-        c.org_refs = self._get_repo_refs(c.rhodecode_repo)
-        c.org_repos = []
-        c.other_repos = []
-        c.org_repos.append((org_repo.repo_name, '%s/%s' % (
-                                org_repo.user.username, c.repo_name))
-                           )
-
-        # add org repo to other so we can open pull request agains itself
-        c.other_repos.extend(c.org_repos)
-
-        c.default_pull_request = org_repo.repo_name  # repo name pre-selected
-        c.default_pull_request_rev = self._get_default_rev(org_repo)  # revision pre-selected
-        c.default_revs = self._get_repo_refs(org_repo.scm_instance)
-        #add orginal repo
-        other_repos_info[org_repo.repo_name] = {
-            'gravatar': h.gravatar_url(org_repo.user.email, 24),
-            'description': org_repo.description,
-            'revs': h.select('other_ref', '', c.default_revs, class_='refs')
+        def add_other_repo(repo, branch_rev=None):
+            if repo.repo_name in other_repos_info: # shouldn't happen
+                return
+            c.other_repos.append((repo.repo_name, repo.repo_name))
+            other_refs, selected_other_ref = self._get_repo_refs(repo.scm_instance, branch_rev=branch_rev)
+            other_repos_info[repo.repo_name] = {
+                'user': dict(user_id=repo.user.user_id,
+                             username=repo.user.username,
+                             firstname=repo.user.firstname,
+                             lastname=repo.user.lastname,
+                             gravatar_link=h.gravatar_url(repo.user.email, 14)),
+                'description': repo.description.split('\n', 1)[0],
+                'revs': h.select('other_ref', selected_other_ref, other_refs, class_='refs')
         }
 
-        #gather forks and add to this list
+        # add org repo to other so we can open pull request against peer branches on itself
+        add_other_repo(org_repo, branch_rev=org_rev)
+        c.default_other_repo = org_repo.repo_name
+
+        # gather forks and add to this list ... even though it is rare to
+        # request forks to pull from their parent
         for fork in org_repo.forks:
-            c.other_repos.append((fork.repo_name, '%s/%s' % (
-                                    fork.user.username, fork.repo_name))
-                                 )
-            other_repos_info[fork.repo_name] = {
-                'gravatar': h.gravatar_url(fork.user.email, 24),
-                'description': fork.description,
-                'revs': h.select('other_ref', '',
-                                 self._get_repo_refs(fork.scm_instance),
-                                 class_='refs')
-            }
+            add_other_repo(fork)
+
         #add parents of this fork also, but only if it's not empty
         if org_repo.parent and org_repo.parent.scm_instance.revisions:
-            c.default_pull_request = org_repo.parent.repo_name
-            c.default_pull_request_rev = self._get_default_rev(org_repo.parent)
-            c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance)
-            c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
-                                        org_repo.parent.user.username,
-                                        org_repo.parent.repo_name))
-                                     )
-            other_repos_info[org_repo.parent.repo_name] = {
-                'gravatar': h.gravatar_url(org_repo.parent.user.email, 24),
-                'description': org_repo.parent.description,
-                'revs': h.select('other_ref', '',
-                                 self._get_repo_refs(org_repo.parent.scm_instance),
-                                 class_='refs')
-            }
+            add_other_repo(org_repo.parent)
+            c.default_other_repo = org_repo.parent.repo_name
 
+        c.default_other_repo_info = other_repos_info[c.default_other_repo]
         c.other_repos_info = json.dumps(other_repos_info)
-        c.review_members = [org_repo.user]
+
         return render('/pullrequests/pullrequest.html')
 
     @NotAnonymous()
@@ -189,29 +227,18 b' class PullrequestsController(BaseRepoCon'
             elif errors.error_dict.get('pullrequest_title'):
                 msg = _('Pull request requires a title with min. 3 chars')
             else:
-                msg = _('error during creation of pull request')
+                msg = _('Error creating pull request')
 
             h.flash(msg, 'error')
             return redirect(url('pullrequest_home', repo_name=repo_name))
 
         org_repo = _form['org_repo']
-        org_ref = _form['org_ref']
+        org_ref = 'rev:merge:%s' % _form['merge_rev']
         other_repo = _form['other_repo']
-        other_ref = _form['other_ref']
+        other_ref = 'rev:ancestor:%s' % _form['ancestor_rev']
         revisions = _form['revisions']
         reviewers = _form['review_members']
 
-        # if we have cherry picked pull request we don't care what is in
-        # org_ref/other_ref
-        rev_start = request.POST.get('rev_start')
-        rev_end = request.POST.get('rev_end')
-
-        if rev_start and rev_end:
-            # this is swapped to simulate that rev_end is a revision from
-            # parent of the fork
-            org_ref = 'rev:%s:%s' % (rev_end, rev_end)
-            other_ref = 'rev:%s:%s' % (rev_start, rev_start)
-
         title = _form['pullrequest_title']
         description = _form['pullrequest_desc']
 
@@ -269,9 +296,6 b' class PullrequestsController(BaseRepoCon'
         :param pull_request:
         :type pull_request:
         """
-        rev_start = request.GET.get('rev_start')
-        rev_end = request.GET.get('rev_end')
-
         org_repo = pull_request.org_repo
         (org_ref_type,
          org_ref_name,
@@ -283,7 +307,7 b' class PullrequestsController(BaseRepoCon'
          other_ref_rev) = pull_request.other_ref.split(':')
 
         # despite opening revisions for bookmarks/branches/tags, we always
-        # convert this to rev to prevent changes after book or branch change
+        # convert this to rev to prevent changes after bookmark or branch change
         org_ref = ('rev', org_ref_rev)
         other_ref = ('rev', other_ref_rev)
 
@@ -294,17 +318,12 b' class PullrequestsController(BaseRepoCon'
 
         c.cs_ranges = [org_repo.get_changeset(x) for x in pull_request.revisions]
 
-        other_ref = ('rev', getattr(c.cs_ranges[0].parents[0]
-                                  if c.cs_ranges[0].parents
-                                  else EmptyChangeset(), 'raw_id'))
-
         c.statuses = org_repo.statuses([x.raw_id for x in c.cs_ranges])
-        c.target_repo = other_repo.repo_name
-        # defines that we need hidden inputs with changesets
-        c.as_form = request.GET.get('as_form', False)
 
         c.org_ref = org_ref[1]
+        c.org_ref_type = org_ref[0]
         c.other_ref = other_ref[1]
+        c.other_ref_type = other_ref[0]
 
         diff_limit = self.cut_off_limit if not fulldiff else None
 
@@ -386,7 +405,7 b' class PullrequestsController(BaseRepoCon'
 
         try:
             cur_status = c.statuses[c.pull_request.revisions[0]][0]
-        except:
+        except Exception:
             log.error(traceback.format_exc())
             cur_status = 'undefined'
         if c.pull_request.is_closed() and 0:
@@ -398,6 +417,8 b' class PullrequestsController(BaseRepoCon'
                                          )
         c.changeset_statuses = ChangesetStatus.STATUSES
 
+        c.as_form = False
+        c.ancestor = None # there is one - but right here we don't know which
         return render('/pullrequests/pullrequest_show.html')
 
     @NotAnonymous()
@@ -410,11 +431,15 b' class PullrequestsController(BaseRepoCon'
         status = request.POST.get('changeset_status')
         change_status = request.POST.get('change_changeset_status')
         text = request.POST.get('text')
+        close_pr = request.POST.get('save_close')
 
         allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
         if status and change_status and allowed_to_change_status:
-            text = text or (_('Status change -> %s')
+            _def = (_('Status change -> %s')
                             % ChangesetStatus.get_status_lbl(status))
+            if close_pr:
+                _def = _('Closing with') + ' ' + _def
+            text = text or _def
         comm = ChangesetCommentsModel().create(
             text=text,
             repo=c.rhodecode_db_repo.repo_id,
@@ -423,7 +448,9 b' class PullrequestsController(BaseRepoCon'
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line'),
             status_change=(ChangesetStatus.get_status_lbl(status)
-            if status and change_status and allowed_to_change_status else None)
+                           if status and change_status
+                           and allowed_to_change_status else None),
+            closing_pr=close_pr
         )
 
         action_logger(self.rhodecode_user,
@@ -441,7 +468,7 b' class PullrequestsController(BaseRepoCon'
                     pull_request=pull_request_id
                 )
 
-            if request.POST.get('save_close'):
+            if close_pr:
                 if status in ['rejected', 'approved']:
                     PullRequestModel().close_pull_request(pull_request_id)
                     action_logger(self.rhodecode_user,

rhodecode/controllers/search.py

@@ -29,7 +29,7 b' from pylons.i18n.translation import _'
 from pylons import request, config, tmpl_context as c
 
 from rhodecode.lib.auth import LoginRequired
-from rhodecode.lib.base import BaseController, render
+from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.indexers import CHGSETS_SCHEMA, SCHEMA, CHGSET_IDX_NAME, \
     IDX_NAME, WhooshResultWrapper
 
@@ -46,14 +46,14 b' from rhodecode.lib.utils2 import safe_st'
 log = logging.getLogger(__name__)
 
 
-class SearchController(BaseController):
+class SearchController(BaseRepoController):
 
     @LoginRequired()
     def __before__(self):
         super(SearchController, self).__before__()
 
-    def index(self, search_repo=None):
-        c.repo_name = search_repo
+    def index(self, repo_name=None):
+        c.repo_name = repo_name
         c.formated_results = []
         c.runtime = ''
         c.cur_query = request.GET.get('q', None)

rhodecode/controllers/summary.py

@@ -30,20 +30,23 b' import urllib'
 from time import mktime
 from datetime import timedelta, date
 from urlparse import urlparse
-from rhodecode.lib.compat import product
-
-from rhodecode.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, \
-    NodeDoesNotExistError
 
 from pylons import tmpl_context as c, request, url, config
 from pylons.i18n.translation import _
+from webob.exc import HTTPBadRequest
 
 from beaker.cache import cache_region, region_invalidate
 
+from rhodecode.lib import helpers as h
+from rhodecode.lib.compat import product
+from rhodecode.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, \
+    NodeDoesNotExistError
 from rhodecode.config.conf import ALL_READMES, ALL_EXTS, LANGUAGES_EXTENSIONS_MAP
 from rhodecode.model.db import Statistics, CacheInvalidation
-from rhodecode.lib.utils2 import safe_unicode
-from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
+from rhodecode.lib.utils import jsonify
+from rhodecode.lib.utils2 import safe_unicode, safe_str
+from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
+    NotAnonymous
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 from rhodecode.lib.markup_renderer import MarkupRenderer
@@ -70,8 +73,6 b' class SummaryController(BaseRepoControll'
 
     def index(self, repo_name):
         c.dbrepo = dbrepo = c.rhodecode_db_repo
-        c.following = self.scm_model.is_following_repo(repo_name,
-                                                self.rhodecode_user.user_id)
 
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=10, **kw)
@@ -101,10 +102,10 b' class SummaryController(BaseRepoControll'
            'pass': password,
            'scheme': parsed_url.scheme,
            'netloc': parsed_url.netloc,
-           'path': decoded_path
+           'path': urllib.quote(safe_str(decoded_path))
         }
 
-        uri = uri_tmpl % uri_dict
+        uri = (uri_tmpl % uri_dict)
         # generate another clone url by id
         uri_dict.update(
          {'path': decoded_path.replace(repo_name, '_%s' % c.dbrepo.repo_id)}
@@ -138,7 +139,9 b' class SummaryController(BaseRepoControll'
         if dbrepo.enable_statistics:
             c.show_stats = True
             c.no_data_msg = _('No data loaded yet')
-            run_task(get_commits_stats, c.dbrepo.repo_name, ts_min_y, ts_max_y)
+            recurse_limit = 500  # don't recurse more than 500 times when parsing
+            run_task(get_commits_stats, c.dbrepo.repo_name, ts_min_y,
+                     ts_max_y, recurse_limit)
         else:
             c.show_stats = False
             c.no_data_msg = _('Statistics are disabled for this repository')
@@ -186,6 +189,14 b' class SummaryController(BaseRepoControll'
             self.__get_readme_data(c.rhodecode_db_repo)
         return render('summary/summary.html')
 
+    @NotAnonymous()
+    @jsonify
+    def repo_size(self, repo_name):
+        if request.is_xhr:
+            return c.rhodecode_db_repo._repo_size()
+        else:
+            raise HTTPBadRequest()
+
     def __get_readme_data(self, db_repo):
         repo_name = db_repo.repo_name
 

rhodecode/i18n/en/LC_MESSAGES/rhodecode.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: rhodecode 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-14 04:19+0100\n"
+"POT-Creation-Date: 2013-04-05 10:19-0700\n"
 "PO-Revision-Date: 2011-02-25 19:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <[e-mail]>\n"
@@ -22,11 +22,11 b' msgid "All Branches"'
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:83
-msgid "show white space"
+msgid "Show white space"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97
-msgid "ignore white space"
+msgid "Ignore white space"
 msgstr ""
 
 #: rhodecode/controllers/changeset.py:163
@@ -34,20 +34,20 b' msgstr ""'
 msgid "%s line context"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:314
-#: rhodecode/controllers/pullrequests.py:417
+#: rhodecode/controllers/changeset.py:329
+#: rhodecode/controllers/pullrequests.py:438
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 
-#: rhodecode/controllers/changeset.py:345
+#: rhodecode/controllers/changeset.py:360
 msgid ""
 "Changing status on a changeset associated witha closed pull request is "
 "not allowed"
 msgstr ""
 
-#: rhodecode/controllers/compare.py:75
-#: rhodecode/controllers/pullrequests.py:121
+#: rhodecode/controllers/compare.py:74
+#: rhodecode/controllers/pullrequests.py:167
 #: rhodecode/controllers/shortlog.py:100
 msgid "There are no changesets yet"
 msgstr ""
@@ -89,156 +89,187 b' msgid "%s %s feed"'
 msgstr ""
 
 #: rhodecode/controllers/feed.py:86
-#: rhodecode/templates/changeset/changeset.html:137
-#: rhodecode/templates/changeset/changeset.html:149
-#: rhodecode/templates/compare/compare_diff.html:62
-#: rhodecode/templates/compare/compare_diff.html:73
-#: rhodecode/templates/pullrequests/pullrequest_show.html:94
-#: rhodecode/templates/pullrequests/pullrequest_show.html:153
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
 msgid "Changeset was too big and was cut off..."
 msgstr ""
 
-#: rhodecode/controllers/feed.py:92
-msgid "commited on"
-msgstr ""
-
-#: rhodecode/controllers/files.py:86
-msgid "click here to add new file"
-msgstr ""
-
-#: rhodecode/controllers/files.py:87
+#: rhodecode/controllers/feed.py:91
+#, python-format
+msgid "%s committed on %s"
+msgstr ""
+
+#: rhodecode/controllers/files.py:88
+msgid "Click here to add new file"
+msgstr ""
+
+#: rhodecode/controllers/files.py:89
 #, python-format
 msgid "There are no files yet %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:265 rhodecode/controllers/files.py:325
+#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335
 #, python-format
 msgid "This repository is has been locked by %s on %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:292
+#: rhodecode/controllers/files.py:279
+msgid "You can only edit files with revision being a valid branch "
+msgstr ""
+
+#: rhodecode/controllers/files.py:293
 #, python-format
-msgid "Edited %s via RhodeCode"
-msgstr ""
-
-#: rhodecode/controllers/files.py:297
+msgid "Edited file %s via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:309
 msgid "No changes"
 msgstr ""
 
-#: rhodecode/controllers/files.py:308 rhodecode/controllers/files.py:372
+#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388
 #, python-format
 msgid "Successfully committed to %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:313 rhodecode/controllers/files.py:378
+#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/controllers/files.py:344
-#, python-format
-msgid "Added %s via RhodeCode"
-msgstr ""
-
-#: rhodecode/controllers/files.py:358
+#: rhodecode/controllers/files.py:347
+msgid "Added file via RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/files.py:364
 msgid "No content"
 msgstr ""
 
-#: rhodecode/controllers/files.py:362
+#: rhodecode/controllers/files.py:368
 msgid "No filename"
 msgstr ""
 
-#: rhodecode/controllers/files.py:404
-msgid "downloads disabled"
-msgstr ""
-
-#: rhodecode/controllers/files.py:415
+#: rhodecode/controllers/files.py:372
+msgid "Location must be relative path and must not contain .. in path"
+msgstr ""
+
+#: rhodecode/controllers/files.py:420
+msgid "Downloads disabled"
+msgstr ""
+
+#: rhodecode/controllers/files.py:431
 #, python-format
 msgid "Unknown revision %s"
 msgstr ""
 
-#: rhodecode/controllers/files.py:417
+#: rhodecode/controllers/files.py:433
 msgid "Empty repository"
 msgstr ""
 
-#: rhodecode/controllers/files.py:419
+#: rhodecode/controllers/files.py:435
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/controllers/files.py:564
-#: rhodecode/templates/changeset/changeset_range.html:13
-#: rhodecode/templates/changeset/changeset_range.html:31
+#: rhodecode/controllers/files.py:617
+#: rhodecode/templates/changeset/changeset_range.html:9
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/controllers/files.py:565 rhodecode/controllers/pullrequests.py:74
-#: rhodecode/controllers/summary.py:236 rhodecode/model/scm.py:550
+#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131
+#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606
+#: rhodecode/templates/switch_to_list.html:3
+#: rhodecode/templates/branches/branches.html:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/controllers/files.py:566 rhodecode/controllers/pullrequests.py:78
-#: rhodecode/controllers/summary.py:237 rhodecode/model/scm.py:561
+#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132
+#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617
+#: rhodecode/templates/switch_to_list.html:15
+#: rhodecode/templates/shortlog/shortlog_data.html:10
+#: rhodecode/templates/tags/tags.html:10
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/controllers/forks.py:158
+#: rhodecode/controllers/forks.py:175
 #, python-format
-msgid "forked %s repository as %s"
-msgstr ""
-
-#: rhodecode/controllers/forks.py:172
+msgid "Forked repository %s as %s"
+msgstr ""
+
+#: rhodecode/controllers/forks.py:189
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:218 rhodecode/controllers/journal.py:261
+#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318
 msgid "public journal"
 msgstr ""
 
-#: rhodecode/controllers/journal.py:222 rhodecode/controllers/journal.py:265
-#: rhodecode/templates/base/base.html:232
+#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322
 #: rhodecode/templates/journal/journal.html:12
 msgid "journal"
 msgstr ""
 
-#: rhodecode/controllers/login.py:143
-msgid "You have successfully registered into rhodecode"
-msgstr ""
-
-#: rhodecode/controllers/login.py:164
+#: rhodecode/controllers/login.py:138
+msgid "You have successfully registered into RhodeCode"
+msgstr ""
+
+#: rhodecode/controllers/login.py:159
 msgid "Your password reset link was sent"
 msgstr ""
 
-#: rhodecode/controllers/login.py:184
+#: rhodecode/controllers/login.py:179
 msgid ""
 "Your password reset was successful, new password has been sent to your "
 "email"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:76 rhodecode/model/scm.py:556
+#: rhodecode/controllers/pullrequests.py:118
+#: rhodecode/templates/changeset/changeset.html:10
+#: rhodecode/templates/email_templates/changeset_comment.html:15
+msgid "Changeset"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:128
+msgid "Special"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:129
+msgid "Peer branches"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612
+#: rhodecode/templates/switch_to_list.html:28
+#: rhodecode/templates/bookmarks/bookmarks.html:10
 msgid "Bookmarks"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:190
+#: rhodecode/controllers/pullrequests.py:228
 msgid "Pull request requires a title with min. 3 chars"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:192
-msgid "error during creation of pull request"
-msgstr ""
-
-#: rhodecode/controllers/pullrequests.py:224
+#: rhodecode/controllers/pullrequests.py:230
+msgid "Error creating pull request"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:251
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:227
+#: rhodecode/controllers/pullrequests.py:254
 msgid "Error occurred during sending pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:260
+#: rhodecode/controllers/pullrequests.py:287
 msgid "Successfully deleted pull request"
 msgstr ""
 
-#: rhodecode/controllers/pullrequests.py:452
+#: rhodecode/controllers/pullrequests.py:441
+msgid "Closing with"
+msgstr ""
+
+#: rhodecode/controllers/pullrequests.py:478
 msgid "Closing pull request on other statuses than rejected or approved forbidden"
 msgstr ""
 
@@ -254,55 +285,12 b' msgstr ""'
 msgid "An error occurred during this search operation"
 msgstr ""
 
-#: rhodecode/controllers/settings.py:119
-#: rhodecode/controllers/admin/repos.py:272
-#, python-format
-msgid "Repository %s updated successfully"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:137
-#: rhodecode/controllers/admin/repos.py:290
-#, python-format
-msgid "error occurred during update of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:162
-#: rhodecode/controllers/admin/repos.py:315
-#, python-format
-msgid "deleted repository %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:166
-#: rhodecode/controllers/admin/repos.py:325
-#: rhodecode/controllers/admin/repos.py:331
-#, python-format
-msgid "An error occurred during deletion of %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:185
-msgid "unlocked"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:188
-msgid "locked"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:190
-#, python-format
-msgid "Repository has been %s"
-msgstr ""
-
-#: rhodecode/controllers/settings.py:194
-#: rhodecode/controllers/admin/repos.py:423
-msgid "An error occurred during unlocking"
-msgstr ""
-
-#: rhodecode/controllers/summary.py:140
+#: rhodecode/controllers/summary.py:141
 msgid "No data loaded yet"
 msgstr ""
 
-#: rhodecode/controllers/summary.py:144
-#: rhodecode/templates/summary/summary.html:157
+#: rhodecode/controllers/summary.py:147
+#: rhodecode/templates/summary/summary.html:149
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
@@ -311,7 +299,7 b' msgid "Default settings updated successf'
 msgstr ""
 
 #: rhodecode/controllers/admin/defaults.py:110
-msgid "error occurred during update of defaults"
+msgid "Error occurred during update of defaults"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:50
@@ -359,7 +347,7 b' msgid "START_TLS on LDAP connection"'
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:126
-msgid "Ldap settings updated successfully"
+msgid "LDAP settings updated successfully"
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:130
@@ -367,533 +355,616 b' msgid "Unable to activate ldap. The \\"py'
 msgstr ""
 
 #: rhodecode/controllers/admin/ldap_settings.py:147
-msgid "error occurred during update of ldap settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:59
-#: rhodecode/controllers/admin/permissions.py:63
-msgid "None"
+msgid "Error occurred during update of ldap settings"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:60
 #: rhodecode/controllers/admin/permissions.py:64
-msgid "Read"
+msgid "None"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:61
 #: rhodecode/controllers/admin/permissions.py:65
-msgid "Write"
+msgid "Read"
 msgstr ""
 
 #: rhodecode/controllers/admin/permissions.py:62
 #: rhodecode/controllers/admin/permissions.py:66
+msgid "Write"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:63
+#: rhodecode/controllers/admin/permissions.py:67
 #: rhodecode/templates/admin/defaults/defaults.html:9
 #: rhodecode/templates/admin/ldap/ldap.html:9
 #: rhodecode/templates/admin/permissions/permissions.html:9
-#: rhodecode/templates/admin/repos/repo_add.html:9
-#: rhodecode/templates/admin/repos/repo_edit.html:9
+#: rhodecode/templates/admin/repos/repo_add.html:10
+#: rhodecode/templates/admin/repos/repo_add.html:14
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:9
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:13
 #: rhodecode/templates/admin/settings/hooks.html:9
 #: rhodecode/templates/admin/settings/settings.html:9
 #: rhodecode/templates/admin/users/user_add.html:8
 #: rhodecode/templates/admin/users/user_edit.html:9
-#: rhodecode/templates/admin/users/user_edit.html:126
+#: rhodecode/templates/admin/users/user_edit.html:133
 #: rhodecode/templates/admin/users/users.html:9
+#: rhodecode/templates/admin/users/users.html:85
 #: rhodecode/templates/admin/users_groups/users_group_add.html:8
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9
 #: rhodecode/templates/admin/users_groups/users_groups.html:9
-#: rhodecode/templates/base/base.html:197
-#: rhodecode/templates/base/base.html:350
-#: rhodecode/templates/base/base.html:352
-#: rhodecode/templates/base/base.html:354
+#: rhodecode/templates/base/base.html:292
+#: rhodecode/templates/base/base.html:293
+#: rhodecode/templates/base/base.html:299
+#: rhodecode/templates/base/base.html:300
 msgid "Admin"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:69
-msgid "disabled"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:71
-msgid "allowed with manual account activation"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:73
-msgid "allowed with automatic account activation"
-msgstr ""
-
-#: rhodecode/controllers/admin/permissions.py:75
-#: rhodecode/controllers/admin/permissions.py:78
-msgid "Disabled"
-msgstr ""
-
+#: rhodecode/controllers/admin/permissions.py:70
 #: rhodecode/controllers/admin/permissions.py:76
 #: rhodecode/controllers/admin/permissions.py:79
+msgid "Disabled"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:72
+msgid "Allowed with manual account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:74
+msgid "Allowed with automatic account activation"
+msgstr ""
+
+#: rhodecode/controllers/admin/permissions.py:77
+#: rhodecode/controllers/admin/permissions.py:80
 msgid "Enabled"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:122
+#: rhodecode/controllers/admin/permissions.py:128
 msgid "Default permissions updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/permissions.py:136
-msgid "error occurred during update of permissions"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:121
+#: rhodecode/controllers/admin/permissions.py:142
+msgid "Error occurred during update of permissions"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:127
 msgid "--REMOVE FORK--"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:190
+#: rhodecode/controllers/admin/repos.py:168
+#, python-format
+msgid "Created repository %s from %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:174
 #, python-format
-msgid "created repository %s from %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:194
+msgid "Created repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:197
+#, python-format
+msgid "Error creating repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:266
+#, python-format
+msgid "Repository %s updated successfully"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:284
 #, python-format
-msgid "created repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:225
+msgid "Error occurred during update of repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:311
+#: rhodecode/controllers/api/api.py:877
 #, python-format
-msgid "error occurred during creation of repository %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:320
+msgid "Detached %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:314
+#: rhodecode/controllers/api/api.py:879
+#, python-format
+msgid "Deleted %s forks"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:319
+#, python-format
+msgid "Deleted repository %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:322
 #, python-format
 msgid "Cannot delete %s it still contains attached forks"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:349
+#: rhodecode/controllers/admin/repos.py:327
+#, python-format
+msgid "An error occurred during deletion of %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:365
+msgid "Repository permissions updated"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:384
 msgid "An error occurred during deletion of repository user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:368
-msgid "An error occurred during deletion of repository users groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos.py:386
-msgid "An error occurred during deletion of repository stats"
-msgstr ""
-
 #: rhodecode/controllers/admin/repos.py:403
+msgid "An error occurred during deletion of repository user groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:421
+msgid "An error occurred during deletion of repository stats"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:438
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:443
+#: rhodecode/controllers/admin/repos.py:458
+#: rhodecode/controllers/admin/repos.py:485
+msgid "An error occurred during unlocking"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:476
+msgid "Unlocked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:479
+msgid "Locked"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:481
+#, python-format
+msgid "Repository has been %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:505
 msgid "Updated repository visibility in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:447
+#: rhodecode/controllers/admin/repos.py:509
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:452 rhodecode/model/validators.py:300
+#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302
 msgid "Token mismatch"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:465
+#: rhodecode/controllers/admin/repos.py:527
 msgid "Pulled from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:467
+#: rhodecode/controllers/admin/repos.py:529
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:483
+#: rhodecode/controllers/admin/repos.py:545
 msgid "Nothing"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:485
+#: rhodecode/controllers/admin/repos.py:547
 #, python-format
 msgid "Marked repo %s as fork of %s"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos.py:489
+#: rhodecode/controllers/admin/repos.py:551
 msgid "An error occurred during this operation"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:120
+#: rhodecode/controllers/admin/repos.py:590
+msgid "An error occurred during creation of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos.py:604
+msgid "An error occurred during removal of field"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:145
 #, python-format
-msgid "created repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:133
+msgid "Created repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:157
 #, python-format
-msgid "error occurred during creation of repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:167
+msgid "Error occurred during creation of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:214
+#: rhodecode/controllers/admin/repos_groups.py:286
+msgid "Cannot revoke permission for yourself as admin"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:220
 #, python-format
-msgid "updated repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:180
+msgid "Updated repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:235
 #, python-format
-msgid "error occurred during update of repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:198
+msgid "Error occurred during update of repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:253
 #, python-format
 msgid "This group contains %s repositores and cannot be deleted"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:206
+#: rhodecode/controllers/admin/repos_groups.py:260
+#, python-format
+msgid "This group contains %s subgroups and cannot be deleted"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:266
 #, python-format
-msgid "removed repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:212
-msgid "Cannot delete this group it still contains subgroups"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:217
-#: rhodecode/controllers/admin/repos_groups.py:222
+msgid "Removed repository group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:271
 #, python-format
-msgid "error occurred during deletion of repos group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/repos_groups.py:243
+msgid "Error occurred during deletion of repos group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/repos_groups.py:297
 msgid "An error occurred during deletion of group user"
 msgstr ""
 
-#: rhodecode/controllers/admin/repos_groups.py:264
-msgid "An error occurred during deletion of group users groups"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:123
+#: rhodecode/controllers/admin/repos_groups.py:318
+msgid "An error occurred during deletion of group user groups"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:126
 #, python-format
-msgid "Repositories successfully rescanned added: %s,removed: %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:131
+msgid "Repositories successfully rescanned added: %s ; removed: %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:135
 msgid "Whoosh reindex task scheduled"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:162
-msgid "Updated application settings"
-msgstr ""
-
 #: rhodecode/controllers/admin/settings.py:166
-#: rhodecode/controllers/admin/settings.py:299
-msgid "error occurred during updating application settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:207
+msgid "Updated application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:170
+#: rhodecode/controllers/admin/settings.py:301
+msgid "Error occurred during updating application settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:216
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:212
-msgid "error occurred during updating visualisation settings"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:295
+#: rhodecode/controllers/admin/settings.py:221
+msgid "Error occurred during updating visualisation settings"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:297
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:309
+#: rhodecode/controllers/admin/settings.py:311
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:321
+#: rhodecode/controllers/admin/settings.py:323
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:325
-msgid "error occurred during hook creation"
-msgstr ""
-
-#: rhodecode/controllers/admin/settings.py:344
+#: rhodecode/controllers/admin/settings.py:327
+msgid "Error occurred during hook creation"
+msgstr ""
+
+#: rhodecode/controllers/admin/settings.py:346
 msgid "Email task created"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:399
+#: rhodecode/controllers/admin/settings.py:410
 msgid "You can't edit this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:430
+#: rhodecode/controllers/admin/settings.py:452
 msgid "Your account was updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/settings.py:445
-#: rhodecode/controllers/admin/users.py:196
+#: rhodecode/controllers/admin/settings.py:467
+#: rhodecode/controllers/admin/users.py:198
 #, python-format
-msgid "error occurred during update of user %s"
+msgid "Error occurred during update of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:130
 #, python-format
-msgid "created user %s"
+msgid "Created user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:142
 #, python-format
-msgid "error occurred during creation of user %s"
+msgid "Error occurred during creation of user %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users.py:176
 msgid "User updated successfully"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:212
-msgid "successfully deleted user"
-msgstr ""
-
-#: rhodecode/controllers/admin/users.py:217
+#: rhodecode/controllers/admin/users.py:214
+msgid "Successfully deleted user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:219
 msgid "An error occurred during deletion of user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:231
+#: rhodecode/controllers/admin/users.py:233
 msgid "You can't edit this user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:272
+#: rhodecode/controllers/admin/users.py:276
 msgid "Granted 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:277
+#: rhodecode/controllers/admin/users.py:281
 msgid "Revoked 'repository create' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:283
+#: rhodecode/controllers/admin/users.py:287
 msgid "Granted 'repository fork' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:288
+#: rhodecode/controllers/admin/users.py:292
 msgid "Revoked 'repository fork' permission to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:294
-#: rhodecode/controllers/admin/users_groups.py:279
+#: rhodecode/controllers/admin/users.py:298
+#: rhodecode/controllers/admin/users_groups.py:281
 msgid "An error occurred during permissions saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:309
+#: rhodecode/controllers/admin/users.py:312
 #, python-format
 msgid "Added email %s to user"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:315
+#: rhodecode/controllers/admin/users.py:318
 msgid "An error occurred during email saving"
 msgstr ""
 
-#: rhodecode/controllers/admin/users.py:325
+#: rhodecode/controllers/admin/users.py:328
 msgid "Removed email from user"
 msgstr ""
 
+#: rhodecode/controllers/admin/users.py:341
+#, python-format
+msgid "Added ip %s to user"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:347
+msgid "An error occurred during ip saving"
+msgstr ""
+
+#: rhodecode/controllers/admin/users.py:359
+msgid "Removed ip from user"
+msgstr ""
+
 #: rhodecode/controllers/admin/users_groups.py:86
 #, python-format
-msgid "created users group %s"
+msgid "Created user group %s"
 msgstr ""
 
 #: rhodecode/controllers/admin/users_groups.py:97
 #, python-format
-msgid "error occurred during creation of users group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:164
+msgid "Error occurred during creation of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:166
 #, python-format
-msgid "updated users group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:186
+msgid "Updated user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:188
 #, python-format
-msgid "error occurred during update of users group %s"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:203
-msgid "successfully deleted users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:208
-msgid "An error occurred during deletion of users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:257
-msgid "Granted 'repository create' permission to users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:262
-msgid "Revoked 'repository create' permission to users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:268
-msgid "Granted 'repository fork' permission to users group"
-msgstr ""
-
-#: rhodecode/controllers/admin/users_groups.py:273
-msgid "Revoked 'repository fork' permission to users group"
-msgstr ""
-
-#: rhodecode/lib/auth.py:499
+msgid "Error occurred during update of user group %s"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:205
+msgid "Successfully deleted user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:210
+msgid "An error occurred during deletion of user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:259
+msgid "Granted 'repository create' permission to user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:264
+msgid "Revoked 'repository create' permission to user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:270
+msgid "Granted 'repository fork' permission to user group"
+msgstr ""
+
+#: rhodecode/controllers/admin/users_groups.py:275
+msgid "Revoked 'repository fork' permission to user group"
+msgstr ""
+
+#: rhodecode/lib/auth.py:530
+#, python-format
+msgid "IP %s not allowed"
+msgstr ""
+
+#: rhodecode/lib/auth.py:579
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:540
+#: rhodecode/lib/auth.py:620
 msgid "You need to be a signed in to view this page"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:74
-msgid "binary file"
-msgstr ""
-
-#: rhodecode/lib/diffs.py:90
+#: rhodecode/lib/diffs.py:66
+msgid "Binary file"
+msgstr ""
+
+#: rhodecode/lib/diffs.py:82
 msgid "Changeset was too big and was cut off, use diff menu to display this diff"
 msgstr ""
 
-#: rhodecode/lib/diffs.py:100
+#: rhodecode/lib/diffs.py:92
 msgid "No changes detected"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:374
+#: rhodecode/lib/helpers.py:394
 #, python-format
 msgid "%a, %d %b %Y %H:%M:%S"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:486
+#: rhodecode/lib/helpers.py:506
 msgid "True"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:490
+#: rhodecode/lib/helpers.py:509
 msgid "False"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:530
+#: rhodecode/lib/helpers.py:547
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:533
+#: rhodecode/lib/helpers.py:550
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:546
+#: rhodecode/lib/helpers.py:563
 msgid "Changeset not found"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:589
-#, python-format
-msgid "Show all combined changesets %s->%s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:595
-msgid "compare view"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:615
-msgid "and"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:616
 #, python-format
-msgid "%s more"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:617 rhodecode/templates/changelog/changelog.html:51
-msgid "revisions"
+msgid "Show all combined changesets %s->%s"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:621
+msgid "compare view"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:641
+msgid "and"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:642
+#, python-format
+msgid "%s more"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44
+msgid "revisions"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:667
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:658
-#: rhodecode/templates/pullrequests/pullrequest_show.html:4
-#: rhodecode/templates/pullrequests/pullrequest_show.html:12
-#, python-format
-msgid "Pull request #%s"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:664
-msgid "[deleted] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:666 rhodecode/lib/helpers.py:676
-msgid "[created] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:668
-msgid "[created] repository as fork"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:670 rhodecode/lib/helpers.py:678
-msgid "[forked] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:672 rhodecode/lib/helpers.py:680
-msgid "[updated] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:674
-msgid "[delete] repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:682
-msgid "[created] user"
-msgstr ""
-
 #: rhodecode/lib/helpers.py:684
-msgid "[updated] user"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:686
-msgid "[created] users group"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:688
-msgid "[updated] users group"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:8
+#, python-format
+msgid "Pull request #%s"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:690
-msgid "[commented] on revision in repository"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:692
-msgid "[commented] on pull request for"
+msgid "[deleted] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702
+msgid "[created] repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:694
-msgid "[closed] pull request for"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:696
-msgid "[pushed] into"
-msgstr ""
-
-#: rhodecode/lib/helpers.py:698
-msgid "[committed via RhodeCode] into repository"
+msgid "[created] repository as fork"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704
+msgid "[forked] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706
+msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/helpers.py:700
+msgid "[delete] repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:708
+msgid "[created] user"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:710
+msgid "[updated] user"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:712
+msgid "[created] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:714
+msgid "[updated] user group"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:716
+msgid "[commented] on revision in repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:718
+msgid "[commented] on pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:720
+msgid "[closed] pull request for"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:722
+msgid "[pushed] into"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:724
+msgid "[committed via RhodeCode] into repository"
+msgstr ""
+
+#: rhodecode/lib/helpers.py:726
 msgid "[pulled from remote] into repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:702
+#: rhodecode/lib/helpers.py:728
 msgid "[pulled] from"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:704
+#: rhodecode/lib/helpers.py:730
 msgid "[started following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:706
+#: rhodecode/lib/helpers.py:732
 msgid "[stopped following] repository"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:883
+#: rhodecode/lib/helpers.py:910
 #, python-format
 msgid " and %s more"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:887
+#: rhodecode/lib/helpers.py:914
 msgid "No Files"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1163
+#: rhodecode/lib/helpers.py:1198
 #, python-format
 msgid ""
 "%s repository is not mapped to db perhaps it was created or renamed from "
@@ -901,165 +972,225 b' msgid ""'
 "repositories"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:403
+#: rhodecode/lib/unionrepo.py:193
+msgid "cannot create new union repository"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:411
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:404
+#: rhodecode/lib/utils2.py:412
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:405
+#: rhodecode/lib/utils2.py:413
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:406
+#: rhodecode/lib/utils2.py:414
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:407
+#: rhodecode/lib/utils2.py:415
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:408
+#: rhodecode/lib/utils2.py:416
 #, python-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/lib/utils2.py:424
+#: rhodecode/lib/utils2.py:432
 #, python-format
 msgid "in %s"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:426
-#, python-format
-msgid "%s ago"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:428
-#, python-format
-msgid "in %s and %s"
-msgstr ""
-
-#: rhodecode/lib/utils2.py:431
-#, python-format
-msgid "%s and %s ago"
-msgstr ""
-
 #: rhodecode/lib/utils2.py:434
+#, python-format
+msgid "%s ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:436
+#, python-format
+msgid "in %s and %s"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:439
+#, python-format
+msgid "%s and %s ago"
+msgstr ""
+
+#: rhodecode/lib/utils2.py:442
 msgid "just now"
 msgstr ""
 
-#: rhodecode/lib/celerylib/tasks.py:270
-msgid "password reset link"
-msgstr ""
-
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 rhodecode/model/db.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388
 msgid "Repository no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 rhodecode/model/db.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389
 msgid "Repository read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 rhodecode/model/db.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390
 msgid "Repository write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 rhodecode/model/db.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391
 msgid "Repository admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 rhodecode/model/db.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294
 msgid "Repositories Group no access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 rhodecode/model/db.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295
 msgid "Repositories Group read access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 rhodecode/model/db.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296
 msgid "Repositories Group write access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 rhodecode/model/db.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297
 msgid "Repositories Group admin access"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 rhodecode/model/db.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398
 msgid "RhodeCode Administrator"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 rhodecode/model/db.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399
 msgid "Repository creation disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400
 msgid "Repository creation enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401
 msgid "Repository forking disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402
 msgid "Repository forking enabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403
 msgid "Register disabled"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 rhodecode/model/db.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 rhodecode/model/db.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838
 msgid "Not Reviewed"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 rhodecode/model/db.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839
 msgid "Approved"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 rhodecode/model/db.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840
 msgid "Rejected"
 msgstr ""
 
-#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 rhodecode/model/db.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626
+#: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646
+#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841
 msgid "Under Review"
 msgstr ""
 
-#: rhodecode/model/comment.py:110
+#: rhodecode/model/comment.py:75
 #, python-format
 msgid "on line %s"
 msgstr ""
 
-#: rhodecode/model/comment.py:173
+#: rhodecode/model/comment.py:219
 msgid "[Mention]"
 msgstr ""
 
+#: rhodecode/model/db.py:1252
+msgid "top level"
+msgstr ""
+
+#: rhodecode/model/db.py:1393
+msgid "Repository group no access"
+msgstr ""
+
+#: rhodecode/model/db.py:1394
+msgid "Repository group read access"
+msgstr ""
+
+#: rhodecode/model/db.py:1395
+msgid "Repository group write access"
+msgstr ""
+
+#: rhodecode/model/db.py:1396
+msgid "Repository group admin access"
+msgstr ""
+
 #: rhodecode/model/forms.py:43
 msgid "Please enter a login"
 msgstr ""
@@ -1078,204 +1209,237 b' msgstr ""'
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:220
-#, python-format
-msgid "commented on commit at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:221
-#, python-format
-msgid "sent message at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:222
-#, python-format
-msgid "mentioned you at %(when)s"
-msgstr ""
-
-#: rhodecode/model/notification.py:223
-#, python-format
-msgid "registered in RhodeCode at %(when)s"
-msgstr ""
-
 #: rhodecode/model/notification.py:224
 #, python-format
-msgid "opened new pull request at %(when)s"
+msgid "%(user)s commented on changeset at %(when)s"
 msgstr ""
 
 #: rhodecode/model/notification.py:225
 #, python-format
-msgid "commented on pull request at %(when)s"
-msgstr ""
-
-#: rhodecode/model/pull_request.py:90
+msgid "%(user)s sent message at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:226
+#, python-format
+msgid "%(user)s mentioned you at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:227
+#, python-format
+msgid "%(user)s registered in RhodeCode at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:228
 #, python-format
-msgid "%(user)s wants you to review pull request #%(pr_id)s"
-msgstr ""
-
-#: rhodecode/model/scm.py:542
+msgid "%(user)s opened new pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/notification.py:229
+#, python-format
+msgid "%(user)s commented on pull request at %(when)s"
+msgstr ""
+
+#: rhodecode/model/pull_request.py:104
+#, python-format
+msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s"
+msgstr ""
+
+#: rhodecode/model/scm.py:598
 msgid "latest tip"
 msgstr ""
 
 #: rhodecode/model/user.py:232
-msgid "new user registration"
+msgid "New user registration"
 msgstr ""
 
 #: rhodecode/model/user.py:257 rhodecode/model/user.py:281
+msgid "You can't Edit this user since it's crucial for entire application"
+msgstr ""
+
 #: rhodecode/model/user.py:303
-msgid "You can't Edit this user since it's crucial for entire application"
-msgstr ""
-
-#: rhodecode/model/user.py:327
 msgid "You can't remove this user since it's crucial for entire application"
 msgstr ""
 
-#: rhodecode/model/user.py:333
+#: rhodecode/model/user.py:309
 #, python-format
 msgid ""
 "user \"%s\" still owns %s repositories and cannot be removed. Switch "
 "owners or remove those repositories. %s"
 msgstr ""
 
-#: rhodecode/model/validators.py:36 rhodecode/model/validators.py:37
+#: rhodecode/model/user.py:334
+msgid "Password reset link"
+msgstr ""
+
+#: rhodecode/model/user.py:366
+msgid "Your new password"
+msgstr ""
+
+#: rhodecode/model/user.py:367
+#, python-format
+msgid "Your new RhodeCode password:%s"
+msgstr ""
+
+#: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39
 msgid "Value cannot be an empty list"
 msgstr ""
 
-#: rhodecode/model/validators.py:83
-#, python-format
-msgid "Username \"%(username)s\" already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:85
 #, python-format
-msgid "Username \"%(username)s\" is forbidden"
+msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:87
+#, python-format
+msgid "Username \"%(username)s\" is forbidden"
+msgstr ""
+
+#: rhodecode/model/validators.py:89
 msgid ""
 "Username may only contain alphanumeric characters underscores, periods or"
 " dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:115
+#: rhodecode/model/validators.py:117
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
-#: rhodecode/model/validators.py:134
-msgid "Invalid users group name"
-msgstr ""
-
-#: rhodecode/model/validators.py:135
-#, python-format
-msgid "Users group \"%(usersgroup)s\" already exists"
+#: rhodecode/model/validators.py:136
+msgid "Invalid user group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:137
+#, python-format
+msgid "User group \"%(usergroup)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:139
 msgid ""
-"users group name may only contain  alphanumeric characters underscores, "
+"user group name may only contain alphanumeric characters underscores, "
 "periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
-#: rhodecode/model/validators.py:175
+#: rhodecode/model/validators.py:177
 msgid "Cannot assign this group as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:176
-#, python-format
-msgid "Group \"%(group_name)s\" already exists"
-msgstr ""
-
 #: rhodecode/model/validators.py:178
 #, python-format
+msgid "Group \"%(group_name)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:180
+#, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:236
+#: rhodecode/model/validators.py:238
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
-#: rhodecode/model/validators.py:251
+#: rhodecode/model/validators.py:253
 msgid "Passwords do not match"
 msgstr ""
 
-#: rhodecode/model/validators.py:268
-msgid "invalid password"
-msgstr ""
-
-#: rhodecode/model/validators.py:269
-msgid "invalid user name"
-msgstr ""
-
 #: rhodecode/model/validators.py:270
+msgid "invalid password"
+msgstr ""
+
+#: rhodecode/model/validators.py:271
+msgid "invalid user name"
+msgstr ""
+
+#: rhodecode/model/validators.py:272
 msgid "Your account is disabled"
 msgstr ""
 
-#: rhodecode/model/validators.py:314
-#, python-format
-msgid "Repository name %(repo)s is disallowed"
-msgstr ""
-
 #: rhodecode/model/validators.py:316
 #, python-format
+msgid "Repository name %(repo)s is disallowed"
+msgstr ""
+
+#: rhodecode/model/validators.py:318
+#, python-format
 msgid "Repository named %(repo)s already exists"
 msgstr ""
 
-#: rhodecode/model/validators.py:317
-#, python-format
-msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
-msgstr ""
-
 #: rhodecode/model/validators.py:319
 #, python-format
-msgid "Repositories group with name \"%(repo)s\" already exists"
-msgstr ""
-
-#: rhodecode/model/validators.py:432
+msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\""
+msgstr ""
+
+#: rhodecode/model/validators.py:321
+#, python-format
+msgid "Repository group with name \"%(repo)s\" already exists"
+msgstr ""
+
+#: rhodecode/model/validators.py:438
 msgid "invalid clone url"
 msgstr ""
 
-#: rhodecode/model/validators.py:433
+#: rhodecode/model/validators.py:439
 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url"
 msgstr ""
 
-#: rhodecode/model/validators.py:458
+#: rhodecode/model/validators.py:464
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
-#: rhodecode/model/validators.py:473
+#: rhodecode/model/validators.py:479
 msgid "You don't have permissions to create repository in this group"
 msgstr ""
 
-#: rhodecode/model/validators.py:498
-msgid "This username or users group name is not valid"
-msgstr ""
-
-#: rhodecode/model/validators.py:591
+#: rhodecode/model/validators.py:481
+msgid "no permission to create repository in root location"
+msgstr ""
+
+#: rhodecode/model/validators.py:518
+msgid "You don't have permissions to create a group in this location"
+msgstr ""
+
+#: rhodecode/model/validators.py:557
+msgid "This username or user group name is not valid"
+msgstr ""
+
+#: rhodecode/model/validators.py:650
 msgid "This is not a valid path"
 msgstr ""
 
-#: rhodecode/model/validators.py:606
+#: rhodecode/model/validators.py:665
 msgid "This e-mail address is already taken"
 msgstr ""
 
-#: rhodecode/model/validators.py:626
+#: rhodecode/model/validators.py:685
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
-#: rhodecode/model/validators.py:663
+#: rhodecode/model/validators.py:722
 msgid ""
 "The LDAP Login attribute of the CN must be specified - this is the name "
 "of the attribute that is equivalent to \"username\""
 msgstr ""
 
-#: rhodecode/model/validators.py:682
+#: rhodecode/model/validators.py:735
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
-#: rhodecode/templates/index.html:3
+#: rhodecode/model/validators.py:767
+msgid "Please enter a valid IPv4 or IpV6 address"
+msgstr ""
+
+#: rhodecode/model/validators.py:768
+#, python-format
+msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
+msgstr ""
+
+#: rhodecode/model/validators.py:800
+msgid "Key name can only consist of letters, underscore, dash or numbers"
+msgstr ""
+
+#: rhodecode/templates/index.html:5
 msgid "Dashboard"
 msgstr ""
 
@@ -1284,205 +1448,226 b' msgstr ""'
 #: rhodecode/templates/admin/repos/repos.html:9
 #: rhodecode/templates/admin/users/user_edit_my_account.html:31
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/bookmarks/bookmarks.html:10
+#: rhodecode/templates/bookmarks/bookmarks.html:9
 #: rhodecode/templates/branches/branches.html:9
 #: rhodecode/templates/journal/journal.html:9
-#: rhodecode/templates/journal/journal.html:48
-#: rhodecode/templates/tags/tags.html:10
+#: rhodecode/templates/journal/journal.html:46
+#: rhodecode/templates/journal/journal.html:47
+#: rhodecode/templates/tags/tags.html:9
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/index_base.html:6
 #: rhodecode/templates/admin/repos/repos.html:9
-#: rhodecode/templates/base/base.html:233
 msgid "repositories"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:13
-#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:18
+#: rhodecode/templates/admin/repos/repo_add.html:5
 #: rhodecode/templates/admin/repos/repos.html:21
-msgid "ADD REPOSITORY"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:29
-#: rhodecode/templates/index_base.html:136
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:32
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:33
-#: rhodecode/templates/admin/users_groups/users_group_add.html:32
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
-msgid "Group name"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:30
-#: rhodecode/templates/index_base.html:72
-#: rhodecode/templates/index_base.html:138
-#: rhodecode/templates/index_base.html:176
-#: rhodecode/templates/index_base.html:266
-#: rhodecode/templates/admin/repos/repo_add_base.html:56
-#: rhodecode/templates/admin/repos/repo_edit.html:75
-#: rhodecode/templates/admin/repos/repos.html:72
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34
-#: rhodecode/templates/forks/fork.html:59
-#: rhodecode/templates/settings/repo_settings.html:66
-#: rhodecode/templates/summary/summary.html:114
-msgid "Description"
+msgid "Add repository"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:15
+#: rhodecode/templates/index_base.html:20
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31
+msgid "Add group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:27
+msgid "Edit group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:27
+msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
 #: rhodecode/templates/index_base.html:40
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:47
-msgid "Repositories group"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:71
-#: rhodecode/templates/index_base.html:174
-#: rhodecode/templates/index_base.html:264
+#: rhodecode/templates/index_base.html:140
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43
+#: rhodecode/templates/admin/users_groups/users_group_add.html:32
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:33
+#: rhodecode/templates/admin/users_groups/users_groups.html:34
+msgid "Group name"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:41
+#: rhodecode/templates/index_base.html:83
+#: rhodecode/templates/index_base.html:142
+#: rhodecode/templates/index_base.html:180
+#: rhodecode/templates/index_base.html:270
+#: rhodecode/templates/admin/repos/repo_add_base.html:56
+#: rhodecode/templates/admin/repos/repo_edit.html:75
+#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44
+#: rhodecode/templates/forks/fork.html:56
+#: rhodecode/templates/pullrequests/pullrequest.html:101
+#: rhodecode/templates/summary/summary.html:106
+msgid "Description"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:51
+#: rhodecode/templates/admin/permissions/permissions.html:55
+#: rhodecode/templates/admin/repos/repo_add_base.html:29
+#: rhodecode/templates/admin/repos/repo_edit.html:49
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57
+#: rhodecode/templates/forks/fork.html:47
+msgid "Repository group"
+msgstr ""
+
+#: rhodecode/templates/index_base.html:82
+#: rhodecode/templates/index_base.html:178
+#: rhodecode/templates/index_base.html:268
 #: rhodecode/templates/admin/repos/repo_add_base.html:9
 #: rhodecode/templates/admin/repos/repo_edit.html:32
-#: rhodecode/templates/admin/repos/repos.html:70
-#: rhodecode/templates/admin/users/user_edit.html:196
-#: rhodecode/templates/admin/users/user_edit_my_account.html:59
-#: rhodecode/templates/admin/users/user_edit_my_account.html:180
-#: rhodecode/templates/admin/users/user_edit_my_account.html:216
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:184
-#: rhodecode/templates/bookmarks/bookmarks.html:36
+#: rhodecode/templates/admin/repos/repos.html:71
+#: rhodecode/templates/admin/users/user_edit_my_account.html:172
+#: rhodecode/templates/base/perms_summary.html:14
+#: rhodecode/templates/bookmarks/bookmarks.html:34
 #: rhodecode/templates/bookmarks/bookmarks_data.html:6
-#: rhodecode/templates/branches/branches.html:50
+#: rhodecode/templates/branches/branches.html:47
 #: rhodecode/templates/branches/branches_data.html:6
 #: rhodecode/templates/files/files_browser.html:47
-#: rhodecode/templates/journal/journal.html:70
-#: rhodecode/templates/journal/journal.html:196
-#: rhodecode/templates/journal/journal_page_repos.html:7
-#: rhodecode/templates/settings/repo_settings.html:31
-#: rhodecode/templates/summary/summary.html:43
-#: rhodecode/templates/summary/summary.html:132
-#: rhodecode/templates/tags/tags.html:51
+#: rhodecode/templates/journal/journal.html:193
+#: rhodecode/templates/journal/journal.html:296
+#: rhodecode/templates/summary/summary.html:55
+#: rhodecode/templates/summary/summary.html:124
+#: rhodecode/templates/tags/tags.html:48
 #: rhodecode/templates/tags/tags_data.html:6
 msgid "Name"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:73
+#: rhodecode/templates/index_base.html:84
 msgid "Last change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:74
-#: rhodecode/templates/index_base.html:179
-#: rhodecode/templates/admin/users/user_edit_my_account.html:182
-#: rhodecode/templates/journal/journal.html:198
+#: rhodecode/templates/index_base.html:85
+#: rhodecode/templates/index_base.html:183
+#: rhodecode/templates/index_base.html:273
+#: rhodecode/templates/admin/repos/repos.html:74
+#: rhodecode/templates/admin/users/user_edit_my_account.html:174
+#: rhodecode/templates/journal/journal.html:195
+#: rhodecode/templates/journal/journal.html:298
 msgid "Tip"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:75
-#: rhodecode/templates/index_base.html:181
-#: rhodecode/templates/index_base.html:269
+#: rhodecode/templates/index_base.html:86
+#: rhodecode/templates/index_base.html:185
+#: rhodecode/templates/index_base.html:275
 #: rhodecode/templates/admin/repos/repo_edit.html:121
-#: rhodecode/templates/admin/repos/repos.html:73
+#: rhodecode/templates/admin/repos/repos.html:76
 msgid "Owner"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:76
-#: rhodecode/templates/summary/summary.html:48
-#: rhodecode/templates/summary/summary.html:51
-msgid "RSS"
-msgstr ""
-
-#: rhodecode/templates/index_base.html:77
+#: rhodecode/templates/index_base.html:87
 msgid "Atom"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:167
-#: rhodecode/templates/index_base.html:207
-#: rhodecode/templates/index_base.html:291
-#: rhodecode/templates/admin/repos/repos.html:94
-#: rhodecode/templates/admin/users/user_edit_my_account.html:202
+#: rhodecode/templates/index_base.html:171
+#: rhodecode/templates/index_base.html:209
+#: rhodecode/templates/index_base.html:296
+#: rhodecode/templates/admin/repos/repos.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account.html:196
 #: rhodecode/templates/admin/users/users.html:107
-#: rhodecode/templates/bookmarks/bookmarks.html:60
-#: rhodecode/templates/branches/branches.html:76
-#: rhodecode/templates/journal/journal.html:221
-#: rhodecode/templates/tags/tags.html:77
+#: rhodecode/templates/bookmarks/bookmarks.html:58
+#: rhodecode/templates/branches/branches.html:73
+#: rhodecode/templates/journal/journal.html:217
+#: rhodecode/templates/journal/journal.html:320
+#: rhodecode/templates/tags/tags.html:74
 msgid "Click to sort ascending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:168
-#: rhodecode/templates/index_base.html:208
-#: rhodecode/templates/index_base.html:292
-#: rhodecode/templates/admin/repos/repos.html:95
-#: rhodecode/templates/admin/users/user_edit_my_account.html:203
+#: rhodecode/templates/index_base.html:172
+#: rhodecode/templates/index_base.html:210
+#: rhodecode/templates/index_base.html:297
+#: rhodecode/templates/admin/repos/repos.html:98
+#: rhodecode/templates/admin/users/user_edit_my_account.html:197
 #: rhodecode/templates/admin/users/users.html:108
-#: rhodecode/templates/bookmarks/bookmarks.html:61
-#: rhodecode/templates/branches/branches.html:77
-#: rhodecode/templates/journal/journal.html:222
-#: rhodecode/templates/tags/tags.html:78
+#: rhodecode/templates/bookmarks/bookmarks.html:59
+#: rhodecode/templates/branches/branches.html:74
+#: rhodecode/templates/journal/journal.html:218
+#: rhodecode/templates/journal/journal.html:321
+#: rhodecode/templates/tags/tags.html:75
 msgid "Click to sort descending"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:177
-#: rhodecode/templates/index_base.html:267
+#: rhodecode/templates/index_base.html:181
+#: rhodecode/templates/index_base.html:271
 msgid "Last Change"
 msgstr ""
 
-#: rhodecode/templates/index_base.html:209
-#: rhodecode/templates/index_base.html:293
-#: rhodecode/templates/admin/repos/repos.html:96
-#: rhodecode/templates/admin/users/user_edit_my_account.html:204
-#: rhodecode/templates/admin/users/users.html:109
-#: rhodecode/templates/bookmarks/bookmarks.html:62
-#: rhodecode/templates/branches/branches.html:78
-#: rhodecode/templates/journal/journal.html:223
-#: rhodecode/templates/tags/tags.html:79
-msgid "No records found."
-msgstr ""
-
-#: rhodecode/templates/index_base.html:210
-#: rhodecode/templates/index_base.html:294
-#: rhodecode/templates/admin/repos/repos.html:97
-#: rhodecode/templates/admin/users/user_edit_my_account.html:205
-#: rhodecode/templates/admin/users/users.html:110
-#: rhodecode/templates/bookmarks/bookmarks.html:63
-#: rhodecode/templates/branches/branches.html:79
-#: rhodecode/templates/journal/journal.html:224
-#: rhodecode/templates/tags/tags.html:80
-msgid "Data error."
-msgstr ""
-
 #: rhodecode/templates/index_base.html:211
-#: rhodecode/templates/index_base.html:295
-#: rhodecode/templates/admin/repos/repos.html:98
-#: rhodecode/templates/admin/users/user_edit_my_account.html:206
+#: rhodecode/templates/admin/repos/repos.html:99
+#: rhodecode/templates/admin/users/user_edit_my_account.html:198
+#: rhodecode/templates/admin/users/users.html:109
+#: rhodecode/templates/bookmarks/bookmarks.html:60
+#: rhodecode/templates/branches/branches.html:75
+#: rhodecode/templates/journal/journal.html:219
+#: rhodecode/templates/journal/journal.html:322
+#: rhodecode/templates/tags/tags.html:76
+msgid "No records found."
+msgstr ""
+
+#: rhodecode/templates/index_base.html:212
+#: rhodecode/templates/index_base.html:299
+#: rhodecode/templates/admin/repos/repos.html:100
+#: rhodecode/templates/admin/users/user_edit_my_account.html:199
+#: rhodecode/templates/admin/users/users.html:110
+#: rhodecode/templates/bookmarks/bookmarks.html:61
+#: rhodecode/templates/branches/branches.html:76
+#: rhodecode/templates/journal/journal.html:220
+#: rhodecode/templates/journal/journal.html:323
+#: rhodecode/templates/tags/tags.html:77
+msgid "Data error."
+msgstr ""
+
+#: rhodecode/templates/index_base.html:213
+#: rhodecode/templates/index_base.html:300
+#: rhodecode/templates/admin/repos/repos.html:101
+#: rhodecode/templates/admin/users/user_edit_my_account.html:58
+#: rhodecode/templates/admin/users/user_edit_my_account.html:200
 #: rhodecode/templates/admin/users/users.html:111
-#: rhodecode/templates/bookmarks/bookmarks.html:64
-#: rhodecode/templates/branches/branches.html:80
-#: rhodecode/templates/journal/journal.html:62
-#: rhodecode/templates/journal/journal.html:225
-#: rhodecode/templates/tags/tags.html:81
+#: rhodecode/templates/bookmarks/bookmarks.html:62
+#: rhodecode/templates/branches/branches.html:77
+#: rhodecode/templates/journal/journal.html:221
+#: rhodecode/templates/journal/journal.html:324
+#: rhodecode/templates/tags/tags.html:78
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:54
-msgid "Sign In"
+#: rhodecode/templates/index_base.html:298
+msgid "No repositories found."
+msgstr ""
+
+#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227
+msgid "Log In"
 msgstr ""
 
 #: rhodecode/templates/login.html:21
-msgid "Sign In to"
+#, python-format
+msgid "Log In to %s"
 msgstr ""
 
 #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20
 #: rhodecode/templates/admin/admin_log.html:5
 #: rhodecode/templates/admin/users/user_add.html:32
-#: rhodecode/templates/admin/users/user_edit.html:50
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26
-#: rhodecode/templates/base/base.html:83
-#: rhodecode/templates/summary/summary.html:131
+#: rhodecode/templates/admin/users/user_edit.html:57
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:31
+#: rhodecode/templates/admin/users/users.html:77
+#: rhodecode/templates/base/base.html:203
+#: rhodecode/templates/summary/summary.html:123
 msgid "Username"
 msgstr ""
 
 #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29
 #: rhodecode/templates/admin/ldap/ldap.html:46
 #: rhodecode/templates/admin/users/user_add.html:41
-#: rhodecode/templates/base/base.html:92
+#: rhodecode/templates/base/base.html:212
 msgid "Password"
 msgstr ""
 
@@ -1490,16 +1675,20 b' msgstr ""'
 msgid "Remember me"
 msgstr ""
 
+#: rhodecode/templates/login.html:54
+msgid "Sign In"
+msgstr ""
+
 #: rhodecode/templates/login.html:60
 msgid "Forgot your password ?"
 msgstr ""
 
-#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223
 msgid "Don't have an account ?"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:5
-msgid "Reset your password"
+msgid "Password Reset"
 msgstr ""
 
 #: rhodecode/templates/password_reset.html:11
@@ -1532,23 +1721,23 b' msgstr ""'
 
 #: rhodecode/templates/register.html:47
 #: rhodecode/templates/admin/users/user_add.html:59
-#: rhodecode/templates/admin/users/user_edit.html:90
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
+#: rhodecode/templates/admin/users/user_edit.html:97
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:56
 #: rhodecode/templates/admin/users/user_add.html:68
-#: rhodecode/templates/admin/users/user_edit.html:99
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62
+#: rhodecode/templates/admin/users/user_edit.html:106
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.html:65
 #: rhodecode/templates/admin/users/user_add.html:77
-#: rhodecode/templates/admin/users/user_edit.html:108
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71
-#: rhodecode/templates/summary/summary.html:133
+#: rhodecode/templates/admin/users/user_edit.html:115
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
+#: rhodecode/templates/summary/summary.html:125
 msgid "Email"
 msgstr ""
 
@@ -1560,44 +1749,31 b' msgstr ""'
 msgid "Your account must wait for activation by administrator"
 msgstr ""
 
-#: rhodecode/templates/repo_switcher_list.html:11
+#: rhodecode/templates/repo_switcher_list.html:10
 #: rhodecode/templates/admin/defaults/defaults.html:44
 #: rhodecode/templates/admin/repos/repo_add_base.html:65
 #: rhodecode/templates/admin/repos/repo_edit.html:85
-#: rhodecode/templates/settings/repo_settings.html:76
+#: rhodecode/templates/data_table/_dt_elements.html:61
+#: rhodecode/templates/summary/summary.html:77
 msgid "Private repository"
 msgstr ""
 
-#: rhodecode/templates/repo_switcher_list.html:16
+#: rhodecode/templates/repo_switcher_list.html:12
+#: rhodecode/templates/data_table/_dt_elements.html:63
+#: rhodecode/templates/summary/summary.html:79
 msgid "Public repository"
 msgstr ""
 
-#: rhodecode/templates/switch_to_list.html:3
-#: rhodecode/templates/branches/branches.html:14
-msgid "branches"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:10
 #: rhodecode/templates/branches/branches_data.html:57
 msgid "There are no branches yet"
 msgstr ""
 
-#: rhodecode/templates/switch_to_list.html:15
-#: rhodecode/templates/shortlog/shortlog_data.html:10
-#: rhodecode/templates/tags/tags.html:15
-msgid "tags"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:22
 #: rhodecode/templates/tags/tags_data.html:38
 msgid "There are no tags yet"
 msgstr ""
 
-#: rhodecode/templates/switch_to_list.html:28
-#: rhodecode/templates/bookmarks/bookmarks.html:15
-msgid "bookmarks"
-msgstr ""
-
 #: rhodecode/templates/switch_to_list.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:32
 msgid "There are no bookmarks yet"
@@ -1605,6 +1781,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/admin.html:5
 #: rhodecode/templates/admin/admin.html:13
+#: rhodecode/templates/base/base.html:68
 msgid "Admin journal"
 msgstr ""
 
@@ -1626,11 +1803,13 b' msgstr[0] ""'
 msgstr[1] ""
 
 #: rhodecode/templates/admin/admin_log.html:6
-#: rhodecode/templates/admin/repos/repos.html:74
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:10
+#: rhodecode/templates/admin/repos/repos.html:77
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46
+#: rhodecode/templates/admin/users/user_edit_my_account.html:176
+#: rhodecode/templates/admin/users/users.html:87
+#: rhodecode/templates/admin/users_groups/users_groups.html:37
+#: rhodecode/templates/journal/journal.html:197
+#: rhodecode/templates/journal/journal.html:300
 msgid "Action"
 msgstr ""
 
@@ -1640,11 +1819,11 b' msgid "Repository"'
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log.html:8
-#: rhodecode/templates/bookmarks/bookmarks.html:37
+#: rhodecode/templates/bookmarks/bookmarks.html:35
 #: rhodecode/templates/bookmarks/bookmarks_data.html:7
-#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches.html:48
 #: rhodecode/templates/branches/branches_data.html:7
-#: rhodecode/templates/tags/tags.html:52
+#: rhodecode/templates/tags/tags.html:49
 #: rhodecode/templates/tags/tags_data.html:7
 msgid "Date"
 msgstr ""
@@ -1663,6 +1842,7 b' msgid "Repositories defaults"'
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.html:11
+#: rhodecode/templates/base/base.html:75
 msgid "Defaults"
 msgstr ""
 
@@ -1675,8 +1855,7 b' msgstr ""'
 #: rhodecode/templates/admin/defaults/defaults.html:48
 #: rhodecode/templates/admin/repos/repo_add_base.html:69
 #: rhodecode/templates/admin/repos/repo_edit.html:89
-#: rhodecode/templates/forks/fork.html:72
-#: rhodecode/templates/settings/repo_settings.html:80
+#: rhodecode/templates/forks/fork.html:69
 msgid ""
 "Private repositories are only visible to people explicitly added as "
 "collaborators."
@@ -1704,7 +1883,7 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults.html:75
 #: rhodecode/templates/admin/repos/repo_edit.html:112
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72
 msgid "Enable locking"
 msgstr ""
 
@@ -1715,14 +1894,18 b' msgstr ""'
 
 #: rhodecode/templates/admin/defaults/defaults.html:84
 #: rhodecode/templates/admin/ldap/ldap.html:89
-#: rhodecode/templates/admin/repos/repo_edit.html:141
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74
+#: rhodecode/templates/admin/permissions/permissions.html:92
+#: rhodecode/templates/admin/repos/repo_edit.html:148
+#: rhodecode/templates/admin/repos/repo_edit.html:173
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80
 #: rhodecode/templates/admin/settings/hooks.html:73
-#: rhodecode/templates/admin/users/user_edit.html:133
-#: rhodecode/templates/admin/users/user_edit.html:178
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79
+#: rhodecode/templates/admin/users/user_add.html:94
+#: rhodecode/templates/admin/users/user_edit.html:140
+#: rhodecode/templates/admin/users/user_edit.html:185
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:88
+#: rhodecode/templates/admin/users_groups/users_group_add.html:49
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:135
-#: rhodecode/templates/settings/repo_settings.html:94
 msgid "Save"
 msgstr ""
 
@@ -1731,7 +1914,9 b' msgid "LDAP administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:11
-msgid "Ldap"
+#: rhodecode/templates/admin/users/users.html:86
+#: rhodecode/templates/base/base.html:74
+msgid "LDAP"
 msgstr ""
 
 #: rhodecode/templates/admin/ldap/ldap.html:28
@@ -1813,8 +1998,7 b' msgid "Comments"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications.html:31
-#: rhodecode/templates/base/base.html:267
-#: rhodecode/templates/base/base.html:269
+#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
 msgid "Pull requests"
 msgstr ""
 
@@ -1832,6 +2016,7 b' msgid "Show notification"'
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/show_notification.html:9
+#: rhodecode/templates/base/base.html:241
 msgid "Notifications"
 msgstr ""
 
@@ -1840,11 +2025,12 b' msgid "Permissions administration"'
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:134
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58
-#: rhodecode/templates/admin/users/user_edit.html:143
+#: rhodecode/templates/admin/repos/repo_edit.html:158
+#: rhodecode/templates/admin/repos/repo_edit.html:165
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64
+#: rhodecode/templates/admin/users/user_edit.html:150
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100
-#: rhodecode/templates/settings/repo_settings.html:86
+#: rhodecode/templates/base/base.html:73
 msgid "Permissions"
 msgstr ""
 
@@ -1858,30 +2044,21 b' msgstr ""'
 
 #: rhodecode/templates/admin/permissions/permissions.html:49
 msgid ""
-"All default permissions on each repository will be reset to choosen "
+"All default permissions on each repository will be reset to chosen "
 "permission, note that all custom default permission on repositories will "
 "be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:50
 #: rhodecode/templates/admin/permissions/permissions.html:63
-msgid "overwrite existing settings"
-msgstr ""
-
-#: rhodecode/templates/admin/permissions/permissions.html:55
-#: rhodecode/templates/admin/repos/repo_add_base.html:29
-#: rhodecode/templates/admin/repos/repo_edit.html:49
-#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
-#: rhodecode/templates/forks/fork.html:50
-#: rhodecode/templates/settings/repo_settings.html:48
-msgid "Repository group"
+msgid "Overwrite existing settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:62
 msgid ""
-"All default permissions on each repository group will be reset to choosen"
-" permission, note that all custom default permission on repositories "
-"group will be lost"
+"All default permissions on each repository group will be reset to chosen "
+"permission, note that all custom default permission on repository groups "
+"will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.html:69
@@ -1896,40 +2073,95 b' msgstr ""'
 msgid "Repository forking"
 msgstr ""
 
-#: rhodecode/templates/admin/permissions/permissions.html:92
-#: rhodecode/templates/admin/repos/repo_edit.html:264
-msgid "set"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add.html:5
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:5
-msgid "Add repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add.html:11
-#: rhodecode/templates/admin/repos/repo_edit.html:11
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10
+#: rhodecode/templates/admin/permissions/permissions.html:93
+#: rhodecode/templates/admin/permissions/permissions.html:154
+#: rhodecode/templates/admin/repos/repo_edit.html:149
+#: rhodecode/templates/admin/repos/repo_edit.html:174
+#: rhodecode/templates/admin/repos/repo_edit.html:388
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81
+#: rhodecode/templates/admin/settings/settings.html:115
+#: rhodecode/templates/admin/settings/settings.html:187
+#: rhodecode/templates/admin/settings/settings.html:278
+#: rhodecode/templates/admin/users/user_edit.html:141
+#: rhodecode/templates/admin/users/user_edit.html:186
+#: rhodecode/templates/admin/users/user_edit.html:235
+#: rhodecode/templates/admin/users/user_edit.html:283
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
+#: rhodecode/templates/files/files_add.html:80
+#: rhodecode/templates/files/files_edit.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:110
+msgid "Reset"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:103
+msgid "Default User Permissions"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:113
+#: rhodecode/templates/admin/users/user_edit.html:244
+msgid "Allowed IP addresses"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:127
+#: rhodecode/templates/admin/repos/repo_edit.html:347
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
+#: rhodecode/templates/admin/users/user_edit.html:212
+#: rhodecode/templates/admin/users/user_edit.html:257
+#: rhodecode/templates/admin/users_groups/users_groups.html:46
+#: rhodecode/templates/data_table/_dt_elements.html:122
+#: rhodecode/templates/data_table/_dt_elements.html:130
+msgid "delete"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:128
+#: rhodecode/templates/admin/users/user_edit.html:258
+#, fuzzy, python-format
+msgid "Confirm to delete this ip: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:134
+#: rhodecode/templates/admin/users/user_edit.html:264
+msgid "All IP addresses are allowed"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:145
+#: rhodecode/templates/admin/users/user_edit.html:275
+msgid "New ip address"
+msgstr ""
+
+#: rhodecode/templates/admin/permissions/permissions.html:153
+#: rhodecode/templates/admin/repos/repo_add_base.html:73
+#: rhodecode/templates/admin/repos/repo_edit.html:387
+#: rhodecode/templates/admin/users/user_edit.html:234
+#: rhodecode/templates/admin/users/user_edit.html:282
+msgid "Add"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_add.html:12
+#: rhodecode/templates/admin/repos/repo_add.html:16
+#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103
+#: rhodecode/templates/base/base.html:263
 msgid "Repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add.html:13
-msgid "add new"
+#: rhodecode/templates/admin/repos/repo_add.html:19
+msgid "Add new"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:20
-#: rhodecode/templates/summary/summary.html:104
-#: rhodecode/templates/summary/summary.html:105
+#: rhodecode/templates/summary/summary.html:96
+#: rhodecode/templates/summary/summary.html:97
 msgid "Clone from"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:24
 #: rhodecode/templates/admin/repos/repo_edit.html:44
-#: rhodecode/templates/settings/repo_settings.html:43
 msgid "Optional http[s] url from which repository should be cloned."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:33
-#: rhodecode/templates/forks/fork.html:54
+#: rhodecode/templates/forks/fork.html:51
 msgid "Optionaly select a group to put this repository into."
 msgstr ""
 
@@ -1939,57 +2171,39 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:47
 #: rhodecode/templates/admin/repos/repo_edit.html:66
-#: rhodecode/templates/forks/fork.html:41
-#: rhodecode/templates/settings/repo_settings.html:57
+#: rhodecode/templates/forks/fork.html:38
 msgid "Landing revision"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:51
 #: rhodecode/templates/admin/repos/repo_edit.html:70
-#: rhodecode/templates/forks/fork.html:45
-#: rhodecode/templates/settings/repo_settings.html:61
+#: rhodecode/templates/forks/fork.html:42
 msgid "Default revision for files page, downloads, whoosh and readme"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.html:60
 #: rhodecode/templates/admin/repos/repo_edit.html:79
-#: rhodecode/templates/forks/fork.html:63
-#: rhodecode/templates/settings/repo_settings.html:70
+#: rhodecode/templates/forks/fork.html:60
 msgid "Keep it short and to the point. Use a README file for longer descriptions."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.html:73
-msgid "add"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_add_create_repository.html:9
-msgid "add new repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:5
+#: rhodecode/templates/admin/repos/repo_edit.html:8
 msgid "Edit repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:13
-#: rhodecode/templates/admin/users/user_edit.html:228
-#: rhodecode/templates/admin/users/user_edit.html:230
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:207
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:209
-#: rhodecode/templates/files/files_source.html:29
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "edit"
+#: rhodecode/templates/admin/repos/repo_edit.html:12
+#: rhodecode/templates/admin/settings/hooks.html:9
+#: rhodecode/templates/admin/settings/settings.html:11
+#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121
+#: rhodecode/templates/summary/summary.html:212
+msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:40
-#: rhodecode/templates/settings/repo_settings.html:39
 msgid "Clone uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:53
-#: rhodecode/templates/settings/repo_settings.html:52
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
@@ -1997,177 +2211,206 b' msgstr ""'
 msgid "Change owner of this repository."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:142
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75
-#: rhodecode/templates/admin/settings/settings.html:113
-#: rhodecode/templates/admin/settings/settings.html:179
-#: rhodecode/templates/admin/settings/settings.html:269
-#: rhodecode/templates/admin/users/user_edit.html:134
-#: rhodecode/templates/admin/users/user_edit.html:179
-#: rhodecode/templates/admin/users/user_edit.html:282
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:136
-#: rhodecode/templates/files/files_add.html:82
-#: rhodecode/templates/files/files_edit.html:68
-#: rhodecode/templates/pullrequests/pullrequest.html:124
-#: rhodecode/templates/settings/repo_settings.html:95
-msgid "Reset"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:152
-msgid "Administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:155
+#: rhodecode/templates/admin/repos/repo_edit.html:184
+msgid "Advanced settings"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:187
 msgid "Statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
 msgid "Reset current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:159
+#: rhodecode/templates/admin/repos/repo_edit.html:191
 msgid "Confirm to remove current statistics"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:162
+#: rhodecode/templates/admin/repos/repo_edit.html:194
 msgid "Fetched to rev"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:163
+#: rhodecode/templates/admin/repos/repo_edit.html:195
 msgid "Stats gathered"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:171
-msgid "Remote"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:175
-msgid "Pull changes from remote location"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:175
-msgid "Confirm to pull changes from remote side"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:186
-msgid "Cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:190
-msgid "Invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:190
-msgid "Confirm to invalidate repository cache"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:193
-msgid ""
-"Manually invalidate cache for this repository. On first access repository"
-" will be cached again"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:198
-msgid "List of cached values"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:201
-msgid "Prefix"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:202
-msgid "Key"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:203
-#: rhodecode/templates/admin/users/user_add.html:86
-#: rhodecode/templates/admin/users/user_edit.html:117
-#: rhodecode/templates/admin/users_groups/users_group_add.html:41
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
-msgid "Active"
+msgid "Remote"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:207
+msgid "Pull changes from remote location"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:207
+msgid "Confirm to pull changes from remote side"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.html:218
-#: rhodecode/templates/base/base.html:331
-#: rhodecode/templates/base/base.html:333
-#: rhodecode/templates/base/base.html:335
+msgid "Cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:222
+msgid "Invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:222
+msgid "Confirm to invalidate repository cache"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:225
+msgid ""
+"Manually invalidate cache for this repository. On first access repository"
+" will be cached again"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:230
+msgid "List of cached values"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:233
+msgid "Prefix"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:234
+msgid "Key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:235
+#: rhodecode/templates/admin/users/user_add.html:86
+#: rhodecode/templates/admin/users/user_edit.html:124
+#: rhodecode/templates/admin/users/users.html:84
+#: rhodecode/templates/admin/users_groups/users_group_add.html:41
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:42
+#: rhodecode/templates/admin/users_groups/users_groups.html:36
+msgid "Active"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:250
+#: rhodecode/templates/base/base.html:280
+#: rhodecode/templates/base/base.html:281
 msgid "Public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:224
+#: rhodecode/templates/admin/repos/repo_edit.html:256
 msgid "Remove from public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:226
+#: rhodecode/templates/admin/repos/repo_edit.html:258
 msgid "Add to public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:231
+#: rhodecode/templates/admin/repos/repo_edit.html:263
 msgid ""
 "All actions made on this repository will be accessible to everyone in "
 "public journal"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:238
+#: rhodecode/templates/admin/repos/repo_edit.html:270
 msgid "Locking"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
 msgid "Unlock locked repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:243
+#: rhodecode/templates/admin/repos/repo_edit.html:275
 msgid "Confirm to unlock repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:246
+#: rhodecode/templates/admin/repos/repo_edit.html:278
 msgid "lock repo"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:246
-msgid "Confirm to lock repository"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:247
-msgid "Repository is not locked"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:252
-msgid "Force locking on repository. Works only when anonymous access is disabled"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:259
-msgid "Set as fork of"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:268
-msgid "Manually set this repository as a fork of another from the list"
-msgstr ""
-
-#: rhodecode/templates/admin/repos/repo_edit.html:274
-#: rhodecode/templates/changeset/changeset_file_comment.html:26
-msgid "Delete"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+msgid "Confirm to lock repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:279
+msgid "Repository is not locked"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:284
+msgid "Force locking on repository. Works only when anonymous access is disabled"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:291
+msgid "Set as fork of"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:296
+msgid "set"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:300
+msgid "Manually set this repository as a fork of another from the list"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:306
+#: rhodecode/templates/changeset/changeset_file_comment.html:41
+msgid "Delete"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid "Remove this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:278
-#: rhodecode/templates/settings/repo_settings.html:115
+#: rhodecode/templates/admin/repos/repo_edit.html:315
 msgid "Confirm to delete this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit.html:282
-#: rhodecode/templates/settings/repo_settings.html:119
+#: rhodecode/templates/admin/repos/repo_edit.html:317
+#, python-format
+msgid "this repository has %s fork"
+msgid_plural "this repository has %s forks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:318
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:319
+msgid "Delete forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:322
 msgid ""
 "This repository will be renamed in a special way in order to be "
-"unaccesible for RhodeCode and VCS systems. If you need fully delete it "
+"unaccesible for RhodeCode and VCS systems. If you need to fully delete it"
 "from file system please do it manually"
 msgstr ""
 
+#: rhodecode/templates/admin/repos/repo_edit.html:336
+msgid "Extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:348
+#, fuzzy, python-format
+msgid "Confirm to delete this field: %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:362
+msgid "New field key"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:370
+msgid "New field label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:373
+msgid "Enter short label"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:379
+msgid "New field description"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit.html:382
+msgid "Enter description of a field"
+msgstr ""
+
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:3
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3
 msgid "none"
@@ -2185,8 +2428,6 b' msgstr ""'
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:6
 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6
-#: rhodecode/templates/admin/users/users.html:85
-#: rhodecode/templates/base/base.html:229
 msgid "admin"
 msgstr ""
 
@@ -2196,78 +2437,58 b' msgid "member"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:16
-#: rhodecode/templates/data_table/_dt_elements.html:67
-#: rhodecode/templates/journal/journal.html:95
-#: rhodecode/templates/summary/summary.html:85
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:19
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:28
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:18
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35
 msgid "default"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:33
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55
 msgid "revoke"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:83
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80
 msgid "Add another member"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:97
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100
 msgid "Failed to remove user"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_perms.html:112
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:103
-msgid "Failed to remove users group"
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116
+msgid "Failed to remove user group"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.html:5
 msgid "Repositories administration"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:73
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86
 msgid "apply to children"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:74
+#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87
 msgid ""
-"Set or revoke permission to all children of that group, including "
-"repositories and other groups"
+"Set or revoke permission to all children of that group, including non-"
+"private repositories and other groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups.html:4
+#, python-format
+msgid "%s Group Dashboard"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups.html:9
-#: rhodecode/templates/base/base.html:122
-#: rhodecode/templates/base/base.html:313
-#: rhodecode/templates/base/base.html:315
-#: rhodecode/templates/base/base.html:317
-#: rhodecode/templates/bookmarks/bookmarks.html:11
-#: rhodecode/templates/branches/branches.html:10
-#: rhodecode/templates/changelog/changelog.html:10
-#: rhodecode/templates/changeset/changeset.html:10
-#: rhodecode/templates/changeset/changeset_range.html:9
-#: rhodecode/templates/compare/compare_diff.html:9
-#: rhodecode/templates/files/file_diff.html:8
-#: rhodecode/templates/files/files.html:8
-#: rhodecode/templates/files/files_add.html:15
-#: rhodecode/templates/files/files_edit.html:15
-#: rhodecode/templates/followers/followers.html:9
-#: rhodecode/templates/forks/fork.html:9 rhodecode/templates/forks/forks.html:9
-#: rhodecode/templates/pullrequests/pullrequest.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show.html:8
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:8
-#: rhodecode/templates/settings/repo_settings.html:9
-#: rhodecode/templates/shortlog/shortlog.html:10
-#: rhodecode/templates/summary/summary.html:8
-#: rhodecode/templates/tags/tags.html:11
 msgid "Home"
 msgstr ""
 
@@ -2276,80 +2497,78 b' msgid "with"'
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5
-msgid "Add repos group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:10
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:10
-msgid "Repos groups"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:12
-msgid "add new repos group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:50
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:50
+msgid "Add repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16
+#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82
+msgid "Repository groups"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13
+msgid "Add new repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56
 msgid "Group parent"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:58
-#: rhodecode/templates/admin/users/user_add.html:94
-#: rhodecode/templates/admin/users_groups/users_group_add.html:49
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:90
-#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/admin/repos_groups/repos_groups_add.html:59
 msgid "save"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5
-msgid "Edit repos group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:12
-msgid "edit repos group"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70
+msgid "Edit repository group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13
+#, python-format
+msgid "Edit repository group %s"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27
+msgid "Add child group"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76
 msgid ""
 "Enable lock-by-pulling on group. This option will be applied to all other"
 " groups and repositories inside"
 msgstr ""
 
 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5
-msgid "Repositories groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:22
-msgid "ADD NEW GROUP"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:35
+msgid "Repository groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45
 msgid "Number of toplevel repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36
-#: rhodecode/templates/admin/users/users.html:87
-#: rhodecode/templates/admin/users_groups/users_groups.html:35
-msgid "action"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
-#: rhodecode/templates/admin/users/user_edit.html:259
-#: rhodecode/templates/admin/users_groups/users_groups.html:44
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/data_table/_dt_elements.html:121
-msgid "delete"
-msgstr ""
-
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:55
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64
+msgid "Edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65
+#: rhodecode/templates/base/perms_summary.html:29
+#: rhodecode/templates/base/perms_summary.html:48
+#: rhodecode/templates/base/perms_summary.html:50
+#: rhodecode/templates/data_table/_dt_elements.html:116
+#: rhodecode/templates/data_table/_dt_elements.html:117
+msgid "edit"
+msgstr ""
+
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70
 #, python-format
 msgid "Confirm to delete this group: %s with %s repository"
 msgid_plural "Confirm to delete this group: %s with %s repositories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:63
-msgid "There are no repositories groups yet"
+#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78
+msgid "There are no repository groups yet"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/hooks.html:5
@@ -2357,12 +2576,6 b' msgstr ""'
 msgid "Settings administration"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/hooks.html:9
-#: rhodecode/templates/admin/settings/settings.html:9
-#: rhodecode/templates/settings/repo_settings.html:13
-msgid "Settings"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/hooks.html:24
 msgid "Built in hooks - read only"
 msgstr ""
@@ -2379,205 +2592,210 b' msgstr ""'
 msgid "Failed to remove hook"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:24
+#: rhodecode/templates/admin/settings/settings.html:26
 msgid "Remap and rescan repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:32
-msgid "rescan option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:38
+#: rhodecode/templates/admin/settings/settings.html:34
+msgid "Rescan option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:40
 msgid ""
 "In case a repository was deleted from filesystem and there are leftovers "
 "in the database check this option to scan obsolete data in database and "
 "remove it."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:39
-msgid "destroy old data"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:41
+msgid "Destroy old data"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:43
 msgid ""
 "Rescan repositories location for new repositories. Also deletes obsolete "
 "if `destroy` flag is checked "
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:46
+#: rhodecode/templates/admin/settings/settings.html:48
 msgid "Rescan repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:52
+#: rhodecode/templates/admin/settings/settings.html:54
 msgid "Whoosh indexing"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:60
-msgid "index build option"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:65
-msgid "build from scratch"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:71
+#: rhodecode/templates/admin/settings/settings.html:62
+msgid "Index build option"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:67
+msgid "Build from scratch"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:73
 msgid "Reindex"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:77
+#: rhodecode/templates/admin/settings/settings.html:79
 msgid "Global application settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:86
-msgid "Application name"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:95
-msgid "Realm text"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:104
-msgid "GA code"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:112
-#: rhodecode/templates/admin/settings/settings.html:178
-#: rhodecode/templates/admin/settings/settings.html:268
+#: rhodecode/templates/admin/settings/settings.html:88
+msgid "Site branding"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:97
+msgid "HTTP authentication realm"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:106
+msgid "Google Analytics code"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:114
+#: rhodecode/templates/admin/settings/settings.html:186
+#: rhodecode/templates/admin/settings/settings.html:277
 msgid "Save settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:119
+#: rhodecode/templates/admin/settings/settings.html:121
 msgid "Visualisation settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:127
+#: rhodecode/templates/admin/settings/settings.html:129
 msgid "General"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:132
+#: rhodecode/templates/admin/settings/settings.html:134
 msgid "Use lightweight dashboard"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:139
+#: rhodecode/templates/admin/settings/settings.html:140
+msgid "Use repository extra fields"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:147
 msgid "Icons"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:144
+#: rhodecode/templates/admin/settings/settings.html:152
 msgid "Show public repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:148
+#: rhodecode/templates/admin/settings/settings.html:156
 msgid "Show private repo icon on repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:155
+#: rhodecode/templates/admin/settings/settings.html:163
 msgid "Meta-Tagging"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:160
+#: rhodecode/templates/admin/settings/settings.html:168
 msgid "Stylify recognised metatags:"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:187
+#: rhodecode/templates/admin/settings/settings.html:195
 msgid "VCS settings"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:196
+#: rhodecode/templates/admin/settings/settings.html:204
 msgid "Web"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:201
-msgid "require ssl for vcs operations"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:203
+#: rhodecode/templates/admin/settings/settings.html:209
+msgid "Require SSL for vcs operations"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:211
 msgid ""
 "RhodeCode will require SSL for pushing or pulling. If SSL is missing it "
 "will return HTTP Error 406: Not Acceptable"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:209
+#: rhodecode/templates/admin/settings/settings.html:217
 msgid "Hooks"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:214
-msgid "Update repository after push (hg update)"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:218
-msgid "Show repository size after push"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:222
-msgid "Log user push commands"
+msgid "Update repository after push (hg update)"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:226
-msgid "Log user pull commands"
+msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings.html:230
-msgid "advanced setup"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:235
+msgid "Log user push commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:234
+msgid "Log user pull commands"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:238
+msgid "Advanced setup"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:243
 msgid "Mercurial Extensions"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:240
-msgid "largefiles extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:244
-msgid "hgsubversion extensions"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:246
+#: rhodecode/templates/admin/settings/settings.html:248
+msgid "Enable largefiles extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:252
+msgid "Enable hgsubversion extension"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:254
 msgid ""
-"Requires hgsubversion library installed. Allows clonning from svn remote "
+"Requires hgsubversion library installed. Allows cloning from svn remote "
 "locations"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:256
+#: rhodecode/templates/admin/settings/settings.html:264
 msgid "Repositories location"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:261
+#: rhodecode/templates/admin/settings/settings.html:269
 msgid ""
 "This a crucial application setting. If you are really sure you need to "
 "change this, you must restart application in order to make this setting "
 "take effect. Click this label to unlock."
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:262
-#: rhodecode/templates/base/base.html:221
-msgid "unlock"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:263
+#: rhodecode/templates/admin/settings/settings.html:270
+#: rhodecode/templates/base/base.html:131
+msgid "Unlock"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:272
 msgid ""
 "Location where repositories are stored. After changing this value a "
 "restart, and rescan is required"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:283
+#: rhodecode/templates/admin/settings/settings.html:292
 msgid "Test Email"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:291
+#: rhodecode/templates/admin/settings/settings.html:300
 msgid "Email to"
 msgstr ""
 
-#: rhodecode/templates/admin/settings/settings.html:299
-msgid "Send"
-msgstr ""
-
-#: rhodecode/templates/admin/settings/settings.html:305
-msgid "System Info and Packages"
-msgstr ""
-
 #: rhodecode/templates/admin/settings/settings.html:308
-msgid "show"
+msgid "Send"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:314
+msgid "System Info and Packages"
+msgstr ""
+
+#: rhodecode/templates/admin/settings/settings.html:317
+#: rhodecode/templates/changelog/changelog.html:42
+msgid "Show"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:5
@@ -2586,11 +2804,13 b' msgstr ""'
 
 #: rhodecode/templates/admin/users/user_add.html:10
 #: rhodecode/templates/admin/users/user_edit.html:11
+#: rhodecode/templates/base/base.html:71
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:12
-msgid "add new user"
+#: rhodecode/templates/admin/users/users.html:23
+msgid "Add new user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.html:50
@@ -2601,6 +2821,12 b' msgstr ""'
 msgid "Edit user"
 msgstr ""
 
+#: rhodecode/templates/admin/users/user_edit.html:13
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:13
+#, python-format
+msgid "Edit %s"
+msgstr ""
+
 #: rhodecode/templates/admin/users/user_edit.html:34
 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10
 msgid "Change your avatar at"
@@ -2616,26 +2842,31 b' msgstr ""'
 msgid "API key"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:63
+#: rhodecode/templates/admin/users/user_edit.html:50
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:25
+msgid "Current IP"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit.html:70
 msgid "LDAP DN"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:72
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35
+#: rhodecode/templates/admin/users/user_edit.html:79
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
 msgid "New password"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:81
-#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44
+#: rhodecode/templates/admin/users/user_edit.html:88
+#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53
 msgid "New password confirmation"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:151
+#: rhodecode/templates/admin/users/user_edit.html:158
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108
 msgid "Inherit default permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:156
+#: rhodecode/templates/admin/users/user_edit.html:163
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:113
 #, python-format
 msgid ""
@@ -2643,53 +2874,31 b' msgid ""'
 "options does not have any action"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:162
+#: rhodecode/templates/admin/users/user_edit.html:169
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:119
 msgid "Create repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:170
+#: rhodecode/templates/admin/users/user_edit.html:177
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:127
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:190
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39
-msgid "Nothing here yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:197
-#: rhodecode/templates/admin/users/user_edit_my_account.html:60
-#: rhodecode/templates/admin/users/user_edit_my_account.html:217
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:185
-msgid "Permission"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:198
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:186
-msgid "Edit Permission"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit.html:247
+#: rhodecode/templates/admin/users/user_edit.html:200
 msgid "Email addresses"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:260
+#: rhodecode/templates/admin/users/user_edit.html:213
 #, python-format
 msgid "Confirm to delete this email: %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:274
+#: rhodecode/templates/admin/users/user_edit.html:227
 msgid "New email address"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit.html:281
-msgid "Add"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_my_account.html:5
-#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/base/base.html:242
 msgid "My account"
 msgstr ""
 
@@ -2702,7 +2911,7 b' msgid "My permissions"'
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_my_account.html:38
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:54
 msgid "My repos"
 msgstr ""
 
@@ -2710,132 +2919,97 b' msgstr ""'
 msgid "My pull requests"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account.html:45
-msgid "Add repo"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4
+msgid "Show closed pull requests"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6
 msgid "Opened by me"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10
-#, python-format
-msgid "Pull request #%s opened on %s"
-msgstr ""
-
 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15
+#, python-format
+msgid "Pull request #%s opened on %s"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45
+#: rhodecode/templates/pullrequests/pullrequest_data.html:7
+#: rhodecode/templates/pullrequests/pullrequest_show.html:27
+#: rhodecode/templates/pullrequests/pullrequest_show.html:42
+msgid "Closed"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23
 msgid "Confirm to delete this pull request"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51
+msgid "Nothing here yet"
+msgstr ""
+
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34
 msgid "I participate in"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30
+#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42
+#: rhodecode/templates/pullrequests/pullrequest_data.html:11
 #, python-format
 msgid "Pull request #%s opened by %s on %s"
 msgstr ""
 
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7
-#: rhodecode/templates/bookmarks/bookmarks.html:40
-#: rhodecode/templates/bookmarks/bookmarks_data.html:9
-#: rhodecode/templates/branches/branches.html:54
-#: rhodecode/templates/branches/branches_data.html:9
-#: rhodecode/templates/journal/journal_page_repos.html:8
-#: rhodecode/templates/tags/tags.html:55
-#: rhodecode/templates/tags/tags_data.html:9
-msgid "Revision"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28
-#: rhodecode/templates/journal/journal_page_repos.html:29
-msgid "private"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31
-#: rhodecode/templates/data_table/_dt_elements.html:7
-#: rhodecode/templates/journal/journal_page_repos.html:32
-#, python-format
-msgid "Confirm to delete this repository: %s"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38
-#: rhodecode/templates/journal/journal_page_repos.html:42
-msgid "No repositories yet"
-msgstr ""
-
-#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40
-#: rhodecode/templates/journal/journal_page_repos.html:44
-msgid "create one now"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:9
-#: rhodecode/templates/base/base.html:235
 msgid "users"
 msgstr ""
 
-#: rhodecode/templates/admin/users/users.html:23
-msgid "ADD NEW USER"
-msgstr ""
-
-#: rhodecode/templates/admin/users/users.html:77
-msgid "username"
-msgstr ""
-
 #: rhodecode/templates/admin/users/users.html:80
-msgid "firstname"
+msgid "Firstname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:81
-msgid "lastname"
+msgid "Lastname"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.html:82
-msgid "last login"
-msgstr ""
-
-#: rhodecode/templates/admin/users/users.html:84
-#: rhodecode/templates/admin/users_groups/users_groups.html:34
-msgid "active"
-msgstr ""
-
-#: rhodecode/templates/admin/users/users.html:86
-#: rhodecode/templates/base/base.html:238
-msgid "ldap"
+msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:5
-msgid "Add users group"
+msgid "Add user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:10
-#: rhodecode/templates/admin/users_groups/users_groups.html:9
-msgid "Users groups"
+#: rhodecode/templates/admin/users_groups/users_groups.html:11
+#: rhodecode/templates/base/base.html:72
+msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_add.html:12
-msgid "add new users group"
+#: rhodecode/templates/admin/users_groups/users_groups.html:25
+msgid "Add new user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:5
-msgid "Edit users group"
+msgid "Edit user group"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:11
-msgid "UsersGroups"
+msgid "UserGroups"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:50
+#: rhodecode/templates/admin/users_groups/users_groups.html:35
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:58
-msgid "Choosen group members"
+msgid "Chosen group members"
 msgstr ""
 
 #: rhodecode/templates/admin/users_groups/users_group_edit.html:61
@@ -2850,262 +3024,261 b' msgstr ""'
 msgid "Add all elements"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:146
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:150
 msgid "Group members"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:163
+#: rhodecode/templates/admin/users_groups/users_group_edit.html:167
 msgid "No members yet"
 msgstr ""
 
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:171
-msgid "Permissions defined for this group"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_group_edit.html:178
-msgid "No permissions set yet"
-msgstr ""
-
 #: rhodecode/templates/admin/users_groups/users_groups.html:5
-msgid "Users groups administration"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:23
-msgid "ADD NEW USER GROUP"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:32
-msgid "group name"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:33
-#: rhodecode/templates/base/root.html:46
-msgid "members"
-msgstr ""
-
-#: rhodecode/templates/admin/users_groups/users_groups.html:45
-#, python-format
-msgid "Confirm to delete this users group: %s"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:41
+msgid "User groups administration"
+msgstr ""
+
+#: rhodecode/templates/admin/users_groups/users_groups.html:47
+#, fuzzy, python-format
+msgid "Confirm to delete this user group: %s"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:42
 msgid "Submit a bug"
 msgstr ""
 
-#: rhodecode/templates/base/base.html:77
-msgid "Login to your account"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:100
-msgid "Forgot password ?"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:107
-msgid "Log In"
+#: rhodecode/templates/base/base.html:108
+#: rhodecode/templates/data_table/_dt_elements.html:9
+#: rhodecode/templates/data_table/_dt_elements.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:13
+#: rhodecode/templates/pullrequests/pullrequest_show.html:81
+#: rhodecode/templates/summary/summary.html:8
+msgid "Summary"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:109
+#: rhodecode/templates/changelog/changelog.html:11
+#: rhodecode/templates/data_table/_dt_elements.html:17
+#: rhodecode/templates/data_table/_dt_elements.html:19
+#: rhodecode/templates/data_table/_dt_elements.html:21
+msgid "Changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:110
+#: rhodecode/templates/data_table/_dt_elements.html:25
+#: rhodecode/templates/data_table/_dt_elements.html:27
+#: rhodecode/templates/data_table/_dt_elements.html:29
+#: rhodecode/templates/files/files.html:12
+msgid "Files"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:112
+msgid "Switch To"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:114
+#: rhodecode/templates/base/base.html:267
+msgid "loading..."
 msgstr ""
 
 #: rhodecode/templates/base/base.html:118
-msgid "Inbox"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:123
-#: rhodecode/templates/base/base.html:322
-#: rhodecode/templates/base/base.html:324
-#: rhodecode/templates/base/base.html:326
-#: rhodecode/templates/journal/journal.html:4
-#: rhodecode/templates/journal/public_journal.html:4
-msgid "Journal"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:125
-msgid "Log Out"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:144
-msgid "Switch repository"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:146
-msgid "Products"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:152
-#: rhodecode/templates/base/base.html:182 rhodecode/templates/base/root.html:47
-msgid "loading..."
-msgstr ""
-
-#: rhodecode/templates/base/base.html:158
-#: rhodecode/templates/base/base.html:160
-#: rhodecode/templates/base/base.html:162
-#: rhodecode/templates/data_table/_dt_elements.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:17
-#: rhodecode/templates/data_table/_dt_elements.html:19
-msgid "Summary"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:166
-#: rhodecode/templates/base/base.html:168
-#: rhodecode/templates/base/base.html:170
-#: rhodecode/templates/changelog/changelog.html:15
-#: rhodecode/templates/data_table/_dt_elements.html:23
-#: rhodecode/templates/data_table/_dt_elements.html:25
-#: rhodecode/templates/data_table/_dt_elements.html:27
-msgid "Changelog"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:175
-#: rhodecode/templates/base/base.html:177
-#: rhodecode/templates/base/base.html:179
-msgid "Switch to"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:186
-#: rhodecode/templates/base/base.html:188
-#: rhodecode/templates/base/base.html:190
-#: rhodecode/templates/data_table/_dt_elements.html:31
+msgid "Options"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:124
+#: rhodecode/templates/forks/forks_data.html:21
+msgid "Compare fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:126
+msgid "Lightweight changelog"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:127
+#: rhodecode/templates/base/base.html:287
+#: rhodecode/templates/search/search.html:14
+#: rhodecode/templates/search/search.html:54
+msgid "Search"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:133
+msgid "Lock"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:141
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:142
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:145
 #: rhodecode/templates/data_table/_dt_elements.html:33
 #: rhodecode/templates/data_table/_dt_elements.html:35
-msgid "Files"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:195
-#: rhodecode/templates/base/base.html:199
-msgid "Options"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:204
-#: rhodecode/templates/base/base.html:206
-msgid "repository settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:210
-#: rhodecode/templates/data_table/_dt_elements.html:80
-#: rhodecode/templates/forks/fork.html:13
-msgid "fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:212 rhodecode/templates/base/root.html:50
-#: rhodecode/templates/changelog/changelog.html:43
-msgid "Open new pull request"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:215
-#: rhodecode/templates/forks/forks_data.html:21
-msgid "Compare fork"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:217
-msgid "search"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:223
-msgid "lock"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:234
-msgid "repositories groups"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:236
-msgid "users groups"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:237
-msgid "permissions"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:239
-msgid "defaults"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:240
-msgid "settings"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:251
-#: rhodecode/templates/base/base.html:253
-msgid "Followers"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:259
-#: rhodecode/templates/base/base.html:261
-msgid "Forks"
-msgstr ""
-
-#: rhodecode/templates/base/base.html:340
-#: rhodecode/templates/base/base.html:342
-#: rhodecode/templates/base/base.html:344
-#: rhodecode/templates/search/search.html:52
-msgid "Search"
-msgstr ""
-
-#: rhodecode/templates/base/root.html:42
-msgid "add another comment"
+#: rhodecode/templates/data_table/_dt_elements.html:37
+#: rhodecode/templates/data_table/_dt_elements.html:74
+#: rhodecode/templates/forks/fork.html:9
+msgid "Fork"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:147
+msgid "Create Pull Request"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:153
+msgid "Show Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:153
+msgid "Pull Requests"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:190
+msgid "Not logged in"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:197
+msgid "Login to your account"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:220
+msgid "Forgot password ?"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:243
+msgid "Log Out"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:262
+msgid "Switch repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:274
+msgid "Show recent activity"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:275
+#: rhodecode/templates/journal/journal.html:4
+msgid "Journal"
+msgstr ""
+
+#: rhodecode/templates/base/base.html:286
+msgid "Search in repositories"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:8
+msgid "No permissions defined yet"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:15
+msgid "Permission"
+msgstr ""
+
+#: rhodecode/templates/base/perms_summary.html:16
+msgid "Edit Permission"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:43
-#: rhodecode/templates/journal/journal.html:83
-#: rhodecode/templates/summary/summary.html:57
-msgid "Stop following this repository"
+#, fuzzy
+msgid "Add another comment"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:44
-#: rhodecode/templates/summary/summary.html:61
-msgid "Start following this repository"
+#: rhodecode/templates/data_table/_dt_elements.html:140
+msgid "Stop following this repository"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:45
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:46
 msgid "Group"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:47
+msgid "members"
+msgstr ""
+
 #: rhodecode/templates/base/root.html:48
-msgid "search truncated"
+#: rhodecode/templates/pullrequests/pullrequest.html:181
+msgid "Loading ..."
 msgstr ""
 
 #: rhodecode/templates/base/root.html:49
-msgid "no matching files"
+msgid "Search truncated"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:50
+msgid "No matching files"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:51
-msgid "Open new pull request for selected changesets"
+#: rhodecode/templates/changelog/changelog.html:36
+msgid "Open new pull request"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:52
-msgid "Show selected changes __S -> __E"
+msgid "Open new pull request for selected changesets"
 msgstr ""
 
 #: rhodecode/templates/base/root.html:53
+msgid "Show selected changesets __S -> __E"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:54
+msgid "Show selected changeset __S"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:55
 msgid "Selection link"
 msgstr ""
 
+#: rhodecode/templates/base/root.html:56
+#: rhodecode/templates/changeset/diff_block.html:8
+msgid "Collapse diff"
+msgstr ""
+
+#: rhodecode/templates/base/root.html:57
+msgid "Expand diff"
+msgstr ""
+
 #: rhodecode/templates/bookmarks/bookmarks.html:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
-#: rhodecode/templates/bookmarks/bookmarks.html:39
+#: rhodecode/templates/bookmarks/bookmarks.html:37
 #: rhodecode/templates/bookmarks/bookmarks_data.html:8
-#: rhodecode/templates/branches/branches.html:53
+#: rhodecode/templates/branches/branches.html:50
 #: rhodecode/templates/branches/branches_data.html:8
-#: rhodecode/templates/tags/tags.html:54
+#: rhodecode/templates/shortlog/shortlog_data.html:8
+#: rhodecode/templates/tags/tags.html:51
 #: rhodecode/templates/tags/tags_data.html:8
 msgid "Author"
 msgstr ""
 
+#: rhodecode/templates/bookmarks/bookmarks.html:38
+#: rhodecode/templates/bookmarks/bookmarks_data.html:9
+#: rhodecode/templates/branches/branches.html:51
+#: rhodecode/templates/branches/branches_data.html:9
+#: rhodecode/templates/shortlog/shortlog_data.html:5
+#: rhodecode/templates/tags/tags.html:52
+#: rhodecode/templates/tags/tags_data.html:9
+msgid "Revision"
+msgstr ""
+
 #: rhodecode/templates/branches/branches.html:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:29
+#: rhodecode/templates/branches/branches.html:26
 msgid "Compare branches"
 msgstr ""
 
-#: rhodecode/templates/branches/branches.html:56
+#: rhodecode/templates/branches/branches.html:53
 #: rhodecode/templates/branches/branches_data.html:10
-#: rhodecode/templates/compare/compare_diff.html:5
-#: rhodecode/templates/compare/compare_diff.html:13
-#: rhodecode/templates/tags/tags.html:57
+#: rhodecode/templates/tags/tags.html:54
 #: rhodecode/templates/tags/tags_data.html:10
 msgid "Compare"
 msgstr ""
@@ -3115,115 +3288,80 b' msgstr ""'
 msgid "%s Changelog"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:15
+#: rhodecode/templates/changelog/changelog.html:11
 #, python-format
 msgid "showing %d out of %d revision"
 msgid_plural "showing %d out of %d revisions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changelog/changelog.html:37
+#: rhodecode/templates/changelog/changelog.html:30
 msgid "Clear selection"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:40
+#: rhodecode/templates/changelog/changelog.html:33
 #: rhodecode/templates/forks/forks_data.html:19
 #, python-format
-msgid "compare fork with %s"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:40
+msgid "Compare fork with %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:33
 msgid "Compare fork with parent"
 msgstr ""
 
-#: rhodecode/templates/changelog/changelog.html:49
-msgid "Show"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:74
-#: rhodecode/templates/summary/summary.html:375
-msgid "show more"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:78
-msgid "Affected number of files, click to show more details"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:91
-#: rhodecode/templates/changeset/changeset.html:65
-#: rhodecode/templates/changeset/changeset_file_comment.html:20
-#: rhodecode/templates/changeset/changeset_range.html:46
-msgid "Changeset status"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:94
-#: rhodecode/templates/shortlog/shortlog_data.html:20
-msgid "Click to open associated pull request"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:104
-msgid "Parent"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:110
-#: rhodecode/templates/changeset/changeset.html:42
-msgid "No parents"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:115
+#: rhodecode/templates/changelog/changelog.html:76
+#: rhodecode/templates/summary/summary.html:404
+msgid "Show more"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:89
+#: rhodecode/templates/changeset/changeset_range.html:86
+#, python-format
+msgid "Bookmark %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:95
+#: rhodecode/templates/changeset/changeset.html:111
+#: rhodecode/templates/changeset/changeset_range.html:92
+#, python-format
+msgid "Tag %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:100
 #: rhodecode/templates/changeset/changeset.html:106
-#: rhodecode/templates/changeset/changeset_range.html:79
-msgid "merge"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:118
-#: rhodecode/templates/changeset/changeset.html:109
-#: rhodecode/templates/changeset/changeset_range.html:82
-#: rhodecode/templates/files/files.html:29
-#: rhodecode/templates/files/files_add.html:33
-#: rhodecode/templates/files/files_edit.html:33
-#: rhodecode/templates/shortlog/shortlog_data.html:9
-msgid "branch"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:124
-#: rhodecode/templates/changeset/changeset_range.html:88
-msgid "bookmark"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:130
-#: rhodecode/templates/changeset/changeset.html:114
-#: rhodecode/templates/changeset/changeset_range.html:94
-msgid "tag"
-msgstr ""
-
-#: rhodecode/templates/changelog/changelog.html:301
+#: rhodecode/templates/changeset/changeset_range.html:80
+#, python-format
+msgid "Branch %s"
+msgstr ""
+
+#: rhodecode/templates/changelog/changelog.html:258
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:4
-#: rhodecode/templates/changeset/changeset.html:94
-msgid "removed"
+#: rhodecode/templates/changeset/changeset.html:91
+msgid "Removed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:5
-#: rhodecode/templates/changeset/changeset.html:95
-msgid "changed"
+#: rhodecode/templates/changeset/changeset.html:92
+#, fuzzy
+msgid "Changed"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:6
-#: rhodecode/templates/changeset/changeset.html:96
-msgid "added"
+#: rhodecode/templates/changeset/changeset.html:93
+msgid "Added"
 msgstr ""
 
 #: rhodecode/templates/changelog/changelog_details.html:8
 #: rhodecode/templates/changelog/changelog_details.html:9
 #: rhodecode/templates/changelog/changelog_details.html:10
-#: rhodecode/templates/changeset/changeset.html:98
-#: rhodecode/templates/changeset/changeset.html:99
-#: rhodecode/templates/changeset/changeset.html:100
+#: rhodecode/templates/changeset/changeset.html:95
+#: rhodecode/templates/changeset/changeset.html:96
+#: rhodecode/templates/changeset/changeset.html:97
 #, python-format
-msgid "affected %s files"
+msgid "Affected %s files"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.html:6
@@ -3231,112 +3369,144 b' msgstr ""'
 msgid "%s Changeset"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:14
-msgid "Changeset"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:52
+#: rhodecode/templates/changeset/changeset.html:39
+msgid "No parents"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:49
 msgid "No children"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset.html:70
-#: rhodecode/templates/changeset/diff_block.html:20
-msgid "raw diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:71
-msgid "patch diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:72
-#: rhodecode/templates/changeset/diff_block.html:21
-msgid "download diff"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset.html:62
+#: rhodecode/templates/changeset/changeset_file_comment.html:20
+#: rhodecode/templates/changeset/changeset_range.html:44
+msgid "Changeset status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:67
+#: rhodecode/templates/changeset/diff_block.html:23
+msgid "Raw diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:68
+msgid "Patch diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:69
+#: rhodecode/templates/changeset/diff_block.html:24
+msgid "Download diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:76
-#: rhodecode/templates/changeset/changeset_file_comment.html:82
+#: rhodecode/templates/changeset/changeset.html:73
+#: rhodecode/templates/changeset/changeset_file_comment.html:97
 #, python-format
 msgid "(%d inline)"
 msgid_plural "(%d inline)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:122
-#: rhodecode/templates/compare/compare_diff.html:44
-#: rhodecode/templates/pullrequests/pullrequest_show.html:76
+#: rhodecode/templates/changeset/changeset.html:103
+#: rhodecode/templates/changeset/changeset_range.html:77
+msgid "merge"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:119
+#: rhodecode/templates/compare/compare_diff.html:40
+#: rhodecode/templates/pullrequests/pullrequest_show.html:113
 #, python-format
 msgid "%s file changed"
 msgid_plural "%s files changed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset.html:124
-#: rhodecode/templates/compare/compare_diff.html:46
-#: rhodecode/templates/pullrequests/pullrequest_show.html:78
+#: rhodecode/templates/changeset/changeset.html:121
+#: rhodecode/templates/compare/compare_diff.html:42
+#: rhodecode/templates/pullrequests/pullrequest_show.html:115
 #, python-format
 msgid "%s file changed with %s insertions and %s deletions"
 msgid_plural "%s files changed with %s insertions and %s deletions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:42
-msgid "Submitting..."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:45
-msgid "Commenting on line {1}."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:46
-#: rhodecode/templates/changeset/changeset_file_comment.html:121
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+msgid "Showing a huge diff might take some time and resources"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset.html:134
+#: rhodecode/templates/changeset/changeset.html:146
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+#: rhodecode/templates/pullrequests/pullrequest_show.html:131
+#: rhodecode/templates/pullrequests/pullrequest_show.html:195
+msgid "Show full diff"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:30
 #, python-format
-msgid "Comments parsed using %s syntax with %s support."
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:48
-#: rhodecode/templates/changeset/changeset_file_comment.html:123
-msgid "Use @username inside this text to send notification to this RhodeCode user"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:59
-#: rhodecode/templates/changeset/changeset_file_comment.html:143
-msgid "Comment"
+msgid "Status change on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:32
+#, python-format
+msgid "Comment on pull request #%s"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:57
+msgid "Submitting..."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.html:60
-#: rhodecode/templates/changeset/changeset_file_comment.html:71
-msgid "Hide"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+msgid "Commenting on line {1}."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:61
+#: rhodecode/templates/changeset/changeset_file_comment.html:139
+#, python-format
+msgid "Comments parsed using %s syntax with %s support."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:63
+#: rhodecode/templates/changeset/changeset_file_comment.html:141
+msgid "Use @username inside this text to send notification to this RhodeCode user"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:74
+#: rhodecode/templates/changeset/changeset_file_comment.html:161
+msgid "Comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:75
+msgid "Cancel"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "You need to be logged in to comment."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:67
+#: rhodecode/templates/changeset/changeset_file_comment.html:82
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.html:118
-msgid "Leave a comment"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
-msgid "Check this to change current status of code-review for this changeset"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:125
-msgid "change status"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.html:145
+#: rhodecode/templates/changeset/changeset_file_comment.html:86
+msgid "Hide"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:143
+msgid "Change status"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.html:163
 msgid "Comment and close"
 msgstr ""
 
@@ -3345,97 +3515,118 b' msgstr ""'
 msgid "%s Changesets"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_range.html:29
-#: rhodecode/templates/compare/compare_diff.html:29
-msgid "Compare View"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_range.html:29
-msgid "Show combined compare"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_range.html:54
+#: rhodecode/templates/changeset/changeset_range.html:52
 msgid "Files affected"
 msgstr ""
 
-#: rhodecode/templates/changeset/diff_block.html:19
-msgid "show full diff for this file"
-msgstr ""
-
-#: rhodecode/templates/changeset/diff_block.html:27
-msgid "show inline comments"
-msgstr ""
-
-#: rhodecode/templates/compare/compare_cs.html:5
+#: rhodecode/templates/changeset/diff_block.html:22
+msgid "Show full diff for this file"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:30
+msgid "Show inline comments"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:55
+msgid "Show file at latest version in this repo"
+msgstr ""
+
+#: rhodecode/templates/changeset/diff_block.html:56
+msgid "Show file at initial version in this repo"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_cs.html:4
 msgid "No changesets"
 msgstr ""
 
-#: rhodecode/templates/compare/compare_diff.html:37
-#: rhodecode/templates/pullrequests/pullrequest_show.html:69
+#: rhodecode/templates/compare/compare_cs.html:32
+msgid "Ancestor"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:5
+#, fuzzy, python-format
+msgid "%s Compare"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:9
+msgid "Compare revisions"
+msgstr ""
+
+#: rhodecode/templates/compare/compare_diff.html:33
+#: rhodecode/templates/pullrequests/pullrequest_show.html:106
 #, python-format
 msgid "Showing %s commit"
 msgid_plural "Showing %s commits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/compare/compare_diff.html:52
-#: rhodecode/templates/pullrequests/pullrequest_show.html:84
+#: rhodecode/templates/compare/compare_diff.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:121
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:39
-#: rhodecode/templates/data_table/_dt_elements.html:41
-#: rhodecode/templates/data_table/_dt_elements.html:43
-msgid "Fork"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:60
-#: rhodecode/templates/journal/journal.html:89
-#: rhodecode/templates/summary/summary.html:77
+#: rhodecode/templates/compare/compare_diff.html:58
+#: rhodecode/templates/compare/compare_diff.html:69
+msgid "confirm to show potentially huge diff"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:54
+#: rhodecode/templates/summary/summary.html:69
 msgid "Mercurial repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:62
-#: rhodecode/templates/journal/journal.html:91
-#: rhodecode/templates/summary/summary.html:80
+#: rhodecode/templates/data_table/_dt_elements.html:56
+#: rhodecode/templates/summary/summary.html:72
 msgid "Git repository"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:69
-#: rhodecode/templates/journal/journal.html:97
-#: rhodecode/templates/summary/summary.html:87
-msgid "public repository"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:80
-#: rhodecode/templates/summary/summary.html:96
-#: rhodecode/templates/summary/summary.html:97
-msgid "Fork of"
-msgstr ""
-
-#: rhodecode/templates/data_table/_dt_elements.html:94
+#: rhodecode/templates/data_table/_dt_elements.html:74
+#, python-format
+msgid "Fork of %s"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:88
 msgid "No changesets yet"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:101
-#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:95
+#: rhodecode/templates/data_table/_dt_elements.html:97
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
-#: rhodecode/templates/data_table/_dt_elements.html:109
-#: rhodecode/templates/data_table/_dt_elements.html:111
+#: rhodecode/templates/data_table/_dt_elements.html:103
+#: rhodecode/templates/data_table/_dt_elements.html:105
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.html:122
 #, python-format
+msgid "Confirm to delete this repository: %s"
+msgstr ""
+
+#: rhodecode/templates/data_table/_dt_elements.html:131
+#, python-format
 msgid "Confirm to delete this user: %s"
 msgstr ""
 
-#: rhodecode/templates/email_templates/changeset_comment.html:10
-msgid "New status$"
+#: rhodecode/templates/email_templates/changeset_comment.html:9
+#: rhodecode/templates/email_templates/pull_request_comment.html:15
+msgid "New status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:11
+#: rhodecode/templates/email_templates/pull_request_comment.html:9
+msgid "View this comment here"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:14
+msgid "Repo"
+msgstr ""
+
+#: rhodecode/templates/email_templates/changeset_comment.html:16
+msgid "desc"
 msgstr ""
 
 #: rhodecode/templates/email_templates/main.html:8
@@ -3443,19 +3634,20 b' msgid "This is a notification from Rhode'
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:4
-msgid "Hello"
+#, python-format
+msgid "Hello %s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/password_reset.html:5
+msgid "We received a request to create a new password for your account."
 msgstr ""
 
 #: rhodecode/templates/email_templates/password_reset.html:6
-msgid "We received a request to create a new password for your account."
-msgstr ""
-
-#: rhodecode/templates/email_templates/password_reset.html:8
 msgid "You can generate it by clicking following URL"
 msgstr ""
 
-#: rhodecode/templates/email_templates/password_reset.html:12
-msgid "If you didn't request new password please ignore this email."
+#: rhodecode/templates/email_templates/password_reset.html:11
+msgid "If you did not request new password please ignore this email."
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:4
@@ -3466,33 +3658,28 b' msgid ""'
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:5
-msgid "title"
+msgid "View this pull request here"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request.html:6
-#: rhodecode/templates/pullrequests/pullrequest.html:115
+msgid "title"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request.html:7
 msgid "description"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request.html:11
+#: rhodecode/templates/email_templates/pull_request.html:12
 msgid "revisions for reviewing"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request.html:18
-msgid "View this pull request here"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:4
+#: rhodecode/templates/email_templates/pull_request_comment.html:3
 #, python-format
-msgid "User %s commented on pull request #%s for repository %s"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:10
-msgid "New status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.html:14
-msgid "View this comment here"
+msgid "Pull request #%s for repository %s"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.html:13
+msgid "Closing pull request with status"
 msgstr ""
 
 #: rhodecode/templates/email_templates/registration.html:4
@@ -3503,107 +3690,105 b' msgstr ""'
 msgid "View this user here"
 msgstr ""
 
-#: rhodecode/templates/errors/error_document.html:46
+#: rhodecode/templates/errors/error_document.html:55
 #, python-format
 msgid "You will be redirected to %s in %s seconds"
 msgstr ""
 
 #: rhodecode/templates/files/file_diff.html:4
-#, python-format
-msgid "%s File diff"
-msgstr ""
-
-#: rhodecode/templates/files/file_diff.html:12
+#, fuzzy, python-format
+msgid "%s File Diff"
+msgstr ""
+
+#: rhodecode/templates/files/file_diff.html:8
 msgid "File diff"
 msgstr ""
 
 #: rhodecode/templates/files/files.html:4
-#: rhodecode/templates/files/files.html:74
-#, python-format
-msgid "%s files"
-msgstr ""
-
-#: rhodecode/templates/files/files.html:12
-#: rhodecode/templates/summary/summary.html:351
-msgid "files"
+#: rhodecode/templates/files/files.html:76
+#, fuzzy, python-format
+msgid "%s Files"
+msgstr ""
+
+#: rhodecode/templates/files/files.html:30
+#: rhodecode/templates/files/files_add.html:31
+#: rhodecode/templates/files/files_edit.html:31
+#: rhodecode/templates/shortlog/shortlog_data.html:9
+msgid "Branch"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:4
-#: rhodecode/templates/files/files_edit.html:4
-#, python-format
-msgid "%s Edit file"
+#, fuzzy, python-format
+msgid "%s Files Add"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.html:19
-msgid "add file"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:40
+msgid "Add file"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:38
+#: rhodecode/templates/files/files_browser.html:31
+#: rhodecode/templates/shortlog/shortlog_data.html:78
 msgid "Add new file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:45
+#: rhodecode/templates/files/files_add.html:43
 msgid "File Name"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:56
 msgid "or"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:49
-#: rhodecode/templates/files/files_add.html:54
+#: rhodecode/templates/files/files_add.html:47
+#: rhodecode/templates/files/files_add.html:52
 msgid "Upload file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:58
+#: rhodecode/templates/files/files_add.html:56
 msgid "Create new file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:63
-#: rhodecode/templates/files/files_edit.html:39
+#: rhodecode/templates/files/files_add.html:61
+#: rhodecode/templates/files/files_edit.html:37
 #: rhodecode/templates/files/files_ypjax.html:3
 msgid "Location"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:67
+#: rhodecode/templates/files/files_add.html:65
 msgid "use / to separate directories"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.html:77
-#: rhodecode/templates/files/files_edit.html:63
+#: rhodecode/templates/files/files_add.html:75
+#: rhodecode/templates/files/files_edit.html:61
 #: rhodecode/templates/shortlog/shortlog_data.html:6
-msgid "commit message"
-msgstr ""
-
-#: rhodecode/templates/files/files_add.html:81
-#: rhodecode/templates/files/files_edit.html:67
+msgid "Commit message"
+msgstr ""
+
+#: rhodecode/templates/files/files_add.html:79
+#: rhodecode/templates/files/files_edit.html:65
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:13
-msgid "view"
+msgid "View"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:14
-msgid "previous revision"
+msgid "Previous revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:16
-msgid "next revision"
+msgid "Next revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:23
-msgid "follow current branch"
+msgid "Follow current branch"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:27
-msgid "search file list"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.html:31
-#: rhodecode/templates/shortlog/shortlog_data.html:78
-msgid "add new file"
+msgid "Search file list"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:35
@@ -3627,34 +3812,39 b' msgid "Last modified"'
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.html:52
-msgid "Last commiter"
+msgid "Last committer"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:4
+#, fuzzy, python-format
+msgid "%s Files Edit"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:19
-msgid "edit file"
+msgid "Edit file"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:47
+#: rhodecode/templates/files/files_source.html:23
+msgid "Show annotation"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:48
+#: rhodecode/templates/files/files_source.html:25
+#: rhodecode/templates/files/files_source.html:55
+msgid "Show as raw"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.html:49
-#: rhodecode/templates/files/files_source.html:23
-msgid "show annotation"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:50
-#: rhodecode/templates/files/files_source.html:25
-#: rhodecode/templates/files/files_source.html:53
-msgid "show as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:51
 #: rhodecode/templates/files/files_source.html:26
-msgid "download as raw"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:54
-msgid "source"
-msgstr ""
-
-#: rhodecode/templates/files/files_edit.html:59
+msgid "Download as raw"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:52
+msgid "Source"
+msgstr ""
+
+#: rhodecode/templates/files/files_edit.html:57
 msgid "Editing file"
 msgstr ""
 
@@ -3663,16 +3853,16 b' msgid "History"'
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:9
-msgid "diff to revision"
+msgid "Diff to revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:10
 #, fuzzy
-msgid "show at revision"
+msgid "Show at revision"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:11
-msgid "show full history"
+msgid "Show full history"
 msgstr ""
 
 #: rhodecode/templates/files/files_history_box.html:16
@@ -3687,15 +3877,28 b' msgid "Load file history"'
 msgstr ""
 
 #: rhodecode/templates/files/files_source.html:21
-msgid "show source"
-msgstr ""
-
-#: rhodecode/templates/files/files_source.html:44
+msgid "Show source"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:29
+#, python-format
+msgid "Edit on branch:%s"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "Edit on branch:?"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:31
+msgid "Editing files allowed only when on branch head revision"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.html:46
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.html:53
+#: rhodecode/templates/files/files_source.html:55
 msgid "File is too big to display"
 msgstr ""
 
@@ -3716,8 +3919,10 b' msgstr ""'
 msgid "%s Followers"
 msgstr ""
 
-#: rhodecode/templates/followers/followers.html:13
-msgid "followers"
+#: rhodecode/templates/followers/followers.html:9
+#: rhodecode/templates/summary/summary.html:183
+#: rhodecode/templates/summary/summary.html:184
+msgid "Followers"
 msgstr ""
 
 #: rhodecode/templates/followers/followers_data.html:12
@@ -3729,32 +3934,32 b' msgstr ""'
 msgid "%s Fork"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:31
+#: rhodecode/templates/forks/fork.html:28
 msgid "Fork name"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:68
+#: rhodecode/templates/forks/fork.html:65
 msgid "Private"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:77
+#: rhodecode/templates/forks/fork.html:74
 msgid "Copy permissions"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:81
+#: rhodecode/templates/forks/fork.html:78
 msgid "Copy permissions from forked repository"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:86
+#: rhodecode/templates/forks/fork.html:84
 msgid "Update after clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:90
+#: rhodecode/templates/forks/fork.html:88
 msgid "Checkout source after making a clone"
 msgstr ""
 
-#: rhodecode/templates/forks/fork.html:94
-msgid "fork this repository"
+#: rhodecode/templates/forks/fork.html:93
+msgid "Fork this repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.html:5
@@ -3762,12 +3967,14 b' msgstr ""'
 msgid "%s Forks"
 msgstr ""
 
-#: rhodecode/templates/forks/forks.html:13
-msgid "forks"
+#: rhodecode/templates/forks/forks.html:9
+#: rhodecode/templates/summary/summary.html:189
+#: rhodecode/templates/summary/summary.html:190
+msgid "Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:17
-msgid "forked"
+msgid "Forked"
 msgstr ""
 
 #: rhodecode/templates/forks/forks_data.html:42
@@ -3783,44 +3990,27 b' msgid "RSS journal feed"'
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:32
-#: rhodecode/templates/pullrequests/pullrequest.html:55
 msgid "Refresh"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.html:35
 #: rhodecode/templates/journal/public_journal.html:24
-msgid "RSS feed"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:38
-#: rhodecode/templates/journal/public_journal.html:27
 msgid "ATOM feed"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:49
+#: rhodecode/templates/journal/journal.html:51
 msgid "Watched"
 msgstr ""
 
-#: rhodecode/templates/journal/journal.html:54
-msgid "ADD"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "following user"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:77
-msgid "user"
-msgstr ""
-
-#: rhodecode/templates/journal/journal.html:110
-msgid "You are not following any users or repositories"
-msgstr ""
-
 #: rhodecode/templates/journal/journal_data.html:55
 msgid "No entries yet"
 msgstr ""
 
+#: rhodecode/templates/journal/public_journal.html:4
+#: rhodecode/templates/journal/public_journal.html:21
+msgid "Public Journal"
+msgstr ""
+
 #: rhodecode/templates/journal/public_journal.html:13
 msgid "ATOM public journal feed"
 msgstr ""
@@ -3829,148 +4019,128 b' msgstr ""'
 msgid "RSS public journal feed"
 msgstr ""
 
-#: rhodecode/templates/journal/public_journal.html:21
-msgid "Public Journal"
-msgstr ""
-
 #: rhodecode/templates/pullrequests/pullrequest.html:4
-#: rhodecode/templates/pullrequests/pullrequest.html:12
+#: rhodecode/templates/pullrequests/pullrequest.html:8
 msgid "New pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:54
-msgid "refresh overview"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest.html:66
+#: rhodecode/templates/pullrequests/pullrequest.html:52
 msgid "Detailed compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:70
-#: rhodecode/templates/pullrequests/pullrequest_show.html:100
+#: rhodecode/templates/pullrequests/pullrequest.html:56
+#: rhodecode/templates/pullrequests/pullrequest_show.html:137
 msgid "Pull request reviewers"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:79
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest.html:65
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 msgid "owner"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:91
-#: rhodecode/templates/pullrequests/pullrequest_show.html:127
+#: rhodecode/templates/pullrequests/pullrequest.html:77
 msgid "Add reviewer to this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:97
+#: rhodecode/templates/pullrequests/pullrequest.html:83
 msgid "Create new pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:106
+#: rhodecode/templates/pullrequests/pullrequest.html:92
+#: rhodecode/templates/pullrequests/pullrequest_data.html:14
 #: rhodecode/templates/pullrequests/pullrequest_show.html:25
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33
 msgid "Title"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest.html:123
+#: rhodecode/templates/pullrequests/pullrequest.html:109
 msgid "Send pull request"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
-#, python-format
-msgid "Closed %s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:23
+#: rhodecode/templates/pullrequests/pullrequest_show.html:4
 #, python-format
-msgid "with status %s"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:31
-msgid "Status"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:36
+msgid "%s Pull Request #%s"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:35
+msgid "Review status"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:40
 msgid "Pull request status"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:44
+#: rhodecode/templates/pullrequests/pullrequest_show.html:53
 msgid "Still not reviewed by"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:48
+#: rhodecode/templates/pullrequests/pullrequest_show.html:57
 #, python-format
 msgid "%d reviewer"
 msgid_plural "%d reviewers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:50
-msgid "pull request was reviewed by all reviewers"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.html:58
-msgid "Created on"
+#: rhodecode/templates/pullrequests/pullrequest_show.html:59
+msgid "Pull request was reviewed by all reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.html:65
+msgid "Origin repository"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:89
+msgid "Created on"
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:102
 msgid "Compare view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.html:112
+#: rhodecode/templates/pullrequests/pullrequest_show.html:149
 #, fuzzy
 msgid "reviewer"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.html:164
+msgid "Add or remove reviewer to this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.html:168
+#, fuzzy
+msgid "Save changes"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4
-msgid "all pull requests"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:12
-msgid "All pull requests"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27
-msgid "Closed"
+#, python-format
+msgid "%s Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:6
-#, python-format
-msgid "Search \"%s\" in repository: %s"
+msgid "Search repository"
 msgstr ""
 
 #: rhodecode/templates/search/search.html:8
-#, python-format
-msgid "Search \"%s\" in all repositories"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:12
-#: rhodecode/templates/search/search.html:32
-#, python-format
-msgid "Search in repository: %s"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:14
-#: rhodecode/templates/search/search.html:34
+#: rhodecode/templates/search/search.html:16
 msgid "Search in all repositories"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:48
+#: rhodecode/templates/search/search.html:50
 msgid "Search term"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:60
+#: rhodecode/templates/search/search.html:62
 msgid "Search in"
 msgstr ""
 
-#: rhodecode/templates/search/search.html:63
-msgid "File contents"
-msgstr ""
-
-#: rhodecode/templates/search/search.html:64
-msgid "Commit messages"
-msgstr ""
-
 #: rhodecode/templates/search/search.html:65
+msgid "File contents"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:66
+msgid "Commit messages"
+msgstr ""
+
+#: rhodecode/templates/search/search.html:67
 msgid "File names"
 msgstr ""
 
@@ -3980,39 +4150,23 b' msgstr ""'
 msgid "Permission denied"
 msgstr ""
 
-#: rhodecode/templates/settings/repo_settings.html:5
-#, python-format
-msgid "%s Settings"
-msgstr ""
-
-#: rhodecode/templates/settings/repo_settings.html:102
-msgid "Delete repository"
-msgstr ""
-
-#: rhodecode/templates/settings/repo_settings.html:109
-msgid "Remove repo"
-msgstr ""
-
 #: rhodecode/templates/shortlog/shortlog.html:5
-#, python-format
-msgid "%s Shortlog"
-msgstr ""
-
+#, fuzzy, python-format
+msgid "%s Lightweight Changelog"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog.html:11
 #: rhodecode/templates/shortlog/shortlog.html:15
-#: rhodecode/templates/shortlog/shortlog.html:19
-msgid "shortlog"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:5
-msgid "revision"
+msgid "Lightweight Changelog"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:7
-msgid "age"
-msgstr ""
-
-#: rhodecode/templates/shortlog/shortlog_data.html:8
-msgid "author"
+msgid "Age"
+msgstr ""
+
+#: rhodecode/templates/shortlog/shortlog_data.html:20
+#, python-format
+msgid "Click to open associated pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/shortlog/shortlog_data.html:75
@@ -4032,156 +4186,165 b' msgstr ""'
 msgid "%s Summary"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:12
-msgid "summary"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:20
+#: rhodecode/templates/summary/summary.html:16
 #, python-format
-msgid "repo %s ATOM feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:21
+msgid "%s ATOM feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:17
 #, python-format
-msgid "repo %s RSS feed"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:49
-#: rhodecode/templates/summary/summary.html:52
-msgid "ATOM"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:70
+msgid "%s RSS feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:62
 #, python-format
 msgid "Repository locked by %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:72
+#: rhodecode/templates/summary/summary.html:64
 msgid "Repository unlocked"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:91
+#: rhodecode/templates/summary/summary.html:83
 #, python-format
 msgid "Non changable ID %s"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:88
+msgid "Public"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:88
+#: rhodecode/templates/summary/summary.html:89
+msgid "Fork of"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:96
-msgid "public"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:104
-msgid "remote clone"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:125
+msgid "Remote clone"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:117
 msgid "Contact"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:139
+#: rhodecode/templates/summary/summary.html:131
 msgid "Clone url"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:142
+#: rhodecode/templates/summary/summary.html:136
 msgid "Show by Name"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:137
+msgid "Show by ID"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:143
-msgid "Show by ID"
+msgid "Trending files"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:151
-msgid "Trending files"
+#: rhodecode/templates/summary/summary.html:167
+#: rhodecode/templates/summary/summary.html:232
+msgid "enable"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.html:159
-#: rhodecode/templates/summary/summary.html:175
-#: rhodecode/templates/summary/summary.html:203
-msgid "enable"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:167
 msgid "Download"
 msgstr ""
 
+#: rhodecode/templates/summary/summary.html:163
+msgid "There are no downloads yet"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:165
+msgid "Downloads are disabled for this repository"
+msgstr ""
+
 #: rhodecode/templates/summary/summary.html:171
-msgid "There are no downloads yet"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:173
-msgid "Downloads are disabled for this repository"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:179
 msgid "Download as zip"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
 msgid "Check this to download archive with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:182
+#: rhodecode/templates/summary/summary.html:174
 msgid "with subrepos"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:195
+#: rhodecode/templates/summary/summary.html:197
+msgid "Repository Size"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:204
+#: rhodecode/templates/summary/summary.html:206
+msgid "Feed"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:224
 msgid "Commit activity by day / author"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:206
+#: rhodecode/templates/summary/summary.html:235
 msgid "Stats gathered: "
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:227
-msgid "Shortlog"
-msgstr ""
-
-#: rhodecode/templates/summary/summary.html:229
+#: rhodecode/templates/summary/summary.html:256
+msgid "Latest changes"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:258
 msgid "Quick start"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:243
+#: rhodecode/templates/summary/summary.html:272
 #, python-format
 msgid "Readme file at revision '%s'"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:246
+#: rhodecode/templates/summary/summary.html:275
 msgid "Permalink to this readme"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:304
+#: rhodecode/templates/summary/summary.html:333
 #, python-format
 msgid "Download %s as %s"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:661
+#: rhodecode/templates/summary/summary.html:380
+msgid "files"
+msgstr ""
+
+#: rhodecode/templates/summary/summary.html:690
 msgid "commits"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:662
+#: rhodecode/templates/summary/summary.html:691
 msgid "files added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:663
+#: rhodecode/templates/summary/summary.html:692
 msgid "files changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:664
+#: rhodecode/templates/summary/summary.html:693
 msgid "files removed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:667
+#: rhodecode/templates/summary/summary.html:695
 msgid "commit"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:668
+#: rhodecode/templates/summary/summary.html:696
 msgid "file added"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:669
+#: rhodecode/templates/summary/summary.html:697
 msgid "file changed"
 msgstr ""
 
-#: rhodecode/templates/summary/summary.html:670
+#: rhodecode/templates/summary/summary.html:698
 msgid "file removed"
 msgstr ""
 
@@ -4190,23 +4353,7 b' msgstr ""'
 msgid "%s Tags"
 msgstr ""
 
-#: rhodecode/templates/tags/tags.html:29
+#: rhodecode/templates/tags/tags.html:26
 msgid "Compare tags"
 msgstr ""
 
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was created or renamed"
-#~ " from the file system please run "
-#~ "the application again in order to "
-#~ "rescan repositories"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%s repository is not mapped to db"
-#~ " perhaps it was moved or renamed  "
-#~ "from the filesystem please run the "
-#~ "application again in order to rescan "
-#~ "repositories"
-#~ msgstr ""
-