fixes for release 1.2.4

- docs updates
- requires.txt file
- changelog

7 files changed, 83 insertions, 24 deletions

diff --git a/docs/api/api.rst b/docs/api/api.rst
index 1d0f55ac..a5f2a6de 100644
--- a/docs/api/api.rst
+++ b/docs/api/api.rst
@@ -10,6 +10,19 @@ There's a single schema for calling all api methods. API is implemented
 with JSON protocol both ways. An url to send API request in RhodeCode is
 <your_server>/_admin/api
 
+API ACCESS FOR WEB VIEWS
+++++++++++++++++++++++++
+
+API access can also be turned on for each web view in RhodeCode that is 
+decorated with `@LoginRequired` decorator. To enable API access simple change 
+the standard login decorator to `@LoginRequired(api_access=True)`. 
+After this change, a rhodecode view can be accessed without login by adding a 
+GET parameter `?api_key=<api_key>` to url. By default this is only
+enabled on RSS/ATOM feed views.
+
+
+API ACCESS
+++++++++++
 
 All clients are required to send JSON-RPC spec JSON data::
 
diff --git a/docs/api/index.rst b/docs/api/index.rst
index 41d02ce1..88828712 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -1,4 +1,4 @@
-.. _api:
+.. _indexapi:
 
 API Reference
 =============
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a2b2192a..0f9fd131 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,34 @@ Changelog
 =========
 
 
+1.2.4 (**2012-01-19**)
+======================
+
+news
+----
+
+- RhodeCode is bundled with mercurial series 2.0.X by default, with
+  full support to largefiles extension. Enabled by default in new installations
+- #329 Ability to Add/Remove Groups to/from a Repository via AP
+- added requires.txt file with requirements
+     
+fixes
+-----
+
+- fixes db session issues with celery when emailing admins
+- #331 RhodeCode mangles repository names if the a repository group 
+  contains the "full path" to the repositories
+- #298 Conflicting e-mail addresses for LDAP and RhodeCode users
+- DB session cleanup after hg protocol operations, fixes issues with
+  `mysql has gone away` errors
+- #333 doc fixes for get_repo api function
+- #271 rare JSON serialization problem with statistics enabled
+- #337 Fixes issues with validation of repository name conflicting with 
+  a group name. A proper message is now displayed.
+- #292 made ldap_dn in user edit readonly, to get rid of confusion that field
+  doesn't work   
+
+
 1.2.3 (**2011-11-02**)
 ======================
 
diff --git a/requires.txt b/requires.txt
new file mode 100644
index 00000000..e960d742
--- /dev/null
+++ b/requires.txt
@@ -0,0 +1,15 @@
+Pylons==1.0.0
+Beaker==1.5.4
+WebHelpers>=1.2
+formencode==1.2.4
+SQLAlchemy==0.7.4
+Mako==0.5.0
+pygments>=1.4
+mercurial>=2.0,<2.1
+whoosh<1.8
+celery>=2.2.5,<2.3
+babel
+python-dateutil>=1.5.0,<2.0.0
+dulwich>=0.8.0,<0.9.0
+vcs==0.2.2
+webob==1.0.8
\ No newline at end of file
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index e5b56aee..91f3d1e7 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -8,7 +8,7 @@
 
     :created_on: Apr 9, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -34,11 +34,30 @@ __license__ = 'GPLv3'
 PLATFORM_WIN = ('Windows')
 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD', 'OpenBSD', 'SunOS')
 
+requirements = [
+    "Pylons==1.0.0",
+    "Beaker==1.5.4",
+    "WebHelpers>=1.2",
+    "formencode==1.2.4",
+    "SQLAlchemy==0.7.4",
+    "Mako==0.5.0",
+    "pygments>=1.4",
+    "mercurial>=2.0,<2.1",
+    "whoosh<1.8",
+    "celery>=2.2.5,<2.3",
+    "babel",
+    "python-dateutil>=1.5.0,<2.0.0",
+    "dulwich>=0.8.0,<0.9.0",
+    "vcs==0.2.2",
+    "webob==1.0.8"
+]
+
+
 try:
     from rhodecode.lib import get_current_revision
     _rev = get_current_revision(quiet=True)
 except ImportError:
-    #this is needed when doing some setup.py operations
+    # this is needed when doing some setup.py operations
     _rev = False
 
 if len(VERSION) > 3 and _rev:
diff --git a/rhodecode/lib/__init__.py b/rhodecode/lib/__init__.py
index e89394aa..d39d6d33 100644
--- a/rhodecode/lib/__init__.py
+++ b/rhodecode/lib/__init__.py
@@ -7,7 +7,7 @@
 
     :created_on: Jan 5, 2011
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2011-2012 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -87,12 +87,12 @@ def str2bool(_str):
 def convert_line_endings(line, mode):
     """
     Converts a given line  "line end" accordingly to given mode
-    
+
     Available modes are::
         0 - Unix
         1 - Mac
         2 - DOS
-    
+
     :param line: given line to convert
     :param mode: mode to convert to
     :rtype: str
@@ -154,7 +154,7 @@ def generate_api_key(username, salt=None):
 def safe_unicode(str_, from_encoding='utf8'):
     """
     safe unicode function. Does few trick to turn str_ into unicode
-     
+
     In case of UnicodeDecode error we try to return it with encoding detected
     by chardet library if it fails fallback to unicode with errors replaced
 
diff --git a/setup.py b/setup.py
index 17af1aba..7d0a42c0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,29 +3,13 @@ from rhodecode import get_version
 from rhodecode import __platform__
 from rhodecode import __license__
 from rhodecode import PLATFORM_OTHERS
+from rhodecode import requirements
 
 py_version = sys.version_info
 
 if py_version < (2, 5):
     raise Exception('RhodeCode requires python 2.5 or later')
 
-requirements = [
-        "Pylons==1.0.0",
-        "Beaker==1.5.4",
-        "WebHelpers>=1.2",
-        "formencode==1.2.4",
-        "SQLAlchemy==0.7.3",
-        "Mako==0.5.0",
-        "pygments>=1.4",
-        "mercurial>=2.0,<2.1",
-        "whoosh<1.8",
-        "celery>=2.2.5,<2.3",
-        "babel",
-        "python-dateutil>=1.5.0,<2.0.0",
-        "dulwich>=0.8.0,<0.9.0",
-        "vcs==0.2.2",
-        "webob==1.0.8"
-    ]
 
 dependency_links = [
 ]