Damian Mooyman
445f1d4ccb
Merge pull request #4529 from scott1702/filtered-tree
...
update the filtered tree styling
2015-08-25 14:50:39 +12:00
scott1702
7bbe258b44
update the filtered tree styling
2015-08-25 13:01:17 +12:00
Loz Calver
99a8a81e9a
Fix issues with tests and "subfolder" URLs
2015-08-25 11:49:01 +12:00
Loz Calver
71eb7d3364
Disable IRC notifications for Travis builds
2015-08-24 11:56:04 +01:00
Damian Mooyman
f7c19830d6
BUG Fix JS error on clicking collapsed panel
2015-08-24 17:36:29 +12:00
Sam Minnée
5c5dd7efce
Merge pull request #4531 from tractorcow/pulls/3.2/block-archived-dragdrop
...
BUG disable archived pages from being droppable
2015-08-24 17:04:41 +12:00
Sam Minnée
942ef04664
Merge pull request #4532 from tractorcow/pulls/3.2/packages
...
Add missing packages
2015-08-24 17:04:39 +12:00
Damian Mooyman
f220adc3e0
Update translations
2015-08-24 16:52:39 +12:00
Damian Mooyman
4a011303b9
Add missing packages
2015-08-24 16:15:38 +12:00
Damian Mooyman
80ce5498d8
BUG disable archived pages from being droppable
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1257
2015-08-24 15:59:59 +12:00
Damian Mooyman
958f98b1cf
Merge remote-tracking branch 'origin/3'
2015-08-24 13:08:54 +12:00
Damian Mooyman
4ea344ac9c
Merge remote-tracking branch 'origin/3.2' into 3
2015-08-24 12:57:22 +12:00
Sam Minnée
d0f94b5363
Merge pull request #4521 from tractorcow/pulls/3.2/restore-deprecated-stuff
...
Revert #3425 #3396 to restore deprecated functionality
2015-08-24 12:49:56 +12:00
Damian Mooyman
58409f64c0
Merge remote-tracking branch 'origin/3'
2015-08-24 11:59:21 +12:00
Damian Mooyman
1bb6b85280
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
admin/javascript/LeftAndMain.BatchActions.js
2015-08-24 11:55:54 +12:00
Damian Mooyman
1686c83826
Revert #3425 #3396 to restore deprecated functionality
...
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
19838194a3
Merge pull request #4526 from danrye/patch-1
...
Add support for width and height to embedded photos
2015-08-22 10:51:15 +01:00
Ingo Schommer
fb9753ddc4
Retain script tags in editor if allowed ( fixes #3611 )
...
TinyMCE strips them by default, but if they're specifically added
to the allowed elements we should respect that setting.
Example PHP config:
$validEls = HtmlEditorConfig::get('cms')->getOption('extended_valid_elements');
$validEls .= ',script[src|type]';
HtmlEditorConfig::get('cms')->setOption('extended_valid_elements', $validEls);
2015-08-21 16:49:43 +01:00
Dan
03e644ec62
Add support for width and height to embedded photos
...
Noticed that "from the web" images don't respect the width and height settings, this fixes that.
2015-08-21 11:26:48 -04:00
Daniel Hensby
bb15307a8f
Merge pull request #4524 from tractorcow/pulls/3/bulk-smash
...
BUG Fix bulk actions making sitetree unclickable
2015-08-21 09:31:36 +01:00
Daniel Hensby
28ca23c4ee
Merge pull request #4522 from tractorcow/pulls/3.2/bulk-smash
...
BUG Fix bulk actions making sitetree unclickable
2015-08-21 09:30:00 +01:00
Daniel Hensby
790dff7b81
Merge pull request #4525 from tractorcow/pulls/3.1/teamcity
...
MINOR Adjustment to teamcity output
2015-08-21 09:18:51 +01:00
Daniel Hensby
ab0572e7cc
DOCS Permission comments made a bit clearer
2015-08-21 09:16:46 +01:00
Damian Mooyman
465a3bea64
MINOR Adjustment to teamcity output
2015-08-21 17:30:50 +12:00
Damian Mooyman
b14794b780
BUG Fix bulk actions making sitetree unclickable
2015-08-21 16:24:13 +12:00
Damian Mooyman
0f81d5ece5
BUG Fix bulk actions making sitetree unclickable
2015-08-21 16:22:08 +12:00
Damian Mooyman
6bba01a6d4
Merge pull request #4518 from scott1702/3.2
...
Fix overlaying border on header tabs in firefox
2015-08-21 11:59:10 +12:00
Damian Mooyman
d64852b2e8
Merge pull request #4517 from dhensby/pulls/access-all-areas
...
Fix issue where Access All CMS Sections doesnt work
2015-08-21 11:48:45 +12:00
Daniel Hensby
2cf7446d8e
Merge pull request #4519 from tractorcow/pulls/3.1/fix-setup
...
BUG Fix illegalExtensions breaking tests.
2015-08-21 00:41:38 +01:00
Damian Mooyman
fc212e030c
BUG Fix illegalExtensions breaking tests.
...
Revert #3979
2015-08-21 11:18:58 +12:00
scott1702
7182c50721
Fix overlaying border on header tabs
2015-08-21 09:52:10 +12:00
Daniel Hensby
6eede57ff2
Fix issue where Access All CMS Sections doesnt work
2015-08-20 22:30:43 +01:00
Daniel Hensby
0768434997
Merge pull request #4503 from patricknelson/issue-4502-sort-autocomplete
...
FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
2015-08-19 11:43:29 +01:00
Patrick Nelson
e13aebc3d7
FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
...
Conflicts:
tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
2015-08-19 11:42:45 +01:00
Will Morgan
7fc58f75aa
Merge pull request #4512 from sminnee/4511-fix-tinymce-spellcheck-deprecation
...
Fix tinymce spellcheck deprecation
2015-08-19 10:11:32 +01:00
Sam Minnee
a19fe39301
FIX: Avoid PHP 5.6 deprecation with access to HTTP_RAW_POST_DATA. Fixed #4511
...
PHP 5.6 doesn't like access to HTTP_RAW_POST_DATA and recommends the use of php://input,
which is already supported by this code. I've just removed the deprecated calls.
2015-08-19 16:02:19 +12:00
Sam Minnee
fa4942f3b5
MINOR: Fix line-endings in rpc.php
2015-08-19 16:01:57 +12:00
Damian Mooyman
42e87d6830
Merge pull request #4510 from scott1702/gridfield
...
Make gridfield button sizes consistent with the rest of the cms
2015-08-19 12:39:37 +12:00
scott1702
c803c01e99
Make gridfield button sizes consistent with the rest of the cms
2015-08-19 10:56:40 +12:00
Daniel Hensby
84b70422b6
Merge branch '3'
...
Conflicts:
.travis.yml
2015-08-18 16:41:21 +01:00
Daniel Hensby
0b177ad20f
Merge branch '3.2' into 3
2015-08-18 16:40:20 +01:00
Daniel Hensby
af5ef13e6c
Merge branch '3.1' into 3.2
2015-08-18 16:39:35 +01:00
Daniel Hensby
a4bd11149f
Merge pull request #4508 from kinglozzer/missing-var
...
FIX: Using undefined var in ModelAdmin
2015-08-18 16:31:32 +01:00
Loz Calver
8b638f56fb
FIX: Using undefined var in ModelAdmin
2015-08-18 15:37:15 +01:00
Sam Minnée
9eb2265a21
Merge pull request #4506 from dhensby/pulls/remove-nightly
...
Remove nightly build as PHP 7 support is explicitly off
2015-08-18 09:09:54 +12:00
Daniel Hensby
a73f9ba8fb
Remove nightly build as PHP 7 support is explicitly off
2015-08-17 16:50:05 +01:00
Daniel Hensby
0b36082564
Merge branch '3'
...
Conflicts:
.travis.yml
composer.json
docs/en/changelogs/4.0.0.md
forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
Dan Hensby
c5c8a6a720
Merge remote-tracking branch '3.2' into 3
...
Conflicts:
admin/templates/Includes/ModelAdmin_ImportSpec.ss
css/GridField.css
2015-08-17 11:59:24 +00:00
Daniel Hensby
a8ab5a468d
Merge branch '3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
composer.json
2015-08-17 11:43:28 +01:00
Sam Minnée
5911d50bca
Merge pull request #4477 from nickbooties/nickbooties-patch-1
...
Fixes #4424
2015-08-11 17:34:35 +12:00
