kallithea Changeset - 950110f3f99f

Changeset - 950110f3f99f

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-02-26 17:08:37
marcin@python-works.com

merged changes from stable into beta

3 files changed with 12 insertions and 3 deletions:

docs/contributing.rst

docs/theme/nature/layout.html

rhodecode/lib/__init__.py

0 comments (0 inline, 0 general)

docs/contributing.rst

➞

Show inline comments

@@ @@ -14,12 +14,20 @@ fix might be already fixed there and i t @@
 stable, and not the other way. Finally, when you are finished making a change,
 please send me a pull request.
 To run RhodeCode in a development version you always need to install the tip
 version of RhodeCode and the VCS library.
 after downloading RhodeCode make sure you run::
     python setup.py develop
 command to install all required packages, and prepare development enviroment
 | Thank you for any contributions!
 |  Marcin
 .. _bitbucket: http://bitbucket.org/

docs/theme/nature/layout.html

➞

Show inline comments

@@ @@ -7,8 +7,12 @@ @@
 	<input type="hidden" name="cmd" value="_s-xclick">
 	<input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
 	<input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
 	border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 	<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
     <div style="padding:5px">
      <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
      <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
    </div>
 </div>
 {% endblock %}}

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -229,15 +229,12 @@ def safe_str(unicode_, to_encoding=None) @@
     :param unicode_: unicode to encode
     :rtype: str
     :returns: str object
     """
     if not isinstance(unicode_, basestring):
         return str(unicode_)
     if isinstance(unicode_, str):
         return unicode_
     if not to_encoding:
         import rhodecode
         DEFAULT_ENCODING = rhodecode.CONFIG.get('default_encoding','utf8')

0 comments (0 inline, 0 general)