Commit Graph

13093 Commits

Author SHA1 Message Date
Simon Welsh
64d0a2152b Merge pull request #3469 from stevie-mayhew/patch-1
DataList spelling error
2014-09-04 07:18:42 +10:00
Stevie Mayhew
05379ff188 DataList spelling error
Minor spelling error in DataList
2014-09-04 09:16:13 +12:00
Stig Lindqvist
c112c1c69f Merge pull request #3466 from halkyon/showqueries_label
showqueries output incorrectly shows "ms" instead of "s"
2014-09-03 16:27:33 +12:00
Sean Harvey
e93683bfca showqueries output incorrectly shows "ms" instead of "s" 2014-09-03 16:24:56 +12:00
Sean Harvey
55de41b0d5 Merge pull request #3465 from tractorcow/pulls/3.1/fix-query
BUG MySQLDatabase performs queries on wrong DB connection when using connection $name != default
2014-09-03 11:58:30 +12:00
Damian Mooyman
56d84d22a1 BUG MySQLDatabase performs queries on wrong DB connection when using connection $name != 'default' 2014-09-03 11:43:24 +12:00
Simon Welsh
7bacaa8c6b Merge pull request #3453 from uniun/patch-1
RSS feed should be sent with charset=utf-8 header
2014-08-30 13:18:47 +10:00
Elvinas L.
64490129c2 RSS feed should be sent with charset=utf-8 header 2014-08-29 11:04:44 +03:00
Simon Welsh
6fed1f6791 Merge pull request #3449 from camspiers/patch-2
Fix deprecation warnings in internal SQLQuery usage
2014-08-28 12:43:06 +10:00
Cam Spiers
298017c6d1 Fix deprecation warnings in internal SQLQuery usage 2014-08-28 14:26:17 +12:00
Simon Welsh
935eabc1f9 Merge pull request #3436 from dnadesign/fixsortonrelations
FIX: Sorting a DataQuery over a relation.
2014-08-26 15:54:38 +10:00
Will Rossiter
7993875f16 FIX: Sorting a DataQuery over a relation.
When sorting a DataQuery over a relation, the SQLQuery automatically included the sort column. The issue with the implement is that potentially the joined record has a field with the same name as the source record causing it to be overridden.

In the attached test case, without the patch the title will be set to 'Bar' rather than 'Foo'.

This patch aliases the sort column. Alternativally a patch would be to
2014-08-26 17:41:38 +12:00
Sean Harvey
70dfc55d34 Minor correction to documentation 2014-08-26 14:55:45 +12:00
Damian Mooyman
9ec4669a59 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-25 11:38:13 +12:00
Damian Mooyman
9da3357e3a add 3.1.6 docs 2014-08-25 11:25:01 +12:00
Sean Harvey
afa6612074 Merge pull request #3428 from chillu/pulls/contrib-docs
Updated contrib docs, mention "DO NOT MERGE" pull requests
2014-08-25 09:00:38 +12:00
Ingo Schommer
5c9e88b9a0 Updated contrib docs, mention "DO NOT MERGE" pull requests
These should be avoided because they undermine the process of
peer review and merging in github, we should strive to have
zero open pull requests, as opposed to treating it as a stage
for work in progress. Intermediary code review can happen in github forks instead.

Also remove some checklist items which were based on the Trac bugtracker,
e.g. its not longer possible to assign yourself to issues because
of github's limited permission abilities.
2014-08-25 08:29:25 +12:00
Sean Harvey
13ca45411c Merge pull request #3427 from dhensby/patch-4
Use injector to create `ValidationResult`
2014-08-23 11:53:57 +12:00
Daniel Hensby
c5956d6ac4 Use injector to create ValidationResult 2014-08-22 15:19:01 +01:00
Sean Harvey
0e07f1a7f5 Merge remote-tracking branch 'origin/3.0' into 3.1 2014-08-22 17:50:36 +12:00
Sean Harvey
6e0d9df331 Merge pull request #3406 from ss23/patch-2
Update urlvariabletools.md
2014-08-22 17:24:36 +12:00
Stig Lindqvist
c8c1833e09 Merge pull request #3418 from halkyon/remove_supression
Remove @ suppression operator on session_start()
2014-08-22 17:08:10 +12:00
Ingo Schommer
1661213e5b FIX Opt-out pf form message escaping (fixes #2796)
This fixes a limitation introduced through http://www.silverstripe.org/ss-2013-008-xss-in-numericfield-validation/.
Form messages used to accept HTML, now they’re escaped by default, effectively removing the ability
to pass in HTML and take care of escaping manually.

We pass through HTML to message in core through the CTF system, so this needs to be fixed.
It’s an alternative fix to https://github.com/silverstripe/silverstripe-framework/pull/2803.
2014-08-22 16:59:34 +12:00
Damian Mooyman
0d169d5c8d Merge pull request #3424 from halkyon/director_test_relative
BUG Fixing Director::test() failing on BASE_URL prefixed URLs
2014-08-22 15:46:54 +12:00
Sean Harvey
8063b349c8 BUG Fixing Director::test() failing on BASE_URL prefixed URLs
Example: you have a site in a sub-directory off the webroot, you call
->Link() on a SiteTree record, which returns "/[sitedir]/my-page", and
you pass this URL to Director::test(). It's a valid URL, but
Director::test() will throw a 404.

Director::test() should be ensuring that all URLs passed to it are
properly made relative, not just in the case where it thinks the URL
is absolute.
2014-08-22 15:21:53 +12:00
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
☃ 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
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
Damian Mooyman
a838e9bae6 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-19 09:38:17 +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