Ze'ev Gilovitz
55dfbcd42a
Merge commit '19dcdc5442728451540d764f674f299cc2a80d48' into pk_related
...
* commit '19dcdc5442728451540d764f674f299cc2a80d48':
Try to recover an object by its ID before duplicating it.
2014-05-23 10:37:32 +08:00
Xavier Ordoquy
19dcdc5442
Try to recover an object by its ID before duplicating it.
2014-05-16 00:06:14 +02:00
Alex Louden
0f00a6a8dc
Merge branch 'bugfix/nested_through_many_to_many' into pk_related
...
* bugfix/nested_through_many_to_many: (29 commits)
Updated failing test from #1575
Add colon to time zone offset in readable_datetime_formats
Replaced singular "is" by plural "are"
Removed unnecessary "that"
Added missing "the" word
Added test case to check if the proper attributes are set on html widgets.
Failing test case: an item that wasn't in the relation before is created although it already exist.
Added an test on updates through many to many field.
Removed superfluous "./"s
Added missing "the" word
Added missing "to" word
Automatically set the field name as value for the HTML `id` attribute on the rendered widget.
Fix missing message in ValidationError
Mark strings in AuthTokenSerializer as translatable
Deal with reversed GenericFK.
Removed the former virtual field list.
Added help_text to expected response in test
Sync test result w/ new label
typo
Fixed the reversed relation for virtual fields (generic foreign keys).
...
2014-05-13 11:03:28 +08:00
Xavier Ordoquy
3ed62976ca
Merge remote-tracking branch 'origin/master' into bugfix/nested_through_many_to_many
2014-05-09 21:56:40 +02:00
Carlton Gibson
d69d975015
Merge pull request #1564 from alumni/master
...
Fixes #1535 (HTML widget missing `id` attribute)
2014-05-09 10:36:06 +02:00
Alex Louden
90cc4cab59
Test creating a model with a pk relation
2014-05-09 16:08:58 +08:00
Carlton Gibson
2768101441
Merge pull request #1576 from carltongibson/fix-#1575
...
Updated failing test from #1575
2014-05-08 11:41:33 +02:00
Carlton Gibson
0ff474d7c4
Updated failing test from #1575
2014-05-08 11:20:03 +02:00
Carlton Gibson
591d5240da
Merge pull request #1575 from ewdicus/iso8601
...
Add colon to time zone offset in readable_datetime_formats
2014-05-08 09:34:06 +02:00
Elliott
11115fde9c
Add colon to time zone offset in readable_datetime_formats
2014-05-07 11:37:20 -07:00
Tom Christie
4ce42fb72b
Merge pull request #1569 from sbellem/help-docs
...
Help docs
2014-05-06 15:33:40 +01:00
Sylvain Bellemare
e033a0b9a0
Replaced singular "is" by plural "are"
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
beb7253a96
Removed unnecessary "that"
2014-05-06 15:08:53 +02:00
Sylvain Bellemare
9dc5e15e5a
Added missing "the" word
2014-05-06 15:08:53 +02:00
Lucian Mocanu
708c7b3a81
Added test case to check if the proper attributes are set on html widgets.
2014-05-06 14:17:51 +02:00
Carlton Gibson
8e78a38de5
Merge pull request #1485 from Atrasoftware/master
...
Use help_text, verbose_name, editable attributes for related fields
2014-05-06 13:43:15 +02:00
Xavier Ordoquy
b90ebce00b
Failing test case: an item that wasn't in the relation before is created although it already exist.
2014-05-06 12:23:26 +02:00
Xavier Ordoquy
4bdb6787c1
Added an test on updates through many to many field.
2014-05-06 11:33:13 +02:00
Carlton Gibson
0097fbc861
Merge pull request #1561 from incuna/i18n
...
Mark strings in AuthTokenSerializer as translatable
2014-05-06 10:53:06 +02:00
Tom Christie
28691f2cb1
Merge pull request #1567 from sbellem/help-docs
...
Help docs
2014-05-05 19:47:02 +01:00
Sylvain Bellemare
9e3ba939e1
Removed superfluous "./"s
2014-05-05 20:28:00 +02:00
Sylvain Bellemare
05fc974dc9
Added missing "the" word
2014-05-05 14:44:54 +02:00
Sylvain Bellemare
cdc7d19034
Added missing "to" word
2014-05-05 14:41:10 +02:00
Lucian Mocanu
4e33ff05d9
Automatically set the field name as value for the HTML id attribute on the rendered widget.
2014-05-04 00:12:08 +02:00
Charlie Denton
ccf3c508bd
Fix missing message in ValidationError
2014-05-02 21:58:49 +01:00
Charlie Denton
c15dab903d
Mark strings in AuthTokenSerializer as translatable
2014-05-01 10:18:16 +01:00
Xavier Ordoquy
5dab5e4dcf
Deal with reversed GenericFK.
2014-04-30 23:51:07 +02:00
Xavier Ordoquy
9f9ad964cd
Removed the former virtual field list.
2014-04-30 22:59:43 +02:00
Xavier Ordoquy
d0cb00bd70
Merge remote-tracking branch 'reference/master' into bugfix/nested_through_many_to_many
...
Conflicts:
rest_framework/serializers.py
2014-04-30 22:28:14 +02:00
Xavier Ordoquy
5333a93126
Merge pull request #1409 from tuky/patch-1
...
remove spaces from META['HTTP_X_FORWARDED_FOR'] as throttle key
2014-04-30 21:38:21 +02:00
Xavier Ordoquy
d8fb81ceb1
Merge pull request #1391 from kaygorodov/master
...
Turning off pagination
2014-04-30 20:14:16 +02:00
Emanuele Pucciarelli
295a4ab62d
Added help_text to expected response in test
2014-04-29 22:16:11 +02:00
Emanuele Pucciarelli
fc44cd8d6a
Sync test result w/ new label
2014-04-29 21:45:57 +02:00
Emanuele Pucciarelli
f54399ea77
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
rest_framework/tests/models.py
2014-04-29 21:41:53 +02:00
Tom Christie
161270da99
Merge pull request #1553 from laurentbristiel/master
...
typo
2014-04-29 13:34:58 +01:00
Laurent Bristiel
d8cb85ef8f
typo
2014-04-28 22:00:36 +02:00
Tom Christie
1085b64fec
Merge pull request #1543 from sinitsynsv/master
...
Add help_text and verbose_name attribute mapping for related field
2014-04-28 20:23:12 +01:00
Xavier Ordoquy
ce2e55a513
Merge pull request #1552 from dpetzel/permissions_guide_response_typo
...
very minor typo in code example
2014-04-28 20:51:19 +02:00
dpetzel
5e8f05a8de
very minor typo in code example
2014-04-28 13:51:50 -04:00
Xavier Ordoquy
21810d2643
Merge pull request #1549 from maxpeterson/decode-generate-key
...
Ensure Token.generate_key returns a string.
2014-04-28 14:48:13 +02:00
Max Peterson
73597a16a2
Better Python < 3 compatibility.
2014-04-28 13:13:51 +01:00
Max Peterson
170fa10ae0
Python < 3 compatibility.
2014-04-28 13:10:34 +01:00
Max Peterson
1c777ffe8b
Ensure Token.generate_key returns a string.
2014-04-28 12:35:55 +01:00
Xavier Ordoquy
4a1ef6d4b1
Updated Django's versions.
2014-04-27 11:52:33 +02:00
Xavier Ordoquy
db4a8e6f6e
Merge pull request #1546 from KaczuH/kaczuh
...
Minor typo
2014-04-27 11:30:34 +02:00
Kamil Niski
82094554e5
Minor typo
2014-04-27 02:54:47 +02:00
Xavier Ordoquy
f4a82dd5da
Updated the release notes.
2014-04-24 14:33:36 +02:00
Sergey Sinitsyn
a6e525cf3a
Add help_text and verbose_name attribute mapping for related field
2014-04-24 15:58:53 +06:00
Xavier Ordoquy
1d404874b3
Merge pull request #1527 from Ian-Foote/generic_foreign_key
...
Set GenericForeignKey fields on object before save
2014-04-16 11:27:06 +02:00
Carlton Gibson
03b4c60b2d
Merge pull request #1518 from hroncok/patch-1
...
Add more TRAILING_PUNCTUATION to work with YAML
2014-04-15 15:59:25 +02:00
