merge with beta

docs/api/api.rst

@@ -1,6 +1,6 b''
 .. _api:
 
-
+===
 API
 ===
 

docs/api/models.rst

@@ -1,5 +1,6 b''
 .. _models:
 
+========================
 The :mod:`models` Module
 ========================
 

docs/changelog.rst

@@ -1,9 +1,36 b''
 .. _changelog:
 
+=========
 Changelog
 =========
 
 
+
+1.3.3 (**2012-03-02**)
+----------------------
+
+news
+++++
+
+
+fixes
++++++
+
+- fixed some python2.5 compatibility issues 
+- fixed issues with removed repos was accidentally added as groups, after
+  full rescan of paths
+- fixes #376 Cannot edit user (using container auth)
+- fixes #378 Invalid image urls on changeset screen with proxy-prefix 
+  configuration
+- fixed initial sorting of repos inside repo group
+- fixes issue when user tried to resubmit same permission into user/user_groups
+- bumped beaker version that fixes #375 leap error bug
+- fixed raw_changeset for git. It was generated with hg patch headers
+- fixed vcs issue with last_changeset for filenodes
+- fixed missing commit after hook delete
+- fixed #372 issues with git operation detection that caused a security issue 
+  for git repos
+
 1.3.2 (**2012-02-28**)
 ----------------------
 

docs/contributing.rst

@@ -1,5 +1,6 b''
 .. _contributing:
 
+=========================
 Contributing to RhodeCode
 =========================
 
@@ -14,16 +15,19 b' 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.
+To run RhodeCode in a development version you always need to install the latest
+required libs from `requires.txt` file.
 
-after downloading RhodeCode make sure you run::
+after downloading/pulling RhodeCode make sure you run::
 
     python setup.py develop
 
-command to install all required packages, and prepare development enviroment
+command to install/verify all required packages, and prepare development 
+enviroment.
 
 
+After finishing your changes make sure all tests passes ok. You can run
+the testsuite running nosetest from the project root.
 
 | Thank you for any contributions!
 |  Marcin

docs/installation.rst

@@ -1,5 +1,6 b''
 .. _installation:
 
+============
 Installation
 ============
 

docs/setup.rst

@@ -1,5 +1,6 b''
 .. _setup:
 
+=====
 Setup
 =====
 

docs/upgrade.rst

@@ -1,5 +1,6 b''
 .. _upgrade:
 
+=======
 Upgrade
 =======
 
@@ -25,11 +26,11 b' Then make sure you run the following com'
  
 This will display any changes made by the new version of RhodeCode to your
 current configuration. It will try to perform an automerge. It's always better
-to make a backup of your configuration file before hand and recheck the 
+to make a backup of your configuration file before hand and re check the 
 content after the automerge.
 
 .. note::
-   Please always make sure your .ini files are upto date. Often errors are
+   Please always make sure your .ini files are up to date. Often errors are
    caused by missing params added in new versions.
 
 

docs/usage/backup.rst

@@ -1,5 +1,6 b''
 .. _backup:
 
+====================
 Backing up RhodeCode
 ====================
 

docs/usage/general.rst

@@ -1,5 +1,6 b''
 .. _general:
 
+=======================
 General RhodeCode usage
 =======================
 

docs/usage/git_support.rst

@@ -1,5 +1,6 b''
 .. _git_support:
 
+===========
 GIT support
 ===========
 

docs/usage/statistics.rst

@@ -1,6 +1,6 b''
 .. _statistics:
 
-
+==========
 Statistics
 ==========
 

rhodecode/__init__.py

@@ -26,7 +26,7 b''
 import sys
 import platform
 
-VERSION = (1, 3, 2)
+VERSION = (1, 3, 3)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __dbversion__ = 5  # defines current db version for migrations
 __platform__ = platform.system()