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
11,214 Commits 31 Branches 527 Tags 162 MiB
ef3d974821
Commit Graph

188 Commits

Author SHA1 Message Date
Ingo Schommer
ef3d974821 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
 2013-04-02 02:05:58 +02:00
Ingo Schommer
c08ab18c03 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
	admin/javascript/LeftAndMain.AddForm.js
	docs/en/reference/requirements.md
 2013-04-02 02:00:50 +02:00
Ingo Schommer
f5754c11aa Contribution guidelines, new bugtracker links 2013-04-02 01:51:40 +02:00
Ingo Schommer
538bf01860 Merge remote-tracking branch 'origin/3.1' 2013-03-27 12:12:16 +01:00
Ingo Schommer
ccb0155b8f Config docs improvement: @config and LSB mentions 
Also moved some less important "notes" further down the page.
The doc is still written too much like a technical spec, we need
something that's more accessible to beginners.
 2013-03-27 12:08:12 +01:00
Ingo Schommer
315c03872a Fixed _config.php references and usage in docs 2013-03-27 12:06:57 +01:00
Ingo Schommer
b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	api/RSSFeed.php
	dev/SapphireTest.php
	tests/control/RequestHandlingTest.php
 2013-03-26 10:46:41 +01:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Ingo Schommer
00fb8cf679 Formatting and docs changes to configuration.md 2013-03-24 17:20:36 +01:00
Ingo Schommer
81a51331d6 IX Load _config.php's after static config manifest 
This allows more sophisticated handling of config alterations
in _config.php. One example is additions to DataObject::$db
based on configuration which requires some processing.

See https://github.com/unclecheese/TranslatableDataObject/blob/master/TranslatableDataObject.php
 2013-03-21 00:16:36 +01:00
Ingo Schommer
53c84ee1fe Merge remote-tracking branch 'origin/3.0' into 3.1 2013-03-19 14:04:29 +01:00
Ingo Schommer
99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php
 2013-03-19 13:56:04 +01:00
Andrew Short
94f209eb74 Merge branch '3.1' 2013-03-19 22:36:47 +11:00
Andrew Short
b8a51c3792 Merge branch '3.0' into 3.1 2013-03-19 22:27:09 +11:00
Stephen Shkardoon
2ead2ba60f Removed invalid characters 
No idea what those characters were meant to be, so I removed them.
 2013-03-16 23:17:02 +13:00
Andrew Short
bc941c18b6 Merge branch '3.1' 2013-03-15 21:58:37 +11:00
Andrew Short
6ae931df24 Merge branch '3.0' into 3.1 2013-03-15 21:47:23 +11:00
Dan
4a12d6db3c Minor: Two modules are listed as three. 
...for example "framework" and "cms". These three modules... Should be two modules, or perhaps there is a third missing from the list.
 2013-03-08 10:10:04 -05:00
Ingo Schommer
64888c07b7 Partially revert docs commit 7710cf59 
i18n.js doesn't support named parameters (yet)
 2013-03-04 08:48:16 +01:00
Ryan Wachtl
3d602998b1 Update rich-text-editing.md 
`HtmlEditorField::add_extension('MyToolbarExtension');` was not working for me. I had to use `HtmlEditorField_Toolbar`.
 2013-03-02 14:37:09 -06:00
Ingo Schommer
ce66bc1eaf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/travis/before_script
 2013-02-27 13:34:03 +01:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/HTTP.php
 2013-02-26 13:28:35 +01:00
Ingo Schommer
567e39cd19 Updated composer docs 2013-02-25 11:47:11 +01:00
Ingo Schommer
bb724c43b9 Merge pull request #1142 from chillu/pulls/remove-auto-controller-routing 
API Removed auto-routing of controller name
 2013-02-18 05:30:37 -08:00
Ingo Schommer
957469d770 API Removed auto-routing of controller name 
Use custom routing rules to achieve this effect (see changelog)
 2013-02-18 14:29:47 +01:00
Hamish Friedlander
5fd55a50f2 API Tighten up allowed_actions 
allowed_actions is now only allowed to reference public methods defined
on the same Controller as the allowed_actions static, and
the wildcard "*" has been deprecated
 2013-02-18 14:53:33 +13:00
Hamish Friedlander
7efae6b95f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 14:31:57 +13:00
Ingo Schommer
d51e0bc2ec Improved docs on $allowed_actions 
Added section to "Controllers" and "Form" topics,
added $allowed_actions definitions to all controller examples
 2013-02-17 23:30:40 +01:00
Ingo Schommer
3e27d27f7a Improved docs on $allowed_actions 
Added section to "Controllers" and "Form" topics,
added $allowed_actions definitions to all controller examples
 2013-02-17 23:16:25 +01:00
Daniel Hensby
77476de917 Change to how environment file is found 
The _ss_environment.php file can now be in any parent folder of the framework (according to realpath())

Removing the description of '3 levels deep' and replaced with explanation of infinite depth.
 2013-01-30 15:19:53 +00:00
Ingo Schommer
634c91c6ff Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	email/Mailer.php
 2013-01-30 12:46:24 +01:00
Hamish Friedlander
acfc0be471 Document that yaml files shouldnt be served directly 2013-01-29 14:11:52 +13:00
Sean Harvey
1f1b115ef9 Fixing code formatting 2013-01-24 13:44:23 +13:00
Sean Harvey
3aa2cdccba Fixing code formatting in rich-text-editing docs 2013-01-24 12:50:55 +13:00
Ingo Schommer
6b4d1a7570 Merge pull request #1127 from mateusz/tinymce-docs 
Add docs on how to customise the TinyMCE editor.
 2013-01-23 14:54:09 -08:00
Mateusz U
141538f678 Add docs on how to customise the TinyMCE editor. 
Fix whitespace problems.
 2013-01-24 10:54:14 +13:00
Ingo Schommer
4892c11aaa Clarified docs on isDev usage in dev/build 2013-01-22 14:29:58 +01:00
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
 2013-01-21 11:14:57 +01:00
Ingo Schommer
2e6e0de44d Clarified DataList->limit() docs 2013-01-15 10:14:55 +01:00
Ingo Schommer
f3c0669fec Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	_config/uploadfield.yml
	css/UploadField.css
	forms/UploadField.php
	scss/UploadField.scss
	templates/UploadField.ss
	tests/forms/uploadfield/UploadFieldTest.php
 2013-01-11 10:02:39 +01:00
drzax
f6ab5a4020 Update docs/en/topics/i18n.md 
Make the documentation more clear and 3.x specific. Especially around template translations.
 2013-01-09 12:46:09 +10:00
Ingo Schommer
d13c53fda6 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/model/DataQueryTest.php
 2012-12-14 10:57:28 +01:00
Stig Lindqvist
681a0241e7 DOC Removed link to missing 'extending-the-cms.md' 2012-12-14 16:15:22 +13:00
Ingo Schommer
6571c17992 Merge remote-tracking branch 'origin/3.0' 2012-12-11 17:16:19 +01:00
Ingo Schommer
e8fbfc0bd1 NEW FixtureFactory separated out from YamlFixture 
Enables more generic use of the fixture facilities
without dependency on the YAML format, for example
when creating fixtures from Behat step definitions.

Note: The YamlFixture class needs to be created via
Injector::inst()->create('YamlFixture') now,
direct instantiation is no longer supported.
 2012-12-11 17:06:27 +01:00
Ingo Schommer
fa84c2d705 Merge remote-tracking branch 'origin/3.0' 2012-12-10 17:50:43 +01:00
Simon Welsh
5ca000d0a5 Correct routing rule block indentation 2012-12-07 08:15:53 +13:00
Ingo Schommer
a108f67476 Merge pull request #922 from simonwelsh/rellist-presave 
NEW: Allows setting of has_many and many_many relations before writing
 2012-12-04 01:25:15 -08:00
Will Rossiter
100ad658db Email doc formatting 
Workaround markdown parser throwing a fit with code straight after list.
 2012-12-04 20:00:09 +13:00
Will Rossiter
bf67679155 Fix typo in email docs. 2012-12-04 19:56:36 +13:00