p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,276 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

15276 Commits

Author SHA1 Message Date
Loic Bistuer b7556a4980 [1.6.x] Fixed #20772 -- Fixed minor typo in form media docs. 
Backport of aa41eb9b8b from master
 2013-07-19 05:19:46 -04:00
Loic Bistuer c660f0e985 [1.6.x] Fixed #20767 -- Fixed ModelAdmin.preserve_filters for namespaced URLs. 
Thanks Collin Anderson for the report.

Backport of 2fc6c9472c from master.
 2013-07-18 18:23:21 -04:00
Tim Graham 579ca9ee8d [1.6.x] Fixed #20762 -- Clarified that add_fieldsets is not a standard ModelAdmin attribute. 
Backport of dce8945ea6 from master
 2013-07-18 12:41:51 -04:00
Matt Deacalion Stevens fcd5f3a8d9 [1.6.x] Atom specification URL updated 
Changed to the URL of the official RFC for Atom, since Atomenabled.org
is just a holding page.

Backport of beefc97171 from master
 2013-07-18 08:47:58 -04:00
Tim Graham 1641aa7119 [1.6.x] Fixed #20763 -- Typo in tutorial 3. 
Thanks crichard@ for the report.

Backport of fd95dc9e27 from master
 2013-07-18 08:06:50 -04:00
Alasdair Nicol 9d9f670d93 [1.6.x] Fixed typo in inspectdb docs 
Backport of 1131d4191f from master
 2013-07-18 07:46:42 -04:00
Tim Graham 0db3c45f80 [1.6.x] Fixed #20756 -- Typo in uWSGI docs. 
Backport of a3242dc9fe from master
 2013-07-17 06:51:34 -04:00
Loic Bistuer ed473d61e5 [1.6.x] Reworked docs for ModelForm validation. 
Backport of fba6c2ede7 from master
 2013-07-16 19:21:55 -04:00
Tim Graham 3d25f592fe [1.6.x] Fixed some markup in docs/ref/templates/api.txt 
Backport of 862a04a56d from master
 2013-07-15 11:31:38 -04:00
David Binetti f8fd38b560 [1.6.x] Fixed grammatical error in auth docs 
Backport of 51b50c47c7 from master
 2013-07-14 12:35:26 -04:00
Tim Graham e5241902f3 [1.6.x] Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases 
Thanks simonpercivall.

Backport of d9c580306c from master
 2013-07-13 17:46:37 -04:00
Tim Graham 26b88e7658 [1.6.x] Fixed a deprecation warning in a selenium test. 
Backport of 9b471a8fe3 from master
 2013-07-13 13:22:00 -04:00
Claude Paroz db33b25e86 [1.6.x] Fixed #20582 -- Allowed default Form.label_suffix to be translated 
Thanks Tim Graham for the review.
Backport of 7557207983 from master.
 2013-07-13 16:20:09 +02:00
Tim Graham 7f210563ab [1.6.x] Fixed backport of #20740 2013-07-12 18:00:09 -04:00
Tim Graham 45fab74561 [1.6.x] Fixed #20740 -- GenericIPAddressField should pass protocol to formfield() 
Thanks Jeff250.

Backport of f2cb94f1c0 from master
 2013-07-12 16:06:43 -04:00
Tim Graham b30a872973 [1.6.x] Fixed #20653 -- Renamed checksetup -> check missed in [03465639] 
Thanks CollinAnderson for the report.

Backport of a7d97a6778 from master
 2013-07-12 12:50:53 -04:00
Tim Graham 1c8e539a77 [1.6.x] Fixed #17528 -- Documented that add() and remove() with a many-to-many relationship do not call Model.save() 
Backport of 3cdeb572d7 from master
 2013-07-12 06:22:19 -04:00
Christopher Medrela 9bb04b1a6b [1.6.x] Fixed #20735 -- clarified ManyToManyField constructor doc 
Backport of ac223ff6d1 from master
 2013-07-12 06:06:17 -04:00
Tim Graham fe0a563f81 [1.6.x] Fixed #20730 -- Fixed "Programmatically creating permissions" error. 
Thanks glarrain for the report.

Backport of 684a606a4e from master
 2013-07-11 11:07:51 -04:00
Tim Graham f93b2fe7e6 [1.6.x] Fixed #20733 -- Typo in docs/ref/class-based-views/generic-display.txt 
Thanks ijl20@ for the report.

Backport of ecd746191c from master
 2013-07-11 07:37:42 -04:00
Tim Graham 2e3250fc90 [1.6.x] Added some missing test requirements in the docs; refs #19196 
Backport of 77856dc875 from master
 2013-07-10 12:02:56 -04:00
Tim Graham aecbaaed0c [1.6.x] Fixed #19196 -- Added test/requirements 
Backport of 4d92a0bd86 from master.
 2013-07-10 09:37:15 -04:00
Aymeric Augustin a2b4af3a1a Fixed #20724 -- Test failure on SQLite. 
This test failure happened if the connection's NAME was set to a file
system path, and its TEST_NAME wasn't.

Thanks Claude for the report.

Conflicts:
	tests/transactions_regress/tests.py

Backport of 404870ee1f from master.
 2013-07-09 21:43:20 +02:00
Aymeric Augustin d200405471 Avoided transaction.set_autocommit in tests. 
It doesn't work as one might expect on a certain database backend where
autocommits_when_autocommit_is_off = True. That backend happens to be
popular for running tests.

Backport of 38bc581bc0 from master.
 2013-07-09 21:42:11 +02:00
Shai Berger ae685e54cb [1.6.x] Fixed last_executed_query test failure on Oracle 
Backport of c0a4894dca from master.
 2013-07-09 19:52:16 +02:00
Tim Graham 7788c71890 [1.6.x] Fixed #20722 -- Fixed MemcachedCache backend get_many on Python 3. 
Backport of 3c736207a3 from master
 2013-07-09 11:57:44 -04:00
Claude Paroz e2c1e9ef55 [1.6.x] Partial revert of commit 2bf403ecbd 
Homework: write 100 times geoapp is not geogapp.
Backport of 57815e2630 from master.
 2013-07-09 14:34:16 +02:00
SusanTan c1b24b09f4 [1.6.x] Fixed #18261 -- Clarified 'project root directory' 
Backport of ef3fddf26e from master
 2013-07-09 07:16:31 -04:00
Tim Graham f03398a246 [1.6.x] Fixed #18944 -- Documented PasswordResetForm's from_email argument as a backwards incompatible change for 1.3 
Thanks DrMeers for the report.

Backport of dab921751d from master
 2013-07-08 15:06:31 -04:00
James Bennett b2afe39663 [1.6.x] Fixed #19695 -- Retitle "Form Media" to "Form Assets". 
Backport of c0f03175ce from master
 2013-07-08 14:09:02 -04:00
Tim Graham 730069197f [1.6.x] Fixed #16965 -- Clarified Formset can_delete docs. 
Thanks gregcorey@ for the suggestion.

Backport of 660c30ed95 from master
 2013-07-08 12:21:25 -04:00
Tim Graham 67a6b5e53f [1.6.x] Fixed #20493 -- Added a warning that objects may not be picklable across Django versions 
Thanks cataliniacob for the suggestion and review.

Backport of 1084575163 from master
 2013-07-08 09:59:02 -04:00
Tim Graham cf8d0933cb [1.6.x] Fixed #12346 -- Added a note on how to validate InlineFormSets. 
Thanks johnsmith for the suggestion.

Backport of 181f63c22d from master
 2013-07-08 08:31:46 -04:00
Claude Paroz 0a84cbadb7 [1.6.x] Completed some more name_local names 
Backport of 9383e37a7.
 2013-07-08 12:04:38 +02:00
Mathias Andre ced144155e [1.6.x] Fixed #20716 --Missing 'name_local' translation 
Added 'name_local' translation for Albanian in LANG_INFO
Backport of 8c18f6f61c from master.
 2013-07-08 12:04:10 +02:00
SusanTan 40d2687787 [1.6.x] Fixed #20711 -- Fixed broken link in timesince.py docstring 
Backport of d63327d843 from master.
 2013-07-07 12:40:44 -04:00
Tim Graham a22b2aea19 [1.6.x] Fixed #14006 -- Documented that Field's 'description' attribute is interpolated with field.__dict__ 
Thanks abeld for the suggestion.

Backport of 2d96e660f9 from master.
 2013-07-06 18:34:29 -04:00
Claude Paroz a9dd6221af [1.6.x] Fixed #20224 -- Update docs examples which mention __unicode__ 
Thanks Marc Tamlyn and Tim Graham for the review.
Backport of 7442eb1a24 from master.
 2013-07-05 19:30:08 +02:00
Tim Graham 430aae1b0d [1.6.x] Fixed #20561 -- Emphasized that QuerySet.distinct([*fields]) is only supported by Postgres. 
Thanks jtiai for the suggestion.

Backport of 577b0f9189 from master.
 2013-07-05 07:21:13 -04:00
Tim Graham 14a5b79e29 [1.6.x] Fixed #19539 -- Updated custom model fields example for Python 3. 
Thanks astorije@ for the report.

Backport of b9fceadfd4 from master.
 2013-07-05 06:54:34 -04:00
hekevintran 80dc8175a6 [1.6.x] fixed grammar 
Backport of 62a826ab31 from master.
 2013-07-05 10:58:35 +01:00
Tim Graham d14db25fee [1.6.x] Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for default db. 
Thanks simonpercivall.

Backport of 2cbd579efe from master.
 2013-07-04 20:15:27 -04:00
Tim Graham 541a30c376 [1.6.x] Fixed #20134 -- Correct list of fields that UserManager requires. 
Thanks semenov and pegler.

Backport of da5069f68f from master.
 2013-07-04 10:20:02 -04:00
Tim Graham 23748c483b [1.6.x] Fixed #20673 -- Clarified that HttpRequest.user uses AUTH_USER_MODEL. 
Thanks littlepig for the report.

Backport of f407f75aae from master.
 2013-07-04 09:34:02 -04:00
Tim Graham 9687e387d8 [1.6.x] Fixed #12579 -- Noted QuerySet.get_or_create() depends on database unique constraints. 
Thanks timmolendijk, jdunck, vijay_shanker, and loic84.

Backport of 428de2e339 from master.
 2013-07-04 08:32:49 -04:00
Tim Graham 25b9939fed [1.6.x] Fixed #20690 -- Mentioned LOCALE_PATHS earlier in translation docs. 
Thanks rene@ for the suggestion.

Backport of 231e31c690 from master.
 2013-07-04 05:45:16 -04:00
Simon Charette 2de0d4c452 [1.6.x] Fixed #20675 -- `check_password` should work when no password is specified. 
The regression was introduced by 2c4fe761a. refs #20593.

Backport of 8759778185 from master.
 2013-07-03 14:12:56 -04:00
SusanTan 75041d5ea3 [1.6.x] Fixed #20609 -- Documented how to use request.user with RequestFactory 
Thanks michel@ for the suggestion.

Backport of 067e0424ce from master.
 2013-07-03 11:11:04 -04:00
Tomáš Ehrlich 2f9e5483f6 [1.6.x] Fixed #20687 -- Added documentation for django.core.signing API. 
Thanks Baptiste Mispelon for the suggestion.

Backport of c5bc98d7e1 from master.
 2013-07-03 10:38:53 -04:00
Claude Paroz 295a925cef [1.6.x] Added check when fetching and updating translations from Transifex 
So as syntax errors in po files don't go unnoticed. Refs #20695.
Backport of 63b215591 from master.
 2013-07-03 16:15:52 +02:00