Commits

Daniel LaMotte committed fbd96df Merge

merge default into beta

  • Participants
  • Parent commits 606ea96, 52b1c6d

Comments (0)

Files changed (105)

 *.swp
 *.sqlite
 *.tox
-Paste*.egg
+*.egg-info
+*.egg
 
 syntax: regexp
 ^rcextensions
 2fa16ec5822da0c6fade3dd1ed9b6c0655e5dbbf v0.8.4
 16ba57d8fe2317c49dbd422afd07ab497687aa02 v0.8.5
 53128b6b9a4ddb6ee9554cbb83a082a6d1316b42 v1.0.0rc4
-bdc438fb4fe46fc0408de71bb659c691799a2de6 v1.1.4
-2ab211e0aecdb15fd767e5584244152db5b6f4c1 v1.1.7
-2ab211e0aecdb15fd767e5584244152db5b6f4c1 v1.1.7
+afd98d1f817e6a6b52172735c22160239e615a6b v1.0.0
+bee56f209c40a6880f2f633b02227b5ee1f8ff5a v1.0.1
+d85b0948e53925ebbbc49e9f7967013a04f866e9 v1.0.2
+d9c8dddb96af521e346f05b88d515c536eef3d17 v1.1.0
+344f748517814ed0408a49e392dc625f4cc37fdc v1.1.1
+6c01c12eafb8cc72d4c4cbd121400fad755b2862 v1.1.2
+4fa80e0484ef5c33feaa9c39fc66916f410ba353 v1.1.3
+cb77867d69d3c5931712aac486c980a42ee90745 v1.1.5
+cb77867d69d3c5931712aac486c980a42ee90745 v1.1.5
+008bdfdd95c8bd31ae6d89f76c75c1f49cbcd0bc v1.1.5
+c5af1d3c861fb36b156224e75c2f55a97f54657d v1.1.6
 7327a0d1584cf28d33e738048af1f6809d499451 v1.1.7
+bd102f45950f779995a1beae42b6eb099cdd27b3 v1.1.7
+c8974135732aa0ceb841cee6df66e29f089b4963 v1.1.8
+c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0
+c252049af24cd98eef5f4143fa3abbff3c912e29 1.2.0
+0000000000000000000000000000000000000000 1.2.0
+c252049af24cd98eef5f4143fa3abbff3c912e29 v1.2.0
+0b8fba8ab90b01f811a50e6e7384989cced21d38 v1.2.1
+22273bec00ba2fd860c60a9277d3d7229e288e18 v1.2.2
+1ff606a7858dbd8a5f70b3da5cc89524bd0d84f9 v1.2.3
+a7a282a902b207ce34e830d643c79b7ab52e3b35 v1.2.4
+b6b611e7722e754abebaae6e265cbb4c823d344d v1.2.5
+dbc82e3362a25d2aece42060089824c4342efd17 v1.3.0
+79a95f338fd0115b2cdb77118f39e17d22ff505c v1.3.1
+9ab21c5ddb84935bea5c743b4e147ed5a398b30c v1.3.2
+934906f028b582a254e0028ba25e5d20dd32b9cd v1.3.3
+af21362474e3ab5aa0e2fbb1c872356f2c16c4f3 v1.3.4
+0e2792e04bd316fe64335cbe6a476031ac60b29b v1.3.5
+edfff9f37916389144d3a3644d0a7d7adfd79b11 v1.3.6
+9ae95fdeca184f2404205645f06c6597b74ef2db v1.4.0
+909143a4dde53c46d4f24abb426ec870471c7de1 v1.4.1
+d998cc84cf726798486a438763053f0e1dc1b646 v1.4.2
+3f5d40b9dd99ccb009ea2211ee2d4b594c634946 v1.4.3
+3148c08cf86f1849917e2d50f7ab7766c1550b0a v1.4.4

CONTRIBUTORS

File contents unchanged.

MANIFEST.in

File contents unchanged.

README.rst

File contents unchanged.

development.ini

File contents unchanged.

docs/api/api.rst

File contents unchanged.

docs/changelog.rst

File contents unchanged.

docs/contributing.rst

File contents unchanged.

docs/index.rst

File contents unchanged.

docs/installation.rst

File contents unchanged.

docs/setup.rst

File contents unchanged.

docs/theme/nature/layout.html

File contents unchanged.

docs/upgrade.rst

File contents unchanged.

docs/usage/git_support.rst

File contents unchanged.

docs/usage/statistics.rst

File contents unchanged.

ez_setup.py

File contents unchanged.

production.ini

File contents unchanged.

requires.txt

File contents unchanged.

rhodecode/__init__.py

File contents unchanged.

rhodecode/bin/rhodecode_backup.py

File contents unchanged.

rhodecode/config/deployment.ini_tmpl

File contents unchanged.

rhodecode/config/environment.py

File contents unchanged.

rhodecode/config/middleware.py

File contents unchanged.

rhodecode/config/routing.py

File contents unchanged.

rhodecode/controllers/admin/admin.py

File contents unchanged.

rhodecode/controllers/admin/ldap_settings.py

File contents unchanged.

rhodecode/controllers/admin/permissions.py

File contents unchanged.

rhodecode/controllers/admin/repos.py

File contents unchanged.

rhodecode/controllers/admin/settings.py

File contents unchanged.

rhodecode/controllers/admin/users.py

File contents unchanged.

rhodecode/controllers/api/__init__.py

File contents unchanged.

rhodecode/controllers/api/api.py

File contents unchanged.

rhodecode/controllers/branches.py

File contents unchanged.

rhodecode/controllers/changelog.py

File contents unchanged.

rhodecode/controllers/changeset.py

File contents unchanged.

rhodecode/controllers/error.py

File contents unchanged.

rhodecode/controllers/feed.py

File contents unchanged.

rhodecode/controllers/files.py

File contents unchanged.

rhodecode/controllers/home.py

File contents unchanged.

rhodecode/controllers/journal.py

File contents unchanged.

rhodecode/controllers/login.py

File contents unchanged.

rhodecode/controllers/search.py

File contents unchanged.

rhodecode/controllers/settings.py

File contents unchanged.

rhodecode/controllers/shortlog.py

File contents unchanged.

rhodecode/controllers/summary.py

File contents unchanged.

rhodecode/controllers/tags.py

File contents unchanged.

rhodecode/i18n/rhodecode.pot

File contents unchanged.

rhodecode/lib/__init__.py

File contents unchanged.

rhodecode/lib/auth.py

File contents unchanged.

rhodecode/lib/auth_ldap.py

File contents unchanged.

rhodecode/lib/base.py

File contents unchanged.

rhodecode/lib/celerylib/__init__.py

File contents unchanged.

rhodecode/lib/celerylib/tasks.py

File contents unchanged.

rhodecode/lib/colored_formatter.py

File contents unchanged.

rhodecode/lib/db_manage.py

File contents unchanged.

rhodecode/lib/dbmigrate/__init__.py

File contents unchanged.

rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py

File contents unchanged.

rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py

File contents unchanged.

rhodecode/lib/dbmigrate/versions/__init__.py

File contents unchanged.

rhodecode/lib/exceptions.py

File contents unchanged.

rhodecode/lib/helpers.py

File contents unchanged.

rhodecode/lib/hooks.py

File contents unchanged.

rhodecode/lib/indexers/__init__.py

File contents unchanged.

rhodecode/lib/indexers/daemon.py

File contents unchanged.

rhodecode/lib/middleware/https_fixup.py

File contents unchanged.

rhodecode/lib/middleware/simplegit.py

File contents unchanged.

rhodecode/lib/middleware/simplehg.py

File contents unchanged.

rhodecode/lib/rcmail/smtp_mailer.py

File contents unchanged.

rhodecode/lib/timerproxy.py

File contents unchanged.

rhodecode/lib/utils.py

File contents unchanged.

rhodecode/model/__init__.py

File contents unchanged.

rhodecode/model/db.py

File contents unchanged.

rhodecode/model/forms.py

File contents unchanged.

rhodecode/model/permission.py

File contents unchanged.

rhodecode/model/repo.py

File contents unchanged.

rhodecode/model/repo_permission.py

File contents unchanged.

rhodecode/model/scm.py

File contents unchanged.

rhodecode/model/user.py

File contents unchanged.

rhodecode/public/css/style.css

File contents unchanged.

rhodecode/templates/admin/permissions/permissions.html

File contents unchanged.

rhodecode/templates/admin/repos/repos.html

File contents unchanged.

rhodecode/templates/admin/settings/settings.html

File contents unchanged.

rhodecode/templates/admin/users/user_edit.html

File contents unchanged.

rhodecode/templates/admin/users/user_edit_my_account.html

File contents unchanged.

rhodecode/templates/base/base.html

File contents unchanged.

rhodecode/templates/changelog/changelog.html

File contents unchanged.

rhodecode/templates/changeset/changeset.html

File contents unchanged.

rhodecode/templates/errors/error_document.html

File contents unchanged.

rhodecode/templates/files/files_browser.html

File contents unchanged.

rhodecode/templates/files/files_source.html

File contents unchanged.

rhodecode/templates/index.html

File contents unchanged.

rhodecode/templates/journal/journal.html

File contents unchanged.

rhodecode/templates/login.html

File contents unchanged.

rhodecode/templates/password_reset.html

File contents unchanged.

rhodecode/templates/register.html

File contents unchanged.

rhodecode/templates/search/search_content.html

     %endif
 %endfor
 %if c.cur_query and c.formated_results:
-<div class="pagination-wh pagination-left">
+<div class="pagination-wh pagination-left" style="padding-left:16px">
     ${c.formated_results.pager('$link_previous ~2~ $link_next')}
 </div>
 %endif

rhodecode/templates/summary/summary.html

File contents unchanged.

rhodecode/tests/__init__.py

File contents unchanged.

rhodecode/tests/functional/test_changelog.py

File contents unchanged.

rhodecode/tests/functional/test_summary.py

File contents unchanged.

rhodecode/websetup.py

File contents unchanged.

setup.cfg

File contents unchanged.
 ]
 
 classifiers = [
-    'Development Status :: 4 - Beta',
+    'Development Status :: 5 - Production/Stable',
     'Environment :: Web Environment',
     'Framework :: Pylons',
     'Intended Audience :: Developers',

test.ini

File contents unchanged.