13280 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Loz Calver	369c561aa2	Merge pull request #3666 from Copperis/versioned-0-version-write-fix ... Versioned now creates a new version if the version is 0	2014-12-03 09:43:53 +00:00
Damian Mooyman	1f4f5e68ba	BUG Fix versioned ... Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields - Fix disjoint of ID / RecordID (which should be the same) - Fix calculation of new record version - Fix use of empty vs !isset to check for existing version Conflicts: model/Versioned.php tests/model/VersionedTest.php Cherry picked from commit c140459ac6	2014-12-02 22:30:59 +02:00
Damian Mooyman	3b3478136d	Merge pull request #3677 from jonom/3093-flush-bugs ... FIX: Manifest flushing	2014-11-27 11:24:40 +13:00
Daniel Hensby	ca7030d70d	Merge pull request #3683 from bendubuisson/patch-2 ... Update 5-dataobject-relationship-management.md	2014-11-26 20:42:17 +00:00
Daniel Hensby	979389ca72	Merge pull request #3687 from bendubuisson/patch-4 ... Update access-control.md	2014-11-26 20:36:12 +00:00
Ben Dubuisson	e30a354076	Update access-control.md ... small typo	2014-11-27 09:25:43 +13:00
Daniel Hensby	9e7373a365	Merge pull request #3686 from AntonyThorpe/patch-2 ... Update docs/en/reference/index.md	2014-11-26 20:04:14 +00:00
Antony Thorpe	9a7686c8b9	Update docs/en/reference/index.md ... GridField line included twice	2014-11-27 08:06:00 +13:00
Daniel Hensby	a8ae5cc55b	Merge pull request #3684 from bendubuisson/patch-3 ... Update member.md	2014-11-26 15:30:40 +00:00
Ben Dubuisson	514098c01a	Update member.md ... small typo	2014-11-26 16:32:57 +13:00
Ben Dubuisson	efd978074c	Update 5-dataobject-relationship-management.md ... Some more typos, sorry didn't pick them all up at the same time!	2014-11-26 14:37:33 +13:00
Jonathon Menz	01989aac4e	FIX: Manifest flushing ... Fixes silverstripe/silverstripe-framework#2325 Fixes silverstripe/silverstripe-framework#3093 Static manifest was not being flushed during a dev/build on some environments (without ?flush in URL) and template manifest was never being flushed during a dev/build.	2014-11-26 10:15:09 +10:30
Ingo Schommer	a61fb89e4f	Merge pull request #3682 from bendubuisson/patch-1 ... Update 5-dataobject-relationship-management.md	2014-11-26 11:53:28 +13:00
Ben Dubuisson	a622fce073	Update 5-dataobject-relationship-management.md ... typos	2014-11-26 11:43:49 +13:00
Ingo Schommer	4d4c651b50	Merge pull request #3673 from g4b0/patch-6 ... Update datamodel.md	2014-11-24 22:52:53 +13:00
Gabriele Brosulo	90a7761394	Update datamodel.md ... Syntax error	2014-11-24 10:50:38 +01:00
Sean Harvey	f270dbcad6	Merge pull request #3665 from tractorcow/pulls/3.1/disable-auth ... API Allow CMS re-authentication to be completely disabled if necessary	2014-11-24 09:21:31 +13:00
Daniel Hensby	2055194903	Merge pull request #3668 from phillprice/patch-7 ... Update DropdownField.php	2014-11-22 21:55:30 +00:00
Phill Price	ff67b5ba84	Update DropdownField.php ... Update to DropdownField::create, and in one instance set the Empty Title on the instantiation, rather than afterwards.	2014-11-22 21:01:08 +00:00
Damian Mooyman	31b5a9dc86	API Allow CMS re-authentication to be completely disabled if necessary	2014-11-21 17:43:53 +13:00
Daniel Hensby	f636d15332	Merge pull request #3659 from phillprice/patch-6 ... Update csv-import.md	2014-11-20 09:00:41 +00:00
Phill Price	ff65f5e00f	Update csv-import.md ... Translated the German to English to match up other areas in document	2014-11-19 21:29:54 +00:00
Loz Calver	d91150cc72	Merge pull request #3645 from jonom/insert-from-styles ... MINOR: Fix broken 'Insert From CMS' layout	2014-11-19 09:18:50 +00:00
Damian Mooyman	fe0d330c59	Merge pull request #3656 from halkyon/nginx_buffers ... Adding appropriate nginx fastcgi buffer config required for admin	2014-11-19 15:50:55 +13:00
Jonathon Menz	e4db619f8d	MINOR: Fix broken 'Insert From CMS' layout ... Some updates to UploadField styles broke the layout of this form a bit	2014-11-19 10:52:08 +10:30
Josh Kosmala	2e416b60f3	Update javascript.md fixes #3652 ... I needed to know how to do this to do some jQuery manipulation in the CMS.	2014-11-18 21:56:51 +00:00
Daniel Hensby	e5bed94d07	Merge pull request #3626 from 3Dgoo/feature/site-reports-doc-fix ... Updating Site Reports documentation	2014-11-18 20:59:57 +00:00
Sean Harvey	8d2727eab6	Adding appropriate nginx fastcgi buffer config required for admin	2014-11-19 09:56:40 +13:00
Damian Mooyman	dceaeedc43	Merge pull request #3643 from chillu/pulls/htaccess-doc ... Improve .htaccess commenting	2014-11-19 08:51:10 +13:00
Damian Mooyman	72484cd0bf	Update index.md	2014-11-18 18:41:23 +13:00
Damian Mooyman	c279ff7f0c	Merge remote-tracking branch 'origin/3.1.8' into 3.1	2014-11-18 18:40:15 +13:00
Damian Mooyman	8b3695bd41	Added 3.1.8 changelog	2014-11-18 18:30:19 +13:00
Damian Mooyman	d84926492c	BUG Security::findAnAdministrator doesn't always find an admin	2014-11-18 16:55:11 +13:00
Sean Harvey	27e2a68ef2	Merge pull request #3653 from tractorcow/pulls/3.1/install-admin ... BUG Security::findAnAdministrator doesn't always find an admin	2014-11-18 16:24:40 +13:00
Damian Mooyman	2bdfd65e9b	BUG Security::findAnAdministrator doesn't always find an admin	2014-11-18 15:36:34 +13:00
Ingo Schommer	5babab81ee	Improve .htaccess commenting ... Done alongside improvements of the execution-pipeline.md docs. Installer comment taken from d5723f7.	2014-11-15 14:41:50 +13:00
Damian Mooyman	7b89c17349	Merge remote-tracking branch 'origin/3.1.7' into 3.1	2014-11-14 16:30:14 +13:00
Damian Mooyman	4ece737220	Update changelogs	2014-11-14 15:38:19 +13:00
Daniel Hensby	f035e2b9d4	Merge pull request #3637 from Copperis/method-comment-fix ... filterAny method comments fixed to reflect actual operation	2014-11-13 22:40:19 +00:00
Damian Mooyman	8aee968ab1	Merge pull request #3634 from jedateach/pr/gridfield-footer-simple ... NEW: Make the record count in GridFieldFooter optional	2014-11-14 10:36:25 +13:00
Damian Mooyman	7f2161d7a0	Merge pull request #3599 from kinglozzer/numericfield-whitespace ... Fix whitespace issues in NumericField/NumericFieldTest	2014-11-14 10:31:21 +13:00
Jeremy Shipman	d7eb2757fe	NEW: Make the record count in GridFieldFooter optional	2014-11-14 09:56:39 +13:00
Tadas Giniotis	2f59a6c59b	filterAny method comments fixed to reflect actual operation	2014-11-13 22:12:58 +02:00
Sam Minnée	b15b93630c	Merge pull request #3609 from pedro2555/1494-DBField-exists-returns-value ... Explicit cast return of DBField->exists()	2014-11-12 13:41:49 +13:00
Sam Minnée	71c354d768	Merge pull request #3623 from kinglozzer/pulls/dataobject-db-inheritance ... FIX: DataObject::db() doesn't respect overloaded db types (fixes #3620)	2014-11-12 13:41:03 +13:00
Sam Minnée	421152f722	Merge pull request #3627 from nhorstmeier/patch-1 ... Should use <% with %> rather than <% loop %>	2014-11-12 13:38:10 +13:00
muskie9	a526c45d64	Should use <% with %> rather than <% loop %>	2014-11-11 08:44:37 -06:00
Damian Mooyman	4b2cd5f480	Merge pull request #3622 from g4b0/3610-inheritance-breaks-filtering-if-relations-are-included-bugfix ... Bugfix: fixed inheritance breaks filtering if relations are included	2014-11-11 23:57:21 +13:00
Loz Calver	85b4ba15fc	FIX: DataObject::db() doesn't respect overloaded db types (fixes #3620)	2014-11-11 10:41:54 +00:00
Daniel Hensby	ca9c192c65	Merge pull request #3625 from AntonyThorpe/patch-1 ... Update forms.md	2014-11-11 09:12:35 +00:00