Commit Graph

12942 Commits

Author SHA1 Message Date
Sean Harvey
5491a5dadc Use Injector to create default Upload_Validator instance
Allows this class to be swapped out with a custom Upload_Validator
globally, without having to call Upload::setValidator() everywhere.
2014-07-28 16:28:38 +12:00
Mateusz U
f7a9005a8e Merge pull request #3322 from tractorcow/pulls/3.1/tinymce-config
API Let update interval of tinymce be changed or disabled
2014-07-28 14:17:42 +12:00
Damian Mooyman
0e78e3f3dc API Let update interval of tinymce be changed or disabled 2014-07-28 13:54:02 +12:00
Mateusz U
87f84039f9 Merge pull request #3335 from tractorcow/pulls/3.1/tinymce-self-cleanup
BUG Fix periodic tinymce layout refresh
2014-07-28 13:51:17 +12:00
Damian Mooyman
62ed2d0f22 BUG Fix periodic tinymce layout refresh 2014-07-28 13:33:41 +12:00
Ingo Schommer
48dd233050 Removed link to outdated docs mailinglist 2014-07-28 08:56:21 +12:00
Will Morgan
807755f002 FIX TemplateManifest prevent cache collision 2014-07-28 08:52:11 +12:00
Will Rossiter
4ea2d99cbf Merge pull request #3329 from adrexia/upload-with-preview-fix
Fix upload field display for preview open
2014-07-25 17:20:36 +12:00
Damian Mooyman
0957f2735a Merge pull request #3309 from stojg/issue/cms-1049
Delete parent page, child pages cannot be found anymore
2014-07-25 16:58:39 +12:00
Stig Lindqvist
333a2aa8f9 BUG: CMS tree filters doesn't count the correct number of children for deleted pages
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.

This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.

The solution involves a couple of smaller fixes in both CMS and framework modules.

1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
2014-07-25 16:19:30 +12:00
Naomi Guyer
46a5ee7d1d CSS: Fix upload field display for preview open 2014-07-25 16:15:49 +12:00
Damian Mooyman
bdec3158ba Merge pull request #3319 from wilr/movetogetoptions
Moved option list generation to separate method
2014-07-25 12:51:32 +12:00
Will Rossiter
5a14b7227c Moved checkboxset option list generation to separate method
This allows subclasses and extensions time to modify the list of options and their configuration without having to override the entire Field method.

A more flexible way to implement silverstripe#3311
2014-07-25 11:27:14 +12:00
Damian Mooyman
350ee4d421 Merge pull request #3277 from kopymark/patch-3
Fix for joins code block
2014-07-23 08:54:18 +12:00
Mateusz U
59e7f777a2 Merge pull request #3312 from tractorcow/pulls/3.1/extend-htmleditor-parentid
API Let extensions control folder selector in HtmlEditorField_Toolbar
2014-07-22 10:20:17 +12:00
Damian Mooyman
4453caf32b API Let extensions control folder selector in HtmlEditorField_Toolbar 2014-07-21 15:52:10 +12:00
Damian Mooyman
4ceadec123 Merge pull request #3308 from camfindlay/patch-9
DOCS Setting allowed_extensions in YAML
2014-07-21 08:22:08 +12:00
Cam Findlay
6f08484a90 DOCS Setting allowed_extensions in YAML
3.1 compatible docs in place of #3267
2014-07-20 14:25:21 +12:00
Simon Welsh
b7015cca46 Merge pull request #3297 from senorgeno/3282-orm-left-join-sub-select
BUG #3282: Added ability to subselect with in left or inner join
2014-07-18 19:15:39 +10:00
Mateusz U
613722053c Merge pull request #3299 from stojg/pull/if-user-logged-out-causes-500-error
BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object
2014-07-17 15:15:30 +12:00
Stig Lindqvist
ac64d258b7 BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object
This can happen if the auto-logout feature logs a user out and the user then tries to open another admin or
do an pjax call.
2014-07-17 14:45:22 +12:00
Damian Mooyman
f16306d843 Merge pull request #3286 from mateusz/destroy-checks
BUG Make UI widget destroys more consistent to avoid exceptions.
2014-07-17 14:34:29 +12:00
Mateusz Uzdowski
b34aaca2e8 BUG Fix several issues around onmatch/onunmatch entwines.
1. Add missing _super calls.

2. Make UI widget destroys more consistent to avoid exceptions.
Selectable would throw an exception in the GridField.js if destroy
called from onunmatch - at that stage jQuery UI would have had called
the destroy already. Add a guard, and change to onremove, which triggers
before the element is removed from DOM.

3. DOM traversal fails after the element is removed from DOM.
Onunmatch triggers after the removal of the element from the DOM, which
makes DOM traversal fail. Use onremove instead, which triggers while the
element is still in DOM.
2014-07-17 14:14:52 +12:00
Senorgeno
df6a8b6fb6 BUG #3282: Added ability to subselect with in left or inner join 2014-07-17 13:27:28 +12:00
Sean Harvey
cfe8e15da9 Merge pull request #3268 from camfindlay/wamp-docs
Updating the WAMP docs to latest version and include composer installation notes
2014-07-17 10:29:39 +12:00
Cam Findlay
081087c977 Updating the WAMP docs to include composer installation and apache 2.4 fix - delete index.php
Now uses GFM for code blocks.
2014-07-17 09:58:14 +12:00
Simon Welsh
8a3eebf289 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	i18n/i18n.php
2014-07-16 21:18:07 +10:00
Simon Welsh
cc9603d6a2 Fatal errors should always return false
This allows PHP to set the exit code on fatals.
2014-07-16 21:03:55 +10:00
Adam Judd
171eb42c9e Fix for joins code block 2014-07-09 22:31:41 +09:30
Hamish Friedlander
eed2293f31 Merge pull request #3275 from silverstripe/revert-3272-config_fix
Revert "BUG Config::merge_array_low_into_high() ignores falsey values"
2014-07-09 10:53:33 +12:00
Damian Mooyman
c26df0b3c6 Revert "BUG Config::merge_array_low_into_high() ignores falsey values" 2014-07-09 09:57:25 +12:00
Sean Harvey
50214abf7f Merge pull request #2998 from torleif/patch-4
Fix: WYSIWYG now returns valid HTML in tables
2014-07-08 19:56:16 +12:00
Damian Mooyman
ae7d7516f6 Merge pull request #3272 from halkyon/config_fix
BUG Config::merge_array_low_into_high() ignores falsey values
2014-07-08 15:59:22 +12:00
Sean Harvey
16e546300f BUG Config::merge_array_low_into_high() ignores falsey values
Specific case: LeftAndMain::$session_keepalive_ping = true cannot be
set to false in config.yml for some cases because the value is ignored
when merge_array_low_into_high() is processing the config arrays.
2014-07-08 15:18:26 +12:00
Sean Harvey
d1d295056b Merge pull request #3265 from stevie-mayhew/images-force-resample
FEATURE allow force resampling on images
2014-07-07 11:27:16 +12:00
Sean Harvey
2f188fecc5 Merge pull request #3269 from tractorcow/pulls/3.1/convert-js-enhancements
Better encoding of javascript
2014-07-07 09:22:49 +12:00
Damian Mooyman
c30111eee3 Better encoding of javascript
Fixes #2988
2014-07-07 09:01:53 +12:00
Damian Mooyman
66b3d1cae7 Upgrading TinyMCE dependency from 3.5.8 to 3.5.11 2014-07-05 15:06:26 +12:00
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