SilverStripe ships with default rewriting rules specific to your web server. Apart from
routing requests to the framework, they also prevent access to sensitive files in the webroot,
-for example YAML configuration files. Please refer to the [security](/topics/security) documentation for details.
+for example YAML configuration files. Please refer to the [secure coding](/developer_guides/security/secure_coding/#filesystem) documentation for details.
diff --git a/docs/en/00_Getting_Started/05_Coding_Conventions.md b/docs/en/00_Getting_Started/05_Coding_Conventions.md
index 7c62781ae..e34f813fa 100644
--- a/docs/en/00_Getting_Started/05_Coding_Conventions.md
+++ b/docs/en/00_Getting_Started/05_Coding_Conventions.md
@@ -449,7 +449,7 @@ Use [ANSI SQL](http://en.wikipedia.org/wiki/SQL#Standardization) format where po
### Secure Development
-See [security](/topics/security) for conventions related to handing security permissions.
+See [security](/developer_guides/security) for conventions related to handing security permissions.
## License
diff --git a/docs/en/01_Tutorials/01_Building_A_Basic_Site.md b/docs/en/01_Tutorials/01_Building_A_Basic_Site.md
index 70e7966b1..50d156963 100644
--- a/docs/en/01_Tutorials/01_Building_A_Basic_Site.md
+++ b/docs/en/01_Tutorials/01_Building_A_Basic_Site.md
@@ -51,7 +51,7 @@ When designing your site you should only need to modify the *mysite*, *themes* a
-The CMS is the area in which you can manage your site content. You can access the cms at http://localhost/your_site_name/admin (or http://yourdomain.com/admin if you are using your own domain name). You
+The CMS is the area in which you can manage your site content. You can access the cms at `http://localhost/your_site_name/admin` (or `http://yourdomain.com/admin` if you are using your own domain name). You
will be presented with a login screen. Login using the details you provided at installation. After logging in you
should see the CMS interface with a list of the pages currently on your website (the site tree). Here you can add, delete and reorganize pages. If you need to delete, publish, or unpublish a page, first check "multi-selection" at the top. You will then be able to perform actions on any checked files using the "Actions" dropdown. Clicking on a page will open it in the page editing interface pictured below (we've entered some test content).
@@ -85,7 +85,7 @@ The page type specifies the templates used to render the page, the fields that a
**SilverStripe's friendly URLs**
While you are on the draft or live SilverStripe site, you may notice the URLs point to files that don't exist, e.g.
-http://localhost/contact or http://yourdomainname.com/about-us etc. SilverStripe uses the URL field on the Meta-Data tab of the Edit Page -> Content section to look up the appropriate
+`http://localhost/contact` or `http://yourdomainname.com/about-us` etc. SilverStripe uses the URL field on the Meta-Data tab of the Edit Page -> Content section to look up the appropriate
page in the database.
Note that if you have sub-pages, changing the Top level URL field for a page will affect the URL for all sub-pages. For example, if we changed the URL field "/about-us/" to "/about-silverstripe/" then the sub-pages URLs would now be "/about-silverstripe/URL-of-subpage/" rather than "/about-us/URL-of-subpage/".
@@ -151,7 +151,7 @@ or placed between SilverStripe template tags:
**Flushing the cache**
Whenever we edit a template file, we need to append *?flush=1* onto the end of the URL, e.g.
-http://localhost/your_site_name/?flush=1. SilverStripe stores template files in a cache for quicker load times. Whenever there are
+`http://localhost/your_site_name/?flush=1`. SilverStripe stores template files in a cache for quicker load times. Whenever there are
changes to the template, we must flush the cache in order for the changes to take effect.
## The Navigation System
@@ -344,7 +344,7 @@ Create a new file *HomePage.php* in *mysite/code*. Copy the following code into
Every page type also has a database table corresponding to it. Every time we modify the database, we need to rebuild it.
-We can do this by going to [http://localhost/your_site_name/dev/build](http://localhost/your_site_name/dev/build) (replace *localhost/your_site_name* with your own domain name if applicable).
+We can do this by going to `http://localhost/your_site_name/dev/build`.
It may take a moment, so be patient. This adds tables and fields needed by your site, and modifies any structures that have changed. It
does this non-destructively - it will never delete your data.
diff --git a/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md b/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
index d7670f262..9b06821ce 100644
--- a/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
+++ b/docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
@@ -12,7 +12,7 @@ information.
All data tables in SilverStripe are defined as subclasses of [api:DataObject]. The [api:DataObject] class represents a
single row in a database table, following the ["Active Record"](http://en.wikipedia.org/wiki/Active_record_pattern)
-design pattern. Database Columns are defined as [Data Types](data_types_and_casting) in the static `$db` variable
+design pattern. Database Columns are defined as [Data Types](/developer_guides/model/data_types_and_casting) in the static `$db` variable
along with any [relationships](relations) defined as `$has_one`, `$has_many`, `$many_many` properties on the class.
Let's look at a simple example:
@@ -512,7 +512,7 @@ whenever a new object is created.
Note: Alternatively you can set defaults directly in the database-schema (rather than the object-model). See
-[Data Types and Casting](data_types_and_casting) for details.
+[Data Types and Casting](/developer_guides/model/data_types_and_casting) for details.
## Subclasses
@@ -579,7 +579,7 @@ To retrieve a news article, SilverStripe joins the [api:SiteTree], [api:Page] an
## Related Documentation
-* [Data Types and Casting](../data_types_and_casting)
+* [Data Types and Casting](/developer_guides/model/data_types_and_casting)
## API Documentation
diff --git a/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md b/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md
index 246282fd2..5effa4379 100644
--- a/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md
+++ b/docs/en/02_Developer_Guides/00_Model/How_Tos/Grouping_DataObject_Sets.md
@@ -2,7 +2,7 @@
The [api:SS_List] class is designed to return a flat list of records.
These lists can get quite long, and hard to present on a single list.
-[Pagination](/templates/how_tos/pagination) is one way to solve this problem,
+[Pagination](/developer_guides/templates/how_tos/pagination) is one way to solve this problem,
by splitting up the list into multiple pages.
In this howto, we present an alternative to pagination:
@@ -144,5 +144,5 @@ The final step is the render this into the template using the [api:GroupedList->
## Related
- * [Howto: "Pagination"](/templates/how_tos/pagination)
-
\ No newline at end of file
+ * [Howto: "Pagination"](/developer_guides/templates/how_tos/pagination)
+
diff --git a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
index 51bea33ab..5a792fa0d 100644
--- a/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
+++ b/docs/en/02_Developer_Guides/01_Templates/03_Requirements.md
@@ -30,37 +30,37 @@ as close to rendering as possible (e.g. in `[api:FormField]`.
class MyCustomController extends Controller {
- public function init() {
- parent::init();
+ public function init() {
+ parent::init();
- Requirements::javascript("cms/javascript/LeftAndMain.js");
- Requirements::css("cms/css/TreeSelector.css");
- }
- }
+ Requirements::javascript("cms/javascript/LeftAndMain.js");
+ Requirements::css("cms/css/TreeSelector.css");
+ }
+ }
### CSS Files
:::php
- Requirements::css($path, $media);
+ Requirements::css($path, $media);
If you're using the CSS method a second argument can be used. This argument defines the 'media' attribute of the
`
[api:GridField] powers the automated data UI of [api:ModelAdmin]. For more information about `ModelAdmin` see the
-[Customizing the CMS](../../customizing_the_cms) guide.
+[Customizing the CMS](/developer_guides/customising_the_admin_interface) guide.
Each `GridField` is built from a number of components grouped into the [api:GridFieldConfig]. Without any components,
diff --git a/docs/en/02_Developer_Guides/03_Forms/How_Tos/04_Create_a_GridField_ActionProvider.md b/docs/en/02_Developer_Guides/03_Forms/How_Tos/04_Create_a_GridField_ActionProvider.md
index c79a1d9b8..e1745c23c 100644
--- a/docs/en/02_Developer_Guides/03_Forms/How_Tos/04_Create_a_GridField_ActionProvider.md
+++ b/docs/en/02_Developer_Guides/03_Forms/How_Tos/04_Create_a_GridField_ActionProvider.md
@@ -1,6 +1,6 @@
# How to add a custom action to a GridField row
-In a [GridField](../field_types/gridfield) instance each table row can have a
+In a [GridField](/developer_guides/forms/field_types/gridfield) instance each table row can have a
number of actions located the end of the row such as edit or delete actions.
Each action is represented as a instance of a specific class
(e.g [api:GridFieldEditButton]) which has been added to the `GridFieldConfig`
@@ -79,7 +79,7 @@ below:
While we're working on the code, to add this new action to the `GridField`, add
a new instance of the class to the [api:GridFieldConfig] object. The `GridField`
-[Reference](../field_types/gridfield) documentation has more information about
+[Reference](/developer_guides/forms/field_types/gridfield) documentation has more information about
manipulating the `GridFieldConfig` instance if required.
:::php
@@ -93,7 +93,7 @@ manipulating the `GridFieldConfig` instance if required.
$gridField->getConfig()->addComponent(new GridFieldCustomAction());
For documentation on adding a Component to a `GridField` created by `ModelAdmin`
-please view the [ModelAdmin Reference](/reference/modeladmin#gridfield-customization) section `GridField Customization`
+please view the [GridField Customization](/developer_guides/forms/how_tos/create_a_gridfield_actionprovider) section.
Now let's go back and dive through the `GridFieldCustomAction` class in more
detail.
diff --git a/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md b/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
index 098b5e3d1..0821980a0 100644
--- a/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
+++ b/docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
@@ -116,6 +116,46 @@ limited than using `phpunit` directly, particularly around formatting test outpu
sake dev/tests/all SkipTests=MySkippedTest
# Skip some tests
+## Making Tests Run Fast
+A major impedement to testing is that by default tests are extremely slow to run. There are two things that can be done to speed them up:
+
+### Disable xDebug
+Unless executing a coverage report there is no need to have xDebug enabled.
+
+ :::bash
+ # Disable xdebug
+ sudo php5dismod xdebug
+
+ # Run tests
+ phpunit framework/tests/
+
+ # Enable xdebug
+ sudo php5enmod xdebug
+
+### Use SQLite In Memory
+SQLIte can be configured to fun in memory as opposed to disk and this makes testing an order of magnitude faster. To effect this change add the following to mysite/_config.php - this enables an optional flag to switch between MySQL and SQLite. Note also that the package silverstripe/sqlite3 will need installed, version will vary depending on which version of SilverStripe is being tested.
+
+ :::php
+ if(Director::isDev()) {
+ if(isset($_GET['db']) && ($db = $_GET['db'])) {
+ global $databaseConfig;
+ if($db == 'sqlite3') {
+ $databaseConfig['type'] = 'SQLite3Database';
+ $databaseConfig['path'] = ':memory:';
+ }
+ }
+ }
+
+To use SQLite append '' db=sqlite3 after the phpunit command.
+
+ :::bash
+ phpunit framework/tests '' db=sqlite3
+
+### Speed Comparison
+Testing against a medium sized module with 93 tests:
+* SQLite - 16.15s
+* MySQL - 314s
+This means using SQLite will run tests over 20 times faster.
## Test Databases and Fixtures
diff --git a/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md b/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md
index ecfbecc56..3e9bb0386 100644
--- a/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md
+++ b/docs/en/02_Developer_Guides/07_Debugging/02_URL_Variable_Tools.md
@@ -45,8 +45,8 @@ Append the option and corresponding value to your URL in your browser's address
## Security Redirects
-You can set an URL to redirect back to after a [Security](/topics/security) action. See the section on [URL
-Redirections](security#redirect_back_to_another_page_after_login) for more information and examples.
+You can set an URL to redirect back to after a [Security](/developer_guides/security) action. See the section on [URL
+Redirections](/developer_guides/controllers/redirection) for more information and examples.
| URL Variable | | Values | | Description |
| ------------ | | ------ | | ----------- |
diff --git a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
index 9974ed7d0..35b8fb181 100644
--- a/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
+++ b/docs/en/02_Developer_Guides/08_Performance/01_Caching.md
@@ -17,7 +17,7 @@ Flushing the various manifests is performed through a GET
parameter (`flush=1`). Since this action requires more server resources than normal requests,
executing the action is limited to the following cases when performed via a web request:
- * The [environment](../getting_started/environment_management) is in "dev mode"
+ * The [environment](/getting_started/environment_management) is in "dev mode"
* A user is logged in with ADMIN permissions
* An error occurs during startup
diff --git a/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md b/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
index e6c5a2918..66ce01eb4 100644
--- a/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
+++ b/docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
@@ -6,7 +6,7 @@ site you have to figure this stuff out, and it's not entirely obvious.
## Ways to restrict access
There are a number of ways to restrict access in SilverStripe. In the security tab in the CMS you can create groups
-that have access to certain parts. The options can be found on the [permissions](/reference/permission) documentation.
+that have access to certain parts. The options can be found on the [permissions](/developer_guides/security/permissions) documentation.
Once you have groups, you can set access for each page for a particular group. This can be:
* anyone;
diff --git a/docs/en/02_Developer_Guides/09_Security/02_Permissions.md b/docs/en/02_Developer_Guides/09_Security/02_Permissions.md
index 4e40af440..79ef1f6e6 100644
--- a/docs/en/02_Developer_Guides/09_Security/02_Permissions.md
+++ b/docs/en/02_Developer_Guides/09_Security/02_Permissions.md
@@ -63,7 +63,7 @@ Making this work well is a subtle business and should be discussed with a few de
* On an individual data record, $page->can("View", $member = null) and be called. If a member isn't passed, the
currently logged in member is assumed.
-* On a request, $request->hasPermission("View", $member = null) can be called. See [datamodel](/topics/datamodel) for
+* On a request, $request->hasPermission("View", $member = null) can be called. See [datamodel](/developer_guides/model/permissions) for
information on request objects.
## Special cases
diff --git a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
index f250c4721..9a3388c0f 100644
--- a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
+++ b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
@@ -3,7 +3,7 @@
## Introduction
This page details notes on how to ensure that we develop secure SilverStripe applications.
-See our "[Release Process](/misc/release-process#security-releases) on how to report security issues.
+See our "[Release Process](/contributing/release_process#security-releases) on how to report security issues.
## SQL Injection
@@ -186,7 +186,7 @@ XSS attack against an admin to perform any administrative action.
If you can't trust your editors, SilverStripe must be configured to filter the content so that any javascript is
stripped out
-To enable filtering, set the HtmlEditorField::$sanitise_server_side [configuration](/topics/configuration) property to
+To enable filtering, set the HtmlEditorField::$sanitise_server_side [configuration](/developer_guides/configuration/configuration) property to
true, e.g.
HtmlEditorField::config()->sanitise_server_side = true
@@ -209,12 +209,12 @@ The `SiteTree.ExtraMeta` property uses this to limit allowed input.
It is not currently possible to allow editors to provide javascript content and yet still protect other users
from any malicious code within that javascript.
-We recommend configuring [shortcodes](/reference/shortcodes) that can be used by editors in place of using javascript directly.
+We recommend configuring [shortcodes](/developer_guides/extending/shortcodes) that can be used by editors in place of using javascript directly.
### Escaping model properties
`[api:SSViewer]` (the SilverStripe template engine) automatically takes care of escaping HTML tags from specific
-object-properties by [casting](/topics/datamodel#casting) its string value into a `[api:DBField]` object.
+object-properties by [casting](/developer_guides/model/data_types_and_casting) its string value into a `[api:DBField]` object.
PHP:
@@ -241,7 +241,7 @@ outputting through SSViewer.
### Overriding default escaping in templates
-You can force escaping on a casted value/object by using an [escape type](/topics/datamodel) method in your template, e.g.
+You can force escaping on a casted value/object by using an [escape type](/developer_guides/model/data_types_and_casting) method in your template, e.g.
"XML" or "ATT".
Template (see above):
@@ -323,7 +323,7 @@ Template:
Whenever you insert a variable into an HTML attribute within a template, use $VarName.ATT, no not $VarName.
-You can also use the built-in casting in PHP by using the *obj()* wrapper, see [datamodel](/topics/datamodel) .
+You can also use the built-in casting in PHP by using the *obj()* wrapper, see [datamodel](/developer_guides/model/data_types_and_casting).
### Escaping URLs
@@ -423,7 +423,7 @@ cast types can be found here:
* `(object)` - cast to object
Note that there is also a 'SilverStripe' way of casting fields on a class, this is a different type of casting to the
-standard PHP way. See [casting](/topics/datamodel#casting).
+standard PHP way. See [casting](/developer_guides/model/data_types_and_casting).
diff --git a/docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md b/docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
index b72ecef77..470095011 100644
--- a/docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
+++ b/docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
@@ -11,7 +11,7 @@ The default output of a [api:SearchContext] is either a [api:SQLQuery] object fo
[api:DataObject] instance.
-[api:SearchContext] is mainly used by [ModelAdmin](../customising_the_admin_interface/modeladmin).
+[api:SearchContext] is mainly used by [ModelAdmin](/developer_guides/customising_the_admin_interface/modeladmin).
## Usage
@@ -209,8 +209,8 @@ See `[api:SearchFilter]` API Documentation
## Related Documentation
-* [ModelAdmin](../customising_the_cms/modeladmin)
-* [Tutorial: Site Search](/tutorials/site_search)
+* [ModelAdmin](/developer_guides/customising_the_admin_interface/modeladmin)
+* [Site Search](/tutorials/site_search)
## API Documentation
diff --git a/docs/en/02_Developer_Guides/13_i18n/index.md b/docs/en/02_Developer_Guides/13_i18n/index.md
index a81c8e5e2..634988c0a 100644
--- a/docs/en/02_Developer_Guides/13_i18n/index.md
+++ b/docs/en/02_Developer_Guides/13_i18n/index.md
@@ -232,7 +232,7 @@ If you want to run the text collector for just one module you can use the 'modul
`http://localhost/dev/tasks/i18nTextCollectorTask/?module=cms`
-You'll need to install PHPUnit to run the text collector (see [testing-guide](/topics/testing)).
+You'll need to install PHPUnit to run the text collector (see [testing-guide](/developer_guides/testing)).
## Module Priority
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md
index d218d0a21..30a9ab512 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_CMS_Architecture.md
@@ -13,7 +13,7 @@ feel familiar to you. This is just a quick run down to get you started
with some special conventions.
For a more practical-oriented approach to CMS customizations, refer to the
-[Howto: Extend the CMS Interface](how_tos/extend_cms_interface) which builds
+[Howto: Extend the CMS Interface](/developer_guides/customising_the_admin_interface/how_tos/extend_cms_interface) which builds
## Markup and Style Conventions
@@ -89,7 +89,7 @@ The various panels and UI components within them are loosely coupled to the layo
attribute. The layout is triggered on the top element and cascades into children, with a `redraw` method defined on
each panel and UI component that needs to update itself as a result of layouting.
-Refer to [Layout reference](cms_layout) for further information.
+Refer to [Layout reference](/developer_guides/customising_the_admin_interface/cms_layout) for further information.
## Forms
@@ -148,7 +148,7 @@ correctly configured form.
[jQuery.entwine](https://github.com/hafriedlander/jquery.entwine) is a thirdparty library
which allows us to attach behaviour to DOM elements in a flexible and structured mannger.
It replaces the `behaviour.js` library used in previous versions of the CMS interface.
-See [JavaScript Development](javascript_development) for more information on how to use it.
+See [JavaScript Development](/developer_guides/customising_the_admin_interface/javascript_development) for more information on how to use it.
In the CMS interface, all entwine rules should be placed in the "ss" entwine namespace.
If you want to call methods defined within these rules outside of entwine logic,
you have to use this namespace, e.g. `$('.cms-menu').entwine('ss').collapse()`.
@@ -380,7 +380,7 @@ To avoid repetition, we've written some helpers for various use cases:
* Load into a PJAX panel: `
@@ -116,28 +118,50 @@ Producing a security fix follows this general process:
* Push the current upstream target branches (e.g. 3.2) to the corresponding security fork
to a new branch named for the target release (e.g. 3.2.4). Security fixes should be
applied to this branch only. Once a fix (or fixes) have been applied to this branch, then
- an RC tag can be applied, and a private release can then be developed in order
- to test this RC.
-* Once RC testing is completed and the release is ready for stabilisation, then these fixes
- can then be pushed to the upstream module fork, and the release completed and published
- as per normal.
+ a tag can be applied, and a private release can then be developed in order
+ to test this release.
+* Once release testing is completed and the release is ready for stabilisation, then these fixes
+ can then be pushed to the upstream module fork, and the release completed as per normal.
+ Make sure to publish any draft security pages at the same time as the release is published (same day).
+* After the final release has been published, close related JIRA issues
+ at [open source security jira](https://silverstripe.atlassian.net/secure/RapidBoard.jspa?rapidView=198&view=detail)
+
+
+Note: It's not considered acceptable to disclose any security vulnerability until a fix exists in
+a public stable, not an RC or dev-branch. Security warnings that do not require a stable release
+can be published as soon as a workaround or usable resolution exists.
+
## Standard release process
-The release process, at a high level, involves creating an RC, publishing it, and
-reviewing the need for either another RC or a final stable tag within a short period
+The release process, at a high level, involves creating a release, publishing it, and
+reviewing the need for either another pre-release or a final stable tag within a short period
(normally within 3-5 business days).
-During the RC cycle a temporary RC branch is created, and should only receive
-absolutely critical fixes during the RC cycle. Any changes to this branch should
-result in the requirement for a new RC, thus a higher level of scrutiny is typically
+During the pre-release cycle a temporary branch is created, and should only receive
+absolutely critical fixes during the cycle. Any changes to this branch should
+result in the requirement for a new release, thus a higher level of scrutiny is typically
placed on any pull request to these branches.
-When creating a new RC or stable, the following process is broken down into two
+When creating a new pre-release or stable, the following process is broken down into two
main sets of commands:
### Stage 1: Release preparation:
+If you are managing a release, it's best to first make sure that SilverStripe marketing
+are aware of any impending release. This is so that they can ensure that a relevant blog
+post will appear on [www.silverstripe.org/blog](http://www.silverstripe.org/blog/), and
+cross-posted to other relevant channels such as Twitter and Facebook.
+Sending an email to [marketing@silverstripe.com](mailto:marketing@silverstripe.com)
+with an overview of the release and a rough release timeline.
+
+Check all tickets ([framework](https://github.com/silverstripe/silverstripe-framework/milestones),
+[cms](https://github.com/silverstripe/silverstripe-cms/milestones),
+[installer](https://github.com/silverstripe/silverstripe-installer/milestones)) assigned to that milestone are
+either closed or reassigned to another milestone.
+
+Merge up from other older supported release branches (e.g. merge `3.1`->`3.2`, `3.2`->`3.3`, `3.3`->`3`, `3`->`master`).
+
This is the part of the release that prepares and tests everything locally, but
doe not make any upstream changes (so it's safe to run without worrying about
any mistakes migrating their way into the public sphere).
@@ -154,7 +178,7 @@ This command has the following parameters:
newest 3.2.x version). You can normally leave this out for patch releases,
and the code will normally be able to guess the right version, but you may
as well declare it every time.
-* `--branch-auto` Will automatically create a new RC branch (e.g. 3.2.4) if
+* `--branch-auto` Will automatically create a new temporary release branch (e.g. 3.2.4) if
one does not exist.
This can take between 5-15 minutes, and will invoke the following steps,
@@ -166,10 +190,10 @@ and needs to be manually advanced):
will look at the available versions and branch-aliases of silverstripe/installer
to determine the best version to install from. E.g. installing 4.0.0 will
know to install dev-master, and installing 3.3.0 will install from 3.x-dev.
- If installing RC versions for stabilisation, it will use the correct RC
- branch.
+ If installing pre-release versions for stabilisation, it will use the correct
+ temporary release branch.
* `release:branch` If release:create installed from a non-rc branch, it will
- create the new RC branch (via `--branch-auto`). You can also customise this branch
+ create the new temporary release branch (via `--branch-auto`). You can also customise this branch
with `--branch=
`, but it's best to use the standard.
* `release:translate` All upstream transifex strings will be pulled into the
local master strings, and then the [api:i18nTextCollector] task will be invoked
@@ -193,10 +217,23 @@ Once the release task has completed, it may be ideal to manually test the site o
by running it locally (e.g. `http://localhost/release-3.3.4`) to do some smoke-testing
and make sure that there are no obvious issues missed.
+Since `cow` will only run the unit test suite, you'll need to check
+the build status of Behat end-to-end tests manually on travis-ci.org
+for the various modules (e.g. [framework](https://travis-ci.org/silverstripe/silverstripe-framework))
+and [cms](https://travis-ci.org/silverstripe/silverstripe-cms)).
+
It's also ideal to eyeball the git changes generated by the release tool, making sure
-that no translation strings were unintentionally lost, or that the changelog
+that no translation strings were unintentionally lost, no malicious changes were
+introduced in the (community contributed) translations, and that the changelog
was generated correctly.
+In particular, double check that all necessary information is included in the release notes,
+including:
+
+* Upgrading notes
+* Security fixes included
+* Major changes
+
Once this has been done, then the release is ready to be published live.
### Stage 2: Release publication
@@ -214,7 +251,7 @@ As with the `cow release` command, this step is broken down into the following
subtasks which are invoked in sequence:
* `release:tag` Each module will have the appropriate tag applied (except the theme).
-* `release:push` The RC branches and all tags are pushed up to origin on github.
+* `release:push` The temporary release branches and all tags are pushed up to origin on github.
* `release:archive` This will generate a new tar.gz and zip archive, each for
cms and framework-only installations. These will be copied to the root folder
of the release directory, although the actual build will be created in temporary
@@ -231,11 +268,11 @@ Once all of these commands have completed there are a couple of final tasks left
aren't strictly able to be automated:
* If this is a stable release, it will be necessary to perform a post-release merge
- on open source. This normally will require you to merge the RC branch into the
+ on open source. This normally will require you to merge the temporary release branch into the
source branch (e.g. merge 3.2.4 into 3.2), or sometimes create new branches if
releasing a new minor version, and bumping up the branch-alias in composer.json.
E.g. branching 3.3 from 3, and aliasing 3 as 3.4.x-dev. You can then delete
- the temporary RC branches. This will need to be done before updating the
+ the temporary release branches. This will need to be done before updating the
release documentation in stage 3.
* Merging up the changes in this release to newer branches, following the
SemVer pattern (e.g. 3.2.4 > 3.2 > 3.3 > 3 > master). The more often this is
@@ -251,6 +288,25 @@ aren't strictly able to be automated:
* Make sure that the [releases page](https://github.com/silverstripe/silverstripe-installer/releases)
on github shows the new tag.
+*Updating non-patch versions*
+
+If releasing a new major or minor version it may be necessary to update various SilverStripe portals. Normally a new
+minor version will require a new branch option to be made available on each site menu. These sites include:
+
+* [docs.silverstripe.org](https://docs.silverstripe.org): Update on [github](https://github.com/silverstripe/doc.silverstripe.org)
+ and deployed internally.
+* [api.silverstripe.org](https://api.silverstripe.org): Update on [github](https://github.com/silverstripe/api.silverstripe.org)
+ and deployed internally.
+* [userhelp.silverstripe.org](https://userhelp.silverstripe.org/en/3.2): Update on
+ [github](https://github.com/silverstripe/userhelp.silverstripe.org) and deployed internally.
+ The content for this site is pulled from [silverstripe-userhelp-content](https://github.com/silverstripe/silverstripe-userhelp-content)
+* [demo.silverstripe.org](http://demo.silverstripe.org/): Update on
+ [github](https://github.com/silverstripe/demo.silverstripe.org/) and deployed internally.
+
+It's also a good idea to check that `Deprecation::notification_version('4.0.0');` in framework/_config.php points to
+the right major version. This should match the major version of the current release. E.g. all versions of 4.x
+should be set to `4.0.0`.
+
### Stage 3: Let the world know
Once a release has been published there are a few places where user documentation
@@ -258,7 +314,7 @@ will need to be regularly updated.
* Make sure that the [download page](http://www.silverstripe.org/download) on
silverstripe.org has the release available. If it's a stable, it will appear
- at the top of the page. If an RC pre-release, it will be available under the
+ at the top of the page. If it's a pre-release, it will be available under the
[development builds](http://www.silverstripe.org/download#download-releases)
section. If it's not available, you might need to check that the release was
properly uploaded to aws s3, or that you aren't viewing a cached version of
@@ -277,7 +333,7 @@ will need to be regularly updated.
* Create a release announcement forum sticky on the
[releases and announcements](http://www.silverstripe.org/community/forums/releases-and-announcements/)
forum category. Make this a global read-only sticky, and un-sticky any older release.
-* Update the IRC topic to include the new release version.
+* Update the #silverstripe [IRC](http://www.silverstripe.org/community/contributing-to-silverstripe/irc-channel/) topic to include the new release version.
### Stage 4: Web platform installer release
diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php
index b77107498..53db507cb 100644
--- a/forms/ConfirmedPasswordField.php
+++ b/forms/ConfirmedPasswordField.php
@@ -272,6 +272,7 @@ class ConfirmedPasswordField extends FormField {
} else {
if($value || (!$value && $this->canBeEmpty)) {
$this->value = $value;
+ $this->confirmValue = $value;
}
}
@@ -281,7 +282,7 @@ class ConfirmedPasswordField extends FormField {
->setValue($this->value);
$this->children->fieldByName($this->getName() . '[_ConfirmPassword]')
- ->setValue($this->value);
+ ->setValue($this->confirmValue);
}
return $this;
diff --git a/forms/TreeMultiselectField.php b/forms/TreeMultiselectField.php
index 089ddb57c..5f0f7f302 100644
--- a/forms/TreeMultiselectField.php
+++ b/forms/TreeMultiselectField.php
@@ -103,6 +103,7 @@ class TreeMultiselectField extends TreeDropdownField {
$titleArray = array();
$idArray = array();
$items = $this->getItems();
+ $emptyTitle = _t('DropdownField.CHOOSE', '(Choose)', 'start value of a dropdown');
if($items && count($items)) {
foreach($items as $item) {
@@ -115,7 +116,7 @@ class TreeMultiselectField extends TreeDropdownField {
$title = implode(", ", $titleArray);
$value = implode(",", $idArray);
} else {
- $title = _t('DropdownField.CHOOSE', '(Choose)', 'start value of a dropdown');
+ $title = $emptyTitle;
}
$dataUrlTree = '';
@@ -129,6 +130,7 @@ class TreeMultiselectField extends TreeDropdownField {
$properties,
array(
'Title' => $title,
+ 'EmptyTitle' => $emptyTitle,
'Link' => $dataUrlTree,
'Value' => $value
)
diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 21f4a8d5d..dd69db554 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -667,12 +667,13 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
resetFileField: function() {
// If there's an attached item, remove it
- var fileField = this.find('#file'),
+ var fileField = this.find('.ss-uploadfield[id$="file_Holder"]'),
fileUpload = fileField.data('fileupload'),
currentItem = fileField.find('.ss-uploadfield-item[data-fileid]');
if(currentItem.length) {
- fileUpload._trigger('destroy', null, {content: currentItem});
+ fileUpload._trigger('destroy', null, {context: currentItem});
+ fileField.find('.ss-uploadfield-addfile').removeClass('borderTop');
}
},
diff --git a/javascript/TreeDropdownField.js b/javascript/TreeDropdownField.js
index 4ec97f59b..782f697e0 100644
--- a/javascript/TreeDropdownField.js
+++ b/javascript/TreeDropdownField.js
@@ -138,7 +138,7 @@
this[this.getPanel().is(':visible') ? 'closePanel' : 'openPanel']();
},
setTitle: function(title) {
- title = title || this.data('title') || strings.fieldTitle;
+ title = title || this.data('empty-title') || strings.fieldTitle;
this.find('.treedropdownfield-title').html(title);
this.data('title', title); // separate view from storage (important for search cancellation)
diff --git a/security/Group.php b/security/Group.php
index 0fbd2f2ed..c45823d51 100755
--- a/security/Group.php
+++ b/security/Group.php
@@ -183,7 +183,7 @@ class Group extends DataObject {
// Add roles (and disable all checkboxes for inherited roles)
$allRoles = PermissionRole::get();
- if(Permission::check('ADMIN')) {
+ if(!Permission::check('ADMIN')) {
$allRoles = $allRoles->filter("OnlyAdminCanApply", 0);
}
if($this->ID) {
diff --git a/security/Member.php b/security/Member.php
index d732b569c..e0195153a 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -378,7 +378,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
* quirky problems (such as using the Windmill 0.3.6 proxy).
*/
public static function session_regenerate_id() {
- if(!self::$session_regenerate_id) return;
+ if(!self::config()->session_regenerate_id) return;
// This can be called via CLI during testing.
if(Director::is_cli()) return;
diff --git a/security/Permission.php b/security/Permission.php
index 4d044f67d..20d09a93a 100644
--- a/security/Permission.php
+++ b/security/Permission.php
@@ -163,6 +163,10 @@ class Permission extends DataObject implements TemplateGlobalProvider {
$memberID = (is_object($member)) ? $member->ID : $member;
}
+ if (!$memberID) {
+ return false;
+ }
+
// Turn the code into an array as we may need to add other permsissions to the set we check
if(!is_array($code)) $code = array($code);
diff --git a/tests/forms/ConfirmedPasswordFieldTest.php b/tests/forms/ConfirmedPasswordFieldTest.php
index 846aa4436..ba641940a 100644
--- a/tests/forms/ConfirmedPasswordFieldTest.php
+++ b/tests/forms/ConfirmedPasswordFieldTest.php
@@ -80,5 +80,25 @@ class ConfirmedPasswordFieldTest extends SapphireTest {
"Does not validate when passwords differ"
);
}
+
+ public function testFormValidation() {
+ $form = new Form(
+ new Controller(),
+ 'Form',
+ new FieldList($field = new ConfirmedPasswordField('Password')),
+ new FieldList()
+ );
+
+ $form->loadDataFrom(array(
+ 'Password' => array(
+ '_Password' => '123',
+ '_ConfirmPassword' => '999',
+ )
+ ));
+
+ $this->assertEquals('123', $field->children->first()->Value());
+ $this->assertEquals('999', $field->children->last()->Value());
+ $this->assertNotEquals($field->children->first()->Value(), $field->children->last()->Value());
+ }
}
diff --git a/tests/security/PermissionTest.php b/tests/security/PermissionTest.php
index 94f4815c8..e221b794a 100644
--- a/tests/security/PermissionTest.php
+++ b/tests/security/PermissionTest.php
@@ -124,4 +124,14 @@ class PermissionTest extends SapphireTest {
Config::inst()->remove('Permission', 'hidden_permissions');
$this->assertContains('CMS_ACCESS_LeftAndMain', $permissionCheckboxSet->Field());
}
+
+ public function testEmptyMemberFails() {
+ $member = new Member();
+ $this->assertFalse($member->exists());
+
+ $this->logInWithPermission('ADMIN');
+
+ $this->assertFalse(Permission::checkMember($member, 'ADMIN'));
+ $this->assertFalse(Permission::checkMember($member, 'CMS_ACCESS_LeftAndMain'));
+ }
}
diff --git a/thirdparty/jstree/jquery.jstree.js b/thirdparty/jstree/jquery.jstree.js
index dc302ea16..bb818ed2d 100644
--- a/thirdparty/jstree/jquery.jstree.js
+++ b/thirdparty/jstree/jquery.jstree.js
@@ -1,5 +1,5 @@
/*
- * jsTree 1.0-rc3
+ * jsTree (custom version for SilverStripe: 1.0-rc3 + minor bugfixes)
* http://jstree.com/
*
* Copyright (c) 2010 Ivan Bozhanov (vakata.com)
@@ -2442,7 +2442,7 @@
0);
}
}, this))
- .delegate("a", "mouseup.jstree", $.proxy(function (e) {
+ .delegate("a, #jstree-marker-line", "mouseup.jstree", $.proxy(function (e) {
if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
this.dnd_finish(e);
}
@@ -2524,7 +2524,7 @@
$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
}
}, this))
- .delegate(s.drop_target, "mouseup.jstree-" + this.get_index(), $.proxy(function (e) {
+ .delegate(s.drop_target + ", #jstree-marker-line", "mouseup.jstree-" + this.get_index(), $.proxy(function (e) {
if(this.data.dnd.active && $.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {
this._get_settings().dnd.drop_finish.call(this, { "o" : o, "r" : $(e.target), "e" : e });
}