Daniel Hensby
c31251911c
Merge branch '3.6' into 3
2018-04-18 13:14:46 +01:00
Daniel Hensby
8359f3dc97
Merge branch '3.5' into 3.6
2018-04-18 13:14:07 +01:00
Daniel Hensby
f30cd61cb7
Merge pull request #8009 from webbuilders-group/duplicate-many-many-fix
...
FIX: Duplicating many_many relationships looses the extra fields (fixes #7973 )
2018-04-18 13:11:22 +01:00
UndefinedOffset
36198c482e
Removed extra lookup of the list
2018-04-18 12:16:12 +01:00
UndefinedOffset
af3a9f3ec8
FIX: Duplicating many_many relationships looses the extra fields ( fixes #7973 )
2018-04-18 12:16:02 +01:00
Damian Mooyman
a761056021
Merge pull request #7994 from creative-commoners/pulls/3.6/phpdocs
...
Update some phpdocs that had typos, missing parts or incorrect formats
2018-04-13 09:07:40 +12:00
Robbie Averill
51d4d2c11e
Update some phpdocs that had typos, missing parts or incorrect formats
2018-04-11 20:12:38 +12:00
Robbie Averill
f5c1f181bb
Merge pull request #7990 from lerni/patch-2
...
README fix contributing-link, add httpS
2018-04-11 09:15:04 +12:00
Lukas
6bce88b6ba
README fix contributing-link, add httpS
2018-04-10 17:54:44 +02:00
Robbie Averill
cd7cb225a6
Merge pull request #7945 from kinglozzer/indexual-healing
...
FIX: Don't auto-generate indexes for Text field types (fixes #7900 )
2018-04-10 08:23:18 +12:00
Loz Calver
ebd3fb6526
FIX: Don't auto-generate indexes for Text field types ( fixes #7900 )
2018-04-09 16:44:31 +01:00
Daniel Hensby
b1f726a086
Merge branch '3.6' into 3
2018-03-28 11:08:01 +01:00
Daniel Hensby
b36ba81a40
Merge branch '3.5' into 3.6
2018-03-28 11:06:32 +01:00
Damian Mooyman
45a7b44a15
Merge pull request #7858 from dhensby/pulls/3.5/add-support-file
...
Add support.md file
2018-03-28 16:56:11 +13:00
Daniel Hensby
61463424ff
Support file grammer improvements
2018-03-27 11:49:04 +01:00
Daniel Hensby
e3cdefaa3c
Add support.md file
2018-03-27 11:43:13 +01:00
Robbie Averill
0d8915a898
Merge pull request #7947 from lerni/lerni-patch-1
...
Update link forum
2018-03-27 14:22:02 +13:00
Lukas
78896a73e2
Update link forum
2018-03-20 22:14:23 +01:00
Daniel Hensby
fcf0796dbd
Merge pull request #7936 from 3Dgoo/patch-1
...
Fixing HTMLEditorField API documentation
2018-03-15 12:16:23 +00:00
3Dgoo
61ce4771f9
Fixing HTMLEditorField API documentation
...
The SS3 API documentation for HTMLEditorField was broken before change #7904 :
http://api.silverstripe.org/3/HtmlEditorField.html
This was because there was an unescaped textarea tag in the class description. In #7904 we escaped the tag.
However in a similar pull request #7927 it was suggested we should use backticks instead.
This changes the documentation to use backticks around the textarea tag.
2018-03-15 21:27:45 +10:30
Robbie Averill
d64fedd5e1
Merge pull request #7927 from 3Dgoo/patch-3
...
Fixing FormAction API documentation
2018-03-15 16:12:20 +13:00
3Dgoo
05b2979458
Update FormAction.php
2018-03-15 13:38:15 +10:30
Daniel Hensby
2c6f588785
Merge branch '3.6' into 3
2018-03-14 13:53:37 +00:00
Daniel Hensby
a7931e7a11
Merge branch '3.5' into 3.6
2018-03-14 13:49:29 +00:00
3Dgoo
1d74b3a22d
Update FormAction.php
2018-03-14 13:34:12 +10:30
3Dgoo
97f22cbaa5
Fixing FormAction API documentation
...
The API documentation for FormAction is currently broken:
http://api.silverstripe.org/3/FormAction.html
This is because there are unescaped tags in the class description.
This fix changes the tag in the description to be escaped.
2018-03-14 11:27:15 +10:30
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6
2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5
Updated the DocBlock for ManyManyList's add() method
2018-03-11 14:49:17 -06:00
Daniel Hensby
cf35aadfe5
Merge pull request #7904 from 3Dgoo/patch-2
...
Fixing HTMLEditorField API documentation
2018-03-01 13:03:08 +00:00
3Dgoo
6523d7a6eb
Fixing HTMLEditorField API documentation
...
The API documentation for HTMLEditorField is currently broken:
http://api.silverstripe.org/3/HtmlEditorField.html
This is because there is unescaped start textarea tag in the class description.
This fix changes the tag in the description to be escaped.
2018-03-01 16:31:46 +10:30
Loz Calver
535d02ffeb
Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father
...
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
2018-02-28 10:06:36 +00:00
Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts
2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2
Remove short array syntax
2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288
Fix indentation
2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063
Back port 4.0 implementation of numeric/assoc key merging for summary_fields
2018-02-27 16:42:44 +13:00
Christopher Joe
86addea1d2
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
2018-02-16 23:34:05 +13:00
Daniel Hensby
09726333b7
Merge branch '3.6' into 3
2018-02-13 14:30:59 +00:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6
2018-02-13 14:30:29 +00:00
Daniel Hensby
1bec8a5d0c
Merge pull request #7850 from jonom/singleton-fix-3x
...
FIX Singleton creation
2018-02-13 08:29:47 +00:00
Jonathon Menz
c767e472dc
FIX DataObject singleton creation
...
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878 )
2018-02-12 20:30:35 -08:00
Robbie Averill
1a91806bcc
Merge pull request #7857 from dhensby/pulls/3.5/add-license
...
Create licence file so that GitHub (and humans) can more easily find it
2018-02-13 09:32:24 +13:00
Daniel Hensby
24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it
2018-02-12 11:21:03 +00:00
Daniel Hensby
4ca385e033
Partial revert of #7665 - overzealous string renames
2018-02-09 19:27:45 +00:00
Daniel Hensby
85e97d204b
Partial revert of #7665 - bad docblock changes
2018-02-09 19:27:11 +00:00
Daniel Hensby
5d00d28b2f
Partial revert #7665 - undo changes to thirdparty dir
2018-02-09 18:43:02 +00:00
Daniel Hensby
747a98a07f
Merge branch '3.6' into 3
2018-02-09 13:21:15 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6
2018-02-09 13:20:38 +00:00
Daniel Hensby
2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values
...
Fix for badly escaped values in CSV export
2018-02-08 13:45:52 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton
2018-02-08 12:26:29 +00:00
Damian Mooyman
f4b13fb2c4
Merge remote-tracking branch 'origin/3.6' into 3
...
# Conflicts:
# model/DataQuery.php
2018-02-05 16:53:15 +13:00
