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
16,202 Commits 31 Branches 527 Tags 162 MiB
6948267c41
Commit Graph

16202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Darling
ceccd9551c remove $CleartextPassword and update wording on 
ChangePasswordEmail.ss

4.x version of https://github.com/silverstripe/silverstripe-framework/pull/5194
 2016-03-23 07:50:36 +00:00
Damian Mooyman
094745ec0f API Formally support custom ownership relations 
API 'owned_by' is no longer mandatory for relations backed by normal db relations
API Extension setOwner/clearOwner is now nested
 2016-03-23 14:49:34 +13:00
Damian Mooyman
5845b6089c Merge pull request #5218 from bummzack/5189-fix-canViewVersioned 
Fixed issue where `canViewVersioned` caused a DB error…
 2016-03-23 10:31:49 +13:00
Damian Mooyman
633eb0163e Merge pull request #4551 from sminnee/php7-support 
PHP7 support
 2016-03-23 09:21:51 +13:00
Daniel Hensby
602b07f403 Merge pull request #5194 from christopherdarling/patch-9 2016-03-22 11:14:49 +00:00
Daniel Hensby
affb3dba03 Merge branch 'patch-9' of https://github.com/christopherdarling/silverstripe-framework into christopherdarling-patch-9 2016-03-22 11:13:35 +00:00
Roman Schmid
25c453fe7b Fixed issue where canViewVersioned caused a DB error when Versioned was used with stages other than the default "Stage" and "Live". 
Updated VersionedTest to also check an Object with a single stage in the canView test.
 2016-03-22 09:42:21 +01:00
Sam Minnee
f5af0c85ba FIX: Don’t use SplFixedArray in PHP 7. 
PHP 7 seems to suffer a segfault when using SplFixedArray. Since LRU is
deprecated anyway, I’m not too fussed about getting to the bottom of
this issue, however, if it turns out that SplFixedArray is corrected in
PHP 7.0.0 stable or a future patch release, we could update this check.
 2016-03-22 18:09:38 +13:00
Sam Minnee
aeccb8b8e0 API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 
API: Deprecate SS_Datetime.

The DBField subclasses are have all been renamed to start with “DB” and
be in the SilverStripe\Model\FieldType namespace. To keep DataObject
definitions concise, the original short variations of their names are
preserved as service definitions. Most of the field generation code
doesn’t need to change, but where field classes are referenced directly,
changes will be needed.

SS_Datetime, which is commonly referenced outside the model system
itself, has been preserved as a subclass of DBDatetime. This has been
marked as deprecated and can be removed in SilverStripe 5.

A few places that referred to $db and $casting values weren’t using
the Injector to instantiate the relevant classes. This meant that the
remapping we have created as part of moving classes into a namespace
didn’t work.
 2016-03-22 18:09:30 +13:00
Sam Minnee
262f487053 MINOR: Avoid access-changing subclass in test. 
Using a subclass to change the visibility of protected items didn’t
seem necessary in this case, if we add a reasonably logical getter
method.
 2016-03-22 17:39:09 +13:00
Sam Minnee
52ca089d0b NEW: Ensure php7 builds pass. 
SilverStripe 4 should work in php7, so we shouldn't accept its failure.
 2016-03-22 17:39:09 +13:00
Sam Minnee
8518fc1425 FIX: Clarify PHP7-incompatible call styles. 
These call signatures have changed their meaning in PHP7. The new
disambiguated form should work in all versions.
 2016-03-22 17:39:09 +13:00
Sam Minnee
083799ec03 FIX: Minimal data-model changes to support PHP7. 
The tidiest fix for this will be to update the namespace/naming of all
field types to follow this pattern. I’ve broken out the minimum
necessary to support PHP7 as its own commit, in case anyone needs to
backport that (e.g. if someone wanted to patch a SS 3 system to get
PHP7 support).

Rather than introduce a new API for fieldtype namespace simplification,
I’ve just used Injector. We may come up with a new configuration tool
that is better, but this has the advantage of existing now, and as such
I think is a good first step.
 2016-03-22 17:39:08 +13:00
Sam Minnee
12a83d70ae FIX: Removed PHP4 syntax from Diff.php 
Like SimpleTest, we should probably replace this for a new library,
but for now this will help us achieve PHP7 support.
 2016-03-22 17:39:08 +13:00
Sam Minnee
0dcccfafb3 MINOR: Whitespace fixes in SimpleTest. 2016-03-22 17:39:08 +13:00
Sam Minnee
680b19a1da FIX: Correct PHP4-style constructors in SimpleTest. 
Note that the best solution to this will be to remove the use of
SimpleTest entirely. This is quick fix is intended to help us get PHP7
tests running without needing to cross that bridge.
 2016-03-22 17:39:08 +13:00
Loz Calver
20d116757a Merge pull request #5217 from dhensby/pulls/3.1/docs-csv-parser 
DOCS Fixing CSV Parser docs - fixes #5004
 2016-03-21 15:02:56 +00:00
Daniel Hensby
c8f2e6702b DOCS Fixing CSV Parser docs - fixes #5004 2016-03-21 14:22:43 +00:00
Christopher Darling
96c586b39d FIX: only output $CleartextPassword if it has a value 
The $CleartextPassword value is never populated as reported https://github.com/silverstripe/silverstripe-framework/issues/3257 and in agreeance with the two comments (cc @kinglozzer) I also don't think plaintext passwords should be included in emails by default. As Loz suggests if somebody wants this it can easily be added by overriding the template.
 2016-03-21 09:48:01 +00:00
Daniel Hensby
03a3244d12 Merge pull request #5173 from tractorcow/pulls/4.0/remove-duplicate 
BUG Remove duplicate extension hook
 2016-03-21 09:35:46 +00:00
Daniel Hensby
863b737717 Merge pull request #5214 from tractorcow/pulls/3.1/fix-array-values 
Do not hang on nested parameters in search context
 2016-03-21 09:21:33 +00:00
Daniel Hensby
d2fa01fb17 Merge pull request #5215 from tractorcow/pulls/3.2/fix-folder-relativepath 
BUG Fix File::getRelativePath() failing if parent folder is renamed
 2016-03-21 09:09:12 +00:00
Damian Mooyman
78f19bd2ed Merge pull request #5175 from Firesphere/pulls/feature-set-owner-allmethods 
Enhancement: Set the owner on an extension
 2016-03-21 17:30:37 +13:00
Damian Mooyman
5f8356d686 BUG Fix File::getRelativePath() failing if parent folder is renamed 
Fixes #4993
 2016-03-21 17:22:38 +13:00
Damian Mooyman
94b0f61957 Merge pull request #3494 from dnadesign/tabForceActive 
fixing issue where 'ss-tabs-force-active' wasn't actually working
 2016-03-21 16:53:49 +13:00
Nicola Fontana
11561aeb54 Do not hang on nested parameters in search context 
Backport of 0b5a573 for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
 2016-03-21 15:54:22 +13:00
Daniel Hensby
ada12066f3 FIX Autocomplete loading spinner now showing 2016-03-21 15:15:00 +13:00
Damian Mooyman
cdedee130a Merge pull request #5200 from dhensby/pulls/fix-token-redirect 
FIX Parameter tokens now redirect to correct url if mod_rewrite is off
 2016-03-21 14:45:03 +13:00
Simon Erkelens
debe8ba2a3 Improvement: Set the owner on an extension, before getting all the available method names. 
This enhances the extensions to enable certain features like adding wrapper methods instead of having to have them on the object itself.
 2016-03-21 02:36:34 +01:00
Ingo Schommer
3573236310 Merge pull request #5213 from open-sausages/pulls/4.0/fix-tinymce-shortcodes 
API and BUG fix; Update ssbuttons tinymce plugin for image shortcode parsing
 2016-03-21 14:33:37 +13:00
Damian Mooyman
7769f03ccc BUG Remove duplicate extension hook 
Fixes #5170
Reverts #3355
 2016-03-21 14:03:41 +13:00
Damian Mooyman
2d56ea278a API Move ss buttons plugin out of thirdparty 
BUG Fix incorrect parsing of shortcode properties
 2016-03-21 13:51:33 +13:00
Daniel Hensby
377c66cd49 Merge pull request #5209 from jonom/file-icons 
Restore deleted file icons
 2016-03-20 22:50:56 +00:00
Jonathon Menz
d027a96f3a Restore deleted file icons 
Reverts asset removal from commit 2923787352.
 2016-03-20 14:51:19 -07:00
Damian Mooyman
5d3b896297 Merge pull request #5180 from dhensby/pulls/4/npm-update 
Updating required node version
 2016-03-21 10:46:56 +13:00
Damian Mooyman
214a1e967d Merge pull request #5174 from open-sausages/pulls/4.0/tinymce-image-shortcodes 
Tinymce image shortcodes
 2016-03-21 10:29:03 +13:00
Damian Mooyman
aa635f096b Merge pull request #5185 from jonom/tractorcow-pulls/3/menu-refactor 
API refactor LeftAndMain_Menu.ss into individually overridable compon…
 2016-03-21 10:10:12 +13:00
Ingo Schommer
8ae794ee99 API TinyMCE Image shortcodes 2016-03-21 09:23:40 +13:00
Daniel Hensby
c0d8cf3e97 Merge pull request #5208 from jonom/fix-tabs 
FIX tab wrapping
 2016-03-20 18:36:33 +00:00
Jonathon Menz
283885f091 FIX tab wrapping 
jQuery UI css specificity is different to SS so causes some conflicts. (fixes #5207)
 2016-03-20 11:09:36 -07:00
Daniel Hensby
f28dcdbb2e Merge pull request #5169 from Cheddam/patch-1 
DOCS Update 'Extend CMS Interface' documentation
 2016-03-20 07:52:59 +00:00
Garion
c59cd1e598 Update Extend_CMS_Interface.md 
Add missing `private` declaration.
 2016-03-20 13:08:23 +13:00
Daniel Hensby
250c2b5321 Merge pull request #5186 from jonom/file-icons 
NEW consistent file icons
 2016-03-19 23:56:11 +00:00
Jonathon Menz
2923787352 NEW consistent file icons 
File icons have been updated for consistency and a StripThumbnail method added to File for icon display in gridfield instances (such as file selection interface)
 2016-03-19 10:36:11 -07:00
Daniel Hensby
cbdaf890dd Merge pull request #5145 from tractorcow/pulls/3.2/fulltext-bootstrapping 
BUG Fix FulltextsearchEnable
 2016-03-19 17:17:02 +00:00
Daniel Hensby
206c765b09 Merge pull request #5182 from christopherdarling/patch-8 
DOCS: FulltextSearchable code example
 2016-03-19 10:10:04 +00:00
Daniel Hensby
add2ecdf8b FIX Parameter tokens now redirect to correct url if mod_rewrite is off 2016-03-18 15:56:39 +00:00
Daniel Hensby
0efdfa42e2 Merge pull request #5198 from JorisDebonnet/fix-enum 
Allow empty values in Enum
 2016-03-18 10:37:07 +00:00
Joris Debonnet
4c741125c5 fix #5195: allow empty values in Enum 2016-03-17 22:43:26 +01:00
Hamish Friedlander
98eea60ec9 Merge pull request #5157 from open-sausages/features/triggered-publishing 
API Owned objects are now automatically published
 2016-03-17 14:36:03 +13:00