Daniel Hensby
fa878b1e1f
Merge pull request #4642 from hailwood/patch-1
...
DOCS Remove extra set of li's
2015-10-03 10:28:50 +01:00
Matthew Hailwood
5e68512e1c
Remove extra set of li's
2015-09-30 14:19:20 +13:00
Liam Whittle
71a2ef1350
fixed minor GridField initialization syntax.
2015-09-29 18:51:08 -04:00
Peter Thaleikis
7ca97cd86d
Update 01_Extensions.md
...
adding missing space
2015-09-20 15:15:54 +12:00
Damian Mooyman
c2a407a01b
Add note to changelog
2015-09-18 14:51:04 +12:00
Damian Mooyman
b12bdb754b
Added 3.1.15 changelog
2015-09-18 14:21:20 +12:00
Damian Mooyman
71b8aec306
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-15 13:35:51 +12:00
Damian Mooyman
c4710b2272
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/GroupImportForm.php
admin/code/MemberImportForm.php
tests/model/DataListTest.php
2015-09-15 13:18:47 +12:00
Damian Mooyman
8ddb4c7ffe
Merge remote-tracking branch 'origin/3.1.14' into 3.1
2015-09-15 11:07:14 +12:00
Damian Mooyman
00caeb700d
Added 3.1.14 changelog
...
Update translations
2015-09-15 10:58:15 +12:00
Damian Mooyman
f10785350e
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
admin/code/CMSProfileController.php
admin/tests/LeftAndMainTest.php
control/HTTP.php
security/Permission.php
tests/forms/FormTest.php
tests/model/ArrayListTest.php
tests/security/PermissionTest.php
2015-09-09 14:35:29 +12:00
johndalangin
1b661c9f17
Typo Correction
2015-09-07 17:08:49 +08:00
Cam Findlay
58a8bb1327
DOCS fix to ensure 3.2.0 beta 1 content links work correctly
...
Reported by Community as broken.
2015-09-06 19:29:33 +12:00
Brett Randall
e0b0c17685
Update 02_Composer.md
...
Fixed typo, "in to thier" -> "into their".
2015-09-05 13:50:57 +10:00
Matthias Schelling
f43c528a0d
fixed typo in shortcode docs
2015-09-03 14:46:42 +02:00
Damian Mooyman
ed401176f9
Added 3.1.14-rc1 changelog
2015-09-02 11:04:21 +12:00
Sam Minnée
f4b7cd3f68
Merge pull request #4500 from stevie-mayhew/pulls/get-response
...
FEATURE: implement getter and setter usage for response
2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b
FEATURE: implement getter and setter usage for response
2015-08-29 10:24:06 +12:00
Sean Harvey
03d2fc73c5
Add warning on flush not being run automatically by unit test commands.
2015-08-28 13:00:22 +12:00
JorisDebonnet
b264a835fa
Direct link to 3.2.0 release notes
2015-08-27 13:53:17 +02:00
Daniel Hensby
209bb94319
DOCS Adding docs for special Permission cases
2015-08-26 23:32:07 +01:00
Damian Mooyman
b49149d9d2
Update comment on changelog
2015-08-26 14:16:06 +12:00
Damian Mooyman
1285553ebe
Added 3.2.0-rc1 changelog
2015-08-26 13:44:29 +12:00
Damian Mooyman
1686c83826
Revert #3425 #3396 to restore deprecated functionality
...
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
a8ab5a468d
Merge branch '3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
composer.json
2015-08-17 11:43:28 +01:00
David Alexander
44680d175c
Spelling
2015-08-05 21:34:35 +12:00
Damian Mooyman
55fa645269
Added 3.2.0-beta2 changelog
2015-08-04 10:39:12 +12:00
Damian Mooyman
3ee017a07f
Remove old changlog file
...
Add reference for 3.2.0-beta2
2015-08-04 10:29:40 +12:00
Cam Findlay
ea16aca74b
DOCS create() makes objects not classes.
...
Thanks to Matthew at Cabbage Tree Creative for reporting.
2015-08-03 12:50:24 +12:00
Damian Mooyman
7ee444e08a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
Loz Calver
20a66136e6
Merge pull request #4403 from tractorcow/pulls/3.2/disable-deprecation
...
API Disable deprecation notices by default
2015-07-23 14:23:41 +01:00
Sam Minnée
c7c3e40a2f
Merge pull request #4296 from SpiritLevel/patch-1
...
Update 02_Release_Process.md
2015-07-23 13:38:53 +12:00
Sam Minnée
532bf6ccb9
Merge pull request #3554 from tractorcow/pr/3179
...
FIX: FulltextFilter did not work and was not usable
2015-07-22 11:29:57 +12:00
Daniel Hensby
ca8d0f2818
Merge branch '3.1' into 3.2
...
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
2015-07-20 10:48:01 +01:00
Damian Mooyman
914d734df0
API Disable deprecation notices by default
2015-07-16 09:56:47 +12:00
Daniel Hensby
55a60e86f0
Merge pull request #4401 from marijnkampf/patch-3
...
DOCS
Fixed type in code example
2015-07-15 17:27:27 +01:00
Marijn Kampf
bc66bca187
Fixed type
2015-07-15 15:36:33 +01:00
Marijn Kampf
218d3f1486
Fixed type in code example
2015-07-15 15:36:19 +01:00
Daniel Hensby
2549fa8a93
Merge pull request #4399 from inflammable/patch-1
...
Correct Memcached config in example
2015-07-15 14:21:21 +01:00
David Alexander
7a1d370038
DOCS : added lesson 18 to index.md
2015-07-14 19:13:57 +12:00
Stuart
d6cb2419b8
Correct Memcached config in example
...
Unlike Libmemcached, the Memcached backend server config must be nested inside an array() with a single key 'servers' - otherwise the default host of 127.0.0.1 is used.
array(
'servers' => array(
'host' => 'localhost',
'port' => 11211,
'persistent' => true,
'weight' => 1,
'timeout' => 1,
'retry_interval' => 15,
'status' => true,
'failure_callback' => ''
)
)
2015-07-11 23:18:18 +12:00
David Alexander
644b6b344f
Typo.
2015-07-08 14:40:42 +12:00
Ingo Schommer
31db269f71
Merge pull request #4285 from jonom/docs-contributing-cleanup
...
DOCS Contributing code cleanup
2015-07-08 09:10:06 +12:00
Ingo Schommer
aef8073037
Fixed cms architecture link
2015-07-07 19:40:12 +12:00
Sam Minnee
74d0622d43
Fix docs clobbered by 3.1 -> 3.2 merge.
2015-07-01 10:00:39 +01:00
Jackson
9cb64d48e3
Define function as static (line 59)
...
Not defining function on line 59 as static triggers php error: [Strict Notice] call_user_func() expects parameter 1 to be a valid callback, non-static method Page::ShortcodeColumns() should not be called statically
Note: PHP 5.5.12
2015-06-30 11:29:26 +12:00
Jonathon Menz
a39c2bd473
DOCS Contributing code cleanup
...
Fixed a few typos and formatting issues, and made git workflow diagram easier to read by hyperlinking it to itself. Also included a few lines from 3.2 branch.
2015-06-28 13:19:04 -07:00
David Alexander
85967b8c16
Update 07_Code_of_conduct.md
...
Missed word...:)
2015-06-26 21:39:54 +12:00
Will Morgan
b6b8ab8c35
Merge pull request #4314 from SpiritLevel/patch-2
...
Update 07_Code_of_conduct.md
2015-06-26 09:14:55 +01:00
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
Cam Findlay
bee638eb6a
DOCS Missing closing perenthesis
2015-06-26 15:36:49 +12: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
David Alexander
305801d015
Update 07_Code_of_conduct.md
...
Typos, grammar, rewording.
2015-06-20 16:52:46 +12: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
David Alexander
f6d60ca946
Update 02_Release_Process.md
...
Updated: deprecated API's removed only in MAJOR releases.
2015-06-19 07:51:16 +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
David Alexander
54b0b1fd4e
Update 02_Release_Process.md
...
Typos. Spelling. 404 errors for framework and cms milestones links to github(line 13).
2015-06-18 17:26:58 +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
Damian Mooyman
782c4cbf6f
API Enable single-column fulltext filter search as fallback
2015-06-12 15:36:03 +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
