Sean Harvey
73b1537a89
Merge pull request #3423 from tractorcow/pulls/3.1/travis
...
Reformat .travis.yml
2014-08-22 14:04:08 +12:00
Damian Mooyman
3cfb285122
Reformat .travis.yml
2014-08-22 13:49:10 +12:00
Joel Marcey
0c85680371
Support PHPUnit 3.8+ compatibility
...
Summary:
PHPUnit 3.8+ adds a method to its PHPUnit_Framework_TestListener called addRiskyTest(). Need to stub it out to avoid "must implement this interface method" fatals when using 3.8+
Test Plan:
Reviewers:
CC:
Task ID: #
Blame Rev:
2014-08-22 13:43:23 +12:00
Damian Mooyman
2368b2af2f
Merge pull request #3419 from halkyon/hhvm_tidy_fix
...
Fixing HHVM builds not having tidy support built-in to PHP (#3414 )
2014-08-22 12:02:01 +12:00
Sean Harvey
03c7231fcd
Fixing HHVM builds not having tidy support built-in to PHP ( #3414 )
...
Installs cli tidy, which is used as a fallback for CSSContentParser.
2014-08-22 11:41:51 +12:00
Damian Mooyman
aec8430395
Merge pull request #3393 from halkyon/flushable
...
NEW Provide a consistent way of triggering flush
2014-08-22 10:28:26 +12:00
Sean Harvey
64fbb512da
Merge pull request #3421 from christopherdarling/patch-1
...
DOCS: correct notes on TEMP_FOLDER
2014-08-22 09:41:45 +12:00
Sean Harvey
2b316e79e5
NEW Provide a consistent way of triggering flush
...
Provides an interface for classes to implement their own flush()
functionality. This function gets called early in a request on
all implementations of Flushable when flush=1|all is requested in the
URL.
This fix came out of an issue where Requirements combined files were not
being cleaned up after dev/build?flush=1, due to the fact that flush
would only occur when you called it while on a page that used those
combined files, but not in any other contexts. This will now call flush
on any implementors of Flushable regardless of the context of where
flush was called.
2014-08-22 09:24:27 +12:00
Christopher Darling
d89ed7c4a7
DOCS: correct notes on TEMP_FOLDER
...
getTempParentFolder() in framewor/core/TempPath.php checks for silverstripe-cache directory in webroot first, failing that it falls back on the sys_get_temp_dir() folder.
also, getTempFolder() is no longer in framework/core/Core.php since #b075fa29c59f970bea31bbe8be1bd6560a8778b6, it is now located in framework/core/TempPath.php
2014-08-21 14:31:55 +01:00
Sean Harvey
0b5599e21b
Remove suppression operator on session_start()
...
This was originally added to stop PHP on Windows complaining that it
couldn't garbage collect old sessions, but that was for an old version
of PHP years ago and doesn't seem to be an issue any longer. We
really shouldn't be suppressing this. If session_start() threw a
warning that it couldn't write to the filesystem, then we wouldn't
know about it at all.
2014-08-21 17:38:49 +12:00
Simon Welsh
c4ea64e743
Merge pull request #3416 from halkyon/tidy_doc
...
CSSContentParser: Fix mispelled "tidy" and correct case of "tidy" class
2014-08-21 12:49:50 +10:00
Sean Harvey
fcdcc3889a
CSSContentParser: Fix mispelled "tidy" and correct case of "tidy" class
2014-08-21 13:56:05 +12:00
Sean Harvey
c7fb61120e
Removing redundant aggregatestore cache config ( #3404 )
2014-08-21 09:13:28 +12:00
Daniel Hensby
6577324a9c
Removing duplicate code and keeping File API consistent
2014-08-20 11:18:18 +01:00
☃ Stephen Shkardoon ☃
8c12af6acb
Update urlvariabletools.md
...
Remove strange reference to flush values in showtemplate line.
2014-08-20 21:52:14 +12:00
Sean Harvey
04cbd4dd46
Merge pull request #3401 from kinglozzer/pulls/fix-cli-tidy
...
Fix CSSContentParser's use of CLI 'Tidy'
2014-08-20 21:43:42 +12:00
Loz Calver
8e060d159f
Fix: Make CSSContentParser's use of 'Tidy' consistent
2014-08-20 09:08:03 +01:00
Sean Harvey
61c6dee057
BUG Fixing plural_name messing up singular words ending in "e" ( #3251 )
...
This would ideally be fixed with the ability to use an external library
like gettext, but that's an API change. This for now fixes the issue
where a singular like "Page" returns "Pags" for the plural name.
2014-08-20 14:55:40 +12:00
Sean Harvey
552b54201a
Merge pull request #3302 from JayDevlin/3250-deleteFormattedImages-test
...
FIX Image: deleteFormattedImages() regex
2014-08-20 09:13:36 +12:00
Devlin
4178f7beb0
test all generate methods and formatted image deletetions
2014-08-19 10:12:47 +02:00
Sean Harvey
8bd867ef4e
Merge pull request #3334 from jedateach/fixes/imagick-padresize
...
Image Magick PaddedResize fix
2014-08-19 14:19:13 +12:00
Sean Harvey
ef272be0db
Merge pull request #3400 from jedateach/fixes/imagick-crop-notice
...
FIX: Image_Backend -> croppedResize function doesn't include a backgroundColor
2014-08-19 13:34:47 +12:00
Jeremy Shipman
bf3ad56674
FIX: Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize
2014-08-19 12:24:45 +12:00
Jeremy Shipman
02265dc3c4
FIX: Correctly paddedResize images in IMagickBackend.
...
FIX: Compression quality setting now takes effect.
fixes #3333
2014-08-19 12:24:07 +12:00
Jeremy Shipman
47cc157d97
FIX: Keep ImagickBackend API consistent with Image_Backend interface and fix color formatting.
2014-08-19 12:24:07 +12:00
Sean Harvey
c0abb08b61
Merge pull request #3397 from tractorcow/pulls/3.2/whitespace
...
Remove all redundant whitespace
2014-08-19 09:55:31 +12:00
Damian Mooyman
a838e9bae6
Merge remote-tracking branch 'origin/3.1.6' into 3.1
2014-08-19 09:38:17 +12:00
Damian Mooyman
eb069e605d
Remove all redundant whitespace
2014-08-19 09:17:15 +12:00
Damian Mooyman
64bf786958
Merge pull request #3396 from halkyon/deprecation_cleanup
...
Removing @deprecated 3.1 functionality and classes.
2014-08-19 08:40:14 +12:00
Simon Welsh
d2c828678a
Merge branch 'Nyholm-patch-1' into 3.1
...
Closes #3292
2014-08-18 21:16:51 +10:00
Tobias Nyholm
9476b22409
Added HHVM to .travis.yml
2014-08-18 21:16:30 +10:00
Sean Harvey
7659ebab8e
Merge pull request #3399 from kinglozzer/pulls/dbconfig-response-code
...
Add HTTP status code for $databaseConfig error (fixes #3392 )
2014-08-18 20:54:40 +12:00
Loz Calver
b27cd73cb9
Add HTTP status code for $databaseConfig error ( fixes #3392 )
2014-08-18 09:16:57 +01:00
Damian Mooyman
f49416858c
Added 3.1.6-rc3 changelog
2014-08-18 17:42:31 +12:00
Damian Mooyman
7e70b8de52
BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url
2014-08-18 16:12:44 +12:00
Kirk Mayo
5704ae2113
NEW: Sanitise task name in runTask
2014-08-18 16:12:05 +12:00
Sean Harvey
404478b07f
Removing @deprecated 3.1 functionality and classes.
...
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Simon Welsh
17bdc2dea1
Merge pull request #3395 from halkyon/rewriterule_consistency
...
Fixing inconsistent use of RewriteRule in docs and install.php5
2014-08-18 08:58:57 +10:00
Sean Harvey
8cf99b9bec
Fixing inconsistent use of RewriteRule in docs and install.php5
...
It currently doesn't match the .htaccess that comes with a checkout of
silverstripe-installer.
2014-08-18 10:55:47 +12:00
Sean Harvey
672e817439
Merge pull request #3394 from simonwelsh/stupid-htaccess
...
Don't block rewriting .php URLs
2014-08-18 10:54:10 +12:00
Simon Welsh
b9ae401772
Don't block rewriting .php URLs
2014-08-16 22:08:52 +10:00
Sean Harvey
199d7a8ba7
Merge pull request #3391 from tractorcow/pulls/3.1/fix-history-js
...
BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url
2014-08-15 15:24:46 +12:00
Damian Mooyman
79c7276611
BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url
2014-08-15 15:17:39 +12:00
Simon Welsh
66bacc69f0
Merge pull request #3387 from halkyon/summary_fields_custom_label2
...
BUG Custom label set in summary_fields config gets overridden
2014-08-14 14:22:28 +10:00
Sean Harvey
5f1552b365
BUG Custom label set in summary_fields config gets overridden
2014-08-14 14:19:41 +12:00
Sean Harvey
b346d2b4d3
Merge pull request #3376 from mateusz/link-tracking
...
Move the link-tracking into the cms to remove the SiteTree dependency.
2014-08-14 14:11:22 +12:00
Sean Harvey
9bc7dd3059
Merge pull request #3386 from tractorcow/pulls/3.1/abstracttest
...
BUG Fix 'undefined index 0'
2014-08-14 12:48:45 +12:00
Damian Mooyman
7c2eee116f
BUG Fix 'undefined index 0'
2014-08-14 12:24:56 +12:00
Sean Harvey
f8a77eeace
Merge pull request #3385 from mateusz/viewable-data-getter
...
API Add a getter for customisedObject property.
2014-08-14 11:45:35 +12:00
Mateusz Uzdowski
784e292d4e
API Add a getter for customisedObject property.
...
This is the only way to see if the ViewableData has been customised,
and is useful in situations when you want to further customise an
already-customised object.
2014-08-14 10:28:00 +12:00
