forked fromsymfony/symfony-docs
- Notifications
You must be signed in to change notification settings - Fork0
Commita650b93
committed
minorsymfony#3506 Nykopol overriden options (weaverryan)
This PR was merged into the 2.3 branch.Discussion----------Nykopol overriden optionsSeesymfony#3417 - this is just a rebase to continue it :)| Q | A| ------------- | ---| Doc fix? | no| New docs? | yes| Applies to | 2.3| Fixed tickets |symfony#3412Thanks!Commits-------e574e97 Removing an extra line thanks to@xabbuh4f6cb9d Some additional tweaks and probably some merge conflict fixes362c8b4 document overriden options of choice field70feefd document overriden options of checkboxc62cd13 correct overriden option of button and add checkbox overriden optionab4aafe correct overriden option of button and add checkbox overriden optionFile tree
5 files changed
+54
-9
lines changed- reference/forms/types
- options
5 files changed
+54
-9
lines changedLines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 |
| - | |
| 21 | + | |
22 | 22 |
| |
23 | 23 |
| |
24 | 24 |
| |
|
Lines changed: 11 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
| 16 | + | |
| 17 | + | |
| 18 | + | |
16 | 19 |
| |
17 |
| - | |
18 |
| - | |
| 20 | + | |
19 | 21 |
| |
20 | 22 |
| |
21 | 23 |
| |
| |||
44 | 46 |
| |
45 | 47 |
| |
46 | 48 |
| |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
47 | 56 |
| |
48 | 57 |
| |
49 | 58 |
| |
|
Lines changed: 25 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
23 | 27 |
| |
24 | 28 |
| |
25 | 29 |
| |
26 | 30 |
| |
27 | 31 |
| |
28 | 32 |
| |
29 |
| - | |
30 | 33 |
| |
31 | 34 |
| |
32 | 35 |
| |
33 | 36 |
| |
34 |
| - | |
35 | 37 |
| |
36 | 38 |
| |
37 | 39 |
| |
| |||
109 | 111 |
| |
110 | 112 |
| |
111 | 113 |
| |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
112 | 135 |
| |
113 | 136 |
| |
114 | 137 |
| |
| |||
126 | 149 |
| |
127 | 150 |
| |
128 | 151 |
| |
129 |
| - | |
130 |
| - | |
131 | 152 |
| |
132 | 153 |
| |
133 | 154 |
| |
134 | 155 |
| |
135 | 156 |
| |
136 | 157 |
| |
137 | 158 |
| |
138 |
| - | |
139 |
| - | |
|
Lines changed: 8 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + |
Lines changed: 9 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + |
0 commit comments
Comments
(0)