Damian Mooyman
b28729918b
Merge pull request #4564 from scott1702/font-icons
...
Update view mode section w/ font icons
2015-09-01 12:27:04 +12:00
Damian Mooyman
dc4c40f642
Merge pull request #4507 from JorisDebonnet/resampled-images-in-folders
...
Save resampled images into a folder structure indicating transformations
2015-09-01 11:16:23 +12:00
scott1702
5f56f204f1
Update view mode section w/ font icons
2015-09-01 10:54:52 +12:00
JorisDebonnet
ea05526e9d
Save resampled images into a folder structure indicating transformations
2015-09-01 00:40:27 +02:00
Sam Minnée
f4b7cd3f68
Merge pull request #4500 from stevie-mayhew/pulls/get-response
...
FEATURE: implement getter and setter usage for response
2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b
FEATURE: implement getter and setter usage for response
2015-08-29 10:24:06 +12:00
Loz Calver
fe2be0c262
Merge pull request #4536 from scott1702/font-icons
...
Update font icon library
2015-08-28 10:31:14 +01:00
scott1702
17ab371ffa
Update font icon library
2015-08-28 15:15:06 +12:00
Daniel Hensby
601434a671
Merge pull request #4552 from scott1702/3
...
Fix alignment of logout area
2015-08-28 01:52:08 +01:00
scott1702
6180788f9d
Fix alignment of logout area
2015-08-28 12:20:00 +12:00
Loz Calver
4ec6210c98
Merge pull request #4537 from chillu/pulls/urlsegment-forward-slashes
...
Remove forward slash in URLs in multibyte mode
2015-08-26 16:18:53 +01:00
Ingo Schommer
860b5dcc6e
Remove forward slash in URLs in multibyte mode
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1262
2015-08-26 17:40:04 +12:00
Will Morgan
199f0ea92d
Merge pull request #4539 from kinglozzer/pulls/abstract-build-tasks
...
Allow abstract BuildTask subclasses (closes #4538 )
2015-08-25 15:39:35 +01:00
Loz Calver
df9eb77e2b
Allow abstract BuildTask subclasses ( closes #4538 )
2015-08-25 10:14:15 +01:00
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
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
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
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
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
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
scott1702
7182c50721
Fix overlaying border on header tabs
2015-08-21 09:52:10 +12: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
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
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
Nick
c4c4d79c26
Fix for Issue #4424
...
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces.
Uses className for element ID on ImportSpec template.
2015-08-11 14:56:13 +10:00
Daniel Hensby
910156b84c
Merge pull request #4443 from JorisDebonnet/base64url
...
Url-safe alternative for base64_encode in resampled Image filenames
2015-08-10 13:56:35 +01:00
Sam Minnée
5c3bf3d0a2
Merge pull request #4482 from kinglozzer/classinfo-nonexistant-class
...
Ensure ClassInfo is backwards compatible with non-existant classes
2015-08-10 15:45:32 +12:00
Daniel Hensby
0469722435
Merge pull request #4498 from tractorcow/pulls/3.2/fix-duplicate
...
BUG Fix duplicate primary key crash on duplicate
2015-08-09 23:20:54 +01:00
Damian Mooyman
cf9d2d12ac
BUG Fix duplicate primary key crash on duplicate
2015-08-10 09:54:30 +12:00
