Merge remote-tracking branch 'origin/3.0'

.travis.yml

@@ -4,7 +4,6 @@ php:
  - 5.4
 
 env:
- - TESTDB=SQLITE
  - TESTDB=MYSQL
  - TESTDB=PGSQL
 

docs/en/index.md

@@ -5,7 +5,7 @@ Please read our [guide to contributing documentation](misc/contributing#writing-
 ### Overview
 
  * [Getting started](http://silverstripe.org/getting-started/) | [Feature Overview](http://silverstripe.org/introduction/) | [Demo](http://demo.silverstripe.org/)
- * [Download and Installation](installation/) | [Upgrading](/installation/upgrading) | [Requirements](/installation/server-requirements) | [Changelog](http://open.silverstripe.org/wiki/ChangeLog) | [Roadmap](http://open.silverstripe.com/roadmap)  
+ * [Download and Installation](installation/) | [Upgrading](/installation/upgrading) | [Requirements](/installation/server-requirements) | [Changelog](/changelogs) | [Roadmap](http://www.silverstripe.org/roadmap/)  
  * [API documentation](http://api.silverstripe.org/current) | [Official english book](http://www.silverstripe.org/silverstripe-book) | [Official german book](http://www.silverstripe.org/das-silverstripe-buch)  
 
 

docs/en/installation/server-requirements.md

@@ -22,12 +22,12 @@ Our web-based [PHP installer](/installation) can check if you meet the requireme
  * One of the following databases: 
   * MySQL 5.0+
   * PostgreSQL 8.3+ (requires ["postgresql" module](http://silverstripe.org/postgresql-module))
-  * SQL Server 2008. (requires ["mssql" module](http://silverstripe.org/microsoft-sql-server-database/))
+  * SQL Server 2008+ (requires ["mssql" module](http://silverstripe.org/microsoft-sql-server-database/))
   * Support for [Oracle](http://www.silverstripe.org/oracle-database-module/) and [SQLite](http://silverstripe.org/sqlite-database/) is not commercially supported, but is under development by our open source community.
  * One of the following web server products: 
   * Apache 1.3+ with mod_rewrite and "AllowOverride All" set
-  * IIS 5.x+ (Version 7.5+ and URL Rewrite Module recommended)
-  * Support for Lighttpd and other webservers may work if you are familiar with configuring those products.
+  * IIS 7+
+  * Support for Lighttpd, IIS 6, and other web servers may work if you are familiar with configuring those products.
  * We recommend enabling content compression (for example with mod_deflate) to speed up the delivery of HTML, CSS, and JavaScript.
  * One of the following operating systems:
   * Linux/Unix/BSD

docs/en/installation/windows-manual-iis-6.md

@@ -1,5 +1,9 @@
 # Install SilverStripe manually on Windows using IIS 6
 
+<div class="warning" markdown="1">
+	Note: These instructions may not work, as they're no longer maintained.
+</div>
+
 How to prepare Windows Server 2003 for SilverStripe using IIS 6 and FastCGI.
 
 This guide will work for the following operating systems:

docs/en/installation/windows-manual-iis-7.md

@@ -201,9 +201,11 @@ Now we need to set up folder permissions for PHP. Open the php.ini and find the
 	upload_tmp_dir="C:\Windows\Temp"
 	session.save_path="C:\Windows\Temp"
 
-You will need to give the IIS permission to write to these folders. This can be done by giving **Modify** permission to **IIS** user and **IIS_IUSRS** group.
+Two other important folders to set the permissions on are `assets` and `silverstripe-cache` (if used) in your web root.
 
-Other important folders to give these permissions to are `assets` and `silverstripe-cache` (if used) in your web root.
+You will need to give **Modify** permission to **IUSR** user. To do it right click the folder and choose **Properties**. Then open the security tab, press **Edit** and add the **IUSR** user to the list by clicking the **Add** button. Afterwards tick **Modify** under **Allow** for that user. Repeat these steps for each folder.
+
+![](_images/iis7-iusr-permissions.jpg)
 
 ## Test PHP installation
 

docs/en/installation/windows-manual-iis.md

@@ -11,13 +11,15 @@ This applies to Windows Server 2008, Windows Server 2008 R2, Windows Vista, and
 
 ## [Install using IIS 6.x](windows-manual-iis-6)
 
-*Note: It's recommended you upgrade to Windows Server 2008 R2 which uses IIS 7.5*.
-
 This applies to Windows Server 2003 and Windows Server 2003 R2.
 
+<div class="warning" markdown="1">
+	Note: These instructions may not work, as they're no longer maintained. Please use a version of Windows that supports IIS 7.x
+</div>
+
 ## Additional notes
 
-Microsoft has no URL rewriting module for anything less than IIS 7.x. This will mean your URLs are like yoursite.com/index.php/about-us rather than yoursite.com/about-us.
+Microsoft has no URL rewriting module for any version below IIS 7.x. This will mean your URLs are like yoursite.com/index.php/about-us rather than yoursite.com/about-us.
 However, if you do want friendly URLs you must you must buy or use other URL rewriting software: 
 
  * [IIRF](http://iirf.codeplex.com/) (should work for most cases - see [IIS 6 guide](windows-manual-iis-6) for rewrite rules)

forms/gridfield/GridFieldDetailForm.php

@@ -302,10 +302,11 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 			$curmbs = $this->Breadcrumbs();
 			if($curmbs && $curmbs->count()>=2){
 				$one_level_up = $curmbs->offsetGet($curmbs->count()-2);
-				$text = "
-				<a class=\"crumb ss-ui-button ss-ui-action-destructive cms-panel-link ui-corner-all\" href=\"".$one_level_up->Link."\">
-					Cancel
-				</a>";
+				$text = sprintf(
+					"<a class=\"crumb ss-ui-button ss-ui-action-destructive cms-panel-link ui-corner-all\" href=\"%s\">%s</a>",
+					$one_level_up->Link,
+					_t('GridFieldDetailForm.CancelBtn', 'Cancel')
+				);
 				$actions->push(new LiteralField('cancelbutton', $text));
 			}
 		}

lang/en.yml

@@ -232,6 +232,7 @@ en:
   GridFieldAction_Delete:
     DeletePermissionsFailure: 'No delete permissions'
   GridFieldDetailForm:
+    CancelBtn: Cancel
     Create: Create
     Delete: Delete
     DeletePermissionsFailure: 'No delete permissions'

security/PermissionRole.php

@@ -62,4 +62,16 @@ class PermissionRole extends DataObject {
 			$code->delete();
 		}
 	}
+
+	function fieldLabels($includerelations = true) {
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Title'] = _t('PermissionRole.Title', 'Title');
+		$labels['OnlyAdminCanApply'] = _t(
+			'PermissionRole.OnlyAdminCanApply', 
+			'Only admin can apply',
+			'Checkbox to limit which user can apply this role'
+		);
+		
+		return $labels;
+	}
 }