tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
20,987 Commits 31 Branches 527 Tags 162 MiB
87cc52f3e0
Commit Graph

20987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
470093de2f
Merge pull request #8650 from sminnee/nested-vendor 
FIX: Manifest should ignore vendor folders within packages contained in vendor
 2018-12-12 19:52:03 +00:00
Robbie Averill
fcc37350a1 Merge branch '4.3' into 4 2018-12-12 12:17:37 +00:00
Guy Marriott
020c6fd479
Merge pull request #8663 from open-sausages/pull/4.3/wait-for-loading-after-step 
FIX behat CmsUiContext waits for cms-loading-container after step
 2018-12-12 18:26:31 +13:00
Aaron Carlino
ab116cd5d9 Merge branch '4.1' into 4.2 2018-12-12 15:56:53 +13:00
Aaron Carlino
8e8a8cae9f Update changelog 2018-12-12 14:54:31 +13:00
Aaron Carlino
4ff891fc87 Add changelog 2018-12-12 14:21:23 +13:00
Aaron Carlino
2f9dae2c71 Add changelog 2018-12-12 14:11:21 +13:00
Aaron Carlino
00e996f164 Add changelog 2018-12-12 13:47:17 +13:00
Aaron Carlino
9939719ae3 Update translations 2018-12-12 12:50:47 +13:00
Aaron Carlino
90a50649dd Update translations 2018-12-12 12:34:51 +13:00
Aaron Carlino
fed9afb046 Update translations 2018-12-12 12:21:17 +13:00
Robbie Averill
74698af402 [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:57:18 +13:00
Robbie Averill
8bd747d12a [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:56:55 +13:00
Robbie Averill
fecedc2d98 [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:56:40 +13:00
Robbie Averill
48bd335648 [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:55:58 +13:00
Serge Latyntcev
f7846fc34c FIX behat CmsUiContext waits for cms-loading-container after step 2018-12-10 16:49:57 +13:00
Robbie Averill
466e7cf142
DOCS Fix FCQN in CsvBulkLoader example code 
[ci skip]
 2018-12-06 12:21:08 +00:00
Robbie Averill
5d7c5ffb07 Merge branch '4.3' into 4 2018-12-06 09:40:40 +00:00
Robbie Averill
08866f89d9 Merge branch '4.2' into 4.3 2018-12-06 09:40:05 +00:00
Robbie Averill
96bd17d469 Merge branch '4.1' into 4.2 2018-12-06 09:38:45 +00:00
Robbie Averill
3f532466d1 Merge branch '4.0' into 4.1 2018-12-06 09:37:52 +00:00
Guy Marriott
6edcbe9086
Merge pull request #8592 from open-sausages/pulls/4.0/tree-multiselect-null 
FIX TreeMultiselectField passes value 'unchanged' as null to ORM
 2018-12-06 14:23:48 +13:00
Robbie Averill
1ac36611a6 Update tests to pass in CWP kitchen sink context 2018-12-02 23:04:34 +00:00
Maxime Rainville
731ef00f7a
Merge pull request #8627 from creative-commoners/pulls/4.3/abstr-action-state 
FIX Provide alternatives to session for storing GridField_FormAction state
 2018-12-03 11:58:05 +13:00
Robbie Averill
59efddccb2
Merge pull request #8653 from hpeide/patch-3 
Update 02_Images.md
 2018-12-02 15:15:05 +01:00
Hans Philip Eide
f9cd6d9a15
Update 02_Images.md 
If the default is that resampling is off, shouldn't the example be that force_resample is set to true to enable resample?
 2018-12-01 13:36:52 +01:00
Robbie Averill
f1170255cb
Merge pull request #8652 from edlinklater/patch-2 
FIX incorrect composer module type
 2018-11-30 19:55:08 +01:00
Ed Linklater
cc7aa7b68b
FIX incorrect composer module type 
Was silverstripe/vendormodule, should be silverstripe-vendormodule
 2018-12-01 07:53:21 +13:00
Guy Marriott
c7b5b1efd2
FIX Switching to use Controller::curr as it was using previously 2018-11-30 15:40:45 +13:00
Guy Marriott
32d096d9e5
DOCS Moving interface subscription to the abstract and adding a changelog entry 2018-11-30 15:40:45 +13:00
Guy Marriott
aace1da1f0
DOCS Adding notes on configuring the storage method for GridField_FormActions 2018-11-30 15:40:45 +13:00
Guy Marriott
ddaa22986f
Updating StateStore interface not to define a constructor & fixing GridFieldFilterHeader to add required attributes 2018-11-30 15:40:45 +13:00
Guy Marriott
b4c8f699eb
FIX Provide alternatives to session for storing GridField_FormAction state 2018-11-30 15:40:45 +13:00
Sam Minnee
0c17ffc944 FIX: Manifest should ignore vendor folders within packages contained in vendor 
Without this change vendor/silverstripe/framework/vendor/silverstripe/config
will be pick up by the manifest, which is inappropriate.

Although this doesn’t happen often, it can occur if you have run
“composer install” within vendor/silverstripe/framework, which can be
done either accidentally or (in my case) as part of running the
framework tests isolated from the rest of your project (which is closer
to the execution model on Travis)

Note that the presence of the ‘nestedvendor.txt’ file tests that this
works without any explicit changes to the PHP of the tests, since it’s
merely confirming that such a file is *not* picked up.
 2018-11-30 13:52:25 +13:00
Serge Latyntcev
4ee63eb4e7 TreeMultiselectFieldTest / make scrutinizer happy 2018-11-29 12:13:56 +13:00
Serge Latyntcev
38f8217f01 TreeMultiselectFieldTest / setUp is protected in PHPUnit5 2018-11-29 09:55:28 +13:00
Aled Brown
5d15d20f0f ModelAdmin Menu Icon Class Documentation Added + Namespace Permissions (#8646) 2018-11-28 18:23:37 +01:00
Loz Calver
3f8551df41
Merge pull request #8462 from sminnee/nondestructive-enum 
FIX: Make all enums non-destructive, not just ClassName
 2018-11-28 16:42:12 +01:00
Guy Marriott
1b68157e39
Merge pull request #8633 from falnyr/patch-1 
Referencing env vars in configs
 2018-11-27 09:43:47 +13:00
Loz Calver
441d079647
Merge pull request #8637 from creative-commoners/pulls/4.4/falsy-detail-component 
FIX getComponentByType can return null - prevent null pointer errors
 2018-11-26 18:28:26 +01:00
Loz Calver
213ec240b0
Merge pull request #8635 from creative-commoners/pulls/4.4/redundant-right-group 
FIX Remove redundant "rightGroup" logic and increase getRightGroupField to protected
 2018-11-26 18:28:01 +01:00
Robbie Averill
fa26ead0f6
DOCS Add namespaces to PHP i18n examples, and reference __CLASS__ and self::class as options 2018-11-26 17:15:17 +01:00
Robbie Averill
f22a4b980b FIX getComponentByType can return null - prevent null pointer errors 2018-11-26 16:01:46 +01:00
Robbie Averill
efa427fc45 FIX Remove redundant "rightGroup" logic and increase getRightGroupField to protected 2018-11-26 12:42:47 +01:00
Robbie Averill
1f1c344272 Merge branch '4.3' into 4 
# Conflicts:
 #	tests/php/Forms/ConfirmedPasswordFieldTest.php
 2018-11-26 12:15:17 +01:00
Robbie Averill
41dc9229bf FIX Reverting ExtensionTestState and Extensible extra methods modifications to prevent PHP 5.6 segfault (#8581) 
* API Revert addition of Extensible::flush_extra_methods_cache() and change to ExtensionTestState

This reverts the changes from #8465 and #8505 that relate to ExtensionTestState and the
tracking of extra methods between unit tests. The existing test from #8465 testing
overloaded Extensions after extra_methods are populated has been updated to show that you
must re-add the extension to flush the extra_methods cache if you need this behaviour.

* Revert change to InjectorTest::testExtendedExtensions

* Revert "Add failing test to show that overloaded extensions are broken in Extensible"

This reverts commit 55e79ffdfd.

* DOCS Add docs for extending extensions, and upgrade guide note to 4.3 to avoid using PHP config to do so
 2018-11-26 12:00:02 +13:00
Jan Alfred Richter
34373dad99
Update 03_Environment_Management.md 
Info: You can't use them outside of Injector config (as of 4.2).
 2018-11-26 09:17:48 +13:00
Jan Alfred Richter
0353b29652
Referencing env vars in configs 
As mentioned here: https://stackoverflow.com/a/53459699/2111274
 2018-11-26 08:42:10 +13:00
Guy Marriott
84c8dace7d
Merge pull request #8621 from open-sausages/pulls/4.3/tweak-site-tree-search 
FIX Explicity mark nodes when searching
 2018-11-23 16:14:46 +13:00
Serge Latyntcev
f526c794fc Minor / Refactor php tests for TreeMultiselectField 2018-11-23 16:03:44 +13:00