Commit Graph

17509 Commits

Author SHA1 Message Date
Damian Mooyman
2a9138aa14 Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix
DOCS Docblock fixes for ValidationResult
2016-11-01 10:38:33 +13:00
Daniel Hensby
0b850e0819
DOCS Docblock fixes for ValidationResult 2016-10-31 13:33:59 +00:00
Loz Calver
b6bbed8de0 Merge pull request #6249 from dhensby/pulls/3.4/fix-error-message
FIX filterAny error message now refers to correct method name
2016-10-31 09:02:49 +00:00
Nicola Fontana
fe816076fc BUG Make simplexml_load_file work on shared php-fpm
PHP #62577 [1] together with PHP #64938 [2] make simplexml_load_file()
fails when the "disable load external entities" flag is set.

As a workaround, manually enable the entity loader in the bootstrap
code. We are loading internal XML files after all, so no security
implications should arise.

[1] https://bugs.php.net/bug.php?id=62577
[2] https://bugs.php.net/bug.php?id=64938

Fix #6174.
2016-10-31 06:21:04 +01:00
Damian Mooyman
1622ed8f69 Merge pull request #6242 from open-sausages/pulls/4.0/fix-overlay
BUG Fix missing loading overlay
2016-10-31 15:25:11 +13:00
Damian Mooyman
040ae2e6a3
BUG Fix clicking "No items found" from causing ajax error 2016-10-31 15:21:41 +13:00
Damian Mooyman
513c7aebc7 Fix HtmlEditorField.js indentation 2016-10-31 15:18:50 +13:00
Damian Mooyman
37cb351a66 Merge pull request #6222 from open-sausages/features/4.0/responsive-improvements
ENHANCEMENT: Improved behaviour for flexbox on smaller screens
2016-10-31 14:17:12 +13:00
Paul Clarke
76d3fb80e3 Nicer pattern for showing list view of pages 2016-10-31 13:36:41 +13:00
Damian Mooyman
3fb291d340 Merge pull request #6239 from open-sausages/pulls/4.0/fix-option-changetracker
BUG Fix incorrect change detection on checkbox fields
2016-10-31 13:26:13 +13:00
Christopher Joe
bb2cb3d487 Fix webpack css config, removes duplicate css files that were generated 2016-10-31 13:12:12 +13:00
Christopher Joe
e592c5b45e Remove back button if no callback was given
Fix FormBuilderLoader not chaining promise
2016-10-31 13:11:57 +13:00
Paul Clarke
4cc6cc3151 Fix position of back button on empty preview within campaigns 2016-10-31 12:55:53 +13:00
Paul Clarke
1395ee0c31 Don't hide gridfield content on small list view of tree 2016-10-31 12:21:48 +13:00
Daniel Hensby
747bd4cac0
FIX filterAny error message now refers to correct method name 2016-10-30 12:04:07 +00:00
Paul Clarke
a5d3dccd37 Fix for preview being under toolbar 2016-10-28 16:53:00 +13:00
Paul Clarke
5df797b705 Toolbar-content to be flexible 2016-10-28 16:53:00 +13:00
Paul Clarke
50f0c1f37c Remove fixed height for batch actions 2016-10-28 16:53:00 +13:00
Paul Clarke
2daca4ebc6 Improve alert text, fix spacing 2016-10-28 16:53:00 +13:00
Paul Clarke
706d2b6458 Add additional space to tree bottom, required for large tree 2016-10-28 16:52:03 +13:00
Paul Clarke
fad8df83cc Remove console.log 2016-10-28 16:52:03 +13:00
Paul Clarke
71a4eb7d22 Hide preview in campaigns, override list styles for mobile 2016-10-28 16:52:03 +13:00
Paul Clarke
4373eb6801 Hide sitetree in smaller screens for setting and pages 2016-10-28 16:51:03 +13:00
Christopher Joe
debb1a947e Add responsive class for Campaign list
Fix back button in preview
Fix add to campaign in pages section
2016-10-28 16:51:03 +13:00
Paul Clarke
5350fcf650 Delete legacy styles in Layout, move rest to CampaignAdmin. Convert to BEM 2016-10-28 16:47:50 +13:00
Paul Clarke
c82c88ebf6 Remove legacy classes 2016-10-28 16:44:54 +13:00
Paul Clarke
5257c92fcd Remove legacy class 2016-10-28 16:44:54 +13:00
Paul Clarke
4ce2bcc360 Add back button style if it has text 2016-10-28 16:44:54 +13:00
Paul Clarke
3fd5a6d4e6 Add left border to preview and bg 2016-10-28 16:44:54 +13:00
Paul Clarke
d761075fd3 Move mock back button 2016-10-28 16:44:54 +13:00
Paul Clarke
0885a3178e Adjust button padding so they all have the same height 2016-10-28 16:44:54 +13:00
Paul Clarke
25783db020 toolbar-north to be 100%, removed from toolbar-content 2016-10-28 16:44:54 +13:00
Paul Clarke
50af94099e Remove some legacy layout styles 2016-10-28 16:39:59 +13:00
Paul Clarke
a95781e66e Search and batch actions to have same selected state 2016-10-28 16:39:59 +13:00
Paul Clarke
96964be39d Sitetree scroll moved so whole area scrolls excluding actions 2016-10-28 16:39:59 +13:00
Paul Clarke
364ab957e6 improve spacing of sitetree for smaller screens 2016-10-28 16:39:59 +13:00
Paul Clarke
6254f186b1 Remove border on left of preview mode 2016-10-28 16:39:59 +13:00
Paul Clarke
27724c0829 Remove set width of toolbar-content as it extends further than 100% 2016-10-28 16:39:59 +13:00
Chris Joe
82119888c1 Validation on server side for React forms (fixes #6205) 2016-10-28 16:13:29 +13:00
Damian Mooyman
d7ed308e17 BUG Fix minor html encoding issue in SecurityAdmin (#6240) 2016-10-28 15:22:21 +13:00
Michael Strong
1df533298d BUG abstract HTMLEditorConfig instantiates (#6244)
https://github.com/silverstripe/silverstripe-framework/blob/master/Forms/HTMLEditor/HTMLEditorConfig.php#L64

On line 64, HTMLEditorConfig tries to create an instance of itself if it doesn't exist. However, HTMLEditorConfig is abstract and this throws an error.

This is caused by admin/_config.php
2016-10-28 15:21:44 +13:00
Damian Mooyman
1734e0d2a3 API Shorten overly-verbose invalid extension error (#6231)
Fixes #6198
2016-10-28 15:20:49 +13:00
Damian Mooyman
adfd0456de Merge pull request #6241 from open-sausages/pulls/4.0/fix-pagination-wrapping
BUG Prevent pagination wrapping
2016-10-28 13:44:28 +13:00
Damian Mooyman
ce656edf1b Merge pull request #6224 from open-sausages/pulls/4.0/fix-listview
API Update listview / treeview to use pjax instead of deferred loading
2016-10-28 13:40:58 +13:00
Damian Mooyman
e386c6a153 FIX: Refactor bootstrap.php to allow for code sharing with cms bootstrap 2016-10-28 10:53:11 +13:00
Daniel Hensby
3859a1d7e7
Merge branch '3.4' into 3 2016-10-27 16:16:04 +01:00
Daniel Hensby
2a3768266e
Merge branch '3.3' into 3.4 2016-10-27 16:15:43 +01:00
Daniel Hensby
a97ebf93de
Merge branch '3.2' into 3.3 2016-10-27 16:15:10 +01:00
Daniel Hensby
5f4f07a256
Merge branch '3.1' into 3.2 2016-10-27 16:14:01 +01:00
Loz Calver
68866ad31f Merge pull request #6238 from nfauchelle/patch-2
Remove double quotes so example is not parsed.
2016-10-27 09:05:36 +01:00