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
11,370 Commits 31 Branches 527 Tags 162 MiB
45462baff1
Commit Graph

11370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Shkardoon
45462baff1 Fix misleading composer link 
Fix misleading composer link
 2013-05-25 10:41:56 +12:00
Will Rossiter
438066dc14 Merge pull request #1990 from JayDevlin/1971-text-contextsummary 
FIX #1971: Text->ContextSummary
 2013-05-24 15:19:48 -07:00
Will Rossiter
50936ee799 Merge pull request #1992 from jthomerson/fix_unsaved_relation_list_constructor 
FIX: UnsavedRelationList did not call its constructor
 2013-05-24 15:19:19 -07:00
Jeremy Thomerson
5512d7c0d0 FIX: UnsavedRelationList did not call its constructor 
This resulted in Object extensions not working for it, and methods not existing
where they should have.  It also resulted in poor error messages appearing when
thrown from Object since $this->class was empty since the constructor was never
called in Object.
 2013-05-24 21:14:45 +00:00
Devlin
edaf709783 FIX #1971: Check if the search term is set 2013-05-24 16:57:38 +02:00
Sean Harvey
916de30204 Merge pull request #1980 from feejin/bugfix-ignore-underscored-themes 
FIX: exclude directory from available themes when underscore is first character
 2013-05-23 15:10:00 -07:00
Colin Richardson
b2934d7ebf FIX: exclude directory from available themes when underscore is first character 
Change FALSE to lowercase
 2013-05-23 16:49:35 +01:00
Ingo Schommer
6394eaf6a3 Merge pull request #1975 from adrexia/treedropdown-inside-toggle-1945 
BUG: Treedropdowns broken inside togglecomposite fields (fixes #1945)
 2013-05-23 00:59:38 -07:00
Simon Welsh
a5310080f6 Removes PHPCS env from Travis build 2013-05-23 19:05:46 +12:00
Sam Minnee
738581f0f5 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
 2013-05-23 18:59:34 +12:00
Will Rossiter
651c968915 Remove redundant get_extra_config(). (Fixes #1973) 2013-05-23 18:40:52 +12:00
Sean Harvey
ac2216dabc Merge pull request #1969 from robert-h-curry/patch-1 
Only show direct members of a group in the members field
 2013-05-22 20:28:17 -07:00
Naomi Guyer
8aa8674e78 BUG: Treedropdowns broken inside togglecomposite fields (fixes #1945) 
* Removed positioning javascript from treedropdownfield
* Set parent to be relatively positioned and overflow to visible
 2013-05-23 14:41:08 +12:00
Ingo Schommer
2e2c9226a4 Merge pull request #1934 from simonwelsh/scrut 
Add code-sniffs other than line length to scrutinizer
 2013-05-22 15:52:28 -07:00
Simon Welsh
b9d5f27194 Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
Ingo Schommer
ee784c3663 Fix priority of Member->getHtmlEditorConfigForCMS() (silverstripe/silverstripe-cms#728) 2013-05-22 21:31:42 +02:00
Ingo Schommer
ac0e324e1c Merge pull request #1972 from dhensby/environment-conf-patch 
FIX #1866 Environment file finder logic
 2013-05-22 12:17:43 -07:00
Ingo Schommer
214515f232 Merge pull request #1936 from mikg0/patch-1 
Fix file link recognition in HtmlEditorField.js
 2013-05-22 07:43:11 -07:00
Ingo Schommer
21f69c72bb Merge pull request #1956 from chillu/pulls/htmleditorfield-stacked 
Show HTMLEditorField in full width by default
 2013-05-22 07:22:28 -07:00
Ingo Schommer
30b53e65fe API Full-width HTMLEditorField by default 2013-05-22 16:15:16 +02:00
Daniel Hensby
bc9567c9ef FIX Environment file finder logic 
Fixing the logic that searches for environment files so that warnings
due to open_basedir are suppressed and both the 'realdir' and the server
path are spidered for the environment file.
 2013-05-22 14:35:33 +01:00
Robert Curry
aeb5a2e42a Only show direct members of a group in the members field 
The call to Members() includes members of child groups, which was causing any members added through the grid field to be added to the child groups as well.
 2013-05-22 18:48:36 +12:00
Sean Harvey
abad856534 Use create() to instantiate Member_GroupSet on Member::Groups() 
Keeps it consistent with how HasManyList and ManyManyList are
instantiated in DataObject.
 2013-05-22 13:56:36 +12:00
Sean Harvey
e2553fa864 Merge pull request #1967 from tractorcow/3.1-versioned-updatecmsfields-fix 
BUG Fixed declaration of Versioned::updateCMSFields
 2013-05-21 14:17:17 -07:00
Damian Mooyman
734a5fb469 BUG Fixed declaration of Versioned::updateCMSFields to be compatible with DataExtension::updateCMSFields 2013-05-22 08:08:11 +12:00
Ingo Schommer
9bda0b7c54 Merge pull request #1965 from kinglozzer/1958-stacked-field-descriptions 
FIX: Remove left margin on stacked form field descriptions (fixes #1958)
 2013-05-21 08:05:45 -07:00
Will Rossiter
5ec4f3146f Merge pull request #1869 from wilr/open6236 
FIX: Remove version field from default scaffolded CMS fields.
 2013-05-21 03:50:55 -07:00
Will Rossiter
f6cd582dd9 FIX: Remove version field from default scaffolded CMS fields. 2013-05-21 22:47:54 +12:00
Will Rossiter
90c274b640 Merge pull request #1852 from wilr/open-5117 
FIX: Falling back to summaryFields() should skip non database fields.
 2013-05-21 03:44:57 -07:00
Will Rossiter
17ac2e36fc Merge pull request #1864 from tomzen/patch-1 
Have 'Configuration Reference' link point to uploadfield page
 2013-05-21 03:38:20 -07:00
Ingo Schommer
30906c8b31 Merge pull request #1962 from wilr/api-links 
Update @package, @subpackage labels
 2013-05-21 03:27:22 -07:00
Will Rossiter
ddcfcf7bed Update @package, @subpackage labels 
Cleanup of framework's use of @package and @subpackage labels and additional of labels for classes missing packages.

Moved all GridField related components to the one name.

Countless spelling fixes, grammar for other comments.

Link ClassName references in file headers.
 2013-05-21 22:24:41 +12:00
Loz Calver
55a4fb40a6 FIX: Remove left margin on stacked form field descriptions (fixes #1958) 2013-05-21 09:52:45 +01:00
Ingo Schommer
14771ff31f Merge pull request #1959 from kinglozzer/3.1 
FIX: Minor CSS issues on DatetimeField (fixes #1872)
 2013-05-21 01:33:45 -07:00
Sean Harvey
34b9952e9d Consistently instantiate HasManyList and ManyManyList using create() 2013-05-21 18:13:15 +12:00
Loz Calver
57e4bca55e FIX: Minor CSS issues on DatetimeField 
The two 'child' field divs with a `.field` class were adding additional
margin and borders

SCSS updates
 2013-05-20 09:59:53 +01:00
Sean Harvey
13e632d053 Merge pull request #1867 from tractorcow/3.1-urlsegmentfilter-fixes 
BUG Fixes issue with "+" characters in url.
 2013-05-20 00:36:18 -07:00
Sean Harvey
881a41cc30 Merge pull request #1957 from jedateach/uri-rewriting-patch 
FIX: Don't rewrite urls to be absolute, if they are a URI with a protocol
 2013-05-20 00:31:13 -07:00
Jeremy Shipman
b1ba8bd05b FIX: Updated protocol check to become more stringent. 2013-05-20 12:46:44 +12:00
Jeremy Shipman
d21fd1f0bb FIX: Don't rewrite urls to be absolute, if they are a URI with a protocol. 
This is determined in this fix by the existence of a colon ':', to show the uri has a protocol.
 2013-05-20 11:59:04 +12:00
Ingo Schommer
e0f4bd6113 Fixed conventions in shortcode docs 2013-05-17 14:02:33 +02:00
Ingo Schommer
306d3b0c7e Merged existing shortcode docs with new topics docs from 3.0 2013-05-17 14:01:42 +02:00
Ingo Schommer
4c7c40e8b9 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	parsers/ShortcodeParser.php
 2013-05-17 13:51:54 +02:00
Ingo Schommer
8bf2f16c75 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	README.md
 2013-05-17 13:50:40 +02:00
Ingo Schommer
76cef06440 Merge pull request #1948 from chillu/pulls/shortcode-docs 
Improved shortcode docs
 2013-05-17 04:50:09 -07:00
Ingo Schommer
146b5a81cb Improved shortcode docs 2013-05-17 13:49:46 +02:00
Ingo Schommer
5e663b123b Merge pull request #1933 from g4b0/content-negotiator-default-format 
Bugfix: Added private static $defaultFormat...
 2013-05-17 01:37:15 -07:00
Ingo Schommer
9b0102b488 Merge pull request #1860 from tractorcow/3.1-beforeextend 
NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields
 2013-05-17 01:01:11 -07:00
Ingo Schommer
a87bbb2903 Updated github path 2013-05-17 00:45:52 +02:00
Ingo Schommer
faf6f12478 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-17 00:43:01 +02:00