Commit Graph

14461 Commits

Author SHA1 Message Date
Damian Mooyman
a72bd16f42 API Deprecate delete in favour of archive
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
2015-06-03 14:24:27 +12:00
Robert Reiz
747e87baeb Adding dependency badge and reference badge 2015-06-03 08:57:07 +12:00
Damian Mooyman
51df4df9f1 Fix merge regressions / errors 2015-06-02 20:19:12 +12:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
2015-06-02 19:13:38 +12: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
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
71d766a8d8 Merge pull request #4108 from Turnerj/fix/many-many-extrafields-performance
Fix/Performance: Combine multiple queries into one for ManyManyList::getExtraData
2015-05-29 10:26:56 +12: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
Damian Mooyman
161cd5c14d Merge pull request #4203 from scott1702/sharedraftcontent-module-fix
Fix broken inline buttons
2015-05-26 13:24:59 +12:00
scott1702
f9bd068ffe Fix broken share draft button 2015-05-26 10:19:47 +12:00
Damian Mooyman
e2f180db86 Merge pull request #4228 from flashbackzoo/pulls/menu-fix
Fix left nav styling.
2015-05-25 17:14:31 +12:00
David Craig
8b29732291 Fix left nav styling.
- Incorrent collapsed state on reload, when 'flush' param is not present.
- The content area had a horizontal scroll in split-mode.
2015-05-25 16:55:25 +12:00
Damian Mooyman
1b123c4ffb Merge pull request #4212 from flashbackzoo/pulls/left-nav-behaviour
Add 'sticky' behaviour to left menu
2015-05-25 14:44:53 +12:00
David Craig
3bac6fadfe Add 'sticky' behaviour to left menu 2015-05-25 12:09:14 +12:00
Damian Mooyman
7f61dbdea5 Merge pull request #4227 from scott1702/compass-compile
Update css to most recent changes
2015-05-25 10:50:33 +12:00
scott1702
2f2ba8600b Run compass compile 2015-05-25 10:44:31 +12:00
Damian Mooyman
2936e55a1a Merge pull request #4223 from kinglozzer/pulls/3923-groupeddropdownfield-validation
Add validation for GroupedDropdownField, validate against disabled items (closes #3923)
2015-05-25 10:34:11 +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
Loz Calver
68d8df4e04 FIX: DropdownField didn't consider disabled items 2015-05-22 21:14:11 +01:00
Loz Calver
dfb9b76b95 Add validation for GroupedDropdownField (closes #3923) 2015-05-22 20:55:54 +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