Sam Minnee
b99288db04
MINOR: Fixed copyright year
2014-09-18 13:13:38 +12:00
AntonyThorpe
11187c56c0
Updated for PHPUnit version clarification
...
Updated Composer command to reference latest stable version as advised
Removed testing installation via Browser step
Added a note about the PHPUnit 3.7 requirement for running tests via the Browser
2014-09-17 16:49:52 +12:00
Sean Harvey
4ba6d8153d
Merge pull request #3490 from tractorcow/pulls/3.2/parameterised-joins
...
API Allow parameterised joins / subselects
2014-09-17 07:31:18 +12:00
Damian Mooyman
062ad8e685
API Allow parameterised joins / subselects
2014-09-16 17:54:30 +12:00
Damian Mooyman
6610a6a8fb
Merge pull request #3492 from nhorstmeier/patch-2
...
Update searchcontext.md … showing ???
2014-09-16 09:35:53 +12:00
muskie9
f7deaa8042
Update searchcontext.md with … showing ???
2014-09-15 14:44:03 -05:00
Sean Harvey
4084da82b2
Merge pull request #3489 from markguinn/patch-error-path
...
Fixes a bug that ignored any overridden path for assets/error-404.html (etc)
2014-09-12 23:40:07 +12:00
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
Damian Mooyman
35fcb551d9
Refactor / Cleanup Versioned
2014-09-02 09:17:13 +12:00
Damian Mooyman
c140459ac6
BUG Fix versioned
...
Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields
- Fix disjoint of ID / RecordID (which should be the same)
- Fix calculation of new record version
- Fix use of empty vs !isset to check for existing version
2014-09-02 09:14:08 +12:00
Ingo Schommer
26d7febe05
Merge pull request #3461 from NightJar/testfix
...
Fix some edgecase test issues
2014-09-02 08:52:56 +12:00
Nightjar
e4b563e596
Fixing the failure of some tests if the framework dir is named something other than 'framework' (which is a legitimate option)
2014-09-01 13:53:06 +01:00
Ingo Schommer
da61229221
Merge pull request #3430 from kinglozzer/pulls/retina
...
Add "retina" graphics for high-dpi screens
2014-09-01 23:09:40 +12:00
Will Rossiter
265a34141e
GridFieldDeleteAction missing button text without icons
...
The text on the button is hidden from view via CSS already. This allows the button to have text in the event that the GridField does not provide icons (and likely is better for your screen readers).
2014-09-01 21:58:07 +12:00
Will Rossiter
3644110349
FIX: Ensure that columns are unique within a gridfield
2014-09-01 21:50:36 +12:00
Will Rossiter
0991477e5a
Add support for directly saving into a File object
...
saveInto() assumed you were either saving into a hasOne or if you wanted to create a new object.
This made it impossible to have a FileField on an object that you wanted to upload to. This adds a check so that if the local object is a file, save to that.
2014-08-31 15:59:17 +12:00
Will Rossiter
4b6a03bb0b
Fix deprecation warning with word_list
2014-08-31 15:59:16 +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
Sean Harvey
98ab540aba
Merge pull request #3454 from christopherdarling/patch-1
...
add .yml indentation
2014-08-29 21:57:04 +12:00
Christopher Darling
d993ea8cd0
add .yml indentation
...
added some extra rules for any _config/*.yml files so that they use 2 space indents.
2014-08-29 09:48:40 +01:00
Elvinas L.
64490129c2
RSS feed should be sent with charset=utf-8 header
2014-08-29 11:04:44 +03:00
Will Rossiter
7b0ae41916
Merge pull request #3452 from assertchris/add-editorconfig
...
Add editorconfig.
2014-08-29 15:32:25 +12:00
Christopher Pitt
e391ed5b91
Add editorconfig.
2014-08-29 10:28:05 +12: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