John Milmine
66ed97e08e
fix to grid field loading wrong current page id when using multiple tabs
2016-04-19 21:38:32 +12:00
Daniel Hensby
3c0f2e8e11
[SS-2015-029] FIX Add CSFR protection to tree reorganise
2016-04-19 00:01:04 +01:00
Michael Strong
1f820b0b1c
DOCS allowed_actions access control ( #5333 )
2016-04-18 17:49:30 +12:00
Damian Mooyman
936dcb691b
Merge pull request #5300 from patricknelson/issue-5299-injector-minor-doc
...
FIX for #5299 Adding <code> blocks to Injector documentation.
2016-04-18 11:56:21 +12:00
Loz Calver
69858760e1
Merge pull request #5312 from dhensby/pulls/3.1/fix-5281
...
FIX Stop "success" message showing in CMS
2016-04-12 16:56:06 +01:00
Daniel Hensby
36283b86d5
FIX Stop "success" message showing in CMS
...
fixes #5281
2016-04-12 16:14:31 +01:00
Damian Mooyman
e1f281fd8b
Merge pull request #5236 from dhensby/pulls/3.2/avoid-plain-text-friendlyerrors
...
FIX Dont allow plain text friendly errors
2016-04-12 12:00:54 +12:00
Patrick Nelson
707aa14c6c
FIX for #5299 Adding <code> blocks to Injector documentation.
2016-04-11 10:56:46 -07:00
Daniel Hensby
e57d26bb8e
Merge pull request #5298 from bummzack/patch-email-tests-3.2
...
Fix Email test issue discovered in #5271 .
2016-04-11 15:06:15 +01:00
Roman Schmid
9146450c49
Fix Email test issue discovered in #5271 .
...
Updated/added tests for changed- and forgot-password Emails.
Updated fixture and tests to no longer use a real Email address.
2016-04-11 13:46:41 +02:00
Damian Mooyman
4ea0c92c3c
Merge pull request #5142 from chillu/pulls/3.3/include-cms-tests-in-travis
...
Include CMS smoke tests in Travis builds
2016-04-11 10:15:43 +12:00
Ingo Schommer
539fbe94d8
Include CMS smoke tests in Travis builds
...
We've had a few failures where framework caused regressions in CMS,
so these builds are helpful. They'll increase the overall build
times on the "silverstripe" user because of Travis' build limitations.
The parallel per-build run times shouldn't increase, since
framework builds take longer than cms builds anyway:
CMS Behat build took 13:53 on last 3.3 run,
framework MySQL PDO build took 16:12.
2016-04-06 19:55:43 +12:00
Damian Mooyman
1d3b621460
Merge pull request #5274 from patricknelson/patch-2
...
Removal of FlushGeneratedImagesTask was not documented.
2016-04-06 11:05:40 +12:00
Patrick Nelson
49e6d701e5
Removal of FlushGeneratedImagesTask was not documented.
...
This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).
2016-04-05 15:09:46 -07:00
Damian Mooyman
5a8db29c5b
Merge pull request #5259 from patricknelson/issue-5251-url-parsing
...
FIX for #5251 to address minor URL decoding/parsing bug.
2016-04-04 11:35:06 +12:00
Patrick Nelson
9d9c572cf8
FIX for #5251 to address minor URL decoding/parsing bug.
2016-04-01 11:44:29 -07:00
Sean Harvey
3b7cfd0118
Merge pull request #5256 from tractorcow/pulls/3.1/fix-error-displayed
...
BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false
2016-04-01 12:10:22 +13:00
Damian Mooyman
6ec2656201
BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false
...
Fixes #5250
2016-04-01 11:04:06 +13:00
Damian Mooyman
bea85c22a5
Merge pull request #5233 from kinglozzer/5129-gridfield-shortcode-parsing
...
FIX: GridField::FieldHolder() should not attempt to parse shortcodes (fixes #5129 )
2016-03-31 10:52:44 +13:00
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
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
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
Daniel Hensby
aeb4aa9565
FIX Dont allow plain text friendly errors
2016-03-28 01:20:18 +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
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
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
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
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
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
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
add2ecdf8b
FIX Parameter tokens now redirect to correct url if mod_rewrite is off
2016-03-18 15:56:39 +00:00
Garion
47179fc808
Update Extend_CMS_Interface.md
...
Resurfaces details on actually creating the required handlers for custom buttons in the CMS, which were detailed in a [past version of the docs](https://github.com/silverstripe-droptables/sapphire/blob/side-by-side/docs/en/howto/extend-cms-interface.md#extending-the-cms-actions ).
2016-03-10 01:02:28 +13:00
Damian Mooyman
de044e591b
Merge pull request #5156 from camfindlay/patch-38
...
DOCS Added a useful code example around positioning of tabs in CMS.
2016-03-09 12:06:34 +13:00
Loz Calver
371c84c22a
Merge pull request #5158 from dhensby/pulls/imagik-installer
...
FIX Imagick installer for travis and php 5.3
2016-03-08 16:38:18 +00:00
Daniel Hensby
7c037d8034
trying to fix imagik properly
2016-03-08 15:38:30 +00:00