Commit Graph

14186 Commits

Author SHA1 Message Date
Sean Harvey
6bfbbdcb38 Merge pull request #3534 from jelicanin/3.1
FIX: i18n support in LookupField
2014-10-10 08:56:35 +13:00
Milan Jelicanin
bad9aa1a48 FIX: i18n support in LookupField
Fixed i18n support in LookupField when value is empty (read-only complement of DropdownField)
2014-10-09 17:43:29 +02:00
Sean Harvey
1e422eef0a Merge pull request #3531 from nhorstmeier/patch-1
Update remove extra );
2014-10-09 10:47:37 +13:00
muskie9
5f0dba5398 Update remove extra ); 2014-10-08 15:32:05 -05:00
Daniel Hensby
3b9056fc01 NEW Cookie_Backend for managing cookie state
I've decoupled `Cookie` from the actual act of setting and getting
cookies. Currently there are a few limitations to how Cookie works that
this change mitigates:

0. `Cookie` currently changes the super global `$_COOKIE` when setting
to make the state of an application a bit more managable, but this is
bad because we shouldn't be modifying super globals
0. One can't actually change the `$cookie_class` once the
`Cookie::$inst` has been instantiated
0. One can't test cookies as there is no class that holds the state of
the cookies (it's just held in the super global which is reset as part
of `Director::test()`
0. One can't tell the origin of a cookie (eg: did the application set it
and it needs to be sent, or did we receive it from the browser?)
0. `time()` was used, so testing was made difficult
0. There was no way to get all the cookies at once (without accessing
the super global)

Todos are on the phpdoc and I'd like to write some tests for the backend
as well as update the docs (if there are any) around cookies.
DOCS Adding `Cookie` docs

Explains basic usage of `Cookie` as well as how the `Cookie_Backend`
controls the setting and getting of cookies and manages state of sent vs
received cookies
Fixing `Cookie` usage

`Cookie` is being used inconsistently with the API throughout framework.
Either by not using `force_expiry` to expire cookies or setting them to
null and then expiring them (which is redundant).
NEW `Director::test()` takes `Cookie_Backend` rather than `array` for `$cookies` param
2014-10-06 17:44:51 +13:00
Sean Harvey
b4df2aa80f Merge pull request #3512 from tractorcow/pulls/3.2/exceptions
BUG ErrorControlChain now supports exception handling
2014-10-06 15:22:11 +13:00
Sean Harvey
b58d42f722 Merge pull request #3523 from michalkleiner/patch-1
fixed anonymous function declaration
2014-10-02 14:42:53 +13:00
Michal Kleiner
1c09d31719 fixed anonymous function declaration
uses changed to use
2014-10-02 11:51:23 +13:00
Sean Harvey
776f6976c9 BUG Text::BigSummary() fails with undefined $data when $plain = false 2014-10-01 16:02:28 +13:00
Sean Harvey
461481d56a Merge pull request #3517 from InfinityIo/fix/ConfigureFromEnv-typos
Fixed typos in ConfigureFromEnv.php
2014-09-30 17:10:54 +13:00
Nik
808878a2d4 Fixed typos in ConfigureFromEnv.php 2014-09-30 16:43:43 +13:00
Sean Harvey
c57c24eb81 Merge pull request #3464 from InfinityIo/rewrite_hash_links-SSTemplateParser-fix
Fix over-eager rewrite_hash_links regexp in SSTemplateParser
2014-09-26 18:14:08 +12:00
Nik
5258b84e5c Updated SSViewerTest to test for SSTemplateParser rewrite_hash_links fix 2014-09-26 17:41:27 +12:00
Damian Mooyman
db0cad4616 BUG ErrorControlChain now supports exception handling 2014-09-26 16:54:34 +12:00
Sean Harvey
e37d9223ee Merge pull request #3509 from tractorcow/pr/3364
Added tests that check comparisonClause()
2014-09-26 12:28:12 +12:00
Damian Mooyman
3ff4bf633e Merge pull request #3407 from dhensby/pulls/file-link
Removing duplicate code and keeping File API consistent
2014-09-26 12:16:34 +12:00
torleif
75ec0c4791 Added tests that check comparisonClause()
AS requested by tractorcow: https://github.com/silverstripe/silverstripe-postgresql/pull/26

Tested on MySQL (succeeds as expected)  Tested on PostgreSQL (and fails as expected, but passes with patch). The fixes test only DataQueryTest related items for consistency, e.g. by avoiding DataObject calls.
2014-09-26 12:11:33 +12:00
Sean Harvey
e3056ed831 Merge pull request #3486 from jeffreyguo/pulls/html-field
Updated html field to support quotes
2014-09-26 11:16:42 +12:00
Sean Harvey
f7af0d8955 Merge pull request #3398 from dnadesign/fixsortableheader
API: Add ClassInfo::table_for_object_field to return the table name for ...
2014-09-26 11:14:33 +12:00
Sean Harvey
c55e4fe7e2 Merge pull request #3475 from AntonyThorpe/PHPUnitDocs
Update testing/index.md for clearer PHPUnit installation instructions
2014-09-26 11:11:19 +12:00
Nicolaas
ea62bf9eed Adding link to UserVoice 2014-09-26 11:07:38 +12:00
Will Rossiter
61ec808604 Set $lock_out_after_incorrect_logins out of the box 2014-09-26 10:49:53 +12:00
Will Rossiter
920978df99 API: Add ClassInfo::table_for_object_field
Returns the table name for a field in a class hierarchy.

This issue raised itself with GridFieldSortableHeader not supporting sorting on fields from parent class fields.
2014-09-26 10:38:31 +12:00
Sean Harvey
2c25358828 Merge pull request #2866 from kinglozzer/2862-uploadfield-editform-height
FIX: UploadField height calculation fix (fixes #2862 & #2863)
2014-09-26 10:30:52 +12:00
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