Permalink
Browse files

Merge branch 'develop' of git://github.com/divio/django-cms into develop

  • Loading branch information...
2 parents 17df6c9 + 5e9e4bb commit ff78478ac2791989914e198a7611910261622b42 @kezabelle kezabelle committed Aug 24, 2011
Showing with 21,493 additions and 15,937 deletions.
  1. +5 −1 CHANGELOG.txt
  2. +1 −1 cms/__init__.py
  3. BIN cms/locale/ar/LC_MESSAGES/django.mo
  4. +491 −442 cms/locale/ar/LC_MESSAGES/django.po
  5. BIN cms/locale/ar/LC_MESSAGES/djangojs.mo
  6. +10 −11 cms/locale/ar/LC_MESSAGES/djangojs.po
  7. BIN cms/locale/bg/LC_MESSAGES/django.mo
  8. +467 −435 cms/locale/bg/LC_MESSAGES/django.po
  9. BIN cms/locale/bg/LC_MESSAGES/djangojs.mo
  10. +8 −10 cms/locale/bg/LC_MESSAGES/djangojs.po
  11. BIN cms/locale/bn/LC_MESSAGES/django.mo
  12. +436 −434 cms/locale/bn/LC_MESSAGES/django.po
  13. BIN cms/locale/bn/LC_MESSAGES/djangojs.mo
  14. +9 −11 cms/locale/bn/LC_MESSAGES/djangojs.po
  15. BIN cms/locale/ca/LC_MESSAGES/django.mo
  16. +493 −447 cms/locale/ca/LC_MESSAGES/django.po
  17. BIN cms/locale/ca/LC_MESSAGES/djangojs.mo
  18. +8 −10 cms/locale/ca/LC_MESSAGES/djangojs.po
  19. BIN cms/locale/cs/LC_MESSAGES/django.mo
  20. +485 −439 cms/locale/cs/LC_MESSAGES/django.po
  21. BIN cms/locale/cs/LC_MESSAGES/djangojs.mo
  22. +8 −10 cms/locale/cs/LC_MESSAGES/djangojs.po
  23. BIN cms/locale/cy/LC_MESSAGES/django.mo
  24. +438 −435 cms/locale/cy/LC_MESSAGES/django.po
  25. BIN cms/locale/cy/LC_MESSAGES/djangojs.mo
  26. +11 −12 cms/locale/cy/LC_MESSAGES/djangojs.po
  27. BIN cms/locale/da/LC_MESSAGES/django.mo
  28. +437 −435 cms/locale/da/LC_MESSAGES/django.po
  29. BIN cms/locale/da/LC_MESSAGES/djangojs.mo
  30. +9 −12 cms/locale/da/LC_MESSAGES/djangojs.po
  31. BIN cms/locale/de/LC_MESSAGES/django.mo
  32. +560 −447 cms/locale/de/LC_MESSAGES/django.po
  33. BIN cms/locale/de/LC_MESSAGES/djangojs.mo
  34. +8 −10 cms/locale/de/LC_MESSAGES/djangojs.po
  35. BIN cms/locale/el/LC_MESSAGES/django.mo
  36. +457 −427 cms/locale/el/LC_MESSAGES/django.po
  37. BIN cms/locale/el/LC_MESSAGES/djangojs.mo
  38. +10 −12 cms/locale/el/LC_MESSAGES/djangojs.po
  39. BIN cms/locale/en/LC_MESSAGES/django.mo
  40. +437 −421 cms/locale/en/LC_MESSAGES/django.po
  41. BIN cms/locale/en/LC_MESSAGES/djangojs.mo
  42. +5 −5 cms/locale/en/LC_MESSAGES/djangojs.po
  43. BIN cms/locale/es/LC_MESSAGES/django.mo
  44. +554 −445 cms/locale/es/LC_MESSAGES/django.po
  45. BIN cms/locale/es/LC_MESSAGES/djangojs.mo
  46. +9 −12 cms/locale/es/LC_MESSAGES/djangojs.po
  47. BIN cms/locale/es_AR/LC_MESSAGES/django.mo
  48. +446 −436 cms/locale/es_AR/LC_MESSAGES/django.po
  49. BIN cms/locale/es_AR/LC_MESSAGES/djangojs.mo
  50. +9 −11 cms/locale/es_AR/LC_MESSAGES/djangojs.po
  51. BIN cms/locale/et/LC_MESSAGES/django.mo
  52. +437 −435 cms/locale/et/LC_MESSAGES/django.po
  53. BIN cms/locale/et/LC_MESSAGES/djangojs.mo
  54. +9 −11 cms/locale/et/LC_MESSAGES/djangojs.po
  55. BIN cms/locale/eu/LC_MESSAGES/django.mo
  56. +436 −434 cms/locale/eu/LC_MESSAGES/django.po
  57. BIN cms/locale/eu/LC_MESSAGES/djangojs.mo
  58. +9 −11 cms/locale/eu/LC_MESSAGES/djangojs.po
  59. BIN cms/locale/fa/LC_MESSAGES/django.mo
  60. +496 −449 cms/locale/fa/LC_MESSAGES/django.po
  61. BIN cms/locale/fa/LC_MESSAGES/djangojs.mo
  62. +8 −10 cms/locale/fa/LC_MESSAGES/djangojs.po
  63. BIN cms/locale/fi/LC_MESSAGES/django.mo
  64. +496 −443 cms/locale/fi/LC_MESSAGES/django.po
  65. BIN cms/locale/fi/LC_MESSAGES/djangojs.mo
  66. +8 −10 cms/locale/fi/LC_MESSAGES/djangojs.po
  67. BIN cms/locale/fr/LC_MESSAGES/django.mo
  68. +559 −446 cms/locale/fr/LC_MESSAGES/django.po
  69. BIN cms/locale/fr/LC_MESSAGES/djangojs.mo
  70. +11 −13 cms/locale/fr/LC_MESSAGES/djangojs.po
  71. BIN cms/locale/gu/LC_MESSAGES/django.mo
  72. +437 −434 cms/locale/gu/LC_MESSAGES/django.po
  73. BIN cms/locale/gu/LC_MESSAGES/djangojs.mo
  74. +10 −11 cms/locale/gu/LC_MESSAGES/djangojs.po
  75. BIN cms/locale/he/LC_MESSAGES/django.mo
  76. +436 −434 cms/locale/he/LC_MESSAGES/django.po
  77. BIN cms/locale/he/LC_MESSAGES/djangojs.mo
  78. +9 −11 cms/locale/he/LC_MESSAGES/djangojs.po
  79. BIN cms/locale/hi/LC_MESSAGES/django.mo
  80. +508 −469 cms/locale/hi/LC_MESSAGES/django.po
  81. BIN cms/locale/hi/LC_MESSAGES/djangojs.mo
  82. +12 −16 cms/locale/hi/LC_MESSAGES/djangojs.po
  83. BIN cms/locale/hu/LC_MESSAGES/django.mo
  84. +436 −434 cms/locale/hu/LC_MESSAGES/django.po
  85. BIN cms/locale/hu/LC_MESSAGES/djangojs.mo
  86. +9 −11 cms/locale/hu/LC_MESSAGES/djangojs.po
  87. BIN cms/locale/it/LC_MESSAGES/django.mo
  88. +558 −442 cms/locale/it/LC_MESSAGES/django.po
  89. BIN cms/locale/it/LC_MESSAGES/djangojs.mo
  90. +10 −11 cms/locale/it/LC_MESSAGES/djangojs.po
  91. BIN cms/locale/ja/LC_MESSAGES/django.mo
  92. +505 −438 cms/locale/ja/LC_MESSAGES/django.po
  93. BIN cms/locale/ja/LC_MESSAGES/djangojs.mo
  94. +8 −10 cms/locale/ja/LC_MESSAGES/djangojs.po
  95. BIN cms/locale/km/LC_MESSAGES/django.mo
  96. +1,869 −0 cms/locale/km/LC_MESSAGES/django.po
  97. BIN cms/locale/km/LC_MESSAGES/djangojs.mo
  98. +38 −0 cms/locale/km/LC_MESSAGES/djangojs.po
  99. BIN cms/locale/nl/LC_MESSAGES/django.mo
  100. +549 −446 cms/locale/nl/LC_MESSAGES/django.po
  101. BIN cms/locale/nl/LC_MESSAGES/djangojs.mo
  102. +10 −12 cms/locale/nl/LC_MESSAGES/djangojs.po
  103. BIN cms/locale/no/LC_MESSAGES/django.mo
  104. +488 −442 cms/locale/no/LC_MESSAGES/django.po
  105. BIN cms/locale/no/LC_MESSAGES/djangojs.mo
  106. +8 −10 cms/locale/no/LC_MESSAGES/djangojs.po
  107. BIN cms/locale/pl/LC_MESSAGES/django.mo
  108. +500 −446 cms/locale/pl/LC_MESSAGES/django.po
  109. BIN cms/locale/pl/LC_MESSAGES/djangojs.mo
  110. +10 −11 cms/locale/pl/LC_MESSAGES/djangojs.po
  111. BIN cms/locale/pt/LC_MESSAGES/django.mo
  112. +458 −435 cms/locale/pt/LC_MESSAGES/django.po
  113. BIN cms/locale/pt/LC_MESSAGES/djangojs.mo
  114. +8 −10 cms/locale/pt/LC_MESSAGES/djangojs.po
  115. BIN cms/locale/pt_BR/LC_MESSAGES/django.mo
  116. +495 −440 cms/locale/pt_BR/LC_MESSAGES/django.po
  117. BIN cms/locale/pt_BR/LC_MESSAGES/djangojs.mo
  118. +10 −11 cms/locale/pt_BR/LC_MESSAGES/djangojs.po
  119. BIN cms/locale/ro/LC_MESSAGES/django.mo
  120. +452 −435 cms/locale/ro/LC_MESSAGES/django.po
  121. BIN cms/locale/ro/LC_MESSAGES/djangojs.mo
  122. +43 −0 cms/locale/ro/LC_MESSAGES/djangojs.po
  123. BIN cms/locale/ru/LC_MESSAGES/django.mo
  124. +555 −439 cms/locale/ru/LC_MESSAGES/django.po
  125. BIN cms/locale/ru/LC_MESSAGES/djangojs.mo
  126. +10 −11 cms/locale/ru/LC_MESSAGES/djangojs.po
  127. BIN cms/locale/sk/LC_MESSAGES/django.mo
  128. +493 −443 cms/locale/sk/LC_MESSAGES/django.po
  129. BIN cms/locale/sk/LC_MESSAGES/djangojs.mo
  130. +8 −10 cms/locale/sk/LC_MESSAGES/djangojs.po
  131. BIN cms/locale/sl_SI/LC_MESSAGES/django.mo
  132. +1,905 −0 cms/locale/sl_SI/LC_MESSAGES/django.po
  133. BIN cms/locale/sl_SI/LC_MESSAGES/djangojs.mo
  134. +42 −0 cms/locale/sl_SI/LC_MESSAGES/djangojs.po
  135. BIN cms/locale/sv/LC_MESSAGES/django.mo
  136. +501 −448 cms/locale/sv/LC_MESSAGES/django.po
  137. BIN cms/locale/sv/LC_MESSAGES/djangojs.mo
  138. +8 −10 cms/locale/sv/LC_MESSAGES/djangojs.po
  139. BIN cms/locale/tr/LC_MESSAGES/django.mo
  140. +483 −442 cms/locale/tr/LC_MESSAGES/django.po
  141. BIN cms/locale/tr/LC_MESSAGES/djangojs.mo
  142. +10 −11 cms/locale/tr/LC_MESSAGES/djangojs.po
  143. BIN cms/locale/zh_CN/LC_MESSAGES/django.mo
  144. +551 −433 cms/locale/zh_CN/LC_MESSAGES/django.po
  145. BIN cms/locale/zh_CN/LC_MESSAGES/djangojs.mo
  146. +10 −11 cms/locale/zh_CN/LC_MESSAGES/djangojs.po
  147. BIN cms/locale/zh_TW/LC_MESSAGES/django.mo
  148. +492 −440 cms/locale/zh_TW/LC_MESSAGES/django.po
  149. BIN cms/locale/zh_TW/LC_MESSAGES/djangojs.mo
  150. +8 −10 cms/locale/zh_TW/LC_MESSAGES/djangojs.po
  151. +10 −0 cms/models/managers.py
  152. +11 −25 cms/models/pagemodel.py
  153. +3 −3 cms/plugins/text/forms.py
  154. +53 −0 cms/plugins/text/migrations/0006_2_1_4_upgrade.py
  155. +8 −5 cms/plugins/text/models.py
  156. +2 −1 cms/static/cms/css/plugins/cms.toolbar.css
  157. +6 −5 cms/static/cms/js/plugins/cms.placeholders.js
  158. +8 −8 cms/static/cms/js/plugins/cms.toolbar.js
  159. +1 −1 cms/templates/cms/toolbar/items/login.html
  160. +0 −4 cms/templates/cms/toolbar/toolbar.html
  161. +9 −1 cms/tests/menu.py
  162. +15 −1 cms/tests/security.py
  163. +37 −0 cms/utils/html.py
  164. +8 −2 cms/utils/page.py
  165. +15 −0 docs/advanced/i18n.rst
  166. +2 −32 docs/advanced/templatetags.rst
  167. +2 −2 docs/extending_cms/app_integration.rst
  168. +2 −2 docs/getting_started/installation.rst
  169. +62 −79 docs/getting_started/tutorial.rst
  170. +4 −4 menus/templatetags/menu_tags.py
  171. +2 −1 setup.py
  172. +1 −1 tests/buildout.cfg
View
@@ -52,10 +52,14 @@
- Fixed PlaceholderField not respecting limits in CMS_PLACEHOLDER_CONF (thanks to Ben Hockey for reporting this)
- Fixed the double-monkeypatch check for url reversing (thanks to Benjamin Wohlwend for the patch)
+==== 2.1.4 (2011-08-24) ====
+
+- Fixed a XSS issue in Text Plugins
+
==== 2.2.0 (In Development) ====
- Replaced the old plugin media framework with django-sekizai. (This changed some plugin templates which might cause problems with your CSS styling).
- Made django-mptt a proper dependency
- Removed support for django-dbgettext
- Google Maps Plugin now defaults to use HTTPS.
-- Google Maps Plugin now uses the version 3 of their API, no longer requiring an API Key.
+- Google Maps Plugin now uses the version 3 of their API, no longer requiring an API Key.
View
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = '2.2b1.post1'
+__version__ = '2.2rc1.post2'
# patch settings
try:
Binary file not shown.
Oops, something went wrong.

0 comments on commit ff78478

Please sign in to comment.