Commit Graph

1460 Commits

Author SHA1 Message Date
Will Morgan
bec7799957 Merge pull request #4345 from phillprice/patch-11
DOCS: Link to member custom code change is broken
2015-06-26 09:11:04 +01:00
Phill Price
1bbcde908a Broken link in using custom code for tracking member logging 2015-06-25 14:20:42 +01:00
David Alexander
fda2ad6600 DOCS: Corrected version of master in line 22. 2015-06-24 21:07:32 +12:00
Will Morgan
21e45eed60 Merge pull request #4339 from SpiritLevel/patch-7
DOCS: typos, rewording, updated links.
2015-06-23 09:28:13 +01:00
David Alexander
71c2729aeb DOCS: typos, rewording, updated links. 2015-06-23 14:30:41 +12:00
David Alexander
2125afb2f5 DOCS: fixed broken link 2015-06-23 11:57:54 +12:00
Cam Findlay
449ee6296c DOCS Remove duplicate core committers doc after forward port of branches for 3.2 beta1 release 2015-06-22 11:35:58 +12:00
David Alexander
c4583d4fb9 Update 01_Code.md
Updated link.
2015-06-21 12:23:40 +12:00
Daniel Hensby
a94103245d DOCS Bump PHP version in Server Requirements 2015-06-20 11:32:29 +01:00
Damian Mooyman
9cccfec1a0 Added 3.2.0-beta1 changelog 2015-06-19 19:22:38 +12:00
Damian Mooyman
1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
Daniel Hensby
4dec821f63 Merge pull request #4297 from SpiritLevel/patch-2
DOCS Update 03_Documentation.md
2015-06-18 12:00:49 +01:00
Daniel Hensby
8e96ea3f0f Merge pull request #4302 from SpiritLevel/patch-6
Update index.md
2015-06-18 11:41:30 +01:00
David Alexander
a4ec9b5d4f Update 00_Issues_and_Bugs.md
Corrected Documentation mailing list link.
2015-06-18 20:04:07 +12:00
David Alexander
0b7f24537f Update index.md
Rewording.
2015-06-18 19:40:04 +12:00
David Alexander
dfc1c8df34 Update 05_Translation_Process.md
Typos.
2015-06-18 17:50:29 +12:00
David Alexander
08d8865704 Update 03_Documentation.md
Typos.
2015-06-18 17:42:55 +12:00
Damian Mooyman
83c4ffda52 Merge pull request #4276 from hailwood/patch-2
Add 0 Based Position tip.
2015-06-18 11:04:11 +12:00
Damian Mooyman
7597b888c3 Make SQLQuery strict semver for 3.2 2015-06-17 16:54:17 +12:00
Damian Mooyman
0653ba9630 Merge pull request #3979 from dhensby/pulls/test-nest
Nest and unnest Config and Controller for each test
2015-06-17 16:04:27 +12:00
Ingo Schommer
b95fdc7ba0 Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-17 15:36:03 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Damian Mooyman
46479e969f Document E_RECOVERABLE_ERROR 2015-06-16 12:29:29 +12:00
Damian Mooyman
58cc3da8d8 API Revert DataObject::validate to 3.1 method signature (protected) 2015-06-16 11:59:21 +12:00
Damian Mooyman
4d37e21bc6 Cleanup 3.2 changelog for release 2015-06-15 16:19:08 +12:00
David Alexander
57071869f1 Update index.md
url syntax fix for lesson 2
added lesson 17
2015-06-15 14:46:07 +12:00
David Alexander
e54b7fe404 Update 03_Documentation.md
Addressed dhensby's comments :)
2015-06-14 08:29:50 +12:00
David Alexander
ee4fe7c10c Update 03_Documentation.md
Minor typos & rewording.

Clearer example needed on line 104.
2015-06-13 21:34:32 +12:00
Jonathon Menz
838926085c API New and renamed image functions
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
David Alexander
52a248534a Update index.md
Minor typo.
2015-06-13 11:08:25 +12:00
Matthew Hailwood
1b93db019c Add 0 Based Position tip. 2015-06-12 13:38:09 +12:00
Daniel Hensby
f21427d7fa DOCS Explaining test suite nesting 2015-06-11 16:56:57 +01:00
Myles Beardsmore
67e1cee64a Completed missing comment ending
Completed missing comment ending
2015-06-10 16:56:31 +12: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
a8ace75341 API Support for multiple HTMLEditorConfig per page 2015-06-09 12:17:55 +12:00
Damian Mooyman
f21e59585e Merge remote-tracking branch 'origin/3.1' into 3 2015-06-09 11:02:50 +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
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
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
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
Damian Mooyman
0319f7855b FIX Incorrect env setting in 3.1.13 2015-06-02 12:27:08 +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
Fred Condo
9efc384582 Add defense against SS-2015-013 to nginx example 2015-05-28 17:00:33 -07: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