Commit Graph

12516 Commits

Author SHA1 Message Date
Sean Harvey
c322cb2d65 Fixing SQLQueryTest failures on PHPUnit 3.7.30 2014-02-10 13:32:39 +13:00
Sean Harvey
51a936345a Merge pull request #2839 from tractorcow/pulls/3.1-fieldgroup-description
BUG Fix missing Description element on FieldGroup_holder.ss
2014-02-10 10:50:25 +13:00
Damian Mooyman
1c7af2fd04 BUG Fix missing description element on FieldGroup_holder.ss 2014-02-10 10:38:00 +13:00
Ingo Schommer
0f1ae75dd8 Correct JS i18n in UploadField (fixes #2370) 2014-02-09 20:43:08 +13:00
Ingo Schommer
74a010184e Merge pull request #2834 from mattkirwan/patch-1
Updated add-on URL.
2014-02-09 19:54:05 +13:00
Matt Kirwan
7b1f1a5e4d Updated add-on URL. 2014-02-07 15:48:34 +00:00
Ingo Schommer
caaf286767 Merge pull request #2821 from silverstripe-rebelalliance/rfc4180
BUG: Fixed out of date RFC 4180 URL
2014-02-07 17:51:03 +13:00
Ingo Schommer
27449c4545 cs_CZ transliteration chars (fixes #2816) 2014-02-07 17:43:41 +13:00
Ingo Schommer
71f6f8afc9 Injector updateSpec() instanciation (fixes #2829) 2014-02-07 17:00:27 +13:00
Ingo Schommer
db07a8e1df Fix $disable_themes test state
Wasn't resetting the value after using it
2014-02-07 16:38:41 +13:00
Ingo Schommer
1e2a2ca969 Merge pull request #2831 from silverstripe-rebelalliance/fixingURLs
NEW: Updating out of date URLs in the framework source code and docs
2014-02-07 16:16:24 +13:00
Ingo Schommer
0e9868adfe Merge pull request #2832 from mateusz/behat-permissions
Behat permissions
2014-02-07 16:16:01 +13:00
madmatt
267786a7d1 Add behat test for security permission checkboxes. 2014-02-07 15:41:33 +13:00
Mateusz Uzdowski
e91f10b0ab Add Behat step to click on a row in the first GridField table. 2014-02-07 15:40:06 +13:00
Kirk Mayo
632884252b NEW: Updating out of date URLs in the framework source code and docs 2014-02-07 15:10:44 +13:00
Will Rossiter
9bfd1d3a5d Merge pull request #2830 from hafriedlander/fix/flush
FIX Dont pop up basic auth dialog when trying to flush and isDev=1
2014-02-07 14:49:33 +13:00
Andrew Short
0366403b00 Merge pull request #2820 from nikrolls/patch-1
Fix autocompletion on ::create and ::strong_create
2014-02-07 10:24:36 +11:00
Ingo Schommer
2a3b8a5a70 Merge pull request #2828 from silverstripe-rebelalliance/JSRunnerTest
NEW: Correcting the JSRunnerTest template comments
2014-02-07 12:00:25 +13:00
Ingo Schommer
620ee834d0 Docs for whitespace fixes 2014-02-07 11:57:06 +13:00
Kirk Mayo
4b2352afcf NEW: Correcting the JSRunnerTest template comments 2014-02-07 10:40:28 +13:00
Ingo Schommer
fe4ef54c7c Merge pull request #2825 from mattkirwan/patch-1
Updated filename to reference 'Holder' not 'Page'
2014-02-07 08:03:14 +13:00
Ingo Schommer
5a34d194d8 Merge pull request #2826 from mattkirwan/patch-2
Updated filename to reference 'Holder' not 'Page'
2014-02-07 08:03:02 +13:00
Matt Kirwan
486af1d1a3 Updated filename to reference 'Holder' not 'Page' 2014-02-06 17:14:22 +00:00
Matt Kirwan
21b5a588c2 Updated filename to ref 'Holder' not 'Page' 2014-02-06 17:09:28 +00:00
Kirk Mayo
e2c312d87d BUG: Fixed out of date RFC 4180 URL
BUG: Fixed out of date RFC 4180 URL
2014-02-05 14:44:56 +13:00
Nik Rolls
d1c68e6020 Fix autocompletion on ::create and ::strong_create
This ties in with IDEs that can autocomplete the LSB class when you @return static.
2014-02-04 15:36:24 +13:00
Ingo Schommer
bb9f84afd5 Merge pull request #2806 from tractorcow/pulls/bug-member-locale
BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation
2014-02-03 17:03:48 -08:00
Ingo Schommer
457ec9446b Merge pull request #2700 from ajshort/injector-factory
Injector Factory
2014-02-03 16:50:15 -08:00
Ingo Schommer
da41e3b712 Merge pull request #2819 from JoelMarcey/3.1
Support PHPUnit 3.8+ compatibility
2014-02-03 15:51:46 -08:00
Joel Marcey
0da5413e8d Support PHPUnit 3.8+ compatibility
Summary:

PHPUnit 3.8+ adds a method to its PHPUnit_Framework_TestListener called addRiskyTest(). Need to stub it out to avoid "must implement this interface method" fatals when using 3.8+

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev:
2014-02-03 15:32:58 -08:00
Ingo Schommer
d0ec30dd26 Merge pull request #2815 from Firesphere/patch-2
Don't show next for anything above TotalPages
2014-02-03 11:00:08 -08:00
Andrew Short
1a803cbf7e Correct module inclusion criteria. 2014-02-03 15:52:57 +11:00
Andrew Short
e927fb3118 Use placeholder module name. 2014-02-03 15:48:14 +11:00
Ingo Schommer
254734982d Improved module dev docs 2014-02-03 17:01:48 +13:00
Andrew Short
4ac5a749b0 Register config as a service. 2014-02-03 11:30:39 +11:00
Andrew Short
2f817ba177 NEW: Allow specifying a factory to use for creating services.
A service factory can be used for creating instances where a non-trivial
construction process is required. This is done by adding a `factory`
key to the service definition.
2014-02-03 11:30:22 +11:00
Simon Erkelens
412cbbccc8 Don't show next for anything above TotalPages
Bots often have the habit of trying a next page, even if there isn't one.
Thus, using CurrentPage < TotalPages, prevents from unwanted next-links being shown.
2014-02-02 21:13:48 +01:00
Ingo Schommer
a0f6329dc4 Merge pull request #2811 from silverstripe-rebelalliance/shortcode
NEW: Fixed broken documentation link for Shortcodes
2014-02-02 11:19:54 -08:00
Ingo Schommer
cd99e720b6 Merge pull request #2228 from wilr/oldroutes
Remove old routes
2014-01-30 19:09:25 -08:00
Simon Welsh
d29b083b84 Merge pull request #2812 from Rhym/patch-1
Add a reference for setting the Limit of items.
2014-01-30 18:44:42 -08:00
Kirk Mayo
3a9bd54280 NEW: Fixed broken documentation link for Shortcodes 2014-01-31 15:35:18 +13:00
Ingo Schommer
124886a7f9 Merge pull request #2799 from yearofthegus/document-magic-members
Documented magic properties of DataObject
2014-01-30 18:26:23 -08:00
Ingo Schommer
8a83ea2c15 Merge branch 'madmatt-pulls/apidocs-package-list' into 3.1 2014-01-31 15:18:10 +13:00
Ingo Schommer
b980b24aff Merge pull request #2810 from silverstripe-rebelalliance/issueNot2808
BUG: Fixes #2808 fixed  case type in documentation
2014-01-30 18:17:02 -08:00
Ingo Schommer
ab070944d5 Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list
Conflicts:
	view/SSTemplateParser.php
	view/SSTemplateParser.php.inc
2014-01-31 15:15:59 +13:00
Ingo Schommer
91b363b141 Merge pull request #2756 from madmatt/pulls/behat-form-context
Update theHtmlFieldShouldContain step to include negation.
2014-01-30 18:09:55 -08:00
Kirk Mayo
7a9a968d1b BUG: Fixes #2808 fixed case type in documentation 2014-01-31 14:55:53 +13:00
Ryan Potter
75de6a2848 Add a reference for setting the Limit of items. 2014-01-31 11:20:17 +13:00
Damian Mooyman
293c672fa7 BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation
This will resolve issues in cases where the site locale may be assigned a value that does not have an explicit translation. E.g. if the locale is en_NZ (and it's appropriate for this to be the assigned locale), Afrikaans will no longer be the default selected locale when creating members. Now en_US is chosen as a better fallback default.

This is a minor ease of use fix that means fewer CMS users can be accidentally created in Afrikaans within NZ based sites.

Test cases included.
2014-01-30 15:55:14 +13:00
Will Rossiter
587c489d0f Add getters for Versioned object properties 2014-01-30 13:59:29 +13:00