Commit graph

18 commits

Author SHA1 Message Date
Henrik Levkowetz 7ecfac6308 Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x.
- Legacy-Id: 9028
2015-02-08 21:16:44 +00:00
Henrik Levkowetz 028b7e315a Reverted to [9025] because commit [9026] failed (it was incomplete with a broken working dir).
- Legacy-Id: 9027
Note: SVN reference [9026] has been migrated to Git commit 4a3749a66b
2015-02-08 20:03:16 +00:00
Henrik Levkowetz e921927c59 Upgrading to Django-1.7.4
- Legacy-Id: 9020
2015-02-08 10:35:10 +00:00
Henrik Levkowetz f5e2130aaf Removing django 1.7.1, to be replaced with 1.7.4
- Legacy-Id: 9019
2015-02-08 10:25:51 +00:00
Henrik Levkowetz 4649d85368 Introducing django-1.7.1
- Legacy-Id: 8817
2014-12-22 16:39:54 +00:00
Henrik Levkowetz 435d944cfa Removing django 1.6.4
- Legacy-Id: 8816
2014-12-22 16:29:52 +00:00
Ole Laursen b54f3d05cd Redo non-obsoleted patches to Django - hiding password change in admin, username max_length, JSON serialization of timedelta and debug hack to DoesNotExist so .get() shows the kwargs
- Legacy-Id: 6873
2013-12-11 14:32:13 +00:00
Ole Laursen 1654988abc Replace patched Django 1.2.7 with Django 1.6
- Legacy-Id: 6871
2013-12-11 13:59:17 +00:00
Henrik Levkowetz d2d1c839c9 Revert changes to two django files which should not have been part of [6724].
- Legacy-Id: 6725
Note: SVN reference [6724] has been migrated to Git commit 8f67ca6826
2013-11-21 16:40:28 +00:00
Henrik Levkowetz 8f67ca6826 Changed the password reset URL which is sent out in the password reset email
message to use https: instead of http:.  This is generally a good idea, and
also silences Google Chrome's phishing warning.  Fixes issue #1204.

This commit should have contained only changes to a template file; by
mistake, changes to two django files were also committed here.  That
change has been undone in [6725].
 - Legacy-Id: 6724
Note: SVN reference [6725] has been migrated to Git commit ca1a04f660aa0473bf8f3aadc7809d462ac4cac0
2013-11-21 16:35:22 +00:00
Henrik Levkowetz be7e968da6 Applied fix from https://code.djangoproject.com/attachment/ticket/3615/defer_constraint_checks.diff to defer constraint checks when loading fixtures.
- Legacy-Id: 5818
2013-07-14 14:22:26 +00:00
Henrik Levkowetz ec2550db84 Merged [5613] from mcr@sandelman.ca: include a way to dump timedeltafields so that it is possible to save data to fixtures.
- Legacy-Id: 5785
Note: SVN reference [5613] has been migrated to Git commit 32cb1d83e78d890cc286fb47131489a74dda4b21
2013-06-10 20:33:07 +00:00
Ole Laursen 552e23d76a Fix spelling bug in ported mail_admins hack
- Legacy-Id: 3783
2011-12-23 12:50:51 +00:00
Ole Laursen 498dc38507 Port to Django 1.2, replacing built-in patched Django with Django 1.2.7 (with patches applied on top) and replacing South with South 0.7.3
- Legacy-Id: 3773
2011-12-15 14:13:54 +00:00
Henrik Levkowetz 4c7d5d41b3 Remove debug print statement
- Legacy-Id: 3333
2011-08-18 21:42:21 +00:00
Henrik Levkowetz 7a2859db46 Make django pick up app- and module-specific admin email addresses for stack trace messages.
- Legacy-Id: 3204
2011-07-23 12:48:08 +00:00
Henrik Levkowetz fa45244ef2 Apply patch from django ticket #101863, to provide more debugging information in production error notification emails.
- Legacy-Id: 2469
2010-08-12 13:06:42 +00:00
Henrik Levkowetz 266b7820d0 Merged from log:branch/2.00@2363: Current release branch head to trunk.
- Legacy-Id: 2365
2010-07-21 12:48:05 +00:00