Damian Mooyman
8ff1a36de7
Correct "Māori" to "te reo Māori"
2014-08-05 08:26:22 +12:00
Sean Harvey
dc06bd9239
Merge pull request #3360 from tractorcow/pulls/3.1/revert-3358
...
Revert #3358
2014-08-04 12:15:58 +12:00
Damian Mooyman
2c24d51c0b
Revert #3358
2014-08-04 12:13:19 +12:00
Damian Mooyman
5503c1d7d9
Merge pull request #3359 from halkyon/escape_missing_att
...
Fixed usage of .XML with .ATT for attributes in CheckboxSetField
2014-08-04 10:31:25 +12:00
Sean Harvey
8c56e54a47
Fixed usage of .XML with .ATT for attributes in CheckboxSetField
2014-08-04 10:18:34 +12:00
Damian Mooyman
1e427a2509
Merge pull request #3358 from halkyon/escaping_options_in_fields
...
BUG Fixed escaping of name/value in options of form fields
2014-08-04 10:08:39 +12:00
Sean Harvey
b2dac644a0
BUG Fixed escaping of name/value in options of form fields
...
DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
2014-08-04 09:55:35 +12:00
Ingo Schommer
441a0c03f7
Merge pull request #3352 from mateusz/anchor-defer
...
BUG Return the promise instead of the whole deferred object.
2014-08-02 11:34:25 +12:00
Mateusz Uzdowski
92810898ba
BUG Return the promise instead of the whole deferred object.
2014-08-01 16:25:28 +12:00
Damian Mooyman
94f70a24cb
Merge pull request #3347 from mateusz/plat-61
...
Fix the anchor selector to load anchors from other internal pages.
2014-08-01 12:11:24 +12:00
Mateusz Uzdowski
31c9fb52d1
BUG Fix the anchor selector to work for internal pages.
...
Currently it will only default to pulling in anchors from the current
page, from the editor.
2014-08-01 10:36:34 +12:00
Stig Lindqvist
edb8964722
Merge pull request #3348 from tractorcow/pulls/revert-3345-3323
...
Revert #3345 #3323
2014-07-31 17:34:51 +12:00
Damian Mooyman
c93e752abe
Merge pull request #3346 from mateusz/tdf-synthetic
...
BUG Add a synthetic event to workaround IE8 issues.
2014-07-31 17:28:06 +12:00
Damian Mooyman
a89dbd29e1
Revert #3345 #3323
2014-07-31 17:05:57 +12:00
Mateusz Uzdowski
d8302a0ab7
BUG Add a synthetic event to workaround IE8 issues.
...
Without this event it's not possible to hook into the value change in a
reliable way (panelhide event is called too many times to rely on it).
2014-07-31 15:38:47 +12:00
Damian Mooyman
c02ff14db8
Merge pull request #3345 from dhensby/pulls/test-for-3323
...
TEST Empty absolute urls - tests for #3323
2014-07-31 14:23:35 +12:00
Daniel Hensby
04e5c11ed9
TEST Empty absolute urls - tests for #3323
2014-07-30 23:22:37 +01:00
Damian Mooyman
37f88c8e1a
Merge pull request #3337 from jeffreyguo/pulls/expand-sitetree-node
...
Pulls/expand sitetree node
2014-07-31 08:38:43 +12:00
Jeffrey Guo
5519a026e8
expand a tree node and check a CMS tab
2014-07-30 17:17:08 +12:00
Sean Harvey
76f719c94b
Merge pull request #3323 from dhensby/patch-2
...
FIX Handle empty URLs that are made absolute
2014-07-30 15:42:34 +12:00
Sean Harvey
ab6bfa3800
Merge pull request #3332 from jedateach/fixes/image-backend-yaml
...
FIX: Allow configuring Image backend via yaml.
2014-07-30 15:40:12 +12:00
Simon Welsh
dd0e8f5cdb
Merge pull request #3341 from halkyon/summary_error_on_forbidden
...
BUG Fixing incorrect error message on failed UploadField upload
2014-07-29 11:50:09 +10:00
Simon Welsh
fb9f1bf35a
Merge pull request #3340 from halkyon/generic_error_missing
...
BUG AssetUploadField hides "generic" file upload messages.
2014-07-29 11:49:23 +10:00
Sean Harvey
baa2b696eb
BUG Fixing incorrect error message on failed UploadField upload
...
If applying custom Upload_Validator rules, uploads will fail POST with
a 403 to UploadField/upload as the upload was rejected, but UploadField
still shows that the upload was successful.
jqXHRorError returns either an error string, e.g. "Forbidden" or an
object. If it's a string, ensure that the upload summary shows an
error message. If it's an object and has a status of 200, show the
success message.
2014-07-29 13:38:03 +12:00
Simon Welsh
eee81f8791
Merge pull request #3339 from tractorcow/pulls/3.1/phpdoc
...
PHPDoc and whitespace cleanup for FunctionalTest / TestSession
2014-07-29 10:50:11 +10:00
Damian Mooyman
08c58844ac
PHPDoc cleanup
2014-07-29 12:43:43 +12:00
Sean Harvey
4f1c055aa3
Merge pull request #3342 from mparkhill/patch-2
...
fix speling error in plural_name var description
2014-07-29 12:00:36 +12:00
Michael Parkhill
7417566642
fix speling error in plural_name var description
...
The comment description for plural_name variable had a spelling error
2014-07-29 11:52:59 +12:00
Sean Harvey
329dffd22d
BUG AssetUploadField hides "generic" file upload messages.
...
If an upload fails, the error is not shown correctly, it gets hidden
off the table because of absolute positioning. This currently worked
because it relied upon known errors not showing a "size" element next
to it.
"ui-state-warning-text" and "ui-state-success-text" don't need this
CSS, so it's probably not necessary anyway as it shows the error text
correctly without it.
2014-07-29 10:06:27 +12:00
Simon Welsh
7bbc74e576
Merge pull request #3336 from halkyon/validator_injector
...
Use Injector to create default Upload_Validator instance
2014-07-28 16:05:02 +10:00
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
Jeremy Shipman
ac95a875ed
FIX: Allow configuring Image backend via yaml.
2014-07-28 10:28:52 +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
Daniel Hensby
419f308544
FIX Handle empty URLs that are made absolute
...
When the email sender makes the links absolute, it can't handle empty `href` or `src` attributes as there's no expectation that the string length could be 0
2014-07-25 13:09:47 +01: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
