Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: silverstripe/silverstripe-cms
base: 3.1.0-rc1
...
head fork: silverstripe/silverstripe-cms
compare: 3.1
This comparison is big! We're only showing the most recent 250 commits
Commits on Aug 29, 2013
Damian Mooyman tractorcow BUG Fixed instances of loosely defined SQL predicates not qualified b…
…y table name

Fixed duplicate SQL escaping on SiteTree::get_by_link
5f82814
Ingo Schommer chillu Merge pull request #802 from tractorcow/3.1-condition-fix
BUG Fixed up SQL table.column identifiers, SQL encoding issue
23c9afa
Ingo Schommer chillu Merge pull request #842 from ARNHOE/3.1-siteconfigfix
FIX SiteConfig scrollbars visible
9b15c8c
Tom Densham nedmas FIX: GridField button styling in reports 4f30fed
Ingo Schommer chillu Merge pull request #843 from nedmas/patch-1
FIX: GridField button styling in reports
cdb4ab4
Ingo Schommer chillu Search callback for "add page" selector
Necessary since we now default $showSearch=true in TreeDropdownField.
See silverstripe/silverstripe-framework#2364
4e03107
Commits on Sep 12, 2013
Ingo Schommer chillu Updated translations a2342ce
Ingo Schommer chillu Tagged 3.0.6-rc2 65939e1
Ingo Schommer chillu Updated translations 553f325
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.0' into 3.1 201f488
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.1.0' into 3.1 5203cd2
Commits on Sep 13, 2013
Ingo Schommer chillu Behat scenarios for page permissions and search (steps only)
Actual step implementation not done yet
7ec7a26
Ingo Schommer chillu More specific behat tree assertions 16c802f
Commits on Sep 24, 2013
Ingo Schommer chillu Hints for SiteTree.TreeTitle casting
Relates to SS-2013-009
aee0381
Ingo Schommer chillu Clearer escaping in ReportAdmin
No direct security issue since report titles can't be set by the user
a5d9958
Ingo Schommer chillu FIX Escaping in "dependent pages" (SS-2013-009) ec9c159
Ingo Schommer chillu Clearer escaping in CMSMain
No direct security issue, but makes intent clearer
f477983
Ingo Schommer chillu Hints for SiteTree.TreeTitle casting
Relates to SS-2013-009
29e502a
Ingo Schommer chillu Clearer escaping in ReportAdmin
No direct security issue since report titles can't be set by the user
79996a7
Ingo Schommer chillu FIX Escaping in "dependent pages" (SS-2013-009) e170f4c
Ingo Schommer chillu Clearer escaping in CMSMain
No direct security issue, but makes intent clearer
86339a5
Simon Welsh simonwelsh Merge pull request #853 from chillu/pulls/escape-3.1.0
Escaping 3.1
dde9ce2
Simon Welsh simonwelsh Merge pull request #854 from chillu/pulls/escape-3.0
Escaping 3.0
cec5aa5
Commits on Sep 25, 2013
Ingo Schommer chillu Merge pull request #816 from kinglozzer/798-custom-page-icons
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)
9a4a5d9
Ingo Schommer chillu Tagged 3.1.0-rc3 dc1ae03
Commits on Sep 26, 2013
Ingo Schommer chillu Removed stale salad tests, got behat now fbb9a44
Ingo Schommer chillu Merge tag '3.0.6' into 3.0 0b073d2
Commits on Sep 27, 2013
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.0' into 3.1 8a96bab
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.1.0' into 3.1 0ee7a9b
Ingo Schommer chillu CMSMain assertion fail due to escaping
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
30cf08b
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.0' into 3.1 1a48afd
Commits on Sep 30, 2013
Ingo Schommer chillu CMSMain assertion fail due to escaping
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
7ec9596
Ingo Schommer chillu Updated translations c2a34ff
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.1.0' into 3.1 e991b44
Commits on Oct 01, 2013
Ingo Schommer chillu FIX ReportAdmin report links regression
Regression from 79996a7,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
daf92e6
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.0' into 3.1 956b6de
Commits on Oct 02, 2013
Andrew Short ajshort Fix test sometimes using cached relationship object.
In some circumstances, the CopyContentFrom page will be cached, so when
it is accessed the incorrect value was returned, meaning the test
would fail.
1f4cdfc
Ingo Schommer chillu Merge pull request #860 from ajshort/virtual-page-test-cache
Fix test sometimes using cached relationship object.
64608ea
Ingo Schommer chillu FIX ReportAdmin report links regression
Regression from 79996a7,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
fb9d7a5
Ingo Schommer chillu Fixed report link escaping 52ab9e5
Ingo Schommer chillu Fixed report link escaping 92e0c41
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.0' into 3.1 2a4191d
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.1.0' into 3.1 0c51d38
Ingo Schommer chillu Escape pl_PL.js (fixes #859) 26b086c
Loz Calver kinglozzer Stop MenuTitle updating tree on change
If the MenuTitle is changed and the tree updates, not saving the
changes to the page leaves the tree with the new title instead of the
old, correct one (until a refresh). This also seems counter-intuitive
anyway - suggesting to users that their updated MenuTitle has been
saved before it actually has.
595a037
Ingo Schommer chillu More resilient Behat checks for "page not found"
Wrapping in a step to capture cases where the ErrorPage defaults
haven't been generated, and the default ModelAsController
message shows which is slightly different wording.
0437c05
Commits on Oct 03, 2013
Shea Dawson sheadawson BUGFIX check if hints are defined for given pagetype before using. Fi…
…xes #861
0d2d293
Ingo Schommer chillu Merge pull request #862 from sheadawson/861-hiddenhints
BUGFIX check if hints are defined for given pagetype before using.
0aae86b
Loz Calver kinglozzer FIX Don't validate pages when restoring or reverting (fixes #2449)
Use new method
66bfff4
Commits on Oct 04, 2013
Ingo Schommer chillu updated translations 648c207
Commits on Oct 06, 2013
Ingo Schommer chillu Renamed "ja_JP" locale to "ja"
Better compat with transifex with generic locale
e836bbb
Ingo Schommer chillu Merge branch 'refs/heads/3.1.0' into 3.1 2cb0542
Ingo Schommer chillu Updated translations 7bab37c
Ingo Schommer chillu Merge branch 'refs/heads/3.1.0' into 3.1
Conflicts:
	lang/ar.yml
d2ba127
Ingo Schommer chillu Updated master translation file 6098457
Ingo Schommer chillu Updated translations 413e458
Commits on Oct 07, 2013
Ingo Schommer chillu Updated translations aa44e71
Ingo Schommer chillu Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1 107e4b2
Ingo Schommer chillu Migrated behat features from framework c0cc517
Commits on Oct 08, 2013
Ingo Schommer chillu Moved manage-files.feature from framework
It relies on AssetAdmin which is placed in the 'cms' module
d532d05
Ingo Schommer chillu Updated Te Reo translations 6a8de30
Ingo Schommer chillu Chinese translation encoding 34a0fe3
Commits on Oct 09, 2013
Ingo Schommer chillu Merge pull request #863 from kinglozzer/2449-getcmsvalidator-restore-…
…pages-fix

FIX Don't validate pages when restoring or reverting (fixes silverstripe/silverstripe-framework#2449)
c3e25e9
Commits on Oct 10, 2013
Andrew Short ajshort BUG: Fix add new button not passing the correct parent ID.
The `%s` parent ID placeholder was being URL encoded, so it was not being
replaced properly when adding a new page. This fix separately adds
placeholder parameters to the URL to avoid this issue.

The fix is not ideal, but there is no easy way to indicate that some
URL parameters should be URL encoded and others should not while still
correctly constructing the URL.
b7476f2
Simon Welsh simonwelsh Merge pull request #870 from ajshort/pull-1
BUG: Fix add new button not passing the correct parent ID.
095c784
Simon Welsh simonwelsh Calculate where to scroll to based off the position in the div
Also, only scroll if not currently visible.
0c2514d
Ingo Schommer chillu Merge pull request #871 from simonwelsh/3.1-scroll
Calculate where to scroll to based off the position in the div
b08c707
Andrew Short ajshort Add an extension hook for customising site tree hints. 68d254c
Ingo Schommer chillu Merge pull request #873 from ajshort/pull-2
Add an extension hook for customising site tree hints.
c8dc9a9
Ingo Schommer chillu Avoid encoded HTML breadcrumbs aae6b2b
Commits on Oct 15, 2013
Dawid dawidcieszynski FIX Remove invalid single quote 69ae8a8
Ingo Schommer chillu Merge pull request #876 from cieszak/3.1
FIX Remove invalid single quote
611772c
Commits on Oct 16, 2013
Ingo Schommer chillu Behat travis tests b884671
Commits on Oct 21, 2013
sheadawson MINOR add hook for extensions to update current page id, before falli…
…ng back to default
1b54658
Ingo Schommer chillu Merge pull request #879 from sheadawson/833-currentPageID
Add hook for extensions to update current page id, before falling ...
c645d76
Commits on Oct 22, 2013
Sean Harvey halkyon ContentControllerSearchExtensionTest doesn't clean up after itself.
The problem is FulltextSearchable::enable() does two things:
It enables the extension, as well as sets the MySQL create table option
to MyISAM. Later tests run with the extension enabled, because it doesn't
get removed at the end of the test, but the table type is set back to
InnoDB when the test is reset and schema recreated.

This produces side-effects where later tests in a suite tries to run
ALTER TABLE on File and add fulltext indexes when the table type
is set to InnoDB, causing an error.
ed8ee4e
Mateusz U mateusz Merge pull request #880 from halkyon/fulltextsearch_text
ContentControllerSearchExtensionTest doesn't clean up after itself.
27c8122
Commits on Oct 23, 2013
Ingo Schommer chillu Default CMSMain to Versioned::reading_stage("Stage") 3d9fc2c
Loz Calver kinglozzer NEW: Page types no longer require a controller, they can inherit the …
…parent page type's

Use ClassInfo::ancestry() instead of get_parent_class()

Fall back to ContentController by default
b6589ba
Ingo Schommer chillu Merge pull request #881 from kinglozzer/framework-1905-controller-inh…
…eritance

NEW: Page types no longer require their own controller (fixes silverstripe/silverstripe-framework#1905)
79c0b6c
Commits on Oct 24, 2013
Ingo Schommer chillu Behat tests for image upload and overwrite in HTML editor 677f382
Ingo Schommer chillu API JS i18n files with short locale names, generated by build task
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See silverstripe/silverstripe-buildtools@b59f385

Fixes silverstripe/silverstripe-framework#2499
b726180
Commits on Oct 28, 2013
Trevor trev Fix comment typo e3724e9
Will Rossiter wilr Merge pull request #887 from trev/patch-1
Fix comment typo
a24d84a
Commits on Oct 29, 2013
Loz Calver kinglozzer Set default encoding for compass 634ee2e
Commits on Oct 30, 2013
Will Rossiter wilr Merge pull request #888 from kinglozzer/patch-1
Set default encoding for compass
5101db9
Commits on Nov 01, 2013
Ingo Schommer chillu Merge pull request #884 from chillu/pulls/js-i18n-3.1
API JS i18n files with short locale names, generated by build task
35a84e4
Commits on Nov 06, 2013
Ingo Schommer chillu Disable UploadField change detection in assets/admin/add 2d0ee2c
☃ Stephen Shkardoon ☃ ss23 Refactor old page redirector into an extension f972466
Ingo Schommer chillu Merge pull request #801 from ss23/refactor-old-page-redirector
Refactor old page redirector into an extension
77ef09e
Commits on Nov 07, 2013
Damian Mooyman tractorcow Merge pull request #889 from chillu/pulls/2638-uploadfield
Disable UploadField change detection in assets/admin/add
f9c3f4d
Ingo Schommer chillu Updated translations e2fa3b7
Commits on Nov 12, 2013
Ingo Schommer chillu Merge pull request #883 from chillu/pulls/htmleditor-upload-replace
Behat tests for image upload from computer, editing images, etc
c3b7afb
Commits on Nov 15, 2013
Ingo Schommer chillu Convert behat PHP to SS coding conventions 34c8fb2
Sriram Venkatesh srizzling Implemented Behat test for page search (fixes #620)
Added Deleted state to UpdateState step defination
See #896
e444b35
Commits on Nov 18, 2013
Will Rossiter wilr FIX: ErrorPage generating empty responses for 403/401 requests
Previously by setting the response status code inside the action, this prevented response bodies from being included due to 403/401 being matched by SS_HTTPResponse::isFinished() (which stops popular

I assume SS_HTTPResponse::isFinished() is valid for the permission error use case (and I would be hesitant to change it) so this simply moves the declaration of the response status code till after the parent has populated the body of the response.
ddc2e38
Commits on Nov 20, 2013
Ingo Schommer chillu Default CMSMain to Versioned::reading_stage("Stage") b6194c3
Loz Calver kinglozzer ENHANCEMENT: Add 'Cancel' button to 'Add Page' form 95d9257
Michael Andrewartha mandrew Adding behat test for changing theme of site using CMS dropdown c6b1606
Commits on Nov 22, 2013
Loz Calver kinglozzer Implement History.js logic for "Cancel" action 8f72040
Ingo Schommer chillu Merge pull request #898 from dnadesign/errorpagepermissions
FIX: ErrorPage generating empty responses for 403/401 requests
6804461
Commits on Nov 28, 2013
Sean Harvey halkyon Fixing up scenarios for managing page permissions Behat tests.
Relies on changes from silverstripe-behat-extension:

silverstripe-behat-extension/pull/15
silverstripe-behat-extension/pull/14
silverstripe-behat-extension/pull/13
silverstripe-behat-extension/pull/12
a79ac87
Commits on Dec 01, 2013
Sriram Venkatesh srizzling NEW STEP: Pages editable by and renamed manage page permissions featu…
…re file
86301e6
Commits on Dec 02, 2013
Ingo Schommer chillu Merge pull request #904 from srizzling/is/cms/892
Added new step Pages can be editable by
8613e05
Ingo Schommer chillu Reload "Settings" form on save (fixes #895)
Regression from 920da0d
bd5f631
Ingo Schommer chillu ValidationException support in CMS "Settings" UI ec41cb3
Ingo Schommer chillu More specific Behat assertion for page editability 78b9ef2
Commits on Dec 06, 2013
Martijn van Nieuwenhoven axyr use Controller::join_links() for listview links
This fixes incorrect adding of the locale parameter when using translatable :

http://site.com/admin/pages/edit/show?locale=nl_NL/11
dec2be3
Commits on Dec 12, 2013
Ingo Schommer chillu Merge pull request #899 from mandrew/3.1
Adding behat test for changing theme of site using CMS dropdown
288303c
Commits on Dec 13, 2013
Ingo Schommer chillu Page edit access with CMS_ACCESS_LeftAndMain (fixes #908)
"Access to all sections" implies edit access in the CMS
1f17f43
Commits on Dec 16, 2013
Loz Calver kinglozzer FIX: Prevent "Add Page" button being stuck 'focussed' b964e87
Commits on Dec 17, 2013
Loz Calver kinglozzer FIX: Prevent AssetAdmin duplicate confirmation for file deletion (fixes 0a0ea33
Commits on Dec 19, 2013
Sean Harvey halkyon Merge pull request #913 from kinglozzer/assetadmin-delete-confirmation
FIX: Prevent AssetAdmin duplicate confirmation for file deletion (fixes silverstripe/silverstripe-framework#2639)
c4cd203
Ingo Schommer chillu Updated translations 6f5d992
Ingo Schommer chillu Merge pull request #912 from kinglozzer/cms-page-add-button-focus
FIX: Prevent "Add Page" button being stuck 'focussed'
e009d0e
Ingo Schommer chillu Updated translation masters 046a5fd
Commits on Jan 03, 2014
Loz Calver kinglozzer FIX: Changetracker causing 'saveButton is not a function' error
Regression from 1571d35
034bfc3
Commits on Jan 05, 2014
madmatt madmatt Fix “I can insert an image from the CMS file store”. b097948
madmatt madmatt Fix behat tests for insert-an-image.feature
- Fix “I can insert an image from the CMS file store”.
- Remove unused scenario (we no longer support adding multiple images at once from the CMS).
- Fix “I can edit properties of an image before inserting it” scenario.
- Remove “I can edit dimensions of an image before inserting it” scenario - these fields no longer exist.
- Add documentation to explain why this scenario is marked @todo.
a1f02f8
Commits on Jan 06, 2014
madmatt madmatt Fix behat tests for insert-a-link.feature
- Fix "I can link to a file" scenario.
- Fix "I can link to an anchor” scenario.
- Fix "I can edit a link” scenario.
- MINOR: Grammar fixes.
- Fix "I can remove a link” scenario.
938fb6f
Commits on Jan 15, 2014
Sean Harvey halkyon Fixing test failures because of Translatable and SiteTreeSubsites e93abc6
Commits on Jan 16, 2014
Mateusz U mateusz Merge pull request #924 from halkyon/modules_illegal_extensions_tests
Fixing test failures because of Translatable and SiteTreeSubsites
c8c5675
Sean Harvey halkyon Fixing test failures introduced by Translatable and SiteTreeSubsites
Same fix as e93abc6, except it applies to VirtualPageTest.
93dca70
Mateusz U mateusz Merge pull request #926 from halkyon/virtualpage_extensions_fix
Fixing test failures introduced by Translatable and SiteTreeSubsites
b520027
Sean Harvey halkyon Fixing test not auto-following admin/pages/SearchForm
With additional modules like Translatable, this test fails because
a 301 is issued to redirect the admin/pages/SearchForm request to the
correct URL containining a locale in the query string.
e9b10e5
Commits on Jan 17, 2014
Mateusz U mateusz Merge pull request #927 from halkyon/cmsmainsearch_test_fix
Fixing test not auto-following admin/pages/SearchForm
5e79e66
Commits on Feb 10, 2014
Gus King Documented magic properties/methods of SiteTree and SiteConfig. 457cadb
Ingo Schommer chillu Merge pull request #932 from yearofthegus/document-magic
Documented magic properties/methods of SiteTree and SiteConfig.
74ed412
Gus King Numerous PHPDoc fixes. 7b4cc31
Ingo Schommer chillu Merge pull request #935 from yearofthegus/doctag_fixes
Numerous PHPDoc fixes.
14352f5
Commits on Feb 12, 2014
Ingo Schommer chillu Merge remote-tracking branch 'origin/3.0' into 3.1 0d34b68
Commits on Feb 13, 2014
Sam Minnée sminnee FIX: Fixed testing of theme switching.
The previous theme test relied on the existence of the tutorial theme, which has been removed.
I'ved added a couple of behat rules for scaffolding fake themes, and altered the test to use these.
ab4b72d
Sam Minnée sminnee FIX: Added proper state-restoration code to the ThemeContext: c0e6bf7
Commits on Feb 14, 2014
Sam Minnée sminnee Minor improvement of theme switching test performance. d69c8e5
Sam Minnée sminnee Merge pull request #937 from sminnee/fix-theme-test
FIX: Fixed testing of theme switching.
9c46c7d
Commits on Feb 16, 2014
Hamish Friedlander hafriedlander FIX Limit ExtraMeta to only allow meta and link elements 224033e
Commits on Feb 17, 2014
Jean-Fabien patbolo FIX JS issue when enabling save buttons for when the content has chan…
…ged. Current implementation triggers a 'Object is not a function' error. New implementation follows the same logic as in the onmatch function, and uses .button() as the function
5f2d78a
Sean Harvey halkyon Merge pull request #945 from patbolo/save-buttons-status-issue
FIX JS issue when enabling save buttons for when the content has changed...
311e0d0
Sriram Venkatesh srizzling Adding AdminAssets filter Behat tests 3f28d72
Ingo Schommer chillu Updated translations ca37dc8
Commits on Feb 18, 2014
Ingo Schommer chillu Merge pull request #943 from hafriedlander/fix/extrameta_whitelist
FIX Limit ExtraMeta to only allow meta and link elements
1187766
Commits on Feb 20, 2014
sheadawson FIX fileexists check via ajax didnt know what folder the file was bei…
…ng uploaded to. Fixes #950
dc86539
Commits on Feb 25, 2014
Stig Lindqvist stojg BUG Report admin don't listen to filters
It seems like filter params that are added to the url are added in a bad way

Currently

    ?0[name]=filters[ContentReviewOwnerID]&0[value]=1

Expected:

    ?filters[ContentReviewOwnerID]=1
1625d12
Commits on Mar 12, 2014
Ingo Schommer chillu Added min stability for composer
Required for scrutinizer runs
e604ef8
Will Rossiter wilr Merge pull request #956 from stojg/reportadmin-bug
BUG Report admin don't listen to filters
dca9c7c
Commits on Mar 13, 2014
Ingo Schommer chillu Fixed behat image upload tests
Was using "File" class rather than "Image",
which broke HtmlEditorField->saveInto() with "unknown method getWidth()"
20605f7
Ingo Schommer chillu Fixed behat image upload tests (contd.) dee64bb
Simon Welsh simonwelsh Add PHP 5.6 to the test matrix 79da34f
Commits on Mar 16, 2014
Simon Welsh simonwelsh FIX: Reports with Parameter fields override ReportTitle and ReportDes…
…cription

Fixes #696
5024a48
Simon Welsh simonwelsh Merge pull request #911 from chillu/pulls/908-all-sections-canedit
Page edit access with CMS_ACCESS_LeftAndMain (fixes #908)
2503d1d
Simon Welsh simonwelsh Merge pull request #917 from kinglozzer/savebutton-changetracker-issue
FIX: Changetracker causing 'saveButton is not a function' error
5d18d49
Simon Welsh simonwelsh Merge pull request #919 from madmatt/pulls/behat-insert-image
Fix “I can insert an image from the CMS file store”.
ebbb35d
Simon Welsh simonwelsh Merge pull request #920 from madmatt/pulls/behat-image-uploads
Fix behat tests for insert-an-image.feature
de12aeb
Simon Welsh simonwelsh Merge pull request #921 from madmatt/pulls/behat-insert-links
Fix behat tests for insert-a-link.feature
f90f52f
Simon Welsh simonwelsh Merge pull request #946 from srizzling/adminasset-filter
Adding AdminAssets filter Behat tests
7f62cd3
Simon Welsh simonwelsh Merge pull request #951 from sheadawson/950-fileexists
FIX fileexists check
403b47f
Russell Michell phptek FIX Fixes #965. Allow user date-settings to show on GridField Page admin
- Relies on framework PR #2961.
b4a1aa4
Commits on Mar 17, 2014
Simon Welsh simonwelsh Assets table just shows the name, not the path 7002dcf
Commits on Mar 19, 2014
☃ Stephen Shkardoon ☃ ss23 FIX Prevent SQLi when no URL filters are applied 8e50405
☃ Stephen Shkardoon ☃ ss23 FIX Prevent SQLi when no URL filters are applied 114df8a
☃ Stephen Shkardoon ☃ ss23 FIX Do now allow arbitary class creation in CMS a67ed27
Commits on Mar 26, 2014
Damian Mooyman tractorcow Merge pull request #976 from ss23/SS2014004-3-0
FIX Prevent SQLi when no URL filters are applied
43d308c
Damian Mooyman tractorcow Merge pull request #977 from ss23/SS2014004-3-1
FIX Prevent SQLi when no URL filters are applied
17b3e3e
☃ Stephen Shkardoon ☃ ss23 FIX Do now allow arbitary class creation in CMS bf9b22f
Damian Mooyman tractorcow Merge pull request #978 from ss23/SS2014005-3-0
FIX Do now allow arbitary class creation in CMS
2804331
Damian Mooyman tractorcow Merge pull request #979 from ss23/SS2014005-3-1
FIX Do now allow arbitary class creation in CMS
ab78198
Commits on Mar 31, 2014
Damian Mooyman tractorcow Updated translation master 755f4f1
Ingo Schommer chillu Merge pull request #986 from tractorcow/pulls/translation-update
Updated translation master
4d48c48
Damian Mooyman tractorcow Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/model/SiteTree.php
	tests/controller/CMSMainTest.php
7adbf81
Commits on Apr 07, 2014
Damian Mooyman tractorcow BUG Fix orphaned pages reporting they can be viewed 3204ab5
Will Rossiter wilr Merge pull request #991 from tractorcow/pulls/3.1-canview-orphaned
BUG Fix orphaned pages reporting they can be viewed
f40de3b
Commits on Apr 10, 2014
Damian Mooyman tractorcow Merge pull request #968 from phptek/issue/965
FIX Fixes #965. Allow user date-settings to show on GridField Page admin
baff7f1
Commits on Apr 14, 2014
Damian Mooyman tractorcow API Filter by date created for files
Added test cases
Do not merge before silverstripe-labs/silverstripe-behat-extension#32

ref: CWPBUG-144
3765030
Commits on Apr 28, 2014
Russell Michell phptek NEW Fixes #966. Ability to filter pages on page status.
- New filters for statuses normally found through SiteTree::getStatusFlags().
- Refactored menu sorting. Now alphabetical, as it wasn't previously.
a502c9d
Damian Mooyman tractorcow API Ability to configure paging for assets / pages
ref: CWPBUG-143
0285322
Mateusz U mateusz Merge pull request #992 from tractorcow/pulls/966-fix-searchfilters
BUG Fix issue with page search ignoring filters
072e0d9
Loz Calver kinglozzer FIX: Broken file link tracking (fixes #996) 396fd9a
Ingo Schommer chillu Merge pull request #1003 from tractorcow/pulls/3.1-configurable-paging
API Ability to configure paging for assets / pages
66919ed
Ingo Schommer chillu Merge pull request #994 from tractorcow/pulls/3.1-asset-datefilter
API Filter by date created for files
9bff36c
Damian Mooyman tractorcow BUG Fix encoding of SiteTree.MetaTags 89fbae2
Damian Mooyman tractorcow Merge pull request #998 from kinglozzer/pulls/sitetree-file-linktracking
FIX: Broken file link tracking (fixes #996)
341eeb7
Commits on Apr 29, 2014
Mateusz U mateusz Merge pull request #1004 from tractorcow/pulls/sitetree-title
BUG Fix encoding of SiteTree.MetaTags
fcb6a91
Commits on May 05, 2014
Damian Mooyman tractorcow BUG Behat now uses explicit radio button behaviour c5d5d10
Ingo Schommer chillu Merge pull request #1011 from tractorcow/pulls/3.1-behat-fixes
BUG Behat now uses explicit radio button behaviour
36bb411
Damian Mooyman tractorcow Update travis configuration to use composer phpunit
Made PHP 5.6 an allowed failure
b5214d2
Hamish Friedlander hafriedlander Merge pull request #1010 from tractorcow/pulls/3.1-travis
Update travis configuration to use composer phpunit
1f4d9e4
Damian Mooyman tractorcow API Error page support for Security controller errors f9cb880
Hamish Friedlander hafriedlander Merge pull request #1007 from tractorcow/pulls/3.1-security-errorpage
API Error page support for Security controller errors
435a5ee
Commits on May 06, 2014
Damian Mooyman tractorcow API Update ErrorPage to respect new HTTP Error codes 3162d0e
Hamish Friedlander hafriedlander Merge pull request #1006 from tractorcow/pulls/3.1-http-error-codes
API Update ErrorPage to respect new HTTP Error codes
f2c2ffa
Damian Mooyman tractorcow Updated translation masters bae9580
Commits on May 12, 2014
Damian Mooyman tractorcow Updated translation masters 3033d45
Commits on May 15, 2014
Damian Mooyman tractorcow BUG Fix sorting on main ReportAdmin grid
ref: CWPBUG-133
7277dc1
Commits on Jun 10, 2014
Rodney Way Ensure ajax call includes query parameters so that SitreeFilters func…
…tion as expected. Required for subtree branch loading.
e557951
Damian Mooyman tractorcow Merge pull request #1029 from rodneyway/1028-SiteTree-filtered-view-n…
…ot-applied-to-subtree-branches

1028 - BUG FIX: SiteTree filtered view not applied to subtree branches
88abf5d
Commits on Jun 15, 2014
Ingo Schommer chillu Removed goutte driver from Behat, not supported
Was added way back with the original behat.yml, and then forgotten about
e1f82ab
Commits on Jun 16, 2014
Damian Mooyman tractorcow BUG Fix deleted pages redirecting the CMS
Update behat tests for Mink 1.6 compatibility
b8d19ba
Ingo Schommer chillu Merge pull request #1023 from tractorcow/pulls/3.1/mink-update
BUG Fix deleted pages redirecting the CMS
601efbc
Commits on Jun 24, 2014
Rodney Way BUG: Ensure that all child pages are deleted (regardless of ShowInMen…
…u status) under enforce_strict_hierarchy.

Also updated SiteTree YML test data to match.
1e19485
Damian Mooyman tractorcow Merge pull request #1027 from rodneyway/1026-SiteTree-page-delete-omi…
…ts-children-with-ShowInMenus-off

Ensure that all child pages are deleted (regardless of their ShowInMenu ...
a1286f1
Commits on Jul 01, 2014
Will Rossiter wilr FIX ensure controller stack is updated when execution halted by an ex…
…ception.

See: silverstripe/silverstripe-framework#2467

popCurrent would be incorrectly not pop a controller from the controller stack if an exception was throw from inside the handleRequest() method.

This change captures the exception, ensures the controller is popped from the stack and passes the exception along.
a777266
Commits on Jul 21, 2014
Stig Lindqvist stojg Merge pull request #1039 from dnadesign/fixpopcurrentwarning
FIX ensure controller stack is updated when execution halted by an exception
5107b08
Commits on Jul 24, 2014
Stig Lindqvist stojg BUG: Narrowing site tree search to one date shows no pages
It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
3eefd65
Simon Welsh simonwelsh Merge pull request #1060 from stojg/pull/search-for-date
BUG: Narrowing site tree search to one date shows no pages
6a0366f
Commits on Jul 25, 2014
Stig Lindqvist stojg Bug: CMS tree filters doesn't count the correct number of children fo…
…r 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
45046f0
Damian Mooyman tractorcow Merge pull request #1056 from stojg/issue/cms-1049
BUG: Delete parent page, child pages cannot be found anymore
4967d3d
Commits on Jul 29, 2014
Stig Lindqvist stojg NEW Adding CMS sitetree filter to see the current 'live' site
This adds a new filter that will show a content editor what the current published site-tree
looks like for a visitor. This helps when there is a lot of drafted content that get included
in the default filter 'All Pages'
482c23f
Damian Mooyman tractorcow Merge pull request #1063 from stojg/pull/published-pages-cmsfilter
NEW Adding CMS sitetree filter to see the current 'live' site
1b0add3
Commits on Jul 31, 2014
Jackson jakxnz #1067 No updateEditForm hook on CMSFieldAddController::getEditForm() 20df063
Commits on Aug 01, 2014
Damian Mooyman tractorcow Tests for silverstripe/silverstripe-framework#3347 42755eb
Mateusz U mateusz Merge pull request #1070 from tractorcow/pulls/3.1/framework-3347-test 3e1904a
Commits on Aug 04, 2014
Damian Mooyman tractorcow Merge pull request #1068 from jakxnz/1067-cmsfieldaddcontroller-geted…
…itform


#1067 No updateEditForm hook on CMSFieldAddController::getEditForm()
acf376e
Commits on Aug 05, 2014
Damian Mooyman tractorcow Update translations 407033b
Commits on Aug 06, 2014
Damian Mooyman tractorcow BUG Fix search range for asset filter 1c48cb6
Mateusz U mateusz Merge pull request #1071 from tractorcow/pulls/3.1/fix-asset-search
BUG Fix search range for asset filter
84fcf02
Damian Mooyman tractorcow BUG Fix CMSMain::getList to correctly respect filter result
Fixes #1064
CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned
53dbbb7
Commits on Aug 07, 2014
Sean Harvey halkyon Merge pull request #1069 from tractorcow/pulls/3.1/fix-cmsmain-getlist
BUG Fix CMSMain::getList to correctly respect filter result
3a5c5ef
madmatt madmatt Fix changed pages filter to match SiteTree's 'MODIFIED' label 4e5b196
Damian Mooyman tractorcow Merge pull request #1072 from madmatt/pulls/changed-pages
Fix changed pages filter to match SiteTree's 'MODIFIED' label
0884151
Nicolaas sunnysideup fix spelling of pages from pags to pages
fix spelling of pages from pags to pages
7eeb59a
Damian Mooyman tractorcow Merge pull request #1073 from sunnysideup/patch-8
fix spelling of pages from pags to pages
87146ea
Commits on Aug 11, 2014
Damian Mooyman tractorcow Set minimum firefox version for travis support fc6f0fe
Commits on Aug 12, 2014
Sean Harvey halkyon Merge pull request #1017 from tractorcow/pulls/3.1/fix-report-sorting
BUG Fix sorting on main ReportAdmin grid
796874d
Commits on Aug 22, 2014
Sean Harvey halkyon Reformat .travis.yml 4d0e4b7
Damian Mooyman tractorcow Merge pull request #1090 from halkyon/travis_reformat
Reformat .travis.yml
fa90658
Daniel Hensby dhensby Implement `TemplateGlobalProvider` on `SiteConfig`
Seeing as the `SiteConfig` is a site wide and "global" object, it makes sense to have it universally available to the templates
89184a8
Will Rossiter wilr Merge pull request #1093 from dhensby/patch-1
Implement `TemplateGlobalProvider` on `SiteConfig`
3f902eb
Commits on Aug 26, 2014
Gander Update pl.yml for ContentController.StartEditing
For over a year, here is an error, resulting in the display of the broken link to the Polish version of CMS, after installation.
6d50b26
Commits on Aug 31, 2014
Ingo Schommer chillu Merge pull request #1096 from gander/3.1
Update pl.yml for ContentController.StartEditing
ae4601b
Commits on Sep 18, 2014
Sam Minnée sminnee MINOR: Fixed copyright year f486c32
Commits on Oct 15, 2014
Ingo Schommer chillu Recompiled CSS with compass 1.0
Minor syntactical changes, like alphabetical ordering of filters, uppercasing of hex colours. See http://compass-style.org/blog/2014/08/15/omg-compass-1-0/.
Shouldn't include any user-visible changes, but helps to avoid confusion with the next person trying to modify the CSS (Luke is currently struggling with that)
3b93310
Ingo Schommer chillu Fixed duplicate CSS scoping in AssetAdmin.scss 286dfe4
Commits on Oct 23, 2014
Michael Strong micmania1 FIX Broken links on dependent pages tab 8310135
Loz Calver kinglozzer Merge pull request #1119 from micmania1/fix-broken-links-dependent-pages
FIX Broken links on dependent pages tab
7fc5a29
Commits on Nov 03, 2014
Sean Harvey halkyon BUG sprintf missing on exception in SilverStripeNavigator 56142b8
Sam Minnée sminnee Merge pull request #1127 from halkyon/sprintf_missing
BUG sprintf missing on exception in SilverStripeNavigator
93d09d4
guywatson guywatson Add an extension hook to the getIsModifiedOnStage method d2f0eaf
Daniel Hensby dhensby Merge branch 'guywatson-patch-1' into 3.1 dd0332d
Commits on Nov 08, 2014
Damian Mooyman tractorcow Update translations 708e706
Commits on Nov 17, 2014
Loz Calver kinglozzer FIX: VirtualPages use correct casting for 'virtual' database fields a142ffd
Commits on Dec 02, 2014
Stephen McMahon stephenmcm BUG: Fixed SearchForm not calling getTemplate() in forTemplate() 9d888d5
Commits on Dec 03, 2014
Damian Mooyman tractorcow Merge pull request #1110 from stephenmcm/SearchFormPatch
BUG: Fixes #1107 SearchForm not calling getTemplate() in forTemplate()
19f337b
Commits on Jan 12, 2015
Damian Mooyman tractorcow Update translations ee4639e
Commits on Jan 22, 2015
Michael Strong micmania1 BUG Correctly sanitise Title 7733c43
Damian Mooyman tractorcow Merge pull request #1159 from micmania1/patch-3
BUG Correctly sanitise Title
cfcbfea
Commits on Feb 08, 2015
Daniel Hensby dhensby FIX External redirects shouldnt show in preview pane a530085
Daniel Hensby dhensby Remove double escaping of report data fe8cbc8
Commits on Feb 12, 2015
Damian Mooyman tractorcow Merge pull request #1165 from dhensby/pulls/fixes
Pulls/fixes
0a8cb64
Commits on Feb 15, 2015
Damian Mooyman tractorcow Update translations c7814cf
Commits on Mar 05, 2015
Damian Mooyman tractorcow Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
FIX: VirtualPages use correct casting for 'virtual' database fields
cabd8bb