tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
12,490 Commits 31 Branches 527 Tags 162 MiB
632884252b
Commit Graph

12490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirk Mayo
632884252b NEW: Updating out of date URLs in the framework source code and docs 2014-02-07 15:10:44 +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
Will Rossiter
6d9d53059c Tidy up active tab styles to match background, border alignment on page tabs. 
Before: https://www.evernote.com/shard/s6/sh/82f0a398-c80a-4cb7-81d7-a10b6e2c85ff/b1dfa1ae8ffcbd633b548fa3b2ea8951

After: https://www.evernote.com/shard/s6/sh/66cbe9d3-df0a-42c8-a6e8-a82c68161efe/27df7167802de9c3a267d40324972aa3

Tested throughout the CMS in IE8, Firefox and Chrome.
 2014-01-29 15:47:15 +13:00
Will Rossiter
93085b9660 Correct whitespace / phpdoc 2014-01-28 20:00:47 +13:00
Will Rossiter
079b29bfff FIX Add missing extraClass to FieldGroup_holder 
FieldGroup_holder doesn't use FieldGroup
 2014-01-28 20:00:20 +13:00
Gus King
5797efa263 Documented magic properties of DataObject 2014-01-26 00:11:32 -05:00
Ingo Schommer
48949ba89a Improved i18n JS docs 2014-01-24 11:12:23 +13:00
Ingo Schommer
53e790ff98 Improved Link() docs 2014-01-22 22:28:10 +13:00
Ingo Schommer
318073b05d Merge pull request #2789 from mrsmuneton/ControllerLinkDocumentation 
Adding a Link section to controller.md.
 2014-01-22 22:22:53 +13:00
Ingo Schommer
55608d57f6 Merge pull request #2767 from HARVS1789UK/2766-moneyfield-set-readonly 
BUG: #2766 Corrects MoneyField::performReadonlyTransformation()
 2014-01-22 22:08:16 +13:00
Simon Welsh
cf01ca818a Revert "MINOR: Added behat test to cover changes made in e69e65c." 
This reverts commit e0b4e6125c.
 2014-01-22 15:20:48 +13:00
Mateusz U
ce3a944903 Merge pull request #2780 from madmatt/pulls/securityadmin-js2 
BUGFIX: Fix JS for PermissionCheckboxsetField in SecurityAdmin
 2014-01-20 19:00:00 -08:00
Andrew Short
85d4e6c9a8 Merge pull request #2768 from wilr/gridfieldvalidator 
FIX: Ensure GridFieldDetailForm has the current record validator.
 2014-01-20 16:48:10 -08:00
Ray
ba6513b2b1 Adding a Link section to controller.md showing the Link() function returning custom route value. 2014-01-19 17:46:21 -08:00
Will Rossiter
11a809798b Merge pull request #2788 from MarcusDalgren/session-cookie-fix 
Fix Session::set_cookie_domain
 2014-01-17 12:20:55 -08:00
Marcus Dalgren
9934230ad8 Fix Session::set_cookie_domain 2014-01-17 15:27:51 +01:00
Mateusz U
027022ef67 Merge pull request #2785 from halkyon/cmsmenu_test_fix 
Fixing failing tests because ?locale= is appended to the end of the URL.
 2014-01-16 17:50:40 -08:00
Sean Harvey
9d11f6f2f5 Fixing failing tests because ?locale= is appended to the end of the URL. 
Switching from assertEquals to assertContains to be more flexible when
extensions like Translatable add query vars at the end of the links.
 2014-01-17 13:48:46 +13:00
madmatt
e0b4e6125c MINOR: Added behat test to cover changes made in e69e65c. 2014-01-15 16:20:19 +13:00
madmatt
e69e65c1e3 BUGFIX: Fix JS for PermissionCheckboxsetField in SecurityAdmin 2014-01-15 15:51:35 +13:00
Will Rossiter
9b5a9afe2b Merge pull request #2773 from Zauberfisch/patch-1 
Removed $MetaTitle from docs(closes #2761)
 2014-01-13 21:19:45 -08:00
Zauberfisch
0e95f7f2a6 Removed $MetaTitle from docs(closes #2761) 2014-01-13 19:00:41 +00:00
Joe Harvey
405426799b Issue #2766 - Moves logic to return ReadonlyField versions of MoneyFields child fields to performReadonlyTransformation() method and reverts changes to MoneyField::setReadonly() as per Wilr’s (https://github.com/wilr) request 2014-01-13 08:35:40 +00:00
Will Rossiter
e302793bda Merge pull request #2770 from madmatt/pulls/updatetreenodes-notice 
BUG: Remove possibility of E_NOTICE in updatetreenodes().
 2014-01-12 21:57:32 -08:00
madmatt
77c35e7bde BUGFIX: Remove possibility of E_NOTICE in updatetreenodes(). 2014-01-13 17:47:33 +13:00
Will Rossiter
0b22ca6c59 FIX: Ignore current instance when checking for duplicate records (Fixes #1927) 2014-01-12 20:54:55 +13:00
Will Rossiter
a50996a010 NEW: Add support for push operator on ArrayList (Fixes #1539) 2014-01-12 18:55:40 +13:00