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
|
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
|
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 |
|
Jonathon Menz
|
12e26407ef
|
DOCS: Added default value examples
|
2015-05-29 14:27:22 -07:00 |
|
Damian Mooyman
|
922d02f535
|
API Enable filters to perform 'IS NULL' or 'IS NOT NULL' checks
|
2015-05-26 12:09:17 +12: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 |
|