Will Rossiter
38ca214e2b
Merge pull request #4266 from mediabeastnz/patch-2
...
Completed missing comment ending
2015-06-10 17:41:23 +12:00
Myles Beardsmore
67e1cee64a
Completed missing comment ending
...
Completed missing comment ending
2015-06-10 16:56:31 +12:00
Damian Mooyman
c877882f7e
Merge pull request #4170 from kinglozzer/pulls/4137-leftandmain-tree
...
Store current page before marking tree nodes (fixes #4137 , fixes silverstripe/silverstripe-cms#1135 )
2015-06-10 09:18:05 +12:00
Daniel Hensby
c062670ba3
Removing unreachable test line
2015-06-09 16:01:33 +01:00
Loz Calver
c9d410d49e
Merge pull request #4262 from SpiritLevel/patch-1
...
Update 03_Environment_Management.md
2015-06-09 09:27:43 +01:00
Will Rossiter
29906f1599
Merge pull request #4199 from mthomsonnz/patch-2
...
DOCS: Add links to lessons 10-16 to the tutorials page
2015-06-09 17:19:41 +12:00
David Alexander
5a323f7fe3
Update 03_Environment_Management.md
2015-06-09 16:53:20 +12:00
Damian Mooyman
b42ddd107c
Merge pull request #3499 from colymba/ie-multi-file-upload-fix
...
FIX #3458 iframe transport multi file upload FIX #3343 , FIX #3148
2015-06-09 13:22:10 +12:00
Sam Minnée
2fa6f27073
Removed Mateusz from core committer list.
...
Mateusz has decided to step down from the core committers group.
2015-06-08 22:28:29 +12:00
Daniel Hensby
d3b7abb0b5
Merge pull request #4242 from jonom/docs-database-defaults
...
DOCS: Added default value examples
2015-06-02 18:01:06 +01:00
Sam Minnée
0f3e62f613
Merge pull request #4245 from tractorcow/pulls/3.1.14/fix-api
...
FIX Incorrect env setting in 3.1.13
2015-06-02 15:16:48 +12:00
Damian Mooyman
0319f7855b
FIX Incorrect env setting in 3.1.13
2015-06-02 12:27:08 +12:00
Ingo Schommer
dac1b5818b
Merge pull request #4217 from tractorcow/pulls/3.1/fix-directortest
...
BUG Fix DirectorTest failing when run with sake
2015-06-01 17:34:26 +12:00
Ingo Schommer
f3c722d508
Merge pull request #4195 from oddnoc/phpunit-version
...
DOC: Correct composer invocation to install phpunit
2015-06-01 15:00:55 +12:00
Jonathon Menz
12e26407ef
DOCS: Added default value examples
2015-05-29 14:27:22 -07:00
Damian Mooyman
b92d47220b
Merge pull request #4239 from oddnoc/nginx-x-forwarded-host-docs
...
Add defense against SS-2015-013 to nginx example
2015-05-29 12:53:14 +12:00
Fred Condo
9efc384582
Add defense against SS-2015-013 to nginx example
2015-05-28 17:00:33 -07:00
Damian Mooyman
25f2689833
Merge pull request #4202 from jonom/fix-treedropdown-folders
...
FIX: TreeDropdownField Folder expansion
2015-05-29 10:14:46 +12:00
Damian Mooyman
e733efa195
Merge pull request #4206 from gregsmirnov/pulls/localised-moneyfield-fix
...
BUG Fixed handling of numbers in certain locales
2015-05-29 09:21:43 +12:00
Loz Calver
8a74dc3e0f
Merge pull request #4237 from silverstripe/docs-fix-caption-field-name
...
updated field name for caption text field.
2015-05-28 14:28:36 +01:00
Will Morgan
9324cc916c
Merge pull request #4224 from camfindlay/patch-25
...
DOCS Fix link to common subclasses of form fields
2015-05-28 13:41:02 +01:00
Will Morgan
e930bcf7b9
Merge pull request #4225 from camfindlay/patch-26
...
DOCS Fix issue with bullets and backticks thinking they are code blocks
2015-05-28 13:39:36 +01:00
Myles Beardsmore
06730bc1b3
updated field name for caption text field.
2015-05-28 13:34:59 +01:00
Damian Mooyman
50e33b8e5e
Merge remote-tracking branch 'origin/3.1.13' into 3.1
2015-05-28 19:08:12 +12:00
Damian Mooyman
04b803dfc6
Added 3.1.13 changelog
2015-05-28 18:59:11 +12:00
Damian Mooyman
f55eb5e2cf
Merge pull request #4236 from nyeholt/fix_hostname-whitelist
...
FIX Allow users to specify allowed hosts
2015-05-28 18:09:59 +12:00
Marcus Nyeholt
9c8fa51321
FIX Allow users to specify allowed hosts
...
Allow users to explicitly state which Hosts are allowed to be requested via
this application instance to avoid Host: header forgery attacks.
2015-05-28 15:58:39 +10:00
Hamish Friedlander
b21fd8480a
Merge pull request #4233 from tractorcow/3.1.13
...
Fix merge / test regressions
2015-05-28 17:01:12 +12:00
Damian Mooyman
0a8f328947
Fix merge / test regressions
2015-05-28 16:59:05 +12:00
Damian Mooyman
e8d652b1aa
Merge pull request #4234 from michalkleiner/patch-2
...
DOCS Fixed code example for Requirements::set_write_js_to_body call
2015-05-28 16:06:58 +12:00
Michal Kleiner
4843913f31
Update 03_Requirements.md
...
Fixed code example for setting write_js_to_body value to false
2015-05-28 14:28:05 +12:00
Damian Mooyman
a978b891e1
BUG Fix handling of empty parameter token
2015-05-28 10:13:10 +12:00
Damian Mooyman
75137dbab2
Ensure only trusted proxy servers have control over certain HTTP headers
2015-05-28 10:12:46 +12:00
Damian Mooyman
22a35e48a9
BUG Fix malformed urls redirecting to external sites
2015-05-28 10:12:18 +12:00
Damian Mooyman
79cfa2bb64
Bug fix sqlquery select
2015-05-28 10:11:32 +12:00
Jonathon Menz
869e69a9b2
BUG: Clicking icon in site tree link fails
...
Code removed here intentonally prevented node selection when dragging but at the cost of clicks on site tree icons selecting the node but not loading the link. Since it's possible to drag a site tree item from the title, not just the icon, think it's better to remove this for now (choosing the lesser of two evils). A full fix to prevent node selection should follow, perhaps during an upgrade to jstree.
2015-05-27 09:22:42 -07:00
Jonathon Menz
a56d08b1ae
FIX: TreeDropdownField Folder expansion
...
When viewing a Folder tree, an expansion icon was shown if the Folder had *any* children, but it should be restricted to children that are Folders.
2015-05-27 09:22:42 -07:00
Loz Calver
50d88edd37
Merge pull request #4230 from 3Dgoo/patch-1
...
Fixed typo in GridField API doc
2015-05-27 10:43:58 +01:00
3Dgoo
23c098cd20
Fixed typo in GridField API doc
2015-05-27 10:04:16 +09:30
Damian Mooyman
d43115e320
Merge pull request #4220 from gregsmirnov/pulls/fix-setting-Page-LastEdited-from-fixture-2
...
BUG Fixed setting LastEdited for DataObject with class ancestry
2015-05-26 13:48:48 +12:00
Cam Findlay
15ea4aa54c
DOCS Fix issue with bullets and backticks thinking they are code blocks
...
Thanks to @stojg for reporting.
2015-05-23 17:58:51 +12:00
Cam Findlay
058a08f84f
DOCS Fix link to common subclasses of form fields
2015-05-23 17:30:09 +12:00
Loz Calver
cc6a2ef757
Merge pull request #4219 from gregsmirnov/pulls/3.1/fixed-filesystem-mkdir-expects-one-parameter
...
Fixed Filesystem::mkdir() expects one parameter
2015-05-22 21:32:27 +01:00
Will Morgan
ba98c74df9
Merge pull request #4214 from rotassator/patch-2
...
Template Syntax doco grammar cleanup
2015-05-22 10:35:20 +01:00
Gregory Smirnov
94f6a13729
BUG Fixed setting LastEdited for DataObject with class ancestry
2015-05-22 11:32:59 +02:00
Gregory Smirnov
bfa57af37e
Fixed Filesystem::mkdir() expects one parameter
2015-05-22 11:11:53 +02:00
Damian Mooyman
e0710ae4e4
BUG Fix DirectorTest failing when run with sake
2015-05-22 14:48:35 +12:00
Steve Dixon
63eb6c2a24
Template Syntax doco grammar cleanup
...
Some simple edits to improve some grammatical mistakes and consistency.
2015-05-21 12:56:26 +10:00
Ingo Schommer
85cff0ad8f
Merge pull request #4210 from gregsmirnov/pulls/fix-transliterator-for-polish-locale
...
fixed Transliterator for pl_PL letters
2015-05-21 08:17:47 +12:00
Gregory Smirnov
77a50d153e
fixed Transliterator for pl_PL letters
2015-05-20 19:05:48 +02:00
