Sam Minnee
ab44f5ef47
MINOR: Simplify build matrix for 3.x builds.
...
This is a companion to https://github.com/silverstripe/silverstripe-framework/pull/4556
but targeted at the build needs of SilverStripe 3.x. Commit into 3.1 and
then the merge forward into 3.2 and 3.
2015-08-29 15:50:49 +12: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
48d00895ca
Merge pull request #4554 from halkyon/flush-docs
...
DOCS Add warning on flush not being run automatically by unit test commands.
2015-08-28 02:02:31 +01:00
Sean Harvey
03d2fc73c5
Add warning on flush not being run automatically by unit test commands.
2015-08-28 13:00:22 +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
Sean Harvey
eca781ed91
Merge pull request #3813 from nfauchelle/patch-1
...
Flush should be off by default - consistant
2015-08-28 12:49:24 +12:00
scott1702
6180788f9d
Fix alignment of logout area
2015-08-28 12:20:00 +12:00
Ingo Schommer
28554dbe94
Merge pull request #4504 from dhensby/pulls/fields-fix
...
When loading data into a form, make sure its using ALL fields
2015-08-28 08:38:49 +12:00
Daniel Hensby
08dd8fda62
Merge pull request #4086 from xini/fix-remote-url-field
...
fix width of remote url field label to allow right-click-paste
2015-08-27 20:50:35 +01:00
Daniel Hensby
8015919932
Be defensive with token availability
2015-08-27 17:58:43 +01:00
Daniel Hensby
899eb0b235
FIX Use complete fieldlist for extracting data
2015-08-27 17:58:19 +01:00
Daniel Hensby
cffb11e568
TEST Ensure data is loaded into complete FieldList
2015-08-27 17:56:22 +01:00
JorisDebonnet
b264a835fa
Direct link to 3.2.0 release notes
2015-08-27 13:53:17 +02:00
Ingo Schommer
0c97192558
Merge pull request #4546 from dhensby/pulls/permission-docs
...
DOCS Adding docs for special Permission cases
2015-08-27 10:39:23 +12:00
Daniel Hensby
209bb94319
DOCS Adding docs for special Permission cases
2015-08-26 23:32:07 +01:00
Damian Mooyman
4fdfe3a0a2
Merge pull request #4543 from dhensby/pulls/members-can-view-themselves
...
FIX Members can access their own profiles in CMS
2015-08-27 09:43:43 +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
Daniel Hensby
2d4b743090
FIX Members can access their own profiles in CMS
2015-08-26 15:47:51 +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
Damian Mooyman
b49149d9d2
Update comment on changelog
2015-08-26 14:16:06 +12:00
Damian Mooyman
840c1b1615
Update translations
2015-08-26 13:56:19 +12:00
Damian Mooyman
1285553ebe
Added 3.2.0-rc1 changelog
2015-08-26 13:44:29 +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
Sam Minnée
a40e70f874
Merge pull request #4535 from kinglozzer/travis-notifications
...
Disable IRC notifications for Travis builds
2015-08-25 18:10:46 +12: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
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
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
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
