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
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
Ingo Schommer
a35de54882
Updated github path
2013-05-17 00:41:16 +02:00
Ingo Schommer
79cf1faf53
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
README.md
composer.json
docs/en/installation/from-source.md
docs/en/misc/contributing.md
model/Database.php
2013-05-17 00:37:30 +02:00
Ingo Schommer
5796ed225e
Updated github path
2013-05-17 00:35:28 +02:00
Sean Harvey
0c6f32e752
Merge pull request #1949 from mateusz/tabs-refresh
...
BUG All tabs are in open state when changing the name of a folder.
2013-05-15 19:18:06 -07:00
Mateusz Uzdowski
b480886cab
BUG All tabs are in open state when changing the name of a folder.
...
Submitting the form via AJAX changes the DOM controlled by the tabs
widget, it needs to be notified about the change.
2013-05-16 11:15:03 +12:00
Sean Harvey
3878806ca3
Merge pull request #1946 from halkyon/reinstate_cog_icon_batch_actions
...
Put back cog icon for multi-select batch actions
2013-05-15 16:11:19 -07:00
Damian Mooyman
6e0e3564e1
NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields to allow user code better control over interaction with extending methods
2013-05-16 10:34:45 +12:00
Sam Minnee
b401d39aec
NEW: Move temp data into a user-specific subfolder, to stop temp-permission bugs from occurring.
...
Anyone who has run "sudo -u www-data ./framework/sake dev/build" knows that SilverStripe's temp
folder permissions can be very brittle. This patch resolves this by making the temp folder
user-specific.
To minimise directory pollution it first creates a chmod 777 parent folder with the same name
as the current folder. It then creates a subfolder of this with the same name as the current
user.
The positive impact of this change is that sake can be used without fear of messing up file
permissions. This means, among other things, that we can put a Composer post-update-cmd into
the installer to run dev/build. Progress!
The negative impact is that you will get two caches if you run sake as a different user. However,
that is much better than the current situation - which is a bunch of bugs - and if you're concerned
about that, you still have the option of running sake as www-data.
2013-05-15 12:54:55 +02:00
Sean Harvey
33be390db8
Put back cog icon for multi-select batch actions (was removed in f4b080e)
2013-05-15 21:09:19 +12:00
