release: merge back stable branch into default

2016-09-15 14:41:43 +00:00 · 2016-09-15 14:41:43 +00:00 · c4c1134846
commit c4c1134846
parent a699558770 dc648ad1ff
23 changed files with 8071 additions and 4263 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -24,6 +24,10 @@ recursive-include rhodecode *.cfg
 recursive-include rhodecode *.json
 recursive-include rhodecode *.ini_tmpl
 recursive-include rhodecode *.sh
+recursive-include rhodecode *.mako
+
+# 502 page
+include rhodecode/public/502.html

 # 502 page
 include rhodecode/public/502.html
--- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/de/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/es/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/it/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/pt/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/rhodecode.pot
+++ b/rhodecode/i18n/rhodecode.pot
--- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po
--- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo
+++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.mo
--- a/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po
+++ b/rhodecode/i18n/zh/LC_MESSAGES/rhodecode.po