diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..278e73ca479dce6f956b85cb573eeb64bb0603e6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+.gitattributes export-ignore
+behat.yml export-ignore
+build.properties.default export-ignore
+build.xml export-ignore
+changelog-definitions.default export-ignore
+CONTRIBUTING.md export-ignore
+dependent-modules.default export-ignore
+Makefile export-ignore
+phpunit.teamcity.mssql.xml export-ignore
+phpunit.teamcity.postgresql.xml export-ignore
+phpunit.teamcity.sqlite3.xml export-ignore
+phpunit.teamcity.xml export-ignore
+phpunit.xml.dist export-ignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2c25b35d98bf9cba3ee2eec6392ffba85bd33372..7bce2c7f091323bef499d4a226c2a9ec46a0418d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,6 @@ silverstripe-cache
.project
.settings
.solr
-.idea
-.DS_Store
.ea
apache
advancedworkflow/
@@ -37,6 +35,8 @@ testsession/
themes/
translatable/
userforms/
-vendor/
versionedfiles/
versionfeed/
+.idea
+.DS_Store
+vendor/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 485fb7c59f44d220d22f01103ba60d9c3e88e9c9..2653fe16aeacb4b327fe3b582d9d51049cf78b30 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,12 +1,28 @@
# Contributing
-Any open source product is only as good as the community behind it. You can participate by sharing code, ideas, or simply helping others. No matter what your skill level is, every contribution counts.
+Any open source product is only as good as the community behind it. You can participate by sharing code, ideas, or simply helping others. No matter what your skill level is, every contribution counts. See our [high level contribution overview](http://silverstripe.org/contributing-to-silverstripe) on silverstripe.org on how you can help out.
-See our [high level overview](http://silverstripe.org/contributing-to-silverstripe) on silverstripe.org on how you can help out.
+## Bugtracker ##
-Or, for more detailed guidance, read one of the following pages:
+Bugs are tracked on [github.com](https://github.com/silverstripe/framework/issues).
+Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
- * [Sharing your opinion and raising issues](http://doc.silverstripe.org/framework/en/trunk/misc/contributing/issues)
- * [Providing code, whether it's creating a feature or fixing a bug](http://doc.silverstripe.org/framework/en/trunk/misc/contributing/code)
- * [Writing and translating documentation](http://doc.silverstripe.org/framework/en/trunk/misc/contributing/documentation)
- * [Translating user-interface elements](http://doc.silverstripe.org/framework/en/trunk/misc/contributing/translation)
\ No newline at end of file
+## Development and Contribution ##
+
+For submitting patches, please read our [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code). We only accept pull requests on github.com.
+
+## Links ##
+
+ * [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
+ * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
+ * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
+ * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
+ * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
+ * [Forums](http://silverstripe.org/forums)
+ * [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
+
+## Licensing
+
+By supplying code in issues and pull requests created on github.com and other collaboration tools
+related to the SilverStripe project, you agree that is can be used in distributions and derivative works of
+SilverStripe CMS and associated modules, under the BSD license.
diff --git a/README.md b/README.md
index 98a7ba382e256ac1031d0ef1883c7fd7a7ee21f7..eb7627efaa5d35a5bf48bc67a0478230acc8859c 100644
--- a/README.md
+++ b/README.md
@@ -2,29 +2,36 @@
Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Requires additional modules to function:
- * [`framework`](http://github.com/silverstripe/sapphire): Module including the base framework
+ * [`framework`](http://github.com/silverstripe/silverstripe-framework): Module including the base framework
* [`cms`](http://github.com/silverstripe/silverstripe-cms): Module including a Content Management System
* `themes/simple` (optional)
-## Server Requirements ##
-
-See [doc.silverstripe.org](http://doc.silverstripe.org/framework/en/installation/server-requirements)
-
## Installation ##
See [installation on different platforms](http://doc.silverstripe.org/framework/en/installation/),
and [installation from source](http://doc.silverstripe.org/framework/en/installation/from-source).
+## Bugtracker ##
+
+Bugs are tracked on [github.com](https://github.com/silverstripe/framework/issues).
+Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
+
+## Development and Contribution ##
+
+If you would like to make changes to the SilverStripe core codebase, we have an extensive [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code).
+
## Links ##
* [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
- * [Bugtracker](http://open.silverstripe.org)
+ * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
+ * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
+ * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)
* [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
## License ##
- Copyright (c) 2007-2012, SilverStripe Limited - www.silverstripe.com
+ Copyright (c) 2007-2013, SilverStripe Limited - www.silverstripe.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/assets/.htaccess b/assets/.htaccess
index 14d3bca6cb1e1f3e456a06a15383a8793f4950a8..eef9282ec015ae2a20535671aac26f99989831ce 100644
--- a/assets/.htaccess
+++ b/assets/.htaccess
@@ -23,7 +23,7 @@
# does not support regular expression case insensitive matches using PCRE style.
#
Deny from all
-<FilesMatch "\.(html|HTML|htm|HTM|xhtml|XHTML|js|JS|css|CSS|bmp|BMP|png|PNG|gif|GIF|jpg|JPG|jpeg|JPEG|ico|ICO|pcx|PCX|tif|TIF|tiff|TIFF|au|AU|mid|MID|midi|MIDI|mpa|MPA|mp3|MP3|ogg|OGG|m4a|M4A|ra|RA|wma|WMA|wav|WAV|cda|CDA|avi|AVI|mpg|MPG|mpeg|MPEG|asf|ASF|wmv|WMV|m4v|M4V|mov|MOV|mkv|MKV|mp4|MP4|swf|SWF|flv|FLV|ram|RAM|rm|RM|doc|DOC|docx|DOCX|txt|TXT|rtf|RTF|xls|XLS|xlsx|XLSX|pages|PAGES|ppt|PPT|pptx|PPTX|pps|PPS|csv|CSV|cab|CAB|arj|ARJ|tar|TAR|zip|ZIP|zipx|ZIPX|sit|SIT|sitx|SITX|gz|GZ|tgz|TGZ|bz2|BZ2|ace|ACE|arc|ARC|pkg|PKG|dmg|DMG|hqx|HQX|jar|JAR|xml|XML|pdf|PDF)$">
+<FilesMatch "\.(?i:html|htm|xhtml|js|css|bmp|png|gif|jpg|jpeg|ico|pcx|tif|tiff|au|mid|midi|mpa|mp3|ogg|m4a|ra|wma|wav|cda|avi|mpg|mpeg|asf|wmv|m4v|mov|mkv|mp4|ogv|webm|swf|flv|ram|rm|doc|docx|txt|rtf|xls|xlsx|pages|ppt|pptx|pps|csv|cab|arj|tar|zip|zipx|sit|sitx|gz|tgz|bz2|ace|arc|pkg|dmg|hqx|jar|xml|pdf)$">
Allow from all
</FilesMatch>
diff --git a/assets/web.config b/assets/web.config
index df26900d7452d80c476fe498289c6855851e5b99..2f4f6c3ed863abbb298b2d65484fb942a7272646 100644
--- a/assets/web.config
+++ b/assets/web.config
@@ -57,6 +57,8 @@ directory.
<add fileExtension=".mov" allowed="true" />
<add fileExtension=".mkv" allowed="true" />
<add fileExtension=".mp4" allowed="true" />
+ <add fileExtension=".ogv" allowed="true" />
+ <add fileExtension=".webm" allowed="true" />
<add fileExtension=".swf" allowed="true" />
<add fileExtension=".flv" allowed="true" />
<add fileExtension=".ram" allowed="true" />
@@ -94,4 +96,4 @@ directory.
</requestFiltering>
</security>
</system.webServer>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/behat.yml b/behat.yml
index 295669d095289a4887a4b2378edcc1dc4f07d48b..50c017243856e6a727837feee2e1124831739524 100644
--- a/behat.yml
+++ b/behat.yml
@@ -1,13 +1,16 @@
default:
- extensions:
+ filters:
+ tags: "~@todo"
+ formatter:
+ name: pretty
+ parameters:
+ snippets: false
- SilverStripe\BehatExtension\Extension:
- framework_path: framework
+ extensions:
- Behat\MinkExtension\Extension:
- # Adjust this to your own website URL.
- # Uncomment, or set through environment variable:
- # > export BEHAT_PARAMS="extensions[Behat\MinkExtension\Extension][base_url]=http://localhost/"
+ SilverStripe\BehatExtension\MinkExtension:
+ # Adjust "base_url" to your own website URL.
+ # Can be set via environment variables or _ss_environment.php/$_FILE_TO_URL_MAPPING as well.
#
# base_url: http://localhost/
@@ -17,4 +20,6 @@ default:
javascript_session: selenium2
goutte: ~
selenium2:
- browser: firefox
\ No newline at end of file
+ browser: firefox
+
+ SilverStripe\BehatExtension\Extension: ~
diff --git a/mysite/_config/config.yml b/mysite/_config/config.yml
index 61e9b90931e7790c1d14388252d5dc164fb9a866..b2039568e8816dee4f03ccc2aa8387f6fc33b4dd 100644
--- a/mysite/_config/config.yml
+++ b/mysite/_config/config.yml
@@ -2,6 +2,9 @@
Name: mysiteconfig
After: 'framework/*','cms/*'
---
+# YAML configuration for SilverStripe
+# See http://doc.silverstripe.org/framework/en/topics/configuration
+# Caution: Indentation through two spaces, not tabs
SiteTree:
nested_urls: 1
extensions:
diff --git a/mysite/code/Page.php b/mysite/code/Page.php
index 925f30e1a9e33eeac8373fa7ef8792b39e03a69a..609975e62f37feb4d64b245e982ed12478935763 100755
--- a/mysite/code/Page.php
+++ b/mysite/code/Page.php
@@ -8,6 +8,7 @@ class Page extends BasePage {
);
}
+
class Page_Controller extends BasePage_Controller {
/**
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2bb3c8760a281c9753e06ea2d84821ddd3e8cd67..0bcda1c0705ece8493c697e138773929fdb262d2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -25,10 +25,10 @@
<listeners>
<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
</listeners>
-
+
<groups>
<exclude>
<group>sanitychecks</group>
</exclude>
</groups>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/web.config b/web.config
index a04afa1c4363640a85eb52c4775e9214ad82932b..1d0c7348d320ad37cdfa45f1aa9f007e513771c2 100644
--- a/web.config
+++ b/web.config
@@ -1,5 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.webServer>
+ <security>
+ <requestFiltering>
+ <hiddenSegments>
+ <add segment="silverstripe-cache" />
+ <add segment="vendor" />
+ <add segment="composer.json" />
+ <add segment="composer.lock" />
+ </hiddenSegments>
+ <fileExtensions allowUnlisted="true" >
+ <add fileExtension=".ss" allowed="false"/>
+ <add fileExtension=".yml" allowed="false"/>
+ </fileExtensions>
+ </requestFiltering>
+ </security>
</system.webServer>
-</configuration>
\ No newline at end of file
+</configuration>