Sean Harvey
99f8fb29b5
Merge pull request #3507 from tractorcow/pulls/fix-mailer
...
API / FIX / Cleanup - Mailer and Convert::html2raw
2014-09-26 10:15:18 +12:00
Sean Harvey
f61bb186a7
Merge pull request #3007 from tractorcow/pulls/singleton
...
API Singleton method allowing type inference
2014-09-26 10:11:42 +12:00
Sean Harvey
a20813da9e
Merge pull request #3508 from tractorcow/pulls/3.1/fix-unsavedrelationlist
...
FIX use @param $colName in column call
2014-09-26 09:53:31 +12:00
Gabrijel Gavranović
cf456d6625
FIX use @param $colName in column call
2014-09-26 09:18:29 +12:00
Damian Mooyman
bf4e9eb044
API Singleton method allowing type inference
...
This pattern improves over the current usage of singleton by allowing type inference.
This also better supports refactor, code usage detection, and auto-completion of classes.
2014-09-26 09:10:25 +12:00
Sean Harvey
ee717c7f66
Merge pull request #3287 from IgorNadj/3.1
...
ENH making /dev extendable
2014-09-25 18:34:21 +12:00
Sean Harvey
04e26d4a36
Merge pull request #3025 from tractorcow/pulls/3.2-date-relevance
...
API DateTime.Ago better infers significance of date units.
2014-09-25 18:28:30 +12:00
Sean Harvey
409aebf0af
Merge pull request #2515 from guttmann/html-text-absolutelink-placeholders
...
HTMLText AbsoluteLink parse placeholders
2014-09-25 16:07:41 +12:00
Damian Mooyman
e47800917a
API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding
...
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
2014-09-25 16:04:56 +12:00
Damian Mooyman
29e3347562
API Convert::html2raw no longer wraps text automatically
...
BUG Convert::html2raw now correctly decodes single quotes
2014-09-25 16:04:48 +12:00
Will Rossiter
1d219aad7c
Merge pull request #3506 from christopherdarling/patch-1
...
DOCS: removed reference to deprecated :Negation filter
2014-09-25 08:42:28 +12:00
Christopher Darling
39e9513c32
removed reference to deprecated :Negation filter
2014-09-24 12:49:12 +01:00
Sean Harvey
bbd4e8b8c1
Merge pull request #3462 from tractorcow/pulls/3.2/fix-versioned
...
BUG Fix versioned failing to generate new versions
2014-09-24 18:03:40 +12:00
Simon Welsh
7e58bbf6ce
Merge pull request #3505 from halkyon/cookie_httponly
...
Cookies set via Cookie::set() are now HTTP only by default
2014-09-24 15:49:32 +10:00
Sean Harvey
563155391f
API Cookies set via Cookie::set() are now HTTP only by default
2014-09-24 17:48:13 +12:00
Sean Harvey
6d12cf372e
Merge pull request #2921 from JayDevlin/2904-upload-file-versioning
...
BUG Upload: file versioning uses illegal underscore in filename
2014-09-24 15:59:53 +12:00
Sean Harvey
4ae0d90c55
Merge pull request #2946 from tractorcow/pulls/3.1-fix-injector-inheritance-bug
...
BUG Fix issue with inheritance of Injector service configuration
2014-09-24 15:52:00 +12:00
Simon Welsh
3f7a4ff993
Merge pull request #3504 from halkyon/remove_makefile
...
Removing Makefile referring to old commands, no longer seems useful.
2014-09-24 11:07:05 +10:00
Sean Harvey
45d9735052
Removing Makefile referring to old commands, no longer seems useful.
...
This Makefile doesn't appear to be that useful anymore, especially
considering it's running tests via `dev/tests/all`, an old way of
running the tests. It also refers to "windmill", which I'm pretty sure
has been removed, considering it refers to the "cms" module as well.
Continuous integration should simply just use the `phpunit` command
which is able to output better results for TeamCity, etc.
The only target here which is actually useful is the jasmine one, but
I think that could just be started manually, instead of using this
Makefile.
2014-09-24 13:00:25 +12:00
Sean Harvey
2918562905
Merge pull request #3498 from edlinklater/patch-1
...
MINOR: Docs: Invalid link to WAMP page
2014-09-22 07:39:49 +12:00
Ed Linklater
c2d02a6daf
MINOR: Docs: Invalid link to WAMP page
2014-09-21 13:54:34 +12:00
Ingo Schommer
fb8b22c292
Merge pull request #3402 from halkyon/plural_fix
...
BUG Fixing plural_name messing up singular words ending in "e" (#3251 )
2014-09-18 21:56:56 +12:00
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
