15288 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	3008e43942	Merge remote-tracking branch 'origin/3.2.2' into 3.2	2016-02-19 12:50:53 +13:00
Damian Mooyman	a4805bd6bb	Merge remote-tracking branch 'origin/3.1.17' into 3.1	2016-02-19 12:48:17 +13:00
Damian Mooyman	af28b0a414	Added 3.2.2-rc1 changelog	2016-02-19 11:22:10 +13:00
Damian Mooyman	3738436d0e	Update translations	2016-02-19 10:54:36 +13:00
Damian Mooyman	f32302522c	Added 3.1.17-rc1 changelog	2016-02-19 10:30:25 +13:00
Damian Mooyman	cfd1a5d696	Update translations	2016-02-19 10:21:03 +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	ace7f2cb2e	Merge pull request #5039 from thezenmonkey/patch-2 ... FIX "where" method in SQLUpdate Example	2016-02-16 09:23:27 +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	9d9eb4d2dc	Merge pull request #5025 from patricknelson/patch-1 ... Update 01_Caching.md	2016-02-11 09:34:08 +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
Damian Mooyman	5515f4252a	Merge pull request #5018 from mandrew/patch-3 ... Updating links	2016-02-09 15:10:57 +13:00
Michael Andrewartha	480eeb5be5	Updating links ... Updated old hosting wiki link to point to new hosting page on silverstripe.org and fixing broken links	2016-02-09 12:16:47 +13:00
Daniel Hensby	39212f8b98	Merge pull request #5010 from GOVTNZ/4991-manymany-extrafields ... BUG edge case on many many extra fields (fixes 4991)	2016-02-04 10:28:02 +00:00
Mark Stephens	3fcf1e2c98	BUG edge case on many many extra fields (fixes 4991) ... Fixes an edge case where extraFields are not returned if one side of a many many is added via extension (although this may not be the only failure case). Fixes a downstream issue with dms breaking the CMS on framework 3.2. The bug is where a many many relationship exists on a class, and a sub-class attempts to get the extra fields of the relationship. The change fixes the test for exact matching of the relationship class to the instance class, to checking if the instance is the class or a subclass of the relationship. The unit tests check the dms failure case, which is a more complex failure case.	2016-02-04 12:47:07 +13:00
Damian Mooyman	63ea28c0f8	Merge pull request #5003 from ZarockNZ/patch-1 ... Correct minor typo	2016-02-03 13:15:45 +13:00
DouG	87a674a460	Correct minor typo ... had the word "fun" rather than "run"	2016-02-01 16:25:17 +13:00
Damian Mooyman	5952e38208	Merge pull request #4981 from JorisDebonnet/patch-1 ... Fix incomplete functionality from #3734	2016-01-26 18:52:44 +13:00
JorisDebonnet	51e9923c6c	Fix incomplete functionality from #3734 ... #3734 introduced the ability to *create* `mailto:` links with a subject in them, without the ability to *edit* them. This fixes that.	2016-01-26 01:31:07 +01:00
Loz Calver	60c97dbf14	Merge pull request #4977 from tractorcow/pulls/3.2/fix-idlist-docs ... FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList	2016-01-25 09:27:16 +00:00
Damian Mooyman	d8555b73c4	Merge pull request #4978 from mediabeastnz/patch-3 ... Removed PlayerCsvBulkLoader as importer	2016-01-25 16:05:13 +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	d8e354d144	FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList()	2016-01-25 11:09: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
Daniel Hensby	cd42d070a0	Merge pull request #4968 from tractorcow/pulls/3.2/fix-versioned-rollback ... BUG Fix Versioned::doRollbackTo	2016-01-22 15:12:33 +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
Ingo Schommer	88f8acff5a	Merge pull request #4966 from tractorcow/pulls/3.2/fix-docs ... BUG Revert lost documentation	2016-01-22 13:08:51 +13:00
Damian Mooyman	cca7129385	BUG Revert lost documentation ... Resolves some regressions from #3735	2016-01-22 11:45:00 +13:00
Damian Mooyman	7a2a969814	Merge pull request #4944 from Meeeeeeow/patch-1 ... Docs: Fixed Typo	2016-01-22 08:39:05 +13:00
Damian Mooyman	45c6d0284a	Minor: Update branch names	2016-01-21 14:02:42 +13:00
Meeeeeeow	e448774150	Fixed Typo ... Changed 'Gudes' to 'Guides'	2016-01-19 16:18:35 +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	4de81a7bc8	Merge pull request #4935 from SpiritLevel/3.1-docs ... DOCS 3.1 : typos and broken internal links	2016-01-18 15:23:15 +13:00
David Alexander	45d2b57a65	DOCS 3.1 : typose and broken internal links	2016-01-15 16:39:23 +13:00
Damian Mooyman	bd0716d1ee	Merge pull request #4930 from SpiritLevel/3.1-docs ... DOCS 3.1 - fixes broken internal links	2016-01-15 10:02:43 +13:00
David Alexander	5c99e33eb2	DOCS 3.1 - fixes broken internal links	2016-01-14 23:59:53 +13:00
Damian Mooyman	6e29d35c27	Merge pull request #4922 from flamerohr/vagrant-tutorial ... DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox	2016-01-13 13:09:48 +13:00
Christopher Joe	007e0eeb2f	DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox	2016-01-13 12:12:21 +13:00
Damian Mooyman	aac59a85ff	Merge pull request #4908 from kinglozzer/cms-1307-filelink-field ... FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307)	2016-01-12 11:01:49 +13:00
Damian Mooyman	1d13660530	Merge pull request #4907 from d-rivera-c/pulls/group-roles-admin-check ... Display all roles when an admin, filter by OnlyAdminCanApply when not	2016-01-12 10:50:07 +13:00
Loz Calver	85ba918a54	FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307)	2016-01-11 16:37:27 +00:00
Daniel Hensby	65a6f3d148	Merge pull request #4894 from spekulatius/patch-1 ... DOCS moving to spaces for some examples	2016-01-11 15:54:38 +00:00
Denise Rivera	7e32268ede	display filtered roles when not an admin	2016-01-11 13:05:10 +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	21e1e938eb	Merge pull request #4893 from dhensby/pulls/member-regenerate-session-id ... FIX session_regenerate_id uses config system	2016-01-06 15:16:31 +13:00