470 Commits

Author	SHA1	Message	Date
Damian Mooyman	ca6be9eddb	Document iconv a bit better ... Fixes https://github.com/silverstripe/silverstripe-cms/issues/1002	2016-09-05 17:55:32 +12:00
Damian Mooyman	7105099497	API Change behaviour of filter API to support injected search filter classes ... API Remove DataList::applyFilterContext(), superseded by DataList::createSearchFilter() API SearchFilter::getSupportedModifiers() added to support supported modifier inspection	2016-09-05 17:28:36 +12:00
Rob Ingram	a0d3ad1875	Change order of fixtures in example ... * Make the document explicit about the definition of objects before they are referenced.	2016-08-24 07:37:55 +12:00
Daniel Hensby	1d1227cc9a	Merge branch '3'	2016-08-23 10:37:47 +01:00
Daniel Hensby	058f57979b	Merge branch '3.4' into 3	2016-08-22 16:23:22 +01:00
Daniel Hensby	060bf6b327	Merge branch '3.3' into 3.4	2016-08-22 16:22:37 +01:00
Daniel Hensby	088d88e978	Merge branch '3.2' into 3.3	2016-08-22 16:22:02 +01:00
Daniel Hensby	f4a6e9e517	Merge branch '3.1' into 3.2	2016-08-22 15:30:03 +01:00
Daniel Hensby	8e4e2b4fa8	Merge pull request #4173 from AntonyThorpe/patch-4 ... DOCS Update 06_Tabbed_Forms.md	2016-08-19 15:49:51 +01:00
Damian Mooyman	59efd280ad	Fix issues with CMS permission codes ... Standardise template locations Move CMSSettingsController class to SiteConfig module Fix CMSMenu behaviour for namespaced admin sections Split classes into one per file Manual fixes and cleanup	2016-08-17 11:19:14 +12:00
Christopher Joe	42d36da3fb	Switch redux-logger to redux devtools for easier debugging	2016-08-12 16:11:33 +12:00
Damian Mooyman	7de5b998e1	Merge 3.4 into 3	2016-08-05 19:12:25 +12:00
Damian Mooyman	ca754eb887	Merge 3.3 into 3.4 ... # Conflicts: # admin/javascript/lang/fa_IR.js # admin/javascript/lang/it.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/it.js # lang/cs.yml # lang/eo.yml # lang/fa_IR.yml # lang/fi.yml # lang/it.yml # lang/sk.yml	2016-08-05 16:48:26 +12:00
Damian Mooyman	0d5ae23f2b	Merge 3.2 into 3.3	2016-08-05 14:36:35 +12:00
Damian Mooyman	cb39f2ef27	Merge 3.1 into 3.2 ... # Conflicts: # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # javascript/lang/fa_IR.js # javascript/lang/src/fa_IR.js	2016-08-05 11:41:04 +12:00
Paul Clarke	b9445511b7	Bootstrap GridField	2016-08-03 18:35:18 +12:00
Daniel Hensby	d083c9622a	Merge pull request #4394 from simonwinter/patch-1 ... Update 05_Typography.md	2016-08-02 21:27:56 +01:00
Daniel Hensby	ac17e12464	Merge pull request #3274 from colymba/custom-admin-url	2016-07-19 14:42:25 +01:00
Loz Calver	0a7e4cf7c3	Merge branch '3'	2016-07-15 16:01:48 +01:00
Daniel Hensby	b7fc0a2752	Merge pull request #5790 from patricknelson/issue-5784-email-reply-to ... FIX for #5784: Email API improvements, documentation cleanup.	2016-07-15 00:23:25 +01:00
Patrick Nelson	74c555e004	FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards.	2016-07-14 10:25:40 -07:00
Daniel Hensby	d19955afc8	Merge branch '3'	2016-07-14 14:05:18 +01:00
Daniel Hensby	4c40cf8dbb	Merge branch '3.4' into 3	2016-07-14 12:01:19 +01:00
Daniel Hensby	d766c8559b	Merge branch '3.3' into 3.4	2016-07-14 11:57:15 +01:00
Damian Mooyman	6e68f38efb	API Update react sections to use react-router instead of page.js (#5796) ... Fixes #5711	2016-07-14 17:51:01 +12:00
Damian Mooyman	b7ac5c564d	API / BUG Fix DBField summary methods ... Cleanup DBField subclasses Fixes #2929 Fixes #1381 Fixes #5547 Fixes #1751	2016-07-13 17:15:45 +12:00
Damian Mooyman	5c9044a007	API Enforce default_cast for all field usages ... API Introduce HTMLFragment as casting helper for HTMLText with shortcodes disabled API Introduce DBField::CDATA for XML file value encoding API RSSFeed now casts from the underlying model rather than by override API Introduce CustomMethods::getExtraMethodConfig() to allow metadata to be queried BUG Remove _call hack from VirtualPage API Remove FormField::$dontEscape API Introduce HTMLReadonlyField for non-editable readonly HTML API FormField::Field() now returns string in many cases rather than DBField instance. API Remove redundant *_val methods from ViewableData API ViewableData::obj() no longer has a $forceReturnObject parameter as it always returns an object BUG Fix issue with ViewableData caching incorrect field values after being modified. API Remove deprecated DB class methods API Enforce plain text left/right formfield titles	2016-07-13 17:15:45 +12:00
Damian Mooyman	ce11c47d00	Merge pull request #5700 from Ironcheese/patch-1 ... Moving a field between tabs, wrong variable name	2016-07-12 13:58:54 +12:00
Daniel Hensby	5776a03141	Merge branch '3'	2016-07-11 23:45:41 +01:00
Daniel Hensby	3906228fc1	Merge branch '3.4' into 3	2016-07-11 21:14:21 +01:00
Daniel Hensby	f44c47eea1	Merge branch '3.3' into 3.4	2016-07-11 21:11:05 +01:00
Florian Thoma	9fc51dc527	add async and defer attributes to js requirements, replaces #4555	2016-07-08 14:31:39 +10:00
Robbie Averill	04a4d7937e	DOCS Update 02_Relations (#5785) ... * Code formatting on some variable names * Add example for removing scaffolded parent relation fields	2016-07-07 22:32:43 +01:00
Damian Mooyman	4dadc276b5	Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt ... NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color	2016-07-04 17:35:47 +12:00
Ironcheese	9b1a4b328c	Moving a field between tabs, wrong variable name	2016-06-15 15:36:43 +02:00
Hamish Friedlander	51d53f4b50	Merge pull request #5646 from open-sausages/pulls/4.0/config-table-name ... API Allow table_name to be declared / introduce DataObjectSchema	2016-06-14 15:06:38 +12:00
Daniel Hensby	9e3f76832b	Merge branch '3'	2016-06-13 13:41:20 +01:00
Daniel Hensby	4e392a4d43	Merge branch '3.3' into 3.4	2016-06-13 12:30:16 +01:00
Ingo Schommer	c96e031367	Moved coding conventions docs into contributing folder ... Also created a contributing/coding_conventions landing page separately from the PHP ones, since we now need to account for JS and CSS conventions as well	2016-06-13 08:30:44 +12:00
Damian Mooyman	5e8ae41d47	API Refactor dataobject schema management into separate service ... API Allow table_name to be configured via Config	2016-06-08 13:22:56 +12:00
Sam Minnee	b249cc389a	DOC: Add docs for template namespacing.	2016-06-07 14:36:00 +12:00
Nick	dae2295e16	NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color	2016-06-05 00:05:37 +01:00
Paul	f4037fe319	Swap out .Actions class for bootstrap .btn-toolbar (#5581) ... * Swap out .Actions class for bootstrap .btn-toolbar * Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required	2016-05-27 13:39:10 +12:00
Ingo Schommer	5cace7c693	Fixed javascript/ docs references (#5599) ... * More pointers to new build tooling docs in upgrading guide * Fixed docs references to moved files We don't want to mandate every module to switch from javascript/ to client/src, but at the same time shouldn't reference non-existant files and confuse newcomers that way. * More pointers to new React docs	2016-05-27 13:08:22 +12:00
Michael Strong	db4dc64fb4	DOCS incorrect method referenced ... ModelAdmin uses 'getDefaultSearchContext': http://api.silverstripe.org/3.3/source-class-ModelAdmin.html#173	2016-05-24 13:25:02 +12:00
Daniel Hensby	cdb0b07345	Merge branch '3'	2016-05-20 14:20:33 +01:00
Daniel Hensby	016d39c81e	Merge branch '3.3' into 3.4	2016-05-20 12:34:10 +01:00
Damian Mooyman	5df9cb05f3	Merge pull request #5551 from AntonyThorpe/patch-1 ... Updated 01_Data_Model_and_ORM.md for byID	2016-05-19 14:08:45 +12:00
Michael James	3870c499d6	DOCS Adding comma to array declaration (#5558)	2016-05-18 15:07:45 +01:00
Antony Thorpe	f12258427a	Updated 01_Data_Model_and_ORM.md for byID ... According to the framework's API documentation 'byID' is a method of DataList not 'byId'. Both are used in the documentation.	2016-05-18 08:30:29 +12:00
Daniel Hensby	0594542e7f	Merge branch '3'	2016-05-12 16:42:48 +01:00
Damian Mooyman	7041c5945c	API Enable requirements to persist between flushes	2016-05-12 12:46:30 +12:00
Wing Ho	1e408a13b5	Update typo in environment types documentation	2016-05-10 14:52:49 +10:00
Ingo Schommer	9011aaefa7	Merge pull request #5455 from open-sausages/pulls/4.0/OSS-1691-update-docs ... Update front-end build tooling docs	2016-05-05 20:25:57 +12:00
David Craig	7ceae58e8a	Mark legacy JavaScript docs as deprecated	2016-05-05 11:29:13 +12:00
Damian Mooyman	8ce3d90e18	API Injector dependencies no longer inherit from parent classes automatically ... API Allow classes to inherit service definitions explicitly	2016-05-03 18:39:31 +12:00
Ingo Schommer	2f9e03ec22	Mention ReactJS vs. entwine in docs ... https://silverstripe.atlassian.net/browse/OSS-1691	2016-05-03 08:52:18 +12:00
Damian Mooyman	d52db0ba34	Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.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/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php	2016-04-29 17:50:55 +12:00
NightJar	89351e6c31	Fix the most egregious error for an NZ based proj. (#5416) ... The Bay of Plenty Rugby team is the Steamers, and play in the NPC (National Provincial Championship), hailing from the Te Ika a Maui (North Island). The Canterbury Crusaders (note the alliteration) hail from Te Waipounamu (South Island), and are an entry in the Super Rugby championship, which is an international affair (also known as the Super12, Super15 & most recently Super18), in which the Bay of Plenty is (most unfortunately, depending on your disposition) drafted under the Waikato region's entry with The Chiefs. Being the most popular sport and widely announced news topic in the country means that even people that don't particuarly follow rugby know this, and simple trolls (whether intentional or not) cannot be allowed to slide past quality control; for those that do can get quite upset about this kind of thing. Plus international folk can't be getting the wrong idea; Everyone knows the internet is no place for misinformation!	2016-04-29 12:07:25 +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	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
Damian Mooyman	8b239a5011	Docs and tests for exempt validation actions	2016-04-22 14:52:38 +12:00
Michael Strong	1f820b0b1c	DOCS allowed_actions access control (#5333)	2016-04-18 17:49:30 +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
Damian Mooyman	3c2b53157e	API Update Versioned methods	2016-04-04 14:50:16 +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
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
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
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
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	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	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	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
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
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	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
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
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
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
DouG	87a674a460	Correct minor typo ... had the word "fun" rather than "run"	2016-02-01 16:25:17 +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
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	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
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	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	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
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
Damian Mooyman	3c55608075	Merge pull request #4892 from camfindlay/patch-37 ... DOCS FIX typo for i18n	2016-01-06 15:18:51 +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
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
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
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
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
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
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
Hamish Friedlander	b61d6dcd57	[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs	2015-11-13 15:20:09 +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
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
David Alexander	e88032a7aa	DOCS : spelling	2015-10-23 13:49:03 +13: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	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
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