tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
19,327 Commits 31 Branches 527 Tags 162 MiB
d2a6b979d2
Commit Graph

158 Commits

Author SHA1 Message Date
David Alexander
85967b8c16 Update 07_Code_of_conduct.md 
Missed word...:)
 2015-06-26 21:39:54 +12:00
Will Morgan
b6b8ab8c35 Merge pull request #4314 from SpiritLevel/patch-2 
Update 07_Code_of_conduct.md
 2015-06-26 09:14:55 +01:00
David Alexander
fda2ad6600 DOCS: Corrected version of master in line 22. 2015-06-24 21:07:32 +12:00
David Alexander
71c2729aeb DOCS: typos, rewording, updated links. 2015-06-23 14:30:41 +12:00
Cam Findlay
449ee6296c DOCS Remove duplicate core committers doc after forward port of branches for 3.2 beta1 release 2015-06-22 11:35:58 +12:00
David Alexander
c4583d4fb9 Update 01_Code.md 
Updated link.
 2015-06-21 12:23:40 +12:00
David Alexander
305801d015 Update 07_Code_of_conduct.md 
Typos, grammar, rewording.
 2015-06-20 16:52:46 +12:00
Damian Mooyman
1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
 2015-06-19 10:48:07 +12:00
David Alexander
f6d60ca946 Update 02_Release_Process.md 
Updated: deprecated API's removed only in MAJOR releases.
 2015-06-19 07:51:16 +12:00
Daniel Hensby
4dec821f63 Merge pull request #4297 from SpiritLevel/patch-2 
DOCS Update 03_Documentation.md
 2015-06-18 12:00:49 +01:00
David Alexander
a4ec9b5d4f Update 00_Issues_and_Bugs.md 
Corrected Documentation mailing list link.
 2015-06-18 20:04:07 +12:00
David Alexander
dfc1c8df34 Update 05_Translation_Process.md 
Typos.
 2015-06-18 17:50:29 +12:00
David Alexander
08d8865704 Update 03_Documentation.md 
Typos.
 2015-06-18 17:42:55 +12:00
David Alexander
54b0b1fd4e Update 02_Release_Process.md 
Typos. Spelling. 404 errors for framework and cms milestones links to github(line 13).
 2015-06-18 17:26:58 +12:00
Damian Mooyman
0103b076c3 Merge remote-tracking branch 'origin/3' 
Conflicts:
	forms/Form.php
	model/ManyManyList.php
 2015-06-17 15:41:13 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
 2015-06-17 11:24:25 +12:00
David Alexander
e54b7fe404 Update 03_Documentation.md 
Addressed dhensby's comments :)
 2015-06-14 08:29:50 +12:00
David Alexander
ee4fe7c10c Update 03_Documentation.md 
Minor typos & rewording.

Clearer example needed on line 104.
 2015-06-13 21:34:32 +12: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
Sam Minnée
2fa6f27073 Removed Mateusz from core committer list. 
Mateusz has decided to step down from the core committers group.
 2015-06-08 22:28:29 +12:00
Ingo Schommer
72a284c9b8 Merge remote-tracking branch 'origin/3' 
Conflicts:
	core/Constants.php
	docs/en/05_Contributing/01_Code.md
	tests/model/SQLQueryTest.php
 2015-04-09 16:26:16 +12:00
Damian Mooyman
319b96b48b Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
 2015-03-11 11:40:06 +13:00
Daniel Hensby
d2a3da2203 Making docs gender agnostic 2015-03-07 12:32:04 +00:00
Daniel Hensby
028a80b153 DOCS Adding GitHub labels 2015-03-03 17:24:02 +00: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
Damian Mooyman
a86ed93759 Merge remote-tracking branch 'origin/3' 
Conflicts:
	docs/en/05_Contributing/01_Code.md
 2015-02-20 14:09:38 +13:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
 2015-02-20 10:17:19 +13:00
Cam Findlay
aa5c9ca246 DOCS Reference to ensure contributors read over the Code of conduct 2015-02-16 10:28:52 +13:00
Daniel Hensby
6ea8baa017 DOCS Updating contributing version 2015-02-07 14:38:59 +00:00
Daniel Hensby
e906f48d8d DOCS Updating contributing version 2015-02-07 14:36:21 +00:00
Daniel Hensby
74ec7e413f DOCS Updating contributing version 2015-02-07 14:33:12 +00:00
Cam Findlay
9720b4939d DOCS Fixed link on issues and bugs 2015-02-06 20:37:50 +13:00
Mateusz U
60f4720415 Merge pull request #3852 from camfindlay/patch-19 
DOCS Permanent link to speakup.io added in Code of Conduct
 2015-02-05 09:46:58 +13:00
Cam Findlay
09da54a4bd DOCS Permanent link to speakup.io added in Code of Conduct 
As this is hosted on github pages and the custom domain setup was depricated (We may reinstate the original link later).
 2015-02-05 09:43:42 +13:00
Sean Harvey
a4be52613a Small fixes to code of conduct document. 2015-02-05 09:43:15 +13:00
Cam Findlay
972e20b0de DOCS Code of conduct added 2015-02-05 09:24:10 +13:00
Damian Mooyman
58cb0af753 Merge remote-tracking branch 'origin/3' 
Conflicts:
	composer.json
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.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/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
 2015-01-16 10:08:40 +13:00
Damian Mooyman
88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3 
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.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/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
 2015-01-15 18:52:46 +13:00
Cam Findlay
bfd05d7343 DOCS Core committers should have 2 t's 2015-01-05 10:57:15 +13:00
Ingo Schommer
e48e4cac06 Semver documented in release process 
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
 2014-12-17 15:50:06 +13:00
Cam Findlay
10ce9b9db4 Typo fixes for committers 2014-12-17 15:50:06 +13:00
Cam Findlay
fc110e34fb Added documentation writing style guide points 2014-12-17 15:50:05 +13:00
Will Rossiter
f633236e78 Review and tidy up contributing documentation. 2014-12-17 15:48:57 +13:00
Will Rossiter
084286af4c Add introduction files to each of the sections 2014-12-17 15:48:54 +13:00
Will Rossiter
6c5ddaf054 Restructure of the docs markdown source files into more logical taxonomy 2014-12-17 15:48:35 +13:00
Ingo Schommer
7e44cc7c3a Semver documented in release process 
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
 2014-12-16 11:01:17 +13:00
Cam Findlay
ba27104903 Typo fixes for committers 2014-12-16 11:01:17 +13:00
Cam Findlay
ae8d857a2c Added documentation writing style guide points 2014-12-16 11:01:16 +13:00
Will Rossiter
4a846c288c Review and tidy up contributing documentation. 2014-12-16 11:01:13 +13:00
Will Rossiter
a506dfd42a Add introduction files to each of the sections 2014-12-16 11:01:13 +13:00
Will Rossiter
8e8c5d716d Restructure of the docs markdown source files into more logical taxonomy 2014-12-16 11:01:12 +13:00
Ingo Schommer
f2237aff8d Semver documented in release process 
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
 2014-12-15 17:56:32 +13:00
Cam Findlay
f387ffebe6 Typo fixes for committers 2014-12-15 09:12:49 +13:00
Cam Findlay
36f62b6d4f Added documentation writing style guide points 2014-12-15 09:12:48 +13:00
Will Rossiter
80d4127f43 Review and tidy up contributing documentation. 2014-12-15 09:12:45 +13:00
Will Rossiter
d52b475cfb Add introduction files to each of the sections 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