Loz Calver
83663b4b8c
Merge pull request #5249 from tractorcow/pulls/3.2/customise
...
Standardise spelling of "customise"
2016-03-30 08:42:26 +01:00
Jake Bentvelzen
43c9f15647
Fixed bug where breadcrumb title wouldn't appear if title was blank
2016-03-30 16:46:18 +11:00
Damian Mooyman
f6dca68be1
Merge pull request #5234 from kinglozzer/gridfield-onbeforerender
...
NEW: Add onBeforeRender() hook to GridField
2016-03-30 17:53:04 +13:00
Damian Mooyman
2cfd3ab997
Merge pull request #5231 from kinglozzer/sqlselect-docs
...
Fix code docs for SQLSelect::count()
2016-03-30 14:12:11 +13:00
Damian Mooyman
b8e7f9a934
Standardise spelling of "customise"
...
Fixes #3988
2016-03-30 13:17:28 +13:00
Damian Mooyman
fd64fe5572
Merge pull request #5248 from micmania1/patch-10
...
Filter PDO construct on failure
2016-03-30 13:05:32 +13:00
Michael Strong
159dce337d
Filter PDO construct on failure
2016-03-30 11:35:15 +13:00
Ingo Schommer
4714eeee6b
Merge pull request #5146 from chillu/pulls/3.2/disable-xdebug-travis
...
Disable xdebug on Travis runs
2016-03-30 07:49:32 +13:00
Ingo Schommer
fb660225c2
Behat: Wait until CMS loading overlay is removed
...
This makes tests more robust at the expense of an additional
check with every step. The "ajax steps" logic works similarly,
but does not respect the loading indicator. While this logic
waits for a short time after ajax requests are finished,
in some cases that isn't enough time for the browser to
process the response and remove the loading indicator.
Since the "ajax steps" logic applies to operations outside of the CMS
as well, we can't add the loading indicator check there.
2016-03-29 17:24:47 +13:00
Ingo Schommer
85a361444c
Disable xdebug on Travis runs
...
We're not using it for code coverage,
and it's slowing down both composer and phpunit builds.
Recommended by Travis:
https://docs.travis-ci.com/user/speeding-up-the-build/#PHP-optimisations
2016-03-29 17:21:55 +13:00
Ingo Schommer
7ba4b5b6ef
Merge pull request #5241 from timkung/pulls/upload-validator-filesize-spelling
...
BUG changing all cases of filesize spelling to file size
2016-03-29 16:15:27 +13:00
Tim Kung
7907d20da7
BUG changing all cases of filesize spelling to file size
2016-03-29 13:38:24 +13:00
Daniel Hensby
aeb4aa9565
FIX Dont allow plain text friendly errors
2016-03-28 01:20:18 +01:00
Loz Calver
1e7281a2ba
NEW: Add onBeforeRender() hook to GridField
2016-03-27 10:55:58 +01:00
Loz Calver
5ede516c77
FIX: GridField::FieldHolder() should not attempt to parse shortcodes ( fixes #5129 )
2016-03-27 10:51:46 +01:00
Loz Calver
4353d35c0a
Fix code docs for SQLSelect::count()
2016-03-27 10:23:11 +01:00
Daniel Hensby
2b261e226c
Merge pull request #5228 from christopherdarling/patch-4
...
DOCS: DataList::filter() broken examples
2016-03-26 21:20:34 +00:00
Daniel Hensby
3a932c963f
Merge pull request #5230 from kinglozzer/1684-textfield
...
Deprecate TextField::InternallyLabelledField() (closes #1684 )
2016-03-26 21:14:33 +00:00
Loz Calver
d9798af30c
Deprecate TextField::InternallyLabelledField() ( closes #1684 )
2016-03-26 11:07:33 +00:00
Christopher Darling
4dfe2955e3
DOCS: DataList::filter() broken examples
...
missing ' from 'bob'
2016-03-24 21:32:49 +00:00
Daniel Hensby
0ce257495b
Merge pull request #5226 from timkung/pulls/upload-validator-filesize-spelling
...
DOCS Upload_Validator fixing file size spelling
2016-03-24 09:41:35 +00:00
Tim Kung
7867c51388
Upload_Validator fixing file size spelling
2016-03-24 15:45:58 +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
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
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
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
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
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
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