Sam Minnee
cd02fff8e4
Remove PHP 5.3 from Travis suite, updating minimum version requirement.
...
Since SilverStripe 4 isn't going to work on PHP 5.3, I have removed it from the Travis suite.
2015-08-04 19:42:54 +12:00
Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +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
Sam Minnee
a1f7dcafa2
NEW: Add ‘calls’ section to Injector configs.
...
As well as properties, you can now configure a series of method calls in
your service definitions.
2015-07-30 19:34:46 +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
Damian Mooyman
0103b076c3
Merge remote-tracking branch 'origin/3'
...
Conflicts:
forms/Form.php
model/ManyManyList.php
2015-06-17 15:41:13 +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
