928 Commits

Author SHA1 Message Date
Tim Hovius
96cfab973c Added translation to description
The labels of a field are usually always translated. But this does not happen in the documentation.
2016-04-19 21:37:22 +02:00
William Durand
718dfc6e9c Merge pull request #827 from TannerPO/patch-1
Rename other-bundle-annotations.Rst to other-bundle-annotations.rst
2016-03-22 08:28:24 +01:00
Tanner Newton
8cb2847af4 Rename other-bundle-annotations.Rst to other-bundle-annotations.rst 2016-03-21 19:30:50 -07:00
William Durand
4ed06b40f8 Merge pull request #826 from crazyball/patch-1
Fixed link to documentation
2016-03-21 15:01:15 +01:00
Ambrosini Loïc
f6ec8ba6b1 Fixed link to documentation
Link to ApiDoc documentation is now with ReST format instead of Markdown
2016-03-21 14:47:18 +01:00
William Durand
6793b70157
Prepare 2.12.0 release 2016-03-21 12:19:12 +01:00
William Durand
4a95c81914 Merge pull request #814 from javiereguiluz/fix_813
Transformed documentation to RST format
2016-03-21 11:31:18 +01:00
William Durand
476348de54 Merge pull request #825 from nelmio/conflict
Mark symfony ^2.7.7 as conflict
2016-03-21 11:30:06 +01:00
William Durand
4986e02ec1
Mark symfony ~2.7.8 as conflict 2016-03-21 11:18:46 +01:00
Javier Eguiluz
db5303fcd7 Transformed all files 2016-03-05 19:49:21 +01:00
William Durand
2a0f95eac0 Merge pull request #792 from rodrigm/master
Fix #565
2016-02-24 19:00:28 +01:00
Rodrigo Gómez
89f459dc07 Fix #565
Change PUT by PATCH

Refactor tests for #565
2016-02-24 17:57:22 +01:00
William Durand
4381f065cb Merge pull request #794 from mcfedr/patch-1
Remove incorrect usage of hasOption
2016-02-24 17:51:24 +01:00
William Durand
cec5108133 Merge pull request #781 from AlmogBaku/feature/textareaField
Add textarea type for sandbox
2016-02-24 17:50:13 +01:00
William Durand
364ef73680 Merge pull request #791 from Padam87/response-map
Use the response map in the html view
2016-02-24 17:49:33 +01:00
William Durand
65a5159ce9 Merge pull request #796 from zhukovra/master-array-requirements
Fix Array to string conversion error on array requirements
2016-02-24 17:47:14 +01:00
William Durand
dd6a5e32c3 Merge pull request #799 from debesha/master
Fixed bug with wrong form parsing when several custom inner types exist
2016-02-24 17:46:38 +01:00
William Durand
4e65cd3bc3 Merge pull request #805 from obense/master
Fix Collection Type options - Symfony 2.8 Support
2016-02-24 17:45:32 +01:00
William Durand
f6e952ffe1 Merge pull request #810 from teohhanhui/fix-678
Handle circular references in DunglasApiParser
2016-02-24 17:44:50 +01:00
William Durand
028b09e90a Merge pull request #772 from richaas/master
Added xhrFields: { withCredentials: true } to ajaxOptions
2016-02-24 17:43:14 +01:00
Teoh Han Hui
c1c711bc26 Handle circular references in DunglasApiParser
Fixes #678, reverts #800
2016-02-18 23:18:43 +08:00
William Durand
07545629aa Merge pull request #800 from dunglas/fix_678
Handle circular references in DunglasApiParser
2016-02-14 17:45:10 +01:00
Olivier Bense
18c9fb8c29 Fix Collection Type options - Symfony 2.8 Support 2016-02-09 14:32:49 +01:00
Kévin Dunglas
abb100b29b Handle circular references in DunglasApiParser. Close #678. 2016-02-04 08:34:34 +01:00
Dmitry Malyshenko
0ed53788d2 Fixed bug with wrong form parsing when several custom inner types exist 2016-02-03 10:02:33 +00:00
Zhukov Roman
f2fc6b47c0 Fix Array to string conversion error on array requirements
Fixes #564
2016-02-01 14:33:17 +03:00
Fred Cox
9b734b22bd Remove incorrect usage of hasOption
`hasOption` is confusingly named, it actually checks that the option has been created, not if the user has passed the option. So in this case its always true.
Also changed a weird usage of `in_array`.
2016-01-29 10:56:25 +02:00
Adam Prager
7919b24971 Use the response map in the html view 2016-01-26 04:36:38 +01:00
AlmogBaku
3bc98723fe Add textarea type for sandbox 2016-01-08 20:34:15 +02:00
William Durand
5d9c47bbad Merge pull request #780 from damienalexandre/fixArrayToString
Fix Array to string conversion error on array requirements
2016-01-08 13:33:10 +01:00
Damien Alexandre
306f2c47cf Fix Array to string conversion error on array requirements
Fix https://github.com/nelmio/NelmioApiDocBundle/issues/773
See https://github.com/FriendsOfSymfony/FOSRestBundle/pull/1015
2016-01-08 13:04:25 +01:00
Richard
4744de98fb Added xhrFields: { withCredentials: true } to ajaxOptions to enable
browser authentication for cross origin API requests.
2016-01-06 10:00:21 +01:00
William Durand
1ae2cfa9a5 Merge pull request #768 from SHyx0rmZ/fix-sf-30-dump-command-enter-scope
Check for deprecated method enterScope() in DumpCommand
2015-12-16 16:17:51 +01:00
Patrick Pokatilo
8c336487e7 Check for deprecated method enterScope() in DumpCommand 2015-12-15 17:04:17 +01:00
William Durand
93b189b16a Merge pull request #766 from odolbeau/avoid-array-to-string-conversion
Avoid "array to string conversion" error
2015-12-11 09:12:17 +01:00
Olivier Dolbeau
d3bc49c3d1 Avoid "array to string conversion" error 2015-12-10 09:23:57 +01:00
William Durand
19d4e37365 Merge pull request #765 from Ener-Getick/DEPRECATION
Fix a deprecation
2015-12-08 14:19:42 +01:00
Ener-Getick
24fa5dfbc0 Fix a deprecation 2015-12-08 13:06:38 +01:00
William Durand
49238f44aa
Prepare 2.11.0 release 2015-12-04 09:15:49 +01:00
William Durand
d5395cc0ea
Fix CS 2015-12-04 09:15:21 +01:00
William Durand
1df3ddf49f Merge pull request #752 from Ener-Getick/SF3
Add symfony 3.0 support
2015-12-04 09:09:28 +01:00
Ener-Getick
0461f5ce1d Optimize travis 2015-12-04 08:19:54 +01:00
Ener-Getick
5541412e69 Fix FOSRestBundle compatibility 2015-12-02 16:19:24 +01:00
Ener-Getick
67b7b46627 Add symfony 3.0 support 2015-12-02 16:19:12 +01:00
William Durand
97707ea5f4 Merge pull request #750 from piotrantosik/host-placeholder
Fix route host with placeholder
2015-11-25 10:13:47 +01:00
Piotr Antosik
dd8bdd2070 Fix route host with placeholder 2015-11-23 00:18:50 +01:00
William Durand
4fad200d7b Merge pull request #758 from dunglas/master
Fix tests related to DunglasApiBundle
2015-11-22 08:22:33 +01:00
Kévin Dunglas
224af02f7f Fix tests related to DunglasApiBundle 2015-11-21 18:36:13 +01:00
William Durand
eafa2ade0b Merge pull request #749 from fstr/ISSUE-747-JSP
Introduced default-value parameter to JsonSerializableParser
2015-11-10 14:39:07 +01:00
Florian Strübe
aa10f9a2da Introduced default-value parameter to JsonSerializableParser
JSP is now able to set a default value for scalar types
This makes merging the parser result with other parser results easier
and gives some additional info when creating docs

Removed PHP doc comment block
2015-11-10 14:34:53 +01:00