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
13,370 Commits 31 Branches 527 Tags 162 MiB
ab24ed3bea
Commit Graph

13370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Guinn
2fd3231325 Fixes a bug that ignored any overridden path for assets/error-404.html etc 2014-09-12 12:23:20 +01:00
AntonyThorpe
da8cebaa62 Describe adding PHPUnit as a simple one line command 
- Removed the composer.json example
- Removed comment about PHPUnit versions

Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
 2014-09-12 17:02:04 +12:00
Jeffrey Guo
1f5f2a1798 Updated html field to support quotes 2014-09-12 15:09:12 +12:00
Will Rossiter
12411b7aa3 Merge pull request #3485 from dpenas/patch-1 
Update 5-dataobject-relationship-management.md
 2014-09-12 09:34:09 +12:00
Darío
8d328944fa Update 5-dataobject-relationship-management.md 
Fixed two small mistakes:

"select one the the mentors" -> "select one of the mentors"
WYSIWIG -> WYSIWYG
 2014-09-11 13:15:38 +02:00
AntonyThorpe
f5ccdda22f Updated en/topics/testing/index.md for clearer PHPUnit installation instructions 
Step by step Composer installation instructions, including a composer.json example.

In addition:
- Removed self-page reference to an introduction
- Removed reference to PEAR installation instructions due to end of life
- Removed reference to Ruby as doesn't add value
- Shortened testing via Web Browser section (as covered in Composer installation instructions)
 2014-09-10 17:20:29 +12:00
Juri Demeschew
3eabd7d41a Fix #3356 js not properly included 2014-09-09 06:59:31 +02:00
Simon Welsh
f0ca37fdea Merge pull request #3480 from halkyon/allowed_exts_doc_change 
Fixing broken docs on setting allowed extensions on a FileField
 2014-09-09 09:43:05 +10:00
Simon Welsh
8a667e1a5a Merge pull request #3478 from halkyon/readme_badges 
Adding some README badges for downloads, license and stable version.
 2014-09-09 09:31:50 +10:00
Sean Harvey
6267d2e51e Fixing broken docs on setting allowed extensions on a FileField 
Refers to an invalid variable, and is overriding the entire Upload,
which isn't necessary.
 2014-09-09 11:14:38 +12:00
Sean Harvey
aa8c4fd004 Adding some README badges for downloads, license and stable version. 2014-09-09 09:28:43 +12:00
Ingo Schommer
fedad00e00 Merge pull request #3476 from AntonyThorpe/PEAR-PHPUnit 
Update PhpUnitWrapper.php & TestRunner.php to recommend PHPUnit installation via Composer
 2014-09-08 22:59:42 +12:00
AntonyThorpe
2d0fe7a4aa Update PhpUnitWrapper.php & TestRunner.php to recommend PHPUnit installation via Composer rather than PEAR 
Using the PEAR Installer to install PHPUnit is no longer supported.  See https://github.com/sebastianbergmann/phpunit/wiki/End-of-Life-for-PEAR-Installation-Method.

Replace PEAR in a comment and die output message with Composer.

Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
 2014-09-08 17:46:09 +12:00
Stig Lindqvist
9f3506bf02 Merge pull request #3467 from halkyon/distinct_orm 
Adding ability to change query distinct on DataList and DataQuery
 2014-09-04 14:08:40 +12:00
Sean Harvey
151b7e9876 Adding ability to change query distinct on DataList and DataQuery 2014-09-04 13:51:43 +12:00
Stig Lindqvist
5168fadbe0 Merge pull request #3468 from halkyon/tidy_fixes 
BUG CSSContentParser fails if CLI tidy doesn't output anything.
 2014-09-04 11:15:39 +12:00
Simon Welsh
bc5cb4296b Merge pull request #3470 from spekulatius/patch-2 
Update templates.md
 2014-09-04 09:10:32 +10:00
spekulatius
400bea1ee1 Update templates.md 
Remove link to page which wasn't continued since 2.4.
 2014-09-04 10:51:02 +12:00
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
Sean Harvey
fe42abce69 BUG CSSContentParser fails if CLI tidy doesn't output anything. 
In cases where CLI tidy fails to recognise HTML with errors or
unknown HTML5 elements, it doesn't output any content and
CSSContentParser fails.

This adds the --force-output parameter so that it always outputs
the input content, even if it wasn't completely fixed by tidy.

It seems that tidy class in PHP already does this, so this just
fixes the CLI use of tidy in CSSContentParser to be consistent.

This fix can be observed on the HHVM travis builds, as tidy isn't
compiled into HHVM as an extension.
 2014-09-03 23:08:53 +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
Nik
6141930f15 Copy SSViewer rewrite_hash_links regexp to SSTemplateParser 
As this is meant to represent the same functionality in two different
areas, it should behave the same way in both.
 2014-09-02 15:20:47 +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
Damian Mooyman
96d0874953 BUG Fix issue with inheritance of Injector service configuration 2014-08-25 10:23: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