39 Commits

Author	SHA1	Message	Date
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	745faebd81	Merge 3.2 into 3.3 ... Conflicts: .travis.yml	2016-04-26 00:17:09 +01:00
Damian Mooyman	b8e7f9a934	Standardise spelling of "customise" ... Fixes #3988	2016-03-30 13:17:28 +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	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
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
David Alexander	febbd35b51	DOCS 3.1 : fixing api: links ... missed one	2016-02-17 03:00:22 -07:00
Richard Rudy	87718597e8	FIX "where" method in SQLUpdate Example ... Method should be addWhere	2016-02-15 02:27:04 -05: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	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	5c99e33eb2	DOCS 3.1 - fixes broken internal links	2016-01-14 23:59:53 +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	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
Michael Parkhill	e44f22c6b2	Fix broken link to DataObject api	2015-10-28 11:52:35 +13:00
Damian Mooyman	f21e59585e	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-09 11:02:50 +12:00
Jonathon Menz	12e26407ef	DOCS: Added default value examples	2015-05-29 14:27:22 -07:00
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
jeffreyguo	92a73b83cf	DOCS Update 12_Indexes.md ... Fixing grammar mistakes	2015-03-23 10:15:33 +00:00
jeffreyguo	e0627c7148	Update 01_Data_Model_and_ORM.md	2015-03-19 21:19:11 +00: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	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
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
LiamW	36dbd4f8a1	Update 11_Scaffolding.md ... Noticed the call to the tab is wrong.	2015-02-12 14:16:05 -05:00
BeQ	92c6aa93fd	Update 10_Versioning.md	2015-01-24 18:24:02 -05:00
Nic	43d0ae6263	Update 11_Scaffolding.md to use dataFieldByName	2015-01-23 10:04:19 -06:00
Cam Findlay	3239cfd495	DOCS - fix reported broken links by zippy in IRC	2015-01-14 08:59:55 +13:00
OliBridgman	95be3593ea	Update 01_Data_Model_and_ORM.md ... Couple of grammatical errors.	2015-01-04 23:32:19 +13:00
Uncle Cheese	c1c0ad3dac	developer guides / models	2014-12-15 09:12:47 +13:00
Will Rossiter	699b999f1e	Model guide documentation	2014-12-15 09:12:47 +13:00
Will Rossiter	86812c0937	Rewrite, tidy and format of Forms documentation	2014-12-15 09:12:47 +13:00
Will Rossiter	549531798f	Review and rewrites for Testing Developer Guide	2014-12-15 09:12:46 +13:00
Will Rossiter	d52b475cfb	Add introduction files to each of the sections	2014-12-15 09:12:45 +13:00
Will Rossiter	85f3beee2c	Update documentation introduction	2014-12-15 09:12:45 +13:00
Will Rossiter	e9d88dd8ee	Restructure of the docs markdown source files into more logical taxonomy. ... Rebased on 3.1	2014-12-15 09:12:44 +13:00