tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
18,300 Commits 31 Branches 527 Tags 162 MiB
2aa3b5d5fa
Commit Graph

2196 Commits

Author SHA1 Message Date
Ingo Schommer
cb723a684a Fixed docs wording 2016-04-27 07:58:58 +12:00
Paul
3ce1f48202 Updated CSS coding conventions (#5389) 
Co-authored by @chillu
 2016-04-26 14:21:08 +12:00
David Craig
95565d91ab Update docs to include new client-side routing 2016-04-26 13:46:30 +12:00
Daniel Hensby
679185514d
Merge 3.3 into 3 
Conflicts:
	admin/css/screen.css.map
 2016-04-26 00:24:59 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3 
Conflicts:
	.travis.yml
 2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2 
Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md
 2016-04-26 00:09:33 +01:00
Ingo Schommer
2d1f948a36 Documented JS coding conventions 
See https://github.com/silverstripe/silverstripe-framework/pull/5108
 2016-04-25 21:55:33 +12:00
Damian Mooyman
8b239a5011 Docs and tests for exempt validation actions 2016-04-22 14:52:38 +12:00
Daniel Hensby
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms 2016-04-20 23:57:59 +01:00
Ingo Schommer
19de22f427 API Moved frontend assets into admin/client/ 
admin/javascript => admin/client
admin/javascript/src => admin/client/src/legacy (mostly)
admin/scss/_variables.scss => admin/client/styles/_variables.scss
admin/scss => admin/client/styles/legacy/
admin/css/editor.css => admin/client/dist/css/editor.css
admin/css/screen.css => admin/client/dist/css/bundle.css
admin/images => admin/client/dist/images
admin/images/sprites/src => admin/client/src/sprites
admin/images/sprites/dist => admin/client/dist/sprites
admin/font => admin/client/dist/font
 2016-04-20 21:13:10 +12:00
Sam Minnee
82a89a94f4 Add 2 new committers, remove 1 who has left. 2016-04-19 23:05:59 +12:00
Igor
ec5464a6dc minor docs broken link 2016-04-19 22:21:26 +12:00
Damian Mooyman
0bd62735bc BUG Fix issue with Requirements mangling custom scripts (#5337) 
API Remove deprecated $template parameter from Requirements::includeInHTML
 2016-04-19 17:20:30 +12:00
Michael Strong
1f820b0b1c DOCS allowed_actions access control (#5333) 2016-04-18 17:49:30 +12:00
Hamish Friedlander
97a62b4982 Merge pull request #5278 from open-sausages/pulls/4.0/campaign-admin 
Campaigns Feature
 2016-04-08 10:14:06 +12:00
Ingo Schommer
7ff646091e Noting update to LeftAndMain.help_link 
See https://github.com/silverstripe/silverstripe-framework/pull/5167/
 2016-04-06 19:39:17 +12:00
Patrick Nelson
49e6d701e5 Removal of FlushGeneratedImagesTask was not documented. 
This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).
 2016-04-05 15:09:46 -07:00
David Craig
f8c17bed3b CampaignAdmin and GridField React sections 
Also removes watchify because it wasn't working.
Add SilverStripeBackend class used to fetch data from endpoints for the front-end
 2016-04-05 22:42:13 +12:00
Damian Mooyman
3c2b53157e API Update Versioned methods 2016-04-04 14:50:16 +12:00
Damian Mooyman
87ee4365e7 API Implement ChangeSets for batch publishing 2016-04-04 14:46:38 +12:00
Damian Mooyman
29c5eff433 API Add $context method to DataObject::can for consistency with canCreate() 2016-04-04 14:46:38 +12:00
David Craig
aa1aebd007 Implement client-side routing with Page.js 
- Removes thirdparty dependency History.js
- Adds thirdparty dependency Page.js to manage client-side routing
- Adds a wrapper around Page.js for SilverStripe specific behaviour
- Increased minimum browser requirement to IE10. Native HTML History API routing requires IE10 or newer (necessitated by removal of History.js)
- PJAX pannel loading via now uses promises rather than callbacks
- Adds getClientConfig method to LeftAndMain which can be used to pass config from to the front-end client
 2016-04-01 13:45:14 +13:00
Damian Mooyman
b8e7f9a934 Standardise spelling of "customise" 
Fixes #3988
 2016-03-30 13:17:28 +13:00
Damian Mooyman
094745ec0f API Formally support custom ownership relations 
API 'owned_by' is no longer mandatory for relations backed by normal db relations
API Extension setOwner/clearOwner is now nested
 2016-03-23 14:49:34 +13:00
Sam Minnee
aeccb8b8e0 API: Move DBField subclasses into SilverStripe\Model\FieldType namespace 
API: Deprecate SS_Datetime.

The DBField subclasses are have all been renamed to start with “DB” and
be in the SilverStripe\Model\FieldType namespace. To keep DataObject
definitions concise, the original short variations of their names are
preserved as service definitions. Most of the field generation code
doesn’t need to change, but where field classes are referenced directly,
changes will be needed.

SS_Datetime, which is commonly referenced outside the model system
itself, has been preserved as a subclass of DBDatetime. This has been
marked as deprecated and can be removed in SilverStripe 5.

A few places that referred to $db and $casting values weren’t using
the Injector to instantiate the relevant classes. This meant that the
remapping we have created as part of moving classes into a namespace
didn’t work.
 2016-03-22 18:09:30 +13:00
Damian Mooyman
5d3b896297 Merge pull request #5180 from dhensby/pulls/4/npm-update 
Updating required node version
 2016-03-21 10:46:56 +13:00
Ingo Schommer
8ae794ee99 API TinyMCE Image shortcodes 2016-03-21 09:23:40 +13:00
Garion
c59cd1e598 Update Extend_CMS_Interface.md 
Add missing `private` declaration.
 2016-03-20 13:08:23 +13:00
Damian Mooyman
0848aca462 API Massive refactor of Versioned 
API Implemented recursive versioned actions (publish, etc)
API Un-deprecate delete batch action
API Changed Versioned getters and setters for stages
BUG Inject query parameters during DataObject construction to prevent incorrect lazy loading
 2016-03-17 13:43:53 +13:00
Daniel Hensby
ed267d03bd Updating required node version 2016-03-16 21:54:07 +00:00
Garion
47179fc808 Update Extend_CMS_Interface.md 
Resurfaces details on actually creating the required handlers for custom buttons in the CMS, which were detailed in a [past version of the docs](https://github.com/silverstripe-droptables/sapphire/blob/side-by-side/docs/en/howto/extend-cms-interface.md#extending-the-cms-actions).
 2016-03-10 01:02:28 +13:00
Robbie Averill
9379914038 Updated 4.0.0 changelog 
Backtick mania
 2016-03-09 09:37:06 +13:00
Cam Findlay
14044fff35 DOCS Added a useful code example around positioning of tabs in CMS. 
This useful example wasn't in the docs when I needed it. I ended up tracking this information down at http://stackoverflow.com/questions/5033028/silverstripe-how-do-i-insert-a-tab-before-another-tab

It should really be in the docs.
 2016-03-08 16:18:49 +13:00
Ingo Schommer
f36b110db3 Merge remote-tracking branch 'origin/3.3' 2016-03-04 17:06:04 +13:00
Ingo Schommer
466ed29f0e Merge remote-tracking branch 'origin/3.3' into 3 2016-03-04 14:55:08 +13:00
Ingo Schommer
3c53da0890 Merge remote-tracking branch 'origin/3.2' into 3.3 2016-03-04 14:05:06 +13:00
Ingo Schommer
0f08176c6c Merge pull request #5095 from open-sausages/pulls/4.0/ownership-api 
API Ownership API Implementation
 2016-03-03 17:39:07 +13:00
Daniel Hensby
b8c8875303 DOCS Explicitly noting lack of PHP 7 support 2016-03-01 10:14:14 +00:00
Damian Mooyman
22c0025d47 Improve documentation on documentation 2016-03-01 12:18:11 +13:00
Ingo Schommer
2a3f4daa76 "npm run lock" command 
Uses https://github.com/uber/npm-shrinkwrap instead of the built-in "npm shrinkwrap" since it works more reliably.
Specifically, "npm install" doesn't fail depending on node_modules/ being installed in the local cache or not.
It also makes npm-shrinkwrap.json easier to diff by more consistently ordering its output between runs.

If you need any convincing that this is a problem, look at the over 400 issues related to "shrinkwrap"
in https://github.com/npm/npm/search?q=shrinkwrap&type=Issues&utf8=%E2%9C%93
 2016-02-29 20:50:15 +13:00
Damian Mooyman
7312692a09 Merge branch '3.3' into 3 2016-02-29 17:30:20 +13:00
Damian Mooyman
393a4788bf Merge branch '3.2' into 3.3 2016-02-29 17:29:41 +13:00
Damian Mooyman
f7d49df258 Merge tag '3.2.3' into 3.2 
Release 3.2.3

# Conflicts:
#	lang/cs.yml
 2016-02-29 17:27:00 +13:00
Damian Mooyman
ee6c08a0e4 Merge remote-tracking branch 'origin/3.3' into 3 2016-02-29 17:16:13 +13:00
Damian Mooyman
24a6c53645 Merge branch '3.2' into 3.3 
# Conflicts:
#	admin/code/ModelAdmin.php
#	lang/cs.yml
#	lang/lt.yml
#	lang/sk.yml
 2016-02-29 17:03:22 +13:00
Damian Mooyman
4fbf0b0863 Merge remote-tracking branch 'origin/3.3.1' into 3.3 2016-02-29 17:01:26 +13:00
Damian Mooyman
2c1f837442 Merge branch '3.1' into 3.2 
# Conflicts:
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
#	docs/en/02_Developer_Guides/00_Model/10_Versioning.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
#	docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/14_Files/index.md
#	lang/cs.yml
#	lang/fi.yml
#	lang/sk.yml
 2016-02-29 16:59:20 +13:00
Damian Mooyman
71bf14d590 Merge remote-tracking branch 'origin/3.1.18' into 3.1 2016-02-29 16:49:25 +13:00
Damian Mooyman
fb58233201 Added 3.3.1 changelog 2016-02-29 15:23:25 +13:00
Damian Mooyman
9050761f17 Added 3.2.3 changelog 2016-02-29 15:22:39 +13:00
Damian Mooyman
2147205dc1 Added 3.1.18 changelog 2016-02-29 15:10:05 +13:00
Damian Mooyman
b196d33bfa API Ownership API 
API Filter Relation. query parameters from relations when creating objects
API Versioned::publish now triggers invokeWithExtensions
API Update behaviour of versioned for all_versions mode to respect ID filters
API Tweak behaviour of inherited query parameters
 2016-02-29 14:38:44 +13:00
Damian Mooyman
2b26511faa Merge branch '3.3' into 3 2016-02-27 21:20:15 +13:00
Damian Mooyman
8a8d82cc57 Merge branch '3.3.1' into 3.3 
# Conflicts:
#	lang/cs.yml
 2016-02-27 21:19:29 +13:00
Damian Mooyman
14aa497b80 Merge branch '3.2.3' into 3.2 2016-02-27 21:11:57 +13:00
Damian Mooyman
807377ad2d Added 3.3.1-rc2 changelog 2016-02-27 21:02:09 +13:00
Damian Mooyman
3d2c87029c Added 3.3.1-rc2 changelog 2016-02-27 21:01:57 +13:00
Damian Mooyman
3c053bb85d Added 3.2.3-rc2 changelog 2016-02-27 21:00:59 +13:00
Damian Mooyman
3f5c635353 Added 3.2.3-rc2 changelog 2016-02-27 21:00:46 +13:00
Damian Mooyman
cd05068814 Merge branch '3.1.18' into 3.1 2016-02-27 20:59:51 +13:00
Damian Mooyman
b77acaeeb7 Added 3.1.18-rc2 changelog 2016-02-27 20:53:23 +13:00
Damian Mooyman
9d9a6fc0e8 Added 3.1.18-rc2 changelog 2016-02-27 20:53:15 +13:00
Damian Mooyman
d27be2b325 Merge branch '3.3' into 3 
# Conflicts:
#	javascript/GridField.js
 2016-02-26 17:45:06 +13:00
Damian Mooyman
a2c7524b85 Merge branch '3.1.18' into 3.1 2016-02-26 17:39:06 +13:00
Damian Mooyman
73780ce94e Merge branch '3.2.3' into 3.2 2016-02-26 17:36:45 +13:00
Damian Mooyman
ae29576763 Merge branch '3.3.1' into 3.3 2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c Added 3.3.1-rc1 changelog 2016-02-26 17:30:07 +13:00
Damian Mooyman
8c12b6f992 Added 3.2.3-rc1 changelog 2016-02-26 17:25:00 +13:00
Damian Mooyman
9e0037d43e Added 3.1.18-rc1 changelog 2016-02-26 17:13:49 +13:00
Damian Mooyman
c275c21057 API Extensible::invokeWithExtension has same method signature as Extensible::extend 2016-02-25 17:32:41 +13:00
Damian Mooyman
3b0a9f4ba2 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss
 2016-02-25 14:51:59 +13:00
Daniel Hensby
2fdc96a0de Update PHPUnit from 3.7 to 4.8 2016-02-24 21:42:20 +13:00
Damian Mooyman
9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
 2016-02-24 17:29:06 +13:00
Damian Mooyman
ff5ed6efeb Merge remote-tracking branch 'origin/3.2.2' into 3.2 2016-02-24 17:03:43 +13:00
Damian Mooyman
06d5050321 Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-24 16:54:18 +13:00
Damian Mooyman
0ec021dac8 Added 3.3.0 changelog 2016-02-24 16:30:34 +13:00
Damian Mooyman
531b8b167b Added 3.2.2 changelog 2016-02-24 15:33:02 +13:00
Damian Mooyman
1fe7d029db Added 3.1.17 changelog 2016-02-24 15:31:12 +13:00
Damian Mooyman
9a4f0b48df Added 3.1.17-rc2 changelog 2016-02-24 12:38:54 +13:00
Damian Mooyman
6cd66a6b13 Added 3.2.2-rc2 changelog 2016-02-24 12:01:41 +13:00
Ingo Schommer
37059eb6b3 [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-24 11:47:16 +13:00
Ingo Schommer
faa94d51d5 [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-24 11:33:54 +13:00
Ingo Schommer
589fee1a8a Removed obsolete TestRunner->$skipTests flag 
Taken care of by the default PHPUnit implementation of markTestSkipped()
 2016-02-23 22:29:58 +13:00
Ingo Schommer
d1af214ef5 API Removed custom dev/tests/ execution 
Rely on standard vendor/bin/phpunit via CLI instead.
See https://github.com/silverstripe/silverstripe-framework/issues/4254

- Not disabling xdebug. That should be harmful, and is actively harming test development
- No longer able to specifically skip tests via the `SkipTests` request parameter. Use phpunit.xml groups and the `--exclude-group` CLI argument instead
- No longer able to specify multiple comma-separated module folders. use phpunit.xml groups and the `--group` CLI argument instead
- Not explicitly calling `SSViewer::flush_template_cache()` (was never the case on running `phpunit` CLI anyway, and shouldn't be required any more)
 2016-02-23 20:19:35 +13:00
Damian Mooyman
510c556739 API File has Versioned extension 
API Improved support for versioned DataObject
API GridField extensions for versioned dataobjects
API De-couple File and ErrorPage
API File::handle_shortcode now respects canView()
API AssetControlExtension is now able to delete, publish, or protect files
API Upload now protects new assets by default
 2016-02-23 13:46:28 +13:00
David Craig
5a42a4181a Added Bootstrap Alpha.2 
- Managed by npm
- Created an `npm run css` task to compile
- Updated shrinkwrap
- Updated changelog
 2016-02-23 11:11:24 +13:00
Damian Mooyman
f20ad434ce API Update TinyMCE to 4.x 
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
 2016-02-23 10:10:02 +13:00
Damian Mooyman
e217132808 Merge pull request #5034 from scott1702/compass-gulp 
Replace Compass with gulp-sass
 2016-02-22 11:38:51 +13:00
Damian Mooyman
94cec68c7e Merge pull request #5065 from SpiritLevel/typo 
typo in api link
 2016-02-22 09:14:51 +13:00
David Alexander
23c6b25c6c typo in api link 2016-02-18 23:11:31 -07:00
Damian Mooyman
f1f662fd49 Merge pull request #5050 from SpiritLevel/3.2 
DOCS 3.2 : fixing api: links now that api: tag parser working
 2016-02-19 14:28:20 +13:00
Damian Mooyman
4ba2eb6244 Merge pull request #5053 from robbieaverill/patch-1 
Typo fixes
 2016-02-19 14:27:07 +13:00
Damian Mooyman
73ee4e5458 Merge pull request #5049 from SpiritLevel/3.1 
DOCS 3.1 : fixing api: links
 2016-02-19 14:18:37 +13:00
Damian Mooyman
af28b0a414 Added 3.2.2-rc1 changelog 2016-02-19 11:22:10 +13:00
Damian Mooyman
f32302522c Added 3.1.17-rc1 changelog 2016-02-19 10:30:25 +13:00
Damian Mooyman
97089db8a6 Added 3.3.0-rc3 changelog 2016-02-18 17:29:18 +13:00
Ingo Schommer
893e49703d [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-18 17:28:54 +13:00
David Alexander
903379bde2 DOCS 3.2 : fixing api: links now that api: tag parser working 
fixed a couple of external links

fixed a docs link
 2016-02-17 18:02:38 -07:00
Robbie Averill
0811e87ecc Typo fixes 
* Fixed typo in `$dependencies`
* Updated "simplest example usage of the `Injector`" to specify the correct class name
 2016-02-18 13:53:36 +13:00
David Alexander
febbd35b51 DOCS 3.1 : fixing api: links 
missed one
 2016-02-17 03:00:22 -07:00
Damian Mooyman
829135a85a API remove Object::useCustomClass 
API Broke out Injectable, Configurable, and Extensible from Object into traits
BUG Fix missing extraDataObjects in tests
 2016-02-17 10:22:04 +13:00
scott1702
38b1c0a162 Replace Compass with gulp-sass 2016-02-16 18:35:57 +13:00
Richard Rudy
87718597e8 FIX "where" method in SQLUpdate Example 
Method should be addWhere
 2016-02-15 02:27:04 -05:00
Damian Mooyman
b82d585b57 Merge pull request #5019 from open-sausages/require-react 
Include React and related libraries in framework
 2016-02-15 16:25:39 +13:00
scott1702
2bf802a8cd Include React and related libraries in framework 2016-02-15 16:05:55 +13:00
Damian Mooyman
230d017677 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/css/ie7.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/font/icon-reference.html
#	admin/font/silverstripe.eot
#	admin/font/silverstripe.svg
#	admin/font/silverstripe.ttf
#	admin/font/silverstripe.woff
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
 2016-02-12 15:41:45 +13:00
Patrick Nelson
35ce802ff6 Update 01_Caching.md 
`'failure_callback' => ''` fails but providing `'failure_callback' => null` seems to work fine (since it expects a closure but gets a string, I think).
 2016-02-10 12:59:58 -05:00
Jean-Fabien Barrois
bab1f230bf NEW Cross device "Remember Me" feature 
At the moment, using the "Remember me" function on more than one device will only work with the last device used. Previous devices will not auto login.
This PR introduces a new DataObject for storing hashed tokens against multiple devices. Developers can configure if logging out should discard all tokens, or only the one used on the device logging out; token expiry date is 90 days by default but configurable. For added security, the old behaviour can still be enforced if multiple tokens are not desired.
See silverstripe#1574 for additional background
 2016-02-10 09:42:08 +13:00
Damian Mooyman
d5b4c90cb4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_fonts.scss
#	admin/scss/_retina.scss
 2016-02-09 18:25:47 +13:00
Damian Mooyman
96a905aa09 Update changelog 2016-02-09 18:07:11 +13:00
Damian Mooyman
f66e21c10d Added 3.3.0-rc2 changelog 2016-02-09 18:02:22 +13:00
DouG
87a674a460 Correct minor typo 
had the word "fun" rather than "run"
 2016-02-01 16:25:17 +13:00
Ingo Schommer
a5754674b7 Clarified impact of NPM/Browserify in changelog 2016-01-26 11:39:53 +13:00
David Craig
2140025c20 Implement RFC-7 JavaScript module loader 
- Adds ES6 support via Babel
- Transforms existing JavaScript to UMD modules
- Adds module bundling via Browserify
- Existing JavaScript converted to UMD modules
- lib.js and leftandmain.js are bundled using browserify
- JavaScript minifying of bundles handed by gulp
 2016-01-26 11:39:20 +13:00
Damian Mooyman
69c9ad1428 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_style.scss
#	css/AssetUploadField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
#	lang/fi.yml
 2016-01-25 16:15:41 +13:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
Damian Mooyman
b4e76df531 Add upgrading notes to rc1 2016-01-25 15:35:42 +13:00
Myles Beardsmore
b0057c77f0 Removed PlayerCsvBulkLoader as importer 
Removed PlayerCsvBulkLoader as model importer class and replaced it with CsvBulkLoader instead.
 2016-01-25 15:26:25 +13:00
Damian Mooyman
5f511e5048 Added 3.3.0-rc1 changelog 2016-01-25 15:22:58 +13:00
Damian Mooyman
7c448bb4a2 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	tests/model/DataObjectLazyLoadingTest.php
#	tests/model/VersionedTest.yml
 2016-01-25 14:11:37 +13:00
Daniel Hensby
f131b0d91e Merge pull request #4961 from silverstripe/tractorcow-patch-1 
DOCS Update branch names
 2016-01-22 18:20:15 +00:00
Damian Mooyman
bf8bf5e4d5 BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects 
Document correct configuration of Versioned DataObjects
Fixes #4936
 2016-01-22 15:35:58 +13:00
Damian Mooyman
cca7129385 BUG Revert lost documentation 
Resolves some regressions from #3735
 2016-01-22 11:45:00 +13:00
Damian Mooyman
bdb1a95758 API Cleanup and refactor of select fields 
API Standardise Relation interface
 2016-01-21 15:40:19 +13:00
Damian Mooyman
45c6d0284a Minor: Update branch names 2016-01-21 14:02:42 +13:00
Damian Mooyman
e6b877df27 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
 2016-01-20 13:16:27 +13:00
Damian Mooyman
8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	admin/scss/_tree.scss
#	javascript/TreeDropdownField.js
 2016-01-19 17:08:26 +13:00
Meeeeeeow
e448774150 Fixed Typo 
Changed 'Gudes' to 'Guides'
 2016-01-19 16:18:35 +13:00
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +13:00
Damian Mooyman
46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 
# Conflicts:
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
#	docs/en/03_Upgrading/index.md
#	docs/en/05_Contributing/01_Code.md
#	forms/TreeMultiselectField.php
#	security/Permission.php
 2016-01-19 14:00:19 +13:00
David Alexander
45d2b57a65 DOCS 3.1 : typose and broken internal links 2016-01-15 16:39:23 +13:00
Damian Mooyman
8e1ae55ff6 API Enable single javascript files to declare that they include other files 2016-01-15 09:49:28 +13:00
David Alexander
5c99e33eb2 DOCS 3.1 - fixes broken internal links 2016-01-14 23:59:53 +13:00
Damian Mooyman
738e1db756 Update Nginx rules 
Prevent disclosure of secure assets
 2016-01-13 18:18:22 +13:00
Damian Mooyman
037467beae API Asset Access Control implementation 2016-01-13 18:18:22 +13:00
Christopher Joe
007e0eeb2f DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox 2016-01-13 12:12:21 +13:00
David Craig
254b942737 Adds npm for managing client-side dependencies 
- Includes a package.json file with build and CI scripts
- Includes shrinkwrap file for locking dependency version
- Includes Gulp for running build tasks
- Includes a 'build' task for copying library files from node_modules to thirdparty
- Includes a 'sanity' task for makes sure library files in thirdparty match what's in node_modules
- Includes updates to .travis.yml (new JS_SANITY_CHECK flag) to run the sanity task
 2016-01-13 09:23:47 +13:00
Damian Mooyman
0b3b7ba134 Merge pull request #4888 from sminnee/remove-trailing-whitespace 
MINOR: Remove trailing whitespace
 2016-01-12 10:18:09 +13:00
Christopher Joe
0ac0e5a7d2 Added tutorial for installing silverstripe with Vagrant and Virtualbox 2016-01-08 15:54:05 +13:00
Sam Minnee
4aa50534d5 FIX: Fixes needed to adapt to whitespace changes. 
API: Whitespace trimmed from custom form field templates

The introduction of trailing newlines on all template files introduced
some changes that needed to be made.

Notably, whitespace has been trimmed from rendered form field templates.
This is the minimal impact to SilverStripe developers, as it preserves
the behaviour of the default field types, but I’ve still noted as a
change.
 2016-01-07 14:17:57 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
Damian Mooyman
3c55608075 Merge pull request #4892 from camfindlay/patch-37 
DOCS FIX typo for i18n
 2016-01-06 15:18:51 +13:00
Damian Mooyman
e59595bb23 Merge pull request #4879 from gordonbanderson/patch-1 
Documentation : Using SQLite for Testing
 2016-01-06 13:49:03 +13:00
Peter Thaleikis
4366000a9f fixing examples 
PSR-2 style for examples
 2016-01-06 12:28:26 +13:00
Cam Findlay
7b77380df5 DOCS FIX typo for i18n 
Was causing a number of 404 crawl errors.
 2016-01-06 09:11:23 +13:00
Ingo Schommer
70897834c9 Corrected release docs merge pipeline 2016-01-05 14:08:49 +13:00
Ingo Schommer
90837d4aa2 Release docs: Mention IRC, Behat and milestones 2016-01-05 11:27:46 +13:00
Ingo Schommer
ce1a069885 Clarify RC wording in release docs 
An RC is technically only one of a few "pre-release" labels (alpha, beta, rc)
 2016-01-05 11:27:45 +13:00
Ingo Schommer
7c3fd7de13 Note required commands in release docs 2016-01-05 11:27:45 +13:00
Gordon Anderson
f61cedc03c Update to 00_Unit_Testing 
Additional section with instructions on running tests using in memory SQLite,
 2015-12-30 13:29:32 +07:00
Christopher Darling
ef4a75ad43 DOCS: fixed 3.2.0 changelog DataList code sample 2015-12-23 13:13:32 +00:00
Damian Mooyman
0dfa8ca7b2 Improve release process instructions 2015-12-23 16:45:34 +13:00
Damian Mooyman
5507ce89c6 Copy upgrade notes from 3.3.0.md 2015-12-23 14:12:02 +13:00
Damian Mooyman
70bb3d92c7 Added 3.3.0-beta1 changelog 2015-12-23 13:38:55 +13:00
Damian Mooyman
d63441623a Merge pull request #4612 from johndalangin/patch-4 
Added cookie_secure configuration directive
 2015-12-22 16:36:05 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
 2015-12-22 14:07:52 +13:00
Damian Mooyman
55e1b66285 Merge pull request #4859 from chillu/pulls/noteworthy-contrib-docs 
Note about changelog additions in contrib guide
 2015-12-21 14:33:57 +13:00
Ingo Schommer
b97b604a05 Merge pull request #4837 from tractorcow/pulls/3.2/release-docs 
Documentation on the release process
 2015-12-21 11:55:19 +13:00
Ingo Schommer
e114548a48 Note about changelog additions in contrib guide 2015-12-21 11:52:08 +13:00
Ivo Bathke
f77bac3ab0 Update 02_Composer.md 
gdmedia/ss-auto-git-ignore as dev requirement
 2015-12-17 11:57:46 +01:00
Damian Mooyman
22d8105a56 Add changelog for 3.3.0 2015-12-10 17:48:06 +13:00
Hamish Friedlander
1eda9151a4 Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview 
API Create default security permission model for versioned data objects
 2015-12-09 14:17:27 +13:00
Damian Mooyman
6089a7c5bd API Create default security permission model for versioned data objects 2015-12-09 11:33:53 +13:00
Damian Mooyman
903d4838bb Documentation on the release process 2015-12-04 15:09:58 +13:00
Peter Thaleikis
7db7140a70 fixing example 2015-12-04 11:14:02 +13:00
Marcus Nyeholt
f7c270a3ba NEW Use Config for determining Vary header 
Existing implementation hardcodes the Vary header; swap to using Config layer
instead

Added test for changing the variable from config
 2015-12-02 10:28:24 +11:00
Daniel Hensby
b694829084 Merge pull request #4812 from tractorcow/pulls/4.0/api-composite-sort 
API Enable DataList::sort to support composite field names
 2015-11-30 23:54:45 +00:00
Damian Mooyman
c13b5d989f API Enable advanced configuration options for requirements combined files 
API Enable relative root paths for the default Flysystem AssetAdapter
 2015-12-01 11:07:13 +13:00
Damian Mooyman
641c26299c API Enable linear-only restriction for DataList::applyRelation 
API Remove DataList::getRelation
 2015-12-01 09:58:27 +13:00
Damian Mooyman
ce28259c5f API Replace CacheGeneratedAssetHandler with FlysystemGeneratedAssetHandler 
API Reduce GeneratedAssetHandler API
API Re-introduce Requirements::delete_all_combined_files();
API Re-introduce Requirements::flush()
API Combined files now uses new filenames distinguished by sha1 of sources
 2015-11-26 16:12:05 +13:00
muskie9
fc3b06dbf9 DOCS update LinkingModes description 2015-11-23 14:10:47 -06:00
Daniel Hensby
572945a2fd Merge pull request #4704 from spekulatius/patch-1 
fixing syntax error
 2015-11-23 14:18:50 +00:00
Damian Mooyman
624e3fde6a Merge pull request #4708 from muskie9/patch-7 
DOCS update framework and cms milestone links
 2015-11-20 12:43:11 +13:00
Damian Mooyman
84667e5aa6 Merge pull request #4693 from camfindlay/patch-33 
DOCS Upgrading information about 3.2.0 and the additional modules req…
 2015-11-20 11:13:36 +13:00
Nic
2e5c56f1d0 DOCS update framework and cms milestone links 2015-11-19 11:34:01 -06:00
Cam Findlay
9672cd3994 DOCS SilverStripe core RFC process, template and archive links to past RFCs. 2015-11-19 16:05:49 +13:00
Damian Mooyman
43e4eb129a Merge pull request #4771 from camfindlay/patch-36 
DOCS Update conflict resolution help in code of conduct
 2015-11-17 10:04:40 +13:00
Damian Mooyman
302c741b07 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	control/HTTP.php
	forms/Form.php
	tests/view/SSViewerTest.php
 2015-11-16 16:50:40 +13:00
Damian Mooyman
0178fa5a18 Added 3.2.1 changelog 2015-11-16 16:17:10 +13:00
Damian Mooyman
2e6469956f Add 3.1.16-rc1 changelog 2015-11-16 15:20:30 +13:00
Damian Mooyman
615b2d5563 Added 3.1.16 changelog 2015-11-16 15:16:49 +13:00
Cam Findlay
e5e4a55fe0 DOCS Update conflict resolution help in code of conduct 
Original link was 404.
 2015-11-14 09:42:12 +13:00
Damian Mooyman
c19420f545 Add 3.2.1-rc2 changelog 2015-11-13 15:32:09 +13:00
Damian Mooyman
49acc0d468 Added 3.2.1-rc2 changelog 2015-11-13 15:27:08 +13:00
Hamish Friedlander
b61d6dcd57 [ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs 2015-11-13 15:20:09 +13:00
Nabil Kadimi
03169a429f Fix typo 2015-11-12 22:35:59 +00:00
Damian Mooyman
245e0aae2f [ss-2015-026]: BUG Fix FormField error messages not being encoded safely 2015-11-11 17:50:02 +13:00
Damian Mooyman
1c1c0a23bd Added 3.2.1-rc1 changelog 2015-11-11 17:10:41 +13:00
Damian Mooyman
bc1b2893ac [ss-2015-026]: BUG Fix FormField error messages not being encoded safely 2015-11-11 16:56:19 +13:00
Daniel Hensby
583cbdd77f Merge pull request #4756 from camfindlay/patch-34 
DOCS Suggest a tool to help people generate their change logs for mod…
 2015-11-10 07:50:11 +00:00
Cam Findlay
218049f5c0 DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs. 2015-11-10 11:59:38 +13:00
Cam Findlay
c7b2f88d4e DOCS Suggest a tool to help people generate their change logs for modules. 2015-11-10 11:50:53 +13:00
Daniel Hensby
ef35c2bb6b Merge pull request #4457 from tractorcow/pulls/4.0/no-query 
API Remove SQLQuery
 2015-11-03 16:41:07 +00:00
Damian Mooyman
1e1a7a345c Merge remote-tracking branch 'origin/3' 
Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php
 2015-11-03 14:23:16 +13:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
 2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	lang/cs.yml
	lang/sk.yml
 2015-11-03 11:10:46 +13:00
Ed Linklater
cacbbd75bc DOCS: jQuery delegation in Admin interface 2015-11-01 05:46:13 +13:00
Damian Kissick
0197b46001 Update 01_Code.md 
Corrected 'submiting' spelling
 2015-10-28 21:28:45 +13:00
Michael Parkhill
e44f22c6b2 Fix broken link to DataObject api 2015-10-28 11:52:35 +13:00
Christopher Darling
a1e343629b DOCS: correct config setting for custom editor.css 
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
 2015-10-26 11:02:47 +00:00
Peter Thaleikis
791c52c6bd fixing syntax error 2015-10-25 22:41:13 +13:00
Damian Mooyman
d1ea74e40d API Implement AssetField to edit DBFile fields 2015-10-23 16:57:44 +13:00
Damian Mooyman
3e7eecf978 API Remove SQLQuery 2015-10-23 16:26:04 +13:00
Damian Mooyman
e17a49f8a5 API Restore JS Minification 
BUG Fix incorrect cache on CacheGeneratedAssetHandler
 2015-10-23 14:14:38 +13:00
David Alexander
e88032a7aa DOCS : spelling 2015-10-23 13:49:03 +13:00
Ingo Schommer
f252cfad20 Merge pull request #4680 from open-sausages/features/dbfile-generated-files 
API Generated files API
 2015-10-23 13:19:56 +13:00
Damian Mooyman
f9892c628c API Generated files API 
API Refactor Requirements_Backend to use new APL
 2015-10-23 10:07:48 +13:00
Ingo Schommer
7d17068062 Increase minimum required PHP version to 5.5 
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
 2015-10-22 23:11:16 +13:00
Cam Findlay
0fa8335bc0 DOCS Upgrading information about 3.2.0 and the additional modules required (reports & siteconfig) 
Based on a community question about upgrading their site manually, they followed the instructions but were not aware of the additional modules now required.
 2015-10-22 09:13:57 +13:00
Loz Calver
977642daa9 Remove Spyc YAML library 
Also had to fix some fixture files - none of the YAML spec versions actually support tabs anyway
 2015-10-19 17:07:34 +01:00
Cam Findlay
a555817d6f DOCS Module standard 1.0 
Adding the module standard to 3.2+ docs.
 2015-10-19 11:44:31 +13:00
Damian Mooyman
d884c859d1 BUG Fix file link tracking for new asset abstraction 2015-10-15 12:15:00 +13:00
Damian Mooyman
be239896d3 API Refactor of File / Folder to use DBFile 
API Remove filesystem sync
API to handle file manipulations
 2015-10-13 11:57:39 +13:00
Damian Mooyman
cc4d92e91a Merge remote-tracking branch 'origin/3.2.0' into 3.2 2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568 Added 3.2.0 changelog 2015-10-12 08:44:34 +13:00
Damian Mooyman
a679680c0d Update changelogs to include PDO upgrade instructions 2015-10-07 16:11:42 +13:00
Hamish Friedlander
b03ae843ca Update core contributors docs to include Jono Menz 2015-10-07 14:35:29 +13:00
Damian Mooyman
557c4211fa Update changelog 2015-10-07 09:51:24 +13:00
Damian Mooyman
4af684f2f3 Added 3.2.0-rc2 changelog 2015-10-06 18:49:35 +13:00
Daniel Hensby
fa878b1e1f Merge pull request #4642 from hailwood/patch-1 
DOCS Remove extra set of li's
 2015-10-03 10:28:50 +01:00
Matthew Hailwood
5e68512e1c Remove extra set of li's 2015-09-30 14:19:20 +13:00
Liam Whittle
71a2ef1350 fixed minor GridField initialization syntax. 2015-09-29 18:51:08 -04:00
scott1702
33f181f72a Update changelog to include removal of CMSFileAddController 
Fix error in drag/drop functionality
 2015-09-29 09:58:01 +13:00
Damian Mooyman
ac27836d2b API Implementation of RFC-1 Asset Abstraction 2015-09-24 12:57:28 +12:00
Damian Mooyman
10dece653f API Consolidate DataObject db methods 
BUG Fix namespace and getField on composite fields
 2015-09-22 10:38:12 +12:00
Peter Thaleikis
7ca97cd86d Update 01_Extensions.md 
adding missing space
 2015-09-20 15:15:54 +12:00
Damian Mooyman
c2a407a01b Add note to changelog 2015-09-18 14:51:04 +12:00
Damian Mooyman
b12bdb754b Added 3.1.15 changelog 2015-09-18 14:21:20 +12:00
johndalangin
23d0f51592 Added cookie_secure configuration directive 
Seeing that cookie_secure is not yet added to the documentation, I took the liberty to add it myself.

Thanks and hope this helps!
 2015-09-17 15:53:58 +08:00
Damian Mooyman
34b71cf6c8 Merge remote-tracking branch 'origin/3' 2015-09-15 13:42:17 +12:00
Damian Mooyman
71b8aec306 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-15 13:35:51 +12:00
Damian Mooyman
c4710b2272 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/GroupImportForm.php
	admin/code/MemberImportForm.php
	tests/model/DataListTest.php
 2015-09-15 13:18:47 +12:00
Damian Mooyman
8ddb4c7ffe Merge remote-tracking branch 'origin/3.1.14' into 3.1 2015-09-15 11:07:14 +12:00
Damian Mooyman
00caeb700d Added 3.1.14 changelog 
Update translations
 2015-09-15 10:58:15 +12:00
Damian Mooyman
b552a7370f Merge remote-tracking branch 'origin/3' 
Conflicts:
	tests/model/ImageTest.php
 2015-09-09 15:44:47 +12:00
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
 2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
 2015-09-09 14:35:29 +12:00
johndalangin
1b661c9f17 Typo Correction 2015-09-07 17:08:49 +08:00
Cam Findlay
58a8bb1327 DOCS fix to ensure 3.2.0 beta 1 content links work correctly 
Reported by Community as broken.
 2015-09-06 19:29:33 +12:00
Brett Randall
e0b0c17685 Update 02_Composer.md 
Fixed typo, "in to thier" -> "into their".
 2015-09-05 13:50:57 +10:00
Matthias Schelling
f43c528a0d fixed typo in shortcode docs 2015-09-03 14:46:42 +02:00
Damian Mooyman
ed401176f9 Added 3.1.14-rc1 changelog 2015-09-02 11:04:21 +12:00
Sam Minnée
f4b7cd3f68 Merge pull request #4500 from stevie-mayhew/pulls/get-response 
FEATURE: implement getter and setter usage for response
 2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
Sam Minnee
1b8d295767 API CHANGE: Shift to Monolog for error reporting and logging 
API CHANGE: Debug::showError(), Debug::showLines(), Debug::log(), and Debug::header() removed
NEW: Logging provided

ZendLog has been removed and monolog introduced instead as a dependency.
The “ErrorLogger” injection point is now the used as the logger that
errors are fed into, and implements PSR-3’s Psr\Log\LoggerInterface.

The SS_ERROR_LOG setting expect a Monolog Logger to be provided as the
ErrorLogger.
 2015-08-28 16:06:41 +12:00
Sean Harvey
03d2fc73c5 Add warning on flush not being run automatically by unit test commands. 2015-08-28 13:00:22 +12:00
JorisDebonnet
b264a835fa Direct link to 3.2.0 release notes 2015-08-27 13:53:17 +02:00
Daniel Hensby
209bb94319 DOCS Adding docs for special Permission cases 2015-08-26 23:32:07 +01:00
Damian Mooyman
b49149d9d2 Update comment on changelog 2015-08-26 14:16:06 +12:00
Damian Mooyman
1285553ebe Added 3.2.0-rc1 changelog 2015-08-26 13:44:29 +12:00
Damian Mooyman
958f98b1cf Merge remote-tracking branch 'origin/3' 2015-08-24 13:08:54 +12:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality 
Fixes #4514
 2015-08-24 11:26:25 +12:00
Daniel Hensby
0b36082564 Merge branch '3' 
Conflicts:
	.travis.yml
	composer.json
	docs/en/changelogs/4.0.0.md
	forms/gridfield/GridFieldExportButton.php
 2015-08-17 13:12:41 +01:00
Daniel Hensby
a8ab5a468d Merge branch '3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
 2015-08-17 11:43:28 +01:00
David Alexander
44680d175c Spelling 2015-08-05 21:34:35 +12:00
Sam Minnee
cd02fff8e4 Remove PHP 5.3 from Travis suite, updating minimum version requirement. 
Since SilverStripe 4 isn't going to work on PHP 5.3, I have removed it from the Travis suite.
 2015-08-04 19:42:54 +12:00
Damian Mooyman
55fa645269 Added 3.2.0-beta2 changelog 2015-08-04 10:39:12 +12:00
Damian Mooyman
3ee017a07f Remove old changlog file 
Add reference for 3.2.0-beta2
 2015-08-04 10:29:40 +12:00
Cam Findlay
ea16aca74b DOCS create() makes objects not classes. 
Thanks to Matthew at Cabbage Tree Creative for reporting.
 2015-08-03 12:50:24 +12:00
Damian Mooyman
09210efbc0 Merge remote-tracking branch 'origin/3' 
Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php
 2015-07-31 15:49:35 +12:00
Damian Mooyman
7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	filesystem/File.php
	model/DataObject.php
	model/DataQuery.php
	search/filters/FulltextFilter.php
	search/filters/SearchFilter.php
	tests/core/ClassInfoTest.php
	tests/filesystem/FileTest.php
	tests/model/DataListTest.php
 2015-07-31 11:38:18 +12:00
Sam Minnee
a1f7dcafa2 NEW: Add ‘calls’ section to Injector configs. 
As well as properties, you can now configure a series of method calls in
your service definitions.
 2015-07-30 19:34:46 +12:00
Loz Calver
20a66136e6 Merge pull request #4403 from tractorcow/pulls/3.2/disable-deprecation 
API Disable deprecation notices by default
 2015-07-23 14:23:41 +01:00
Sam Minnée
c7c3e40a2f Merge pull request #4296 from SpiritLevel/patch-1 
Update 02_Release_Process.md
 2015-07-23 13:38:53 +12:00
Sam Minnée
532bf6ccb9 Merge pull request #3554 from tractorcow/pr/3179 
FIX: FulltextFilter did not work and was not usable
 2015-07-22 11:29:57 +12:00
Daniel Hensby
ca8d0f2818 Merge branch '3.1' into 3.2 
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
 2015-07-20 10:48:01 +01:00
Damian Mooyman
914d734df0 API Disable deprecation notices by default 2015-07-16 09:56:47 +12:00
Daniel Hensby
55a60e86f0 Merge pull request #4401 from marijnkampf/patch-3 
DOCS 
Fixed type in code example
 2015-07-15 17:27:27 +01:00
Marijn Kampf
bc66bca187 Fixed type 2015-07-15 15:36:33 +01:00
Marijn Kampf
218d3f1486 Fixed type in code example 2015-07-15 15:36:19 +01:00
Daniel Hensby
2549fa8a93 Merge pull request #4399 from inflammable/patch-1 
Correct Memcached config in example
 2015-07-15 14:21:21 +01:00
David Alexander
7a1d370038 DOCS : added lesson 18 to index.md 2015-07-14 19:13:57 +12:00
Simon Winter
9bb41358fa Update 05_Typography.md 
The documentation isn't clear as to where the editor config call should be made. If developers wish to set this up globally, there is a slightly different syntax required.
 2015-07-14 15:20:15 +12:00
Stuart
d6cb2419b8 Correct Memcached config in example 
Unlike Libmemcached, the Memcached backend server config must be nested inside an array() with a single key 'servers' - otherwise the default host of 127.0.0.1 is used.

array(
	'servers' => array(
		'host' => 'localhost', 
		'port' => 11211, 
		'persistent' => true, 
		'weight' => 1, 
		'timeout' => 1,
		'retry_interval' => 15, 
		'status' => true, 
		'failure_callback' => ''
	)
)
 2015-07-11 23:18:18 +12:00
David Alexander
644b6b344f Typo. 2015-07-08 14:40:42 +12:00
Ingo Schommer
31db269f71 Merge pull request #4285 from jonom/docs-contributing-cleanup 
DOCS Contributing code cleanup
 2015-07-08 09:10:06 +12:00
Ingo Schommer
aef8073037 Fixed cms architecture link 2015-07-07 19:40:12 +12:00
Sam Minnee
74d0622d43 Fix docs clobbered by 3.1 -> 3.2 merge. 2015-07-01 10:00:39 +01:00
Jackson
9cb64d48e3 Define function as static (line 59) 
Not defining function on line 59 as static triggers php error: [Strict Notice] call_user_func() expects parameter 1 to be a valid callback, non-static method Page::ShortcodeColumns() should not be called statically

Note: PHP 5.5.12
 2015-06-30 11:29:26 +12:00
Jonathon Menz
a39c2bd473 DOCS Contributing code cleanup 
Fixed a few typos and formatting issues, and made git workflow diagram easier to read by hyperlinking it to itself. Also included a few lines from 3.2 branch.
 2015-06-28 13:19:04 -07:00
David Alexander
85967b8c16 Update 07_Code_of_conduct.md 
Missed word...:)
 2015-06-26 21:39:54 +12:00
Will Morgan
b6b8ab8c35 Merge pull request #4314 from SpiritLevel/patch-2 
Update 07_Code_of_conduct.md
 2015-06-26 09:14:55 +01:00
Will Morgan
bec7799957 Merge pull request #4345 from phillprice/patch-11 
DOCS: Link to member custom code change is broken
 2015-06-26 09:11:04 +01:00
Cam Findlay
bee638eb6a DOCS Missing closing perenthesis 2015-06-26 15:36:49 +12:00
Phill Price
1bbcde908a Broken link in using custom code for tracking member logging 2015-06-25 14:20:42 +01:00
David Alexander
fda2ad6600 DOCS: Corrected version of master in line 22. 2015-06-24 21:07:32 +12:00
Will Morgan
21e45eed60 Merge pull request #4339 from SpiritLevel/patch-7 
DOCS: typos, rewording, updated links.
 2015-06-23 09:28:13 +01:00
David Alexander
71c2729aeb DOCS: typos, rewording, updated links. 2015-06-23 14:30:41 +12:00
David Alexander
2125afb2f5 DOCS: fixed broken link 2015-06-23 11:57:54 +12:00
Cam Findlay
449ee6296c DOCS Remove duplicate core committers doc after forward port of branches for 3.2 beta1 release 2015-06-22 11:35:58 +12:00
David Alexander
c4583d4fb9 Update 01_Code.md 
Updated link.
 2015-06-21 12:23:40 +12:00
Daniel Hensby
a94103245d DOCS Bump PHP version in Server Requirements 2015-06-20 11:32:29 +01:00
David Alexander
305801d015 Update 07_Code_of_conduct.md 
Typos, grammar, rewording.
 2015-06-20 16:52:46 +12:00
Damian Mooyman
9cccfec1a0 Added 3.2.0-beta1 changelog 2015-06-19 19:22:38 +12:00
Damian Mooyman
1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
 2015-06-19 10:48:07 +12:00
David Alexander
f6d60ca946 Update 02_Release_Process.md 
Updated: deprecated API's removed only in MAJOR releases.
 2015-06-19 07:51:16 +12:00
Daniel Hensby
4dec821f63 Merge pull request #4297 from SpiritLevel/patch-2 
DOCS Update 03_Documentation.md
 2015-06-18 12:00:49 +01:00
Daniel Hensby
8e96ea3f0f Merge pull request #4302 from SpiritLevel/patch-6 
Update index.md
 2015-06-18 11:41:30 +01:00
David Alexander
a4ec9b5d4f Update 00_Issues_and_Bugs.md 
Corrected Documentation mailing list link.
 2015-06-18 20:04:07 +12:00
David Alexander
0b7f24537f Update index.md 
Rewording.
 2015-06-18 19:40:04 +12:00
David Alexander
dfc1c8df34 Update 05_Translation_Process.md 
Typos.
 2015-06-18 17:50:29 +12:00
David Alexander
08d8865704 Update 03_Documentation.md 
Typos.
 2015-06-18 17:42:55 +12:00
David Alexander
54b0b1fd4e Update 02_Release_Process.md 
Typos. Spelling. 404 errors for framework and cms milestones links to github(line 13).
 2015-06-18 17:26:58 +12:00
Damian Mooyman
83c4ffda52 Merge pull request #4276 from hailwood/patch-2 
Add 0 Based Position tip.
 2015-06-18 11:04:11 +12:00
Damian Mooyman
7597b888c3 Make SQLQuery strict semver for 3.2 2015-06-17 16:54:17 +12:00
Damian Mooyman
0653ba9630 Merge pull request #3979 from dhensby/pulls/test-nest 
Nest and unnest Config and Controller for each test
 2015-06-17 16:04:27 +12:00
Damian Mooyman
0103b076c3 Merge remote-tracking branch 'origin/3' 
Conflicts:
	forms/Form.php
	model/ManyManyList.php
 2015-06-17 15:41:13 +12:00
Ingo Schommer
b95fdc7ba0 Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate 
API Revert DataObject::validate to 3.1 method signature (protected)
 2015-06-17 15:36:03 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
 2015-06-17 11:24:25 +12:00
Damian Mooyman
46479e969f Document E_RECOVERABLE_ERROR 2015-06-16 12:29:29 +12:00
Damian Mooyman
58cc3da8d8 API Revert DataObject::validate to 3.1 method signature (protected) 2015-06-16 11:59:21 +12:00
Damian Mooyman
4d37e21bc6 Cleanup 3.2 changelog for release 2015-06-15 16:19:08 +12:00
David Alexander
57071869f1 Update index.md 
url syntax fix for lesson 2
added lesson 17
 2015-06-15 14:46:07 +12:00
David Alexander
e54b7fe404 Update 03_Documentation.md 
Addressed dhensby's comments :)
 2015-06-14 08:29:50 +12:00
David Alexander
ee4fe7c10c Update 03_Documentation.md 
Minor typos & rewording.

Clearer example needed on line 104.
 2015-06-13 21:34:32 +12:00
Jonathon Menz
838926085c API New and renamed image functions 
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
 2015-06-12 17:02:55 -07:00
David Alexander
52a248534a Update index.md 
Minor typo.
 2015-06-13 11:08:25 +12:00
Damian Mooyman
782c4cbf6f API Enable single-column fulltext filter search as fallback 2015-06-12 15:36:03 +12:00
Matthew Hailwood
1b93db019c Add 0 Based Position tip. 2015-06-12 13:38:09 +12:00
Daniel Hensby
f21427d7fa DOCS Explaining test suite nesting 2015-06-11 16:56:57 +01:00
Myles Beardsmore
67e1cee64a Completed missing comment ending 
Completed missing comment ending
 2015-06-10 16:56:31 +12:00
Loz Calver
c9d410d49e Merge pull request #4262 from SpiritLevel/patch-1 
Update 03_Environment_Management.md
 2015-06-09 09:27:43 +01:00
Will Rossiter
29906f1599 Merge pull request #4199 from mthomsonnz/patch-2 
DOCS: Add links to lessons 10-16 to the tutorials page
 2015-06-09 17:19:41 +12:00
David Alexander
5a323f7fe3 Update 03_Environment_Management.md 2015-06-09 16:53:20 +12:00
Damian Mooyman
a8ace75341 API Support for multiple HTMLEditorConfig per page 2015-06-09 12:17:55 +12:00
Damian Mooyman
786b1dd5d4 Merge remote-tracking branch 'origin/3' 
Conflicts:
	control/HTTPRequest.php
	filesystem/Upload.php
	model/ManyManyList.php
 2015-06-09 11:10:14 +12:00
Damian Mooyman
f21e59585e Merge remote-tracking branch 'origin/3.1' into 3 2015-06-09 11:02:50 +12:00
Sam Minnée
2fa6f27073 Removed Mateusz from core committer list. 
Mateusz has decided to step down from the core committers group.
 2015-06-08 22:28:29 +12:00
Damian Mooyman
a72bd16f42 API Deprecate delete in favour of archive 
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
 2015-06-03 14:24:27 +12:00
Daniel Hensby
d3b7abb0b5 Merge pull request #4242 from jonom/docs-database-defaults 
DOCS: Added default value examples
 2015-06-02 18:01:06 +01:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
 2015-06-02 19:13:38 +12:00
Damian Mooyman
0319f7855b FIX Incorrect env setting in 3.1.13 2015-06-02 12:27:08 +12:00
Ingo Schommer
f3c722d508 Merge pull request #4195 from oddnoc/phpunit-version 
DOC: Correct composer invocation to install phpunit
 2015-06-01 15:00:55 +12:00
Thierry François
533d5dbd4b NEW Admin url can now be customized 
The default 'admin/' base URL can now be changed with Director rules
 2015-05-31 16:54:00 +03:00
Jonathon Menz
12e26407ef DOCS: Added default value examples 2015-05-29 14:27:22 -07:00
Fred Condo
9efc384582 Add defense against SS-2015-013 to nginx example 2015-05-28 17:00:33 -07:00
Loz Calver
8a74dc3e0f Merge pull request #4237 from silverstripe/docs-fix-caption-field-name 
updated field name for caption text field.
 2015-05-28 14:28:36 +01:00
Will Morgan
9324cc916c Merge pull request #4224 from camfindlay/patch-25 
DOCS Fix link to common subclasses of form fields
 2015-05-28 13:41:02 +01:00
Will Morgan
e930bcf7b9 Merge pull request #4225 from camfindlay/patch-26 
DOCS Fix issue with bullets and backticks thinking they are code blocks
 2015-05-28 13:39:36 +01:00
Myles Beardsmore
06730bc1b3 updated field name for caption text field. 2015-05-28 13:34:59 +01:00
Damian Mooyman
50e33b8e5e Merge remote-tracking branch 'origin/3.1.13' into 3.1 2015-05-28 19:08:12 +12:00
Damian Mooyman
04b803dfc6 Added 3.1.13 changelog 2015-05-28 18:59:11 +12:00
Marcus Nyeholt
9c8fa51321 FIX Allow users to specify allowed hosts 
Allow users to explicitly state which Hosts are allowed to be requested via
this application instance to avoid Host: header forgery attacks.
 2015-05-28 15:58:39 +10:00
Michal Kleiner
4843913f31 Update 03_Requirements.md 
Fixed code example for setting write_js_to_body value to false
 2015-05-28 14:28:05 +12:00
Damian Mooyman
75137dbab2 Ensure only trusted proxy servers have control over certain HTTP headers 2015-05-28 10:12:46 +12:00
Damian Mooyman
922d02f535 API Enable filters to perform 'IS NULL' or 'IS NOT NULL' checks 2015-05-26 12:09:17 +12:00
Cam Findlay
15ea4aa54c DOCS Fix issue with bullets and backticks thinking they are code blocks 
Thanks to @stojg for reporting.
 2015-05-23 17:58:51 +12:00
Cam Findlay
058a08f84f DOCS Fix link to common subclasses of form fields 2015-05-23 17:30:09 +12:00
Steve Dixon
63eb6c2a24 Template Syntax doco grammar cleanup 
Some simple edits to improve some grammatical mistakes and consistency.
 2015-05-21 12:56:26 +10:00
Fred Condo
84b78a86bf Remove references to installing PHPUnit 
It is now provided automatically via composer. Also, replace the section
about installing PHPUnit with a slightly expanded section on
conveniently invoking phpunit.
 2015-05-19 09:24:09 -07:00
Matt Thomson
07b9cdc8bb DOCS: Add links to lessons 10-16 to the tutorials page 2015-05-19 15:48:56 +12:00
Matt Thomson
f5a72783a8 Fix 404 errors on all lesson links 2015-05-19 14:05:12 +12:00
Damian Mooyman
cd1eb1b484 Merge remote-tracking branch 'origin/3' 
Conflicts:
	admin/tests/CMSFormTest.php
 2015-05-19 09:19:47 +12:00
Damian Mooyman
c1d500dedc Added 3.1.13-rc1 changelog 2015-05-14 14:34:09 +12:00
Stevie Mayhew
9e8a5c9ba5 FIX: remove validation type constraint from form fields for 3.2 release 2015-05-11 12:32:00 +12:00
Antony Thorpe
7c3ba9d4bf Update 06_Tabbed_Forms.md 
Typo.  Adding a field to a tab, not from.  Thanks.
 2015-05-09 21:47:37 +12:00
Marijn Kampf
18fb548fd2 Fix link 2015-05-05 12:13:08 +01:00
Florian Thoma
045b2c569a fix typo 
customise instead of customize
 2015-05-03 13:35:05 +10:00
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
Antony Thorpe
b90432cb26 Update 03_Authentication.md 
Create a list to improve presentation on the silverstripe.org website.  Hopefully this works.  The API descriptions/links are currently missing.
 2015-04-26 18:16:13 +12:00
Will Morgan
959b326147 Merge pull request #4098 from phillprice/patch-10 
DOCS: formatting fix
 2015-04-25 11:46:47 +01:00
Antony Thorpe
c010cb4cec Update 04_GridField.md docs for typo 
Variable name should be $grid, as defined when creating the GridField just above.  Thanks.
 2015-04-25 18:04:40 +12:00
David Craig
3122226273 Add toggleable description to CMS fields 2015-04-24 11:40:29 +12:00
Phill Price
996ddea4a9 DOCS: formatting fix 
the end # removed from titles as they were showing on the page.
 2015-04-23 17:12:49 +01:00
Antony Thorpe
27d3a27a97 Update 03_Testing_Email.md 
Fix typo and link.  It is assertEmailSent not assertEmailSend and a method of SapphireTest.  Thanks.
 2015-04-21 18:17:56 +12:00
Sean Harvey
78e01c07ac Merge pull request #4064 from chillu/pulls/osx-install-docs 
Improved install docs (Vagrant, Homebrew, MAMP)
 2015-04-20 10:14:16 +12:00
spekulatius
9567d9c3f2 Update 01_Validation.md 
missing semicolon
 2015-04-19 20:21:49 +12:00
Steve D
0d7d6b4bd3 Improve SQL Format information paragraph 
Improve SQL Format information paragraph in the SilverStripe Coding Conventions
 2015-04-15 13:08:39 +10:00
Will Rossiter
da6dbeca5f Merge pull request #4014 from jedateach/patch-5 
DOC broken link in docs to how_tos/extend_cms_interface
 2015-04-15 12:27:56 +12:00
Ingo Schommer
9ab61e9e95 Merge pull request #4069 from camfindlay/patch-24 
DOCS Make a note to ensure people install Git and Composer
 2015-04-14 08:10:46 +12:00
Cam Findlay
0d44ea1af1 DOCS Make a note to ensure people install Git and Composer 
Since Composer uses git and this isn't explicitly documented anywhere at our end I have added a note and link for newcomers to follow and get Git before getting Composer.
 2015-04-13 13:28:13 +12:00
Sean Harvey
2a16b5e2a3 Fixing spelling mistake 2015-04-13 11:35:24 +12:00
Ingo Schommer
602fdd57fd Removed outdated IIS6 instructions 
Not linked from anywhere (other than the menu).
IIS 6.0 is part of Windows 2003, which has been EOLed as far as I can tell:
https://support.microsoft.com/en-us/lifecycle?p1=3198
 2015-04-09 21:52:56 +12:00
Ingo Schommer
711efc4542 More install options (Vagrant and Bitnami) 2015-04-09 21:52:56 +12:00
Ingo Schommer
b633b584f6 Simplified base installation step docs 
Mention composer there rather than just the package download.
 2015-04-09 21:52:56 +12:00
Ingo Schommer
27727df096 Updated MAMP install docs, added Homebrew install docs 
* Removed the `php.ini` configuration bits from both MAMP and Homebrew instructions, both actually come with reasonable defaults now (high `memory_limit`, `error_reporting` on full, `date.timezone` set).
 * Removed chapter about package install, we should favour composer now
 * Compressed the install wizard instructions
 2015-04-09 21:52:53 +12:00
Damian Mooyman
e91606e494 API Introduce $FromEnd variable for iterators 2015-04-09 17:02:30 +12:00
Ingo Schommer
72a284c9b8 Merge remote-tracking branch 'origin/3' 
Conflicts:
	core/Constants.php
	docs/en/05_Contributing/01_Code.md
	tests/model/SQLQueryTest.php
 2015-04-09 16:26:16 +12:00
Elliot Sawyer
83a3c4b166 Update 01_Extensions.md 
Fix a typo
 2015-04-02 15:51:51 +13:00
Turnerj
ae8dbe309b FEATURE - Added maximum upload file size by type 
This support is on both an instance level and a global default level.
 2015-03-31 21:57:32 +10:30
Damian Mooyman
43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
 2015-03-31 19:54:15 +13:00
ehyland
77a51c79ab Updated example code 
Made class extend FunctionalTest.
 2015-03-30 16:59:31 +11:00
jeffreyguo
92a73b83cf DOCS Update 12_Indexes.md 
Fixing grammar mistakes
 2015-03-23 10:15:33 +00:00
Marijn Kampf
91bdb5b530 Missing ; in example 2015-03-23 09:31:51 +00:00
Damian Mooyman
ffcbeb5812 Added 3.1.12 changelog 2015-03-20 19:29:20 +13:00
jeffreyguo
e0627c7148 Update 01_Data_Model_and_ORM.md 2015-03-19 21:19:11 +00:00
Damian Mooyman
0754f2eed2 Merge remote-tracking branch 'origin/3.1.11' into 3.1 2015-03-19 17:55:53 +13:00
Damian Mooyman
b3364150f9 Added 3.1.11 changelog 2015-03-19 17:46:36 +13:00
jeffreyguo
bdba2c2e41 Update 01_SiteConfig.md 
MINOR: wording errors
 2015-03-18 11:25:26 +13:00
Jeremy Shipman
f2b1fa9aed FIX: broken link in docs to how_tos/extend_cms_interface 
I'm not certain this fixes the issue, as I haven't tested it. It at least points it out.
 2015-03-16 09:55:33 +13:00
Loz Calver
203f77116b Fixes, tests and documentation for multiple many_manys between the same class 2015-03-13 09:27:23 +00:00
jeffreyguo
8a82f05014 Update 01_Introduction.md 
MINOR: wording and format correction
 2015-03-12 14:40:18 +13:00
jeffreyguo
09026d92bc Update Dynamic_Default_Fields.md 
MINOR: fixing grammar mistakes.
 2015-03-11 16:27:56 +13:00
jeffreyguo
c6a499a1c1 Update 01_Data_Model_and_ORM.md 
Line#15: removed "is" in "Database Columns are is defined"
Line#404: changed "17 or 74" to "17 or 43" according to line #409
 2015-03-11 14:48:21 +13:00
Damian Mooyman
319b96b48b Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
 2015-03-11 11:40:06 +13:00
Daniel Hensby
791a846fbf Merge pull request #3989 from wernerkrauss/patch-1 
Update 00_Partial_Caching.md
 2015-03-10 11:06:40 +00:00
Daniel Hensby
fcf0e8980a Merge pull request #3919 from unclecheese/patch-8 
MINOR: Remove children from Tutorials landing page. Deprecated.
 2015-03-09 12:02:19 +00:00
wernerkrauss
fbe0592ef9 Update 00_Partial_Caching.md 
Adding $ for variable names and quoted parameters as discussed with @kinglozzer on IRC
 2015-03-09 12:50:05 +01:00
Loz Calver
81c1e36305 Merge pull request #3972 from dhensby/pulls/3690-reapply 
DOCS SS_ERROR_LOG reuqires relative location to BASE_PATH
 2015-03-09 11:36:29 +00:00
Daniel Hensby
ef818b3b7b Merge pull request #3970 from tractorcow/pulls/3.2/api-zero-pagination 
API enable PaginatedList to be disabled by setting page length to 0
 2015-03-09 11:28:36 +00:00
Damian Mooyman
7bf4d2e95e Added 3.1.11-rc1 changelog 2015-03-09 18:55:23 +13:00
Damian Mooyman
872d05fd1b Added 3.1.11-rc1 changelog 2015-03-09 18:28:50 +13:00
Ingo Schommer
45fcdc672a Merge pull request #3983 from dhensby/pulls/gender-neutral-docs 
Making docs gender agnostic
 2015-03-08 22:57:40 +13:00
Fred Condo
bd5f5232fa DOCS: Correct & expand routing docs 
- Correct syntax error in TeamController sample code
- Explain mandatory use case of $url_handlers
- Provide sample code for mandatory use case of $url_handlers
 2015-03-07 13:25:44 -08:00
Daniel Hensby
d2a3da2203 Making docs gender agnostic 2015-03-07 12:32:04 +00:00
Corey Sewell
2742f46b79 Added "Composer managed modules, Git and .gitignore" section to Getting Started/02 Composer 2015-03-06 10:28:07 +13:00
Corey Sewell
f924354e12 Remove incorrect L flag for Basic Auth RewriteRule 
As per the installer [.htaccess](https://github.com/silverstripe/silverstripe-installer/blob/3.1/.htaccess#L37) the RewriteRule to enable Basic Auth when using CGI/FastCGI with Apache does not have the L flag.
 2015-03-06 07:36:43 +13:00
Daniel Hensby
96b1583aae DOCS SS_ERROR_LOG reuqires relative location to BASE_PATH 2015-03-05 12:07:56 +00:00
Damian Mooyman
9367fd2456 API enable PaginatedList to be disabled by setting page length to 0 2015-03-05 12:07:14 +13:00
Daniel Hensby
028a80b153 DOCS Adding GitHub labels 2015-03-03 17:24:02 +00:00
Fred Condo
82ed86f6cd DOCS: correct broken links 
- Correct internal links between documentation pages
- Delete defunct links to documentation removed during documentation reorganization
- Restore testing glossary
- Verify by crawling site locally
 2015-02-27 16:09:15 -08:00
Michael Strong
4c5a07ecec FIX Updated docs 
The docs as they were would break websites and no warning was given regarding the security around doing this.
 2015-02-27 17:00:46 +13:00
Damian Mooyman
773624a40b Merge pull request #3947 from camfindlay/docs/uploadfield 
DOCS Reinstate a missing upload field doc and give a review.
 2015-02-26 17:51:01 +13:00
Cam Findlay
8146943a00 DOCS Reinstate a missing upload field doc and give a review. 2015-02-26 15:17:05 +13:00
Jeremy Shipman
39fac21fb9 Explain the module specific themes separation capability of Silverstripe 
Relates to #3944
 2015-02-26 12:56:33 +13:00
johndalangin
5eb5cc7cca YML Config Not Compatible with Requirements Class 
After hours of trying to debug why `write_js_to_bottom` wasn't working, I realized that the Requirements class variables were set to `protected` and not `private static` which I believe is necessary for the Config YML variables to be passed correctly to the class.

The documentation was edited to reflect the working, albeit traditional non-YML method of setting class variables.

Best regards,

John
 2015-02-24 00:58:31 +08:00
Damian Mooyman
a86ed93759 Merge remote-tracking branch 'origin/3' 
Conflicts:
	docs/en/05_Contributing/01_Code.md
 2015-02-20 14:09:38 +13:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
 2015-02-20 10:17:19 +13:00
unclecheese
2af48738c9 MINOR: Remove children from Tutorials landing page. Deprecated. 2015-02-19 17:20:45 +13:00
Nic
5cda017424 Update index.md to link to how-to's for 3 tutorials/recipies 2015-02-18 20:47:57 -06:00
Ingo Schommer
3b66b75f2f Merge pull request #3889 from unclecheese/tutorial-deprecation 
Several changes that deprecate the old written tutorials in favour of Lessons section
 2015-02-19 14:49:30 +13:00
Damian Mooyman
1e5519cf1a Reformat changelog 2015-02-19 13:16:40 +13:00
Damian Mooyman
f95c181c97 Merge remote-tracking branch 'origin/3.1.10' into 3.1 2015-02-19 12:57:12 +13:00
Damian Mooyman
c302edc4e7 Added 3.1.10 changelog 2015-02-19 12:37:16 +13:00
Daniel Hensby
8a405b50b0 Merge branch 'patch-3' of https://github.com/AntonyThorpe/silverstripe-framework into AntonyThorpe-patch-3 
DOCS Error handling examples of different files closes #3701

Conflicts:
	docs/en/topics/error-handling.md
 2015-02-18 00:10:49 +00:00
Cam Findlay
666075d56c DOCS Mention the mod_dir changes to Windows WAMP users 
WAMP Server likely comes with Apache 2.4 so is very relevant to have this instruction available as a troubleshoot.
 2015-02-18 11:34:03 +13:00
Daniel Hensby
3d9b57ca9e Merge pull request #3905 from muskie9/patch-3 
DOCS Update Common Problems with mod_rewrite issue
 2015-02-17 22:32:39 +00:00
muskie9
4ccb0bc858 Update Common Problems with mod_rewrite issue 2015-02-17 16:28:02 -06:00
Cam Findlay
0fd6b8eaca DOCS Mention the option of Environment files for WAMP users 
Once you get a few sites under your belt most devs would likely turn to using environment files to names DB credentials. This introduces this a bit earlier to get them used to the simple idea of an environment file.

Eventually I'd like to rewrite the installer to generate this over storing in the _config.php.
 2015-02-18 11:13:02 +13:00
Damian Mooyman
fab44dce75 Added 3.1.10-rc2 changelog 2015-02-17 18:05:16 +13:00
Daniel Hensby
e26d518c33 DOCS Removing redundant PHP syntax declaration 2015-02-16 14:00:22 +00:00
Daniel Hensby
3573075de0 DOCS Removing redundant PHP syntax declaration 2015-02-16 13:59:49 +00:00
Daniel Hensby
5d35650cbb DOCS Removing redundant PHP syntax declaration 2015-02-16 13:58:57 +00:00
Damian Mooyman
9a97cbc255 Added 3.1.10-rc1 changelog 2015-02-16 16:39:01 +13:00
Cam Findlay
aa5c9ca246 DOCS Reference to ensure contributors read over the Code of conduct 2015-02-16 10:28:52 +13:00
Sean Harvey
cebc0d08c5 Merge pull request #3894 from tractorcow/pulls/3.1/encoding-fixes 
BUG Lots of encoding fixes
 2015-02-16 09:18:41 +13:00
Damian Mooyman
1db08bac88 BUG Fix FormAction title encoding 
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
 2015-02-13 15:50:45 +13:00
LiamW
36dbd4f8a1 Update 11_Scaffolding.md 
Noticed the call to the tab is wrong.
 2015-02-12 14:16:05 -05:00
Uncle Cheese
c88ddef477 add new lessons 9, 10 
remove tutorials from home page
 2015-02-13 00:48:05 +13:00
Uncle Cheese
9218919437 Several changes to deprecate old tutorials 2015-02-12 17:15:53 +13:00
gavin bruce
e96d40d391 Update 00_Partial_Caching.md 
Spelling mistake fix.
 2015-02-10 14:30:29 +10:00
Christopher Pitt
0a19d882d3 Update index.md 
404 fix
 2015-02-10 09:16:18 +13:00
Nick
a7be8003e0 Fix some broken links for flushable and errors in the caching code examples 2015-02-09 22:55:59 +13:00
Daniel Hensby
6ea8baa017 DOCS Updating contributing version 2015-02-07 14:38:59 +00:00
Daniel Hensby
e906f48d8d DOCS Updating contributing version 2015-02-07 14:36:21 +00:00
Daniel Hensby
74ec7e413f DOCS Updating contributing version 2015-02-07 14:33:12 +00:00
Cam Findlay
9720b4939d DOCS Fixed link on issues and bugs 2015-02-06 20:37:50 +13:00
unclecheese
647f921c08 MINOR: Add lesson 8 2015-02-05 16:25:07 +13:00
Mateusz U
60f4720415 Merge pull request #3852 from camfindlay/patch-19 
DOCS Permanent link to speakup.io added in Code of Conduct
 2015-02-05 09:46:58 +13:00