Permalink
Browse files

[per-object-permissions] Merged to trunk [3938]

  • Loading branch information...
1 parent 3f60a8e commit f6fa1032968d8baaf2a30f8478793e8592c72c72 Christopher Long committed Oct 27, 2006
Showing with 5,402 additions and 2,040 deletions.
  1. +14 −1 AUTHORS
  2. +8 −0 MANIFEST.in
  3. +7 −6 django/bin/daily_cleanup.py
  4. +4 −6 django/conf/global_settings.py
  5. BIN django/conf/locale/cs/LC_MESSAGES/django.mo
  6. +462 −270 django/conf/locale/cs/LC_MESSAGES/django.po
  7. BIN django/conf/locale/da/LC_MESSAGES/django.mo
  8. +319 −389 django/conf/locale/da/LC_MESSAGES/django.po
  9. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  10. +483 −234 django/conf/locale/de/LC_MESSAGES/django.po
  11. BIN django/conf/locale/en/LC_MESSAGES/django.mo
  12. +445 −227 django/conf/locale/en/LC_MESSAGES/django.po
  13. BIN django/conf/locale/ja/LC_MESSAGES/django.mo
  14. +495 −276 django/conf/locale/ja/LC_MESSAGES/django.po
  15. BIN django/conf/locale/ja/LC_MESSAGES/djangojs.mo
  16. +26 −18 django/conf/locale/ja/LC_MESSAGES/djangojs.po
  17. BIN django/conf/locale/tr/LC_MESSAGES/django.mo
  18. +2,209 −0 django/conf/locale/tr/LC_MESSAGES/django.po
  19. BIN django/conf/locale/tr/LC_MESSAGES/djangojs.mo
  20. +109 −0 django/conf/locale/tr/LC_MESSAGES/djangojs.po
  21. BIN django/conf/locale/zh_CN/LC_MESSAGES/django.mo
  22. +2 −2 django/conf/locale/zh_CN/LC_MESSAGES/django.po
  23. BIN django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo
  24. +13 −15 django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
  25. +1 −1 django/contrib/admin/templates/admin/login.html
  26. +1 −1 django/contrib/admin/templates/admin_doc/view_detail.html
  27. +2 −2 django/contrib/admin/templatetags/admin_modify.py
  28. +1 −0 django/contrib/admin/views/auth.py
  29. +1 −1 django/contrib/admin/views/decorators.py
  30. +1 −1 django/contrib/admin/views/main.py
  31. +1 −0 django/contrib/auth/create_superuser.py
  32. +2 −2 django/contrib/auth/decorators.py
  33. +5 −5 django/contrib/auth/forms.py
  34. +15 −4 django/contrib/auth/models.py
  35. +2 −2 django/contrib/comments/views/comments.py
  36. +2 −0 django/contrib/sitemaps/templates/sitemap.xml
  37. +1 −5 django/contrib/sitemaps/templates/sitemap_index.xml
  38. +10 −25 django/core/handlers/base.py
  39. +34 −23 django/core/handlers/modpython.py
  40. +21 −8 django/core/handlers/wsgi.py
  41. +91 −43 django/core/management.py
  42. +6 −3 django/core/servers/basehttp.py
  43. +2 −1 django/core/urlresolvers.py
  44. +24 −3 django/core/validators.py
  45. +18 −0 django/db/backends/mysql/base.py
  46. +10 −2 django/db/backends/sqlite3/base.py
  47. +12 −3 django/db/models/fields/__init__.py
  48. +2 −2 django/db/models/fields/related.py
  49. +7 −4 django/db/models/manipulators.py
  50. +30 −29 django/db/models/query.py
  51. +4 −3 django/forms/__init__.py
  52. +9 −3 django/middleware/common.py
  53. +11 −5 django/template/__init__.py
  54. +5 −1 django/template/defaulttags.py
  55. +28 −28 django/test/client.py
  56. +5 −2 django/test/doctest.py
  57. +31 −0 django/utils/itercompat.py
  58. +1 −2 django/utils/simplejson/scanner.py
  59. +1 −1 django/views/debug.py
  60. +3 −3 django/views/generic/create_update.py
  61. +2 −2 docs/admin_css.txt
  62. +1 −1 docs/apache_auth.txt
  63. +2 −2 docs/api_stability.txt
  64. +40 −19 docs/authentication.txt
  65. +3 −3 docs/contributing.txt
  66. +25 −6 docs/db-api.txt
  67. +16 −2 docs/django-admin.txt
  68. +14 −4 docs/faq.txt
  69. +14 −15 docs/forms.txt
  70. +8 −8 docs/generic_views.txt
  71. +26 −8 docs/install.txt
  72. +3 −2 docs/model-api.txt
  73. +1 −1 docs/release_notes_0.95.txt
  74. +2 −2 docs/request_response.txt
  75. +11 −11 docs/serialization.txt
  76. +6 −12 docs/settings.txt
  77. +25 −1 docs/templates.txt
  78. +44 −3 docs/templates_python.txt
  79. +3 −3 docs/testing.txt
  80. +5 −5 docs/tutorial02.txt
  81. +2 −2 docs/tutorial03.txt
  82. +1 −1 docs/tutorial04.txt
  83. +0 −217 ez_setup.py
  84. +23 −21 setup.py
  85. +4 −0 tests/modeltests/basic/models.py
  86. +4 −0 tests/modeltests/custom_pk/models.py
  87. +14 −0 tests/modeltests/one_to_one/models.py
  88. +23 −19 tests/regressiontests/dateformat/tests.py
  89. +1 −0 tests/regressiontests/initial_sql_regress/sql/simple.sql
  90. 0 tests/regressiontests/null_queries/__init__.py
  91. +54 −0 tests/regressiontests/null_queries/models.py
  92. +29 −8 tests/regressiontests/templates/tests.py
View
15 AUTHORS
@@ -42,6 +42,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:
+ adurdin@gmail.com
akaihola
Andreas
ant9000@netwise.it
@@ -63,6 +64,7 @@ answer newbie questions, and generally made Django that much better:
Ian Clelland <clelland@gmail.com>
crankycoder@gmail.com
Matt Croydon <http://www.postneo.com/>
+ dackze+django@gmail.com
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
Jason Davies (Esaj) <http://www.jasondavies.com/>
Alex Dedul
@@ -73,14 +75,17 @@ answer newbie questions, and generally made Django that much better:
Jeremy Dunck <http://dunck.us/>
Andy Dustman <farcepest@gmail.com>
Clint Ecker
+ Enrico <rico.bl@gmail.com>
favo@exoweb.net
gandalf@owca.info
Baishampayan Ghose
martin.glueck@gmail.com
Simon Greenhill <dev@simon.net.nz>
Espen Grindhaug <http://grindhaug.org/>
Brant Harris
+ Hawkeye
heckj@mac.com
+ Joel Heenan <joelh-django@planetjoel.com>
hipertracker@gmail.com
Ian Holsman <http://feh.holsman.net/>
Kieran Holland <http://www.kieranholland.com>
@@ -94,26 +99,31 @@ answer newbie questions, and generally made Django that much better:
kilian <kilian.cavalotti@lip6.fr>
Sune Kirkeby <http://ibofobi.dk/>
Cameron Knight (ckknight)
+ Meir Kriheli <http://mksoft.co.il/>
Bruce Kroeze <http://coderseye.com/>
Joseph Kocherhans
konrad@gwu.edu
lakin.wecker@gmail.com
Stuart Langridge <http://www.kryogenix.org/>
Eugene Lazutkin <http://lazutkin.com/blog/>
- Jeong-Min Lee
+ Jeong-Min Lee <falsetru@gmail.com>
Christopher Lenz <http://www.cmlenz.net/>
+ lerouxb@gmail.com
limodou
+ mattmcc
Martin Maney <http://www.chipy.org/Martin_Maney>
Manuzhai
Petar Marić
mark@junklight.com
mattycakes@gmail.com
Jason McBrayer <http://www.carcosa.net/jason/>
+ mccutchen@gmail.com
michael.mcewan@gmail.com
mmarshall
Eric Moritz <http://eric.themoritzfamily.com/>
Robin Munn <http://www.geekforgod.com/>
Nebojša Dorđević
+ Fraser Nevett <mail@nevett.org>
Sam Newman <http://www.magpiebrain.com/>
Neal Norwitz <nnorwitz@google.com>
oggie rob <oz.robharvey@gmail.com>
@@ -141,6 +151,7 @@ answer newbie questions, and generally made Django that much better:
Radek Švarz <http://www.svarz.cz/translate/>
Swaroop C H <http://www.swaroopch.info>
Aaron Swartz <http://www.aaronsw.com/>
+ Tyson Tate <tyson@fallingbullets.com>
Tom Tobin
Tom Insam
Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
@@ -150,8 +161,10 @@ answer newbie questions, and generally made Django that much better:
Milton Waddams
Dan Watson <http://theidioteque.net/>
Rachel Willmer <http://www.willmer.com/kb/>
+ Gary Wilson <gary.wilson@gmail.com>
wojtek
ye7cakf02@sneakemail.com
+ ymasuda@ethercube.com
Cheng Zhang
A big THANK YOU goes to:
View
@@ -0,0 +1,8 @@
+include AUTHORS
+include INSTALL
+include LICENSE
+recursive-include django/conf/locale *
+recursive-include django/contrib/admin/templates
+recursive-include django/contrib/admin/media
+recursive-include django/contrib/comments/templates
+recursive-include django/contrib/sitemaps/templates
@@ -1,16 +1,17 @@
-"Daily cleanup file"
+"""
+Daily cleanup job.
-from django.db import backend, connection, transaction
+Can be run as a cronjob to clean out old data from the database (only expired
+sessions at the moment).
+"""
-DOCUMENTATION_DIRECTORY = '/home/html/documentation/'
+from django.db import backend, connection, transaction
def clean_up():
# Clean up old database records
cursor = connection.cursor()
cursor.execute("DELETE FROM %s WHERE %s < NOW()" % \
- (backend.quote_name('core_sessions'), backend.quote_name('expire_date')))
- cursor.execute("DELETE FROM %s WHERE %s < NOW() - INTERVAL '1 week'" % \
- (backend.quote_name('registration_challenges'), backend.quote_name('request_date')))
+ (backend.quote_name('django_session'), backend.quote_name('expire_date')))
transaction.commit_unless_managed()
if __name__ == "__main__":
@@ -56,6 +56,7 @@
('ja', gettext_noop('Japanese')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
+ ('pl', gettext_noop('Polish')),
('pt-br', gettext_noop('Brazilian')),
('ro', gettext_noop('Romanian')),
('ru', gettext_noop('Russian')),
@@ -64,6 +65,7 @@
('sr', gettext_noop('Serbian')),
('sv', gettext_noop('Swedish')),
('ta', gettext_noop('Tamil')),
+ ('tr', gettext_noop('Turkish')),
('uk', gettext_noop('Ukrainian')),
('zh-cn', gettext_noop('Simplified Chinese')),
('zh-tw', gettext_noop('Traditional Chinese')),
@@ -222,10 +224,6 @@
# http://www.djangoproject.com/documentation/templates/#now
MONTH_DAY_FORMAT = 'F j'
-# Whether to enable Psyco, which optimizes Python code. Requires Psyco.
-# http://psyco.sourceforge.net/
-ENABLE_PSYCO = False
-
# Do you want to manage transactions manually?
# Hint: you really don't!
TRANSACTIONS_MANAGED = False
@@ -273,8 +271,8 @@
COMMENTS_ALLOW_PROFANITIES = False
# The profanities that will trigger a validation error in the
-# 'hasNoProfanities' validator. All of these should be in lower-case.
-PROFANITIES_LIST = ['asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit']
+# 'hasNoProfanities' validator. All of these should be in lowercase.
+PROFANITIES_LIST = ('asshat', 'asshead', 'asshole', 'cunt', 'fuck', 'gook', 'nigger', 'shit')
# The group ID that designates which users are banned.
# Set to None if you're not using it.
Binary file not shown.
Oops, something went wrong.

0 comments on commit f6fa103

Please sign in to comment.