Ingo Schommer
8ec3641e60
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/javascript/LeftAndMain.FieldHelp.js
lang/en.yml
model/URLSegmentFilter.php
2012-12-21 15:04:17 +01:00
Ingo Schommer
3fd1769142
Added docs about which branch to choose
2012-12-21 14:26:51 +01:00
Ingo Schommer
f0f83b26a8
BUG Graceful handling of sprintf with too few params in i18n::_t()
...
Originally discovered as a problem with the 'GridFieldDetailForm.Saved' in nl.yml
2012-12-21 11:46:39 +01:00
Ingo Schommer
661a4a2492
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:46:38 +01:00
Ingo Schommer
7a6ce01567
BUG Skip pagination on UnsavedRelationList in GFPaginator
2012-12-20 20:16:53 +01:00
Ingo Schommer
c054ab49a2
Merge pull request #1053 from unclecheese/patch-11
...
Fix edge case in which uninitialized buttons are being destroyed.
2012-12-20 11:08:47 -08:00
Ingo Schommer
6bcffd66ad
Merge pull request #1063 from drzax/log-file-formatter-fix
...
BUGFIX Ensure has length before using string index access.
2012-12-20 10:19:03 -08:00
Ingo Schommer
d918c26782
Allow recursive includes in i18nTextCollector ( fixes #8133 )
2012-12-20 12:46:57 +01:00
Ingo Schommer
9ffd25225e
Don't complain about pre-replaced YAML fixture relations
2012-12-20 12:46:56 +01:00
Nathan J. Brauer
d487a42456
API Default to Upload::$uploads_dir in UploadField
2012-12-20 10:25:52 +01:00
Sean Harvey
aa3b358469
Adding test for SortColumn to SQLQueryTest
...
Mostly for the benefit of MSSQLDatabase which is having problems
with subselects and alias functions.
2012-12-20 15:52:46 +13:00
Simon Welsh
e20f15df55
Remove /e option due to preg_replace_callback use
2012-12-20 15:35:40 +13:00
Simon Elvery
1a4eaaaf04
BUGFIX Ensure has length before using string index access.
2012-12-20 12:27:09 +10:00
Sam Minnée
0ab513ac5d
Merge pull request #1060 from simonwelsh/55-fixes
...
Use preg_replace_callback over preg_replace with e modifier
2012-12-19 18:13:20 -08:00
Simon Welsh
c56a80d6ce
Use preg_replace_callback over preg_replace with e modifier
2012-12-20 13:40:42 +13:00
Ingo Schommer
e4cb25b831
Merge pull request #1058 from chillu/pulls/remove-testsession
...
API Remove dev/tests/startsession etc, use new "testsession" module
2012-12-19 11:42:56 -08:00
Ingo Schommer
86940aa684
Made hyphen escaping clearer in FileNameFilter and URLSegmentFilter
...
Does not actually change behaviour, but ensures that the hyphen
is not interpreted as a range identifier should it be placed
between two characters which PCRE regards as "rangeable".
2012-12-19 17:30:28 +01:00
Kirk Mayo
561e629c16
NEW Show the allowed extensions as a toggle tip as per trac 7993
...
NEW Added a behat test for showing extension trac 7993
2012-12-19 17:00:39 +01:00
Ingo Schommer
2e1a5081fa
API Remove dev/tests/startsession etc, use new "testsession" module
...
Removed commands: startsession, endsession, sessionloadyml, setdb, emptydb.
See https://github.com/silverstripe-labs/silverstripe-testsession
2012-12-19 16:05:37 +01:00
unclecheese
07fb756327
Fix edge case in which uninitialized buttons are being destroyed.
...
In certain cases, the button may not yet be initialized or may no longer have button properties at the time of removal from the DOM. Without this check, an uncaught exception is thrown.
2012-12-18 09:41:54 -05:00
Ingo Schommer
9b3aebd310
Allow HTML in FormField->setDescription()
2012-12-18 15:02:23 +01:00
Ingo Schommer
f72a024af5
Updated changelog notes
2012-12-18 10:40:05 +01:00
Mateusz Uzdowski
d5a1c3d99a
BUG SS has problems handling + in URLs. Filter them out.
...
+ has a special meaning in the URLs so overall it's a good idea to
strip them out. Otherwise they would need to appear in their ugly url
encoded form "%2B".
Refer: http://open.silverstripe.org/ticket/7929
2012-12-18 09:44:47 +01:00
Sam Minnée
e4198de115
Merge pull request #1047 from simonwelsh/ns_class_parse
...
FIX Handle namespaced classes in Object::parse_class_spec()
2012-12-17 23:55:50 -08:00
Sam Minnée
9460e8704c
Merge pull request #1043 from tractorcow/3.1-deleted-pages-fixes
...
Fix for issue #7975 - Issue with retrieving deleted pages
2012-12-17 19:50:27 -08:00
Simon Welsh
94be5c6d87
FIX Handle namespaced classes in Object::parse_class_spec()
2012-12-18 15:00:45 +13:00
Ingo Schommer
618a3d0314
Requirements acces to files with query strings ( fixes #7735 )
...
Originally authored by florian.thoma, tests added
by Ingo Schommer. Also removed query params from
file paths before calling mtime() on it.
See https://github.com/silverstripe/sapphire/pull/1023
2012-12-18 01:01:19 +01:00
Matt Lewis
af6eccea96
Fixing typo in Requirements allowing access to files requested with query strings
2012-12-18 00:53:54 +01:00
Paul Clarke
51c6a87fc7
Fix for ie8 styles for preview switch and modes
2012-12-17 23:11:05 +01:00
Ingo Schommer
8779e9be5b
BUG Fixed changetracking for radio and checkbox field types
...
Also removing the 'changed' class from the form once
no further fields are marked as changed. That's important
now that we're surfacing the state much more visibly
through the alternative "save" button styles in the CMS.
2012-12-17 23:02:04 +01:00
Damian Mooyman
b01b91ffc3
BUG When selecting stage_unique from Versioned the augmentSQL function would permanantly alter the DataQuery while doing a recursive augmentSQL. This fix correctly maintains the correct Versioned.mode so that subsequent calls to this function exhibit the same expected behaviour.
2012-12-18 10:11:30 +13:00
Justin Martin
0ee7bbf75c
BUG: Removed !important attribute of #Remember margin
2012-12-17 17:45:39 +01:00
Loz Calver
8066376290
ENHANCEMENT: LeftAndMain breadcrumbs to use MenuTitle
...
Breadcrumbs in the CMS currently only use title, when MenuTitle is
probably more appropriate (if it is set).
2012-12-17 17:41:04 +01:00
uniun
77212c0647
CMS Titles does not support UTF-8
...
Title in CMS is set using header X-Title. But UTF-8 characters can't be used in HTTP headers. So the title should be encoded just before sending X-Title header and decoded before setting HTML document title (fixes #7942 ).
2012-12-17 17:36:00 +01:00
Ingo Schommer
0d37cd3e69
Updated changelog
2012-12-17 16:40:33 +01:00
Ingo Schommer
8f239d6373
SimpleXML string casting in tests for older PHPUnit
2012-12-17 15:52:01 +01:00
Ingo Schommer
7950584b3a
SimpleXML string casting in tests for older PHPUnit
2012-12-17 15:46:09 +01:00
Ingo Schommer
546d202f3a
Don't complain about pre-replaced YAML fixture relations
2012-12-17 15:33:12 +01:00
Ingo Schommer
6028cf1b62
Fixed panel spacing regressions from 544d2eb6
...
Specifically, the change removed the "add page" panel padding,
because it moved padding from .cms-panel-padded into
commonly contained elements, like .ui-tabs-panel.
Apart from breaking layouts, it makes the class meaningless,
since its only padded depending on which elements it contains.
In order to rectify some introduced inconsistencies,
much too complex were required, e.g.
.ui-tabs .cms-edit-form, .ui-tabs .cms-content-fields {...}.
2012-12-17 15:20:13 +01:00
Ingo Schommer
407a19cdb6
Beta changelog links
2012-12-17 14:27:31 +01:00
Ingo Schommer
c1bd1432d1
Tab spacing (regression from 2d075671
)
2012-12-17 14:21:13 +01:00
Ingo Schommer
375c33e0cf
Wider sidebar to accommodate "add" and "edit" buttons
2012-12-17 13:00:18 +01:00
Ingo Schommer
c5c2df2323
Merge remote-tracking branch 'origin/3.0' into 3.1
2012-12-17 11:54:40 +01:00
Ingo Schommer
3b59d4a762
Updated translations
2012-12-17 11:45:09 +01:00
Ingo Schommer
e8f3e7b36e
Only reset test state in SapphireTest if its previously been set
...
That's not the case e.g. if the *first* test in a suite
is skipped, so setUp() is never executed completely.
2012-12-17 11:44:08 +01:00
Ingo Schommer
a823c38c3f
Fixed JS syntax error
2012-12-17 11:38:03 +01:00
Ingo Schommer
9cfa7b75f1
Wider side panel to fit "add" and "edit" button
...
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.
2012-12-17 11:38:03 +01:00
Ingo Schommer
17908b670a
Revert CMS button style (regression from fe08236
)
...
Was originally added for CMS grouped actions,
but can't see any effect. Probably related to the unreleased
changes around the new "batch actions" and "add page" panel styling.
It breaks button height in the top toolbar, by shifting from jQuery
UI's (well tested) mode of applying padding to the container,
to applying padding to the contained text instead. This
conflicts with the line-height set on many buttons.
2012-12-17 11:38:00 +01:00
Damian Mooyman
6aa16e1f01
BUG Test case for versioned now correctly checks IDs returned from Versioned::get_including_deleted
...
BUG Issue with deleted records not being queried properly.
API DataQuery::expressionForField no longer requires a second parameter. Rather the query object is inferred from the DataQuery itself. This should improve consistency of use of this function.
2012-12-17 17:15:26 +13:00
Ingo Schommer
75b0c3ec8f
Added 3.1.0-beta1 changelog
2012-12-17 00:47:36 +01:00