Sean Harvey
7e45980530
Merge pull request #3266 from tractorcow/pulls/3.1/debug-view
...
API Debug::dump in CLI no longer generates HTML. Uses colours.
2014-07-05 14:48:00 +12:00
Damian Mooyman
3c5e51a9f1
API Debug::dump in CLI no longer generates HTML. Uses colours.
...
API Column size is configurable in DebugView
2014-07-05 14:37:06 +12:00
Sam Minnée
14faf95f35
Fixed wrong variable name in modeladmin docs
2014-07-05 14:34:42 +12:00
Sam Minnée
ac9a6cbc62
Merge pull request #3169 from JorisDebonnet/patch-3
...
Update modeladmin.md
2014-07-05 14:33:49 +12:00
Stevie Mayhew
1d86fe4f52
FEATURE allow force resampling on images
2014-07-05 14:29:01 +12:00
Sam Minnée
2a3eebf6df
Merge pull request #3261 from oceanmountain/patch-1
...
Update templates.md
2014-07-05 14:23:20 +12:00
Hamish Friedlander
c5f41a7d20
Merge pull request #3246 from tractorcow/pulls/3.1/remove-basicauth-isdev
...
BUG using isDev query string no longer triggers basic auth
2014-07-05 12:57:12 +12:00
kay
f3f6f8a8be
Update templates.md
...
Changed Fragment links to Anchor links, however it's is slighty confusing what the right name for the thing is.
According to w3.org: "Some URIs refer to a location within a resource. This kind of URI ends with "#" followed by an anchor identifier (called the fragment identifier)." - http://www.w3.org/TR/html401/intro/intro.html#fragment-uri
After doing some research in the most common used name for the #some-link identifier I came to the conclusion that most of the time (about 70% on StackOverflow/BlogArticles/Interwebz) Anchor-link was the term used to describe the identifier. Imho, Anchor is the prefered term for the identifier.
Is it acceptable to change fragment to anchor, since it seems more used?
2014-07-04 13:40:26 +02:00
Sean Harvey
ceb1e6db38
Merge pull request #3256 from tylerkidd/htmlEditorField_Field_fix
...
Updated HtmlEditorField Field()
2014-07-04 11:59:24 +12:00
Tyler Kidd
16f5ef147e
Updated HtmlEditorField Field()
...
I had a need to use onBeforeRender on a DataExtension of
HtmlEditorField and noticed it wasn't there. Added return
parent::Field($properties) use FormField::Field which utilizes
onBeforeRender.
2014-07-03 08:54:37 -05:00
Stig Lindqvist
e1da0867d0
Merge pull request #3255 from tractorcow/pulls/3.1/fix-i8n-locale
...
BUG: Fix incorrect common_languages config
2014-07-03 18:01:11 +12:00
Damian Mooyman
c329f07023
BUG: Fix incorrect common_languages config
2014-07-03 17:52:52 +12:00
Damian Mooyman
d3c7e41419
BUG using isDev or isTest query string no longer triggers basic auth
2014-07-02 11:51:51 +12:00
Simon Welsh
6874e44179
Remove PHP 5.6 from allowed failures
...
PHP5.6 is due for release rather soon, so we should be ready for it
2014-06-28 08:57:24 +10:00
Will Rossiter
2c741fec0c
FIX Add support for compositedbfield within many_many_extraFields
...
Previously selectFromTable would simply try to select the composite field name. This expands the extraField name to include the children field names and uses CompositeDBField::writeToManipulation to generate the correct SQL for the queries.
2014-06-28 10:54:48 +12:00
Michael Parkhill
19e0d5e3d5
FIX declarations matching PHPUnit_Framework_Assert
...
FIX for phpunit error message: ERROR [Strict Notice]: Declaration of SapphireTest::assertNotContains() should be compatible with PHPUnit_Framework_Assert::assertNotContains, and the same error for assertContains()
2014-06-27 16:05:40 +12:00
Damian Mooyman
a6f244faff
Merge pull request #3231 from tscole/patch-2
...
Update i18n.php
2014-06-24 09:14:17 +12:00
Damian Mooyman
15c03bcb46
Merge pull request #3230 from tscole/patch-1
...
Update i18n.php
2014-06-24 09:12:29 +12:00
tscole
32c2028368
Update i18n.php
...
Norwegian should use 'nb' and not 'no' in common languages array
2014-06-23 14:52:08 +01:00
tscole
f329f3b313
Update i18n.php
...
Correct common_languages for Norwegian to use 'nb' and not 'no'
2014-06-23 14:50:36 +01:00
Damian Mooyman
6ff1d3ccbc
Merge pull request #3225 from halkyon/log_constants
...
Adding some more commonly used SS_Log priority constants.
2014-06-23 13:15:45 +12:00
Sean Harvey
9c2ddd4850
Adding some more commonly used SS_Log priority constants.
2014-06-23 11:50:05 +12:00
Mateusz U
32ae468454
Merge pull request #3216 from halkyon/session_inst
...
Better support for overloading start and destroy methods in Session
2014-06-23 10:15:15 +12:00
Damian Mooyman
ecb0caf1a1
Merge pull request #3228 from daslicht/patch-1
...
Update javascript.md
2014-06-23 08:45:17 +12:00
daslicht
e0c4a70a8d
Update javascript.md
...
Replaced deprecated jQuery live() with on(), updated link to documentation.
2014-06-22 10:59:59 +02:00
Sean Harvey
0ee3a683a5
Better support for overloading start and destroy methods in Session
...
Move functionality from static start and destroy functions into instance
methods, allowing these to be overloaded. This works the same way as
calling Session::set() which then in turn calls inst_set()
Additionally use Injector to create the default Session instance to
allow the class to be swapped out.
2014-06-20 10:35:53 +12:00
Will Rossiter
f48cf98921
Merge pull request #3223 from camfindlay/patch-6
...
Fixes to the :::ss parsing tutorial 1.
2014-06-20 10:20:05 +12:00
Cam Findlay
3e91900cc1
Fixes to the :::ss parsing - extra tabs were breaking it.
2014-06-20 10:13:07 +12:00
Stig Lindqvist
86e91b57bf
Merge pull request #3219 from AntonyThorpe/patch-1
...
Update forms.md with additional example code in MyForm.ss
2014-06-19 15:43:11 +12:00
Antony Thorpe
6ac1c8256b
Update forms.md with additional code in MyForm.ss
...
Show two ways of reaching a nested field plus that field's validation message
2014-06-17 17:18:04 +12:00
Damian Mooyman
11cc27f700
Merge pull request #2967 from halkyon/formfield_readonly
...
Fixing FormField not setting readonly attribute on setReadonly(true)
2014-06-17 14:48:56 +12:00
Sean Harvey
b4bfb75a0d
Merge pull request #3207 from chillu/pulls/behat-gridfield
...
Moved table-related feature steps to behat extension
2014-06-17 13:43:33 +12:00
Damian Mooyman
91afa4ac61
Merge pull request #3211 from kinglozzer/pulls/3210-duplicate-classes
...
FIX: ClassManifest errors if files contain duplicate class names (fixes #3210 )
2014-06-17 10:17:47 +12:00
Loz Calver
3d71a22a98
FIX: ClassManifest errors if files contain duplicate class names ( fixes #3210 )
2014-06-16 22:18:18 +01:00
Stig Lindqvist
34304cf6e4
Merge pull request #3139 from tractorcow/pulls/3.1/fix-gridfield-sorting
...
BUG Fix grid field showing search without search component added
2014-06-14 17:10:17 +12:00
Stig Lindqvist
332c2c3db0
Merge pull request #3129 from dnadesign/formFieldContainerFieldList
...
added in a containerFieldList getter
2014-06-14 17:06:15 +12:00
Stig Lindqvist
c05030d513
Merge pull request #3188 from dhensby/patch-1
...
DOCS Explicitly exclude dev deps for deployment
2014-06-14 16:28:43 +12:00
Ingo Schommer
415ba11356
Merge pull request #3175 from tractorcow/pulls/3.1/mink-update
...
Update for Mink 1.6 compatibility (DO NOT MERGE)
2014-06-13 16:34:22 +12:00
Ingo Schommer
a433fa2ec4
Moved table-related feature steps to behat extension
...
Reused for tables other than GridField.
See https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/51
2014-06-13 15:10:16 +12:00
Damian Mooyman
3e29f6b29b
Merge pull request #3203 from mateusz/remove-global-state
...
Fetch the nearest Controller instead of relying on global state.
2014-06-13 10:15:19 +12:00
Mateusz Uzdowski
741ab96418
Fetch the nearest Controller instead of relying on global state.
...
Controller:curr() in this context are equivalent to calling
getToplevelController() which already solves the issue of nested
GridFields.
2014-06-12 16:47:49 +12:00
Mateusz U
020b590f23
Merge pull request #3201 from tractorcow/pulls/3.1/di-fix
...
BUG fix dependency injection stumbling over ViewableData's __isset
2014-06-12 10:41:37 +12:00
Damian Mooyman
d516063db7
BUG fix dependency injection stumbling over ViewableData's __isset
2014-06-12 10:08:59 +12:00
Mateusz U
a584c8c83a
Merge pull request #3198 from tractorcow/pulls/3.1/lazy-session
...
Versioned no longer sets redundant session data
2014-06-11 16:55:20 +12:00
Damian Mooyman
4c5de82625
Versioned no longer sets redundant session data
2014-06-11 16:42:22 +12:00
Damian Mooyman
8c10e12529
Merge pull request #3196 from mateusz/patch-html-editor-field
...
BUG Sanitise the PHP output.
2014-06-11 12:13:33 +12:00
Mateusz Uzdowski
18b6870cf2
BUG Sanitise the PHP output.
2014-06-11 11:34:31 +12:00
Damian Mooyman
fe597e32b4
Merge pull request #3193 from phillprice/patch-3
...
Update Form.php
2014-06-11 09:02:17 +12:00
Phill Price
b2455f2d20
Update Form.php
...
tiny typo
2014-06-10 13:50:28 +01:00
colymba
8fb5e9c3a4
API New JS sprintf and inject replacement functions
...
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-06-05 22:47:49 +03:00