kallithea Changeset - fcb5054937f6

Changeset - fcb5054937f6

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 4 4

Marcin Kuzminski - 15 years ago 2011-03-05 23:02:15
marcin@python-works.com

merge with optional gravatars

8 files changed with 8 insertions and 1 deletions:

development.ini

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/helpers.py

rhodecode/public/images/user14.png

bin+new file

rhodecode/public/images/user20.png

bin+new file

rhodecode/public/images/user24.png

bin+new file

rhodecode/public/images/user30.png

bin+new file

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -46,12 +46,13 @@ lang=en @@
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = develop
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 25
 use_gravatar = true
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

production.ini

➞

Show inline comments

@@ @@ -45,12 +45,13 @@ static_files = false @@
 lang=en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 250
 use_gravatar = true
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -46,12 +46,13 @@ lang=en @@
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = ${app_instance_uuid}
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -7,13 +7,13 @@ import random @@
 import hashlib
 import StringIO
 import urllib
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url, request
+from pylons import url, request, config
 from pylons.i18n.translation import _, ungettext
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
@@ @@ -32,12 +32,13 @@ from webhelpers.date import time_ago_in_ @@
 from webhelpers.paginate import Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
     convert_boolean_attrs, NotGiven
 from vcs.utils.annotate import annotate_highlight
 from rhodecode.lib.utils import repo_name_slug
 from rhodecode.lib import str2bool
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """Reset button
     """
     _set_input_attrs(attrs, type, name, value)
     _set_id_attr(attrs, id, name)
@@ @@ -562,12 +563,15 @@ HasRepoPermissionAny, HasRepoPermissionA @@
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
 def gravatar_url(email_address, size=30):
     if not str2bool(config['app_conf'].get('use_gravatar')):
         return "/images/user%s.png" % size
     ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')
     default = 'identicon'
     baseurl_nossl = "http://www.gravatar.com/avatar/"
     baseurl_ssl = "https://secure.gravatar.com/avatar/"
     baseurl = baseurl_ssl if ssl_enabled else baseurl_nossl

rhodecode/public/images/user14.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

rhodecode/public/images/user20.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

rhodecode/public/images/user24.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

rhodecode/public/images/user30.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

0 comments (0 inline, 0 general)