Commit Graph

14879 Commits

Author SHA1 Message Date
Cam Findlay
bee638eb6a DOCS Missing closing perenthesis 2015-06-26 15:36:49 +12:00
Jason
b5f88af1f0 Add extension hook for getManyManyComponents()
Call extension after DataModel is set
2015-06-26 11:04:31 +10:00
Damian Mooyman
8e1da86bf1 Merge pull request #3982 from dhensby/pulls/safe-unnesting
Safe unnesting of Config and Injector
2015-06-26 10:08:29 +12:00
Phill Price
1bbcde908a Broken link in using custom code for tracking member logging 2015-06-25 14:20:42 +01:00
Daniel Hensby
2e657baede Merge pull request #4347 from kinglozzer/pulls/spinner-fix
Fix background size for spinner @2x
2015-06-25 13:25:08 +01:00
Hamish Friedlander
f5d6f20113 Merge pull request #4333 from sminnee/shortcode-fix
Allow shortcodes inside script tags. Fixes #4332.
2015-06-25 14:51:03 +12:00
Damian Mooyman
d85590ddb9 Merge pull request #4348 from dhensby/pulls/3.2/fix-orphaned-passwords
FIX MemberPassword history removed with with Members
2015-06-25 09:14:09 +12:00
Daniel Hensby
3507ddb0e8 FIX MemberPassword history removed with with Members
Currently Members that were deleted would still have their passwords
stored in the DB even though they were deleted. This seems unnecessary
and just increases data that could potentially be compromised later.
2015-06-24 21:04:23 +01:00
Will Morgan
0514605cdc Merge pull request #4346 from phillprice/patch-12
DOCS: Typo in a block
2015-06-24 15:31:35 +01:00
Loz Calver
3ebb73a675 Fix background size for spinner @2x 2015-06-24 12:04:21 +01:00
Phill Price
b2024107a9 DOCS: Typo in a block 2015-06-24 11:57:12 +01:00
Will Morgan
1f6a74cc71 Merge pull request #4344 from SpiritLevel/patch-3
DOCS: Corrected version of master in line 22.
2015-06-24 11:16:31 +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
Will Morgan
b7945eb251 Merge pull request #4338 from SpiritLevel/patch-5
DOCS: fixed broken link
2015-06-23 09:24:41 +01:00
Damian Mooyman
3e1c156411 Merge pull request #4341 from flashbackzoo/pulls/add-page-nesting
Fix new page SiteTree nesting
2015-06-23 17:32:22 +12:00
David Craig
f6745a3feb Fix new page SiteTree nesting 2015-06-23 16:53:38 +12: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
Sam Minnee
d7241958ff Performance/reliability improvement for leaving unrecognised tags.
error_behaviour = self::LEAVE is the default behaviour. In this case,
we don’t even need to bother recognising such tags. Rather than
replacing with marker images and re-inserting the original text after
we’re done, we can leave them alone.

This should make the code faster and more reliable.
2015-06-22 11:31:12 +01:00
Sam Minnee
6d05c57881 Ensure that shortcodes inside script tags are parsed. Fixes #4332.
The problem is that the marker images aren’t picked up by DOMDocument
if they are inserted into a <script> tag, due to the semantics of HTML.

This fix does an additional replacement after the marker images are
replaced in this way to pick up any leftover tags.
2015-06-22 11:29:12 +01:00
Daniel Hensby
13df9c4163 Merge pull request #4330 from camfindlay/4329-duplicatecc
DOCS Remove duplicate core committers doc
2015-06-22 07:17:28 +01: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
Daniel Hensby
04f96da453 Merge pull request #4326 from SpiritLevel/patch-3
DOCS Update 01_Code.md
2015-06-21 09:33:27 +01:00
David Alexander
c4583d4fb9 Update 01_Code.md
Updated link.
2015-06-21 12:23:40 +12:00
Daniel Hensby
ebeea242fe Merge pull request #4125 from assertchris/clean-up-form-field
Clean up FormField
2015-06-20 16:30:44 +01:00
Sam Minnée
c91fc6ab26 Merge pull request #4324 from dhensby/pulls/namespace-import-manifest-fix
FIX Imported namespaces now correctly used to determine class inhertance
2015-06-20 16:30:20 +01:00
Daniel Hensby
66391ab57a FIX Imported namespaces now correctly used to determine class inheritance
Fixes #3707
2015-06-20 16:09:10 +01:00
Christopher Pitt
4ba051409d Cleaned up FormField 2015-06-20 13:55:58 +01: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
Ingo Schommer
c5cf19a86a Merge pull request #4312 from sminnee/exclude-docs-from-export
FIX: docs not included in composer package installs
2015-06-20 13:22:47 +12:00
Daniel Hensby
b4802dfd78 Merge pull request #4311 from JayDevlin/3.2-install-requireWriteable
Install - Check if mysite/_config/config.yml is writeable
2015-06-19 17:38:05 +01:00
Daniel Hensby
9110e689cf Merge pull request #4313 from shoaibali/3.2
Unable to migrate down
2015-06-19 16:28:08 +01:00
ezero
900a7b7ff9 Unable to migrate down
Possible bug? Running PHP 5.6.3 
I had to override this method in MyMigrationTask.
2015-06-20 00:38:59 +12:00
Sam Minnee
a58e59565b FIX: docs not included in composer package installs (through export-ignore git attribute)
This change will improve the performance of package-download-based installs of composer packages, by
excluding docs. It does this by exlcuding them from the output of the "git archive" command.

The suggestion came from https://github.com/composer/composer/issues/1750
2015-06-19 12:01:41 +01:00
Devlin
da4c31cd50 Install - Check if mysite/_config/config.yml is writeable 2015-06-19 12:36:49 +02:00
Damian Mooyman
9cccfec1a0 Added 3.2.0-beta1 changelog 2015-06-19 19:22:38 +12:00
Damian Mooyman
bc8bc7d0c5 Update translations 2015-06-19 18:18:00 +12:00
Damian Mooyman
e32b06846b Revert "GridFieldDeleteAction missing button text without icons"
This reverts commit 265a34141e.
2015-06-19 17:43:05 +12:00
Hamish Friedlander
4e8aa72702 Merge pull request #4310 from tractorcow/pulls/3.2/deprecations
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 15:58:27 +12:00
Damian Mooyman
d9c7d4538b Update user help link for 3.2 2015-06-19 15:56:12 +12:00
Damian Mooyman
e14f743bf0 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +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
aa3871d716 Merge pull request #4306 from gregsmirnov/pulls/3.1/fixed-datetimefield-setname-issue-4305
Issue #4305: fixed DatetimeField::setName()
2015-06-18 22:10:13 +01:00
Daniel Hensby
20ebd88fb8 Merge pull request #4307 from gregsmirnov/pulls/3.1/test-timefield-value-at-12am-issue-1713
Test TimeField value at 12:00 am
2015-06-18 22:06:16 +01: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
Gregory Smirnov
5b22e3afc5 Test TimeField value at 12:00 am 2015-06-18 18:53:44 +02:00
Gregory Smirnov
66b1dd9154 Issue 4305: fixed DatetimeField::setName() 2015-06-18 18:36:02 +02: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