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
17,722 Commits 31 Branches 527 Tags 162 MiB
3138092ad7
Commit Graph

2054 Commits

Author SHA1 Message Date
Will Rossiter
18a1cc1db3 MINOR: update docs to fix issues raised via comments. MINOR: remove section on comments. 2012-03-31 09:03:54 +13:00
Ingo Schommer
c56176c5d5 MINOR Updated 'from-source' installation to use new 'simple' theme (which also fixes the problem of checking out 'blackcandy' sub themes via git into overlapping repository paths) 2012-03-28 22:55:44 +02:00
Sean Harvey
fca60b786c ENHANCEMENT Addition of ModelAdmin::getExportFields() which allows ModelAdmin classes to customise which fields should be exported. Defaults to the summary fields from the model class definition. 2012-03-25 20:01:43 +13:00
Sean Harvey
769995cd1d MINOR Fix reference to class that was renamed in modeladmin docs 2012-03-24 10:30:47 +13:00
Sam Minnee
6c35588eda API CHANGE: Rename 'PastMember' to 'IsRepeatMember' in templates. 
API CHANGE: Move Controller::PastMember() to Member::is_repeat_member() in code.
API CHANGE: Removed Controller::CurrentMember(), it was only ever intended as a template global provider.
 2012-03-16 15:05:28 +13:00
Ingo Schommer
22dc7fd2d8 MINOR Warning about imminent TableField deprecation 2012-03-15 22:31:55 +01:00
Ingo Schommer
4d723c7580 MINOR Added note about 'homepagefordomain' module coupling 2012-03-14 22:44:07 +01:00
Andy Adiwidjaja
31c9e98c7d Correction of template documentation: Removed mentions of deprecated control statement. 2012-03-14 16:54:52 +01:00
Ingo Schommer
f8d38a332c MINOR Upgrading notes 2012-03-13 22:39:35 +01:00
Sam Minnee
d88a68016f MINOR: Broke changelog entries in two to sidestep PHP 5.2 bug affecting sapphiredocs 2012-03-13 13:30:41 +13:00
Sam Minnee
13bfc1f173 Revert "MINOR Removed "MINOR" and "Other" change log from 3.0.0-beta1 change log to get it rendering through sapphiredocs" 
This reverts commit 4f8a4643ff.
 2012-03-13 12:51:09 +13:00
Ingo Schommer
4f8a4643ff MINOR Removed "MINOR" and "Other" change log from 3.0.0-beta1 change log to get it rendering through sapphiredocs 2012-03-13 00:47:46 +01:00
Ingo Schommer
c4ec0c54aa MINOR 3.0.0-beta1 changelog 2012-03-12 23:53:38 +01:00
Ingo Schommer
2d151b8cfa API CHANGE Deprecated TableListField and ComplexTableField, use GridField instead 2012-03-12 17:26:42 +01:00
Ingo Schommer
2ec9de1e59 MINOR Updated GridFieldDetailForm naming 2012-03-12 09:55:33 +01:00
Andrew O'Neil
24815ce020 MINOR: Updated GridField documentation 2012-03-12 09:55:15 +01:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25 
SSF-25: ModelAdmin
 2012-03-09 15:23:20 -08:00
Ingo Schommer
3a068a0d18 MINOR Removed references to outdated versions from docs 2012-03-09 21:34:05 +01:00
Ingo Schommer
4216a09177 API CHANGE Removed BasicAuth::enable()/disable(), use protect_entire_site() 2012-03-09 21:20:20 +01:00
Ingo Schommer
e12a3a4ab7 API CHANGE ModelAdmin uses GridField, DataList and new layout. Removed ModelAdmin_CollectionController, ModelAdmin_RecordController and related functionality. 
API CHANGE Removed ModelAdmin->ResultColumns()/ColumnSelectionField, selection of own fields no longer possible through the UI, to be replaced by a more generic GridField component
 2012-03-09 15:15:58 +01:00
Sam Minnee
a071456837 Merge branch 'master' of github.com:silverstripe/sapphire 
Conflicts:
	tests/forms/gridfield/GridFieldDetailFormTest.php
	tests/forms/gridfield/GridFieldPopupFormsTest.yml
 2012-03-09 14:37:32 +13:00
Stig Lindqvist
09d6fa7bb3 API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:07:40 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Sean Harvey
c59c717d78 API CHANGE Removed CustomRequiredFields, please use custom validation instead 
BUGFIX Ensure validators still used in ModelAdmin forms
 2012-03-09 12:45:18 +13:00
Sean Harvey
9f3344b355 API CHANGE Removed built-in behaviour.js client-side form validation. 
This is no longer supported. Please use custom client-side validation instead. (see 3.0.0 changelog
for more information)
 2012-03-09 12:19:57 +13:00
Sam Minnee
5800db0239 API CHANGE: Allow for the creation of custom GridField fragments. (#6911) 2012-03-09 10:03:53 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration' 
Conflicts:
	forms/gridfield/GridField.php
 2012-03-08 20:25:21 +01:00
Ingo Schommer
ac20bfaf99 MINOR Renamed GridFieldAction_Edit to GridFieldEditAction, GridFieldAction_Delete to GridFieldDeleteAction, to make it clearer that there's no parent class/concept called "GridFieldAction". There's only the GridFieldActionProvider interface, as well as the GridField_FormAction (which is a related, but different kettle of fish). 2012-03-08 18:22:25 +01:00
Ingo Schommer
dca1b0df1c MINOR GridField docs 2012-03-06 12:39:13 +01:00
Ingo Schommer
f691eae93e MINOR Docs 2012-03-06 11:21:38 +01:00
Hamish Friedlander
f8edc4bd13 MINOR: Add upgrade docs covering the changes to ViewableData 2012-03-06 09:31:56 +13:00
Ingo Schommer
0117b32fee API CHANGE Removed MemberTableField, use GridField with GridFieldConfig_RelationEditor instead 2012-03-05 17:41:51 +01:00
Ingo Schommer
6798d40709 MINOR GridField documentation 2012-03-05 12:27:25 +01:00
Ingo Schommer
299bf8b9c6 Merge branch 'integration' 2012-03-02 20:53:06 +01:00
Ingo Schommer
424da6abe1 API CHANGE Moved NZGovtPasswordValidator to new 'securityextras' module 2012-03-02 00:28:22 +01:00
Ingo Schommer
0ab43cdcb8 API CHANGE Moved "IP Address restrictions for groups" feature to a new "ipaddress-restriction" module (SSF-53) 2012-03-01 21:36:01 +01:00
Ingo Schommer
9c95a9ae29 MINOR Removed GridFieldRelationAdd->useAutoSuggestion flag, as the field doesn't work without it (no current ID is being set via JS) (SSF-53) 2012-03-01 17:57:16 +01:00
Ingo Schommer
d171b11451 MINOR Documented special HTTP response codes in CMS 2012-02-28 20:30:45 +01:00
Ingo Schommer
5911abc0f6 API CHANGE Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias. 
API CHANGE Removed several unsed JavaScript globals: sprintf(), Number.prototype.CURRENCIES, Number.prototype.toCurrency(), String.prototype.ucfirst(), jQuery.fn.clearFields(), jQuery.fn.clearInputs()
MINOR Removed prototype_improvements.js and jquery_improvements.js files, now contained in individual component code (or removed altogether)
 2012-02-16 12:27:47 +01:00
Ingo Schommer
a1e9c0f41e ENHANCEMENT CMS panels restructured to use two new types of "tools" templates, fetched through LeftAndMain->Tools() and LeftAndMain->EditFormTools(). Requires less overloading of template markup. 2012-02-15 14:26:45 +01:00
Ingo Schommer
92d513857c MINOR Changed $Left placeholder in CMS templates to $Tools, documented it 2012-02-15 14:26:45 +01:00
Ingo Schommer
8d9b00a4fd MINOR Docs about HtmlEditorField and rich text editing 2012-02-14 13:53:35 +01:00
Will Rossiter
f91b5b1242 MINOR: add upgrade note about breadcrumbs 2012-02-11 15:14:42 +13:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Philipp Krenn
a67c6ce936 ENHANCEMENT Added section on security ratings, moved security process description from 'contributing' to 'release process' section 2012-02-01 11:10:10 +01:00
Ingo Schommer
6a6aee4b17 MINOR Updated changelog 2012-01-31 17:04:59 +01:00
Ingo Schommer
04a10a4265 MINOR Updated coding conventions to require the 'public' keyword for class methods and variables 2012-01-30 23:13:42 +01:00
Stig Lindqvist
7f09b6931b API CHANGE DataList::subtract and DataQuery::subtract for subtracting a list from another list 
Minor Stripped out ManyManyList tests from DataListTest into it's own test case
 2012-01-26 17:59:43 +13:00
Sam Minnée
ccbcb386e7 Merge pull request #161 from silverstripe-scienceninjas/pull/3.0.0-alpha2-change-log 
MINOR Updated changelog
 2012-01-09 21:37:09 -08:00
Stig Lindqvist
6436870a57 MINOR Updated changelog 2012-01-10 18:35:03 +13:00
Sam Minnee
7c6050b407 Merge remote-tracking branch 'refs/remotes/chillu/formfield-constructors' 
Conflicts:
	forms/CountryDropdownField.php
 2012-01-10 16:41:02 +13:00
Sam Minnee
cb13299cf9 API CHANGE: Added GridField_URLHandler component interface. 2012-01-09 18:47:31 +13:00
Sam Minnee
1e1e3a2d80 MINOR: Fixed a few layout glitches on the grid field documentation. 2012-01-09 17:57:05 +13:00
Sam Minnee
740f5014b2 MINOR: Added documentation for the grid field, including information on how to extend it. 2012-01-09 17:39:18 +13:00
Ingo Schommer
7f9ced2a42 MINOR Docs on github collab 2012-01-08 19:44:55 +01:00
Sean Harvey
3d8079c1b5 API CHANGE Removed GeoIP functionality from sapphire. This now belongs in a separate "silverstripe-geoip" GitHub repository: https://github.com/silverstripe-labs/silverstripe-geoip 2012-01-02 18:00:36 +01:00
Ingo Schommer
cc32957414 API CHANGE Don't allow specifying $form as constructor argument in various form fields, use setForm() instead (to achieve a cleaner API with less confusing parameter order) 2012-01-02 17:50:34 +01:00
Ingo Schommer
1eaf45a118 MINOR Documentation for FormField->setTemplate() and FormField->setAttribute() 2012-01-02 16:48:36 +01:00
Ingo Schommer
b5421d9598 ENHANCEMENT Allowing custom attributes in (most) FormField implementations, which allows for HTML5 data attributes 2012-01-02 16:48:14 +01:00
Ingo Schommer
7d46e7e751 MINOR Added CMS architecture documentation 2012-01-01 18:24:09 +01:00
Stig Lindqvist
a642a299c5 DOC Update the documentation for the datamodel to describe the SS_List sort, filter and exclude methods 2011-12-17 16:42:30 +13:00
Mark Stephens
288369f1a9 ENHANCEMENT: Updated the template language documentation, based on work done by mrmorphic. 2011-12-17 15:25:15 +13:00
Ingo Schommer
d0cbbab513 Merge pull request #62 from howardgrigg/patch-1 
MINOR Correct BreadCrumb include
 2011-12-16 16:27:54 -08:00
Ingo Schommer
719bb18db8 MINOR Added documentation about the new File.ShowInSearch property 2011-12-03 12:01:23 +01:00
Ingo Schommer
880a9acec4 MINOR Fixed site-search docs 2011-12-03 12:01:23 +01:00
Ingo Schommer
a8f57be2f2 Merge pull request #118 from silverstripe/multibyte-urlsegment 
URLSegmentFilter API (sapphire/master)
 2011-12-02 02:20:59 -08:00
Ingo Schommer
9b27a4c1be ENHANCEMENT More flexible URL filtering through new URLSegmentFilter API. Support for multibyte URL segments through URLPathFilter::$default_allow_multibyte. Abstraction from Convert::raw2url() (and SiteTree->generateURLSegment()) 2011-11-29 11:04:08 +01:00
Ingo Schommer
1fec67e5af MINOR Doc whitespace 2011-11-22 11:09:43 +01:00
Ingo Schommer
bd59602eff MINOR Updated "Extend the CMS" howto 2011-11-22 11:06:46 +01:00
Sam Minnée
84f47f5c86 Merge pull request #63 from simonwelsh/patch-4 
Documentation fix
 2011-11-02 13:34:40 -07:00
Sam Minnee
39da4bef74 MINOR: Updated upgrade guide. 2011-10-31 15:59:07 +13:00
Ingo Schommer
f3aa449e6a MINOR Updated changelog 2011-10-30 23:40:47 +01:00
Sam Minnee
a4ee0f4dad ENHANCMEMENT: Added SS_Map to replace SQLMap. 
API CHANGE: Deprecate SQLMap.
 2011-10-29 17:34:32 +13:00
Simon Welsh
af144d9692 WS 2011-10-29 13:48:22 +13:00
Simon Welsh
03f52c42d9 Adds docs on Fulltext search usage in MySQL 2011-10-29 13:46:09 +13:00
Hamish Friedlander
0a3e0f15de MINOR: Replace references to FieldSet (now deprecated) with references to FieldList 2011-10-28 15:58:55 +13:00
Fred Condo
9bd499617b Spelling correction 
Found and fixed all misspellings of "[Hh]ierarchy"
 2011-10-18 15:32:52 -07:00
Ingo Schommer
b4a8852285 MINOR Updated changelog 2011-10-18 11:54:45 +02:00
Ingo Schommer
715638333e API CHANGE Obeying existing memory_limit settings in increase_memory_limmit_to(). Introduced set_increase_memory_limit_max() and set_increase_time_limit_max() 2011-10-07 14:12:48 +02:00
Sean Harvey
ad13f80f57 ENHANCEMENT Updated Windows installation documentation on using PHP Manager which takes out most of the PHP configuration effort. 2011-09-28 16:05:45 +13:00
Will Rossiter
1732a17114 Merged new-orm into datagrid 2011-09-26 16:47:54 +13:00
simonwelsh
d0af084bb5 Fixes tag syntax (should end with %>, not >%) 2011-09-24 10:55:42 +12:00
Howard Grigg
7d6ebe1057 Minor - Correct BreadCrumb include 2011-09-22 17:47:33 +10:00
Ingo Schommer
c862b2423b MINOR Fixed merge errors from 'history-panel' branch 2011-09-19 21:01:17 +02:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
73cca09960 BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping 2011-09-15 14:43:34 +02:00
Ingo Schommer
c776a1cd67 BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping 2011-09-15 14:24:46 +02:00
Will Rossiter
01b08a57c0 MINOR: removed incorrect getter/setter statements. 2011-09-07 13:09:03 +12:00
Will Rossiter
dc84665ec2 MINOR: removed incorrect getter/setter statements. 2011-09-07 13:08:54 +12:00
simonwelsh
8342f6b20e Removed references to Language Chooser Widget until it can be updated to work with the new translation model. 2011-08-24 16:42:56 +12:00
Will Rossiter
0ef416112b MINOR: fixed syntax error in FormAction example. 2011-08-20 05:10:03 +12:00
Al
1189bcb7fe MINOR Documentation corrected download link for tutorial code 2011-08-14 13:46:00 +02:00
Al
83c738acbf MINOR Documentation added Requirements::set_suffix_requirements() as requested in disqus 2011-08-14 13:45:56 +02:00
Will Rossiter
62ed1386a3 MINOR: documentation fixes from comments provided by the community. See below for a list of fixes: 
* fixed typo in Email documentation.
* updated link for tutorial code to be relative now that bug #6408 is fixed
* removed 2.3 related docs from 2.4 docs folder
* fixed typo with Orientation documentation
* updated old task url for images/flush
 2011-08-11 13:55:27 +12:00
Fred Condo
e1bf92b8d0 MINOR: Fixed grammatical error 2011-06-10 19:55:08 -07:00
Fred Condo
c48720ea1c MINOR: Rewrite documentation of Breadcrumbs to conform to actual behaviour of SiteTree 2011-06-10 16:49:22 -07:00
Will Rossiter
0c1b856ce8 MINOR: removed note about only supporting MySQL. SS has support for PGSQL, MSSQL, SQLite. 2011-06-10 09:28:36 +12:00
Ingo Schommer
490fd01213 MINOR Contributing docs 2011-06-08 10:57:36 +12:00
Will Rossiter
bf516ed671 MINOR: fixed typos in form documentation 2011-06-06 14:25:41 +12:00
Sam Minnee
878b348a0f Merge branch 'master' into new-orm 
Conflicts:
	docs/en/reference/built-in-page-controls.md
	model/SQLQuery.php
 2011-05-26 17:08:10 +12:00
Ingo Schommer
3588cefa30 MINOR DateField documentation 2011-05-25 21:24:33 +12:00
Ingo Schommer
18b9a5519d MINOR Removed oudated documentation link to 'translatable' module 2011-05-15 15:51:14 +12:00
Sam Minnee
485ea3e41d Updated changelog to include more removed classes 2011-05-02 12:34:06 +12:00
Ingo Schommer
b21dbd9641 MINOR Fixed from-source docs, added 'preview' release cycle to release-process docs 2011-05-02 08:44:09 +12:00
Ingo Schommer
fe5a7f7351 MINOR Created 3.0.0 upgrading guide, 3.0.0-pr1 changelog 2011-05-01 22:30:53 +12:00
Al
5ecb55dfb2 MINOR Documentation tidying 2011-05-01 17:50:06 +12:00
Al
5304215fc7 MINOR Documentation updated to reflect that $PastVisitor is deprecated 2011-05-01 17:36:09 +12:00
ajshort
3fbb29a6c5 FEATURE: Added PaginatedList, which wraps around a data list or set to provide pagination functionality. This replaces the pagination functionality baked into DataObjectSet. 
API CHANGE: Removed pagination related methods from DataObjectSet and implemented them on PaginatedList.
API CHANGE: Removed DataObjectSet::parseQueryLimit(), this is now implemented as PaginatedList::setPaginationFromQuery().
API CHANGE: Deprecated DataObjectSet::TotalItems in favour of Count().
ENHANCEMENT: Added FirstLink and LastLink to PaginatedList.
MINOR: Updated documentation, and added a how-to on paginating items.
 2011-05-01 15:26:29 +12:00
Sam Minnee
f5d2e43636 ENHANCEMENT: Added documentation for the new ORM. 2011-05-01 15:26:29 +12:00
Ingo Schommer
79e0634537 Merge branch 'cms-ui-preparation' 2011-04-28 22:48:02 +12:00
ajshort
3a1c2df4e7 API CHANGE: Renamed DataObjectDecorator to DataExtension. 
API CHANGE: Renamed LeftAndMainDecorator to LeftAndMainExtension.
MINOR: Replaced all references to decorators with extension.
 2011-04-26 11:01:38 +10:00
Ingo Schommer
d21dce0a09 MINOR Documentation around new CSS conventions in CMS and layout panel customizations 2011-04-24 11:46:51 +12:00
Ingo Schommer
f4cb6ae40f MINOR Renamed #sitetree_ul to .cms-tree in templates, removed #sitetree from contained <ul> (unnecessary duplication) 2011-04-24 11:46:51 +12:00
Ingo Schommer
583f669c68 API CHANGE Adjusting to split of SiteTree->getCMSFields() into getSettingsFields(), and new tab paths ("Root.Content" instead of "Root.Content.Main") 2011-04-24 11:46:49 +12:00
d57
9b8594af8c Triage of Template Tags rendering syntactically incorrect, per Disqus comment 2011-03-29 23:18:06 -05:00
Ingo Schommer
3dc5c2b1db MINOR Added 3.0.0-alpha1 changelog 2011-03-29 18:07:56 +13:00
Ingo Schommer
d61444e976 API CHANGE Moved Translatable class into new 'translatable' module 2011-03-29 18:07:56 +13:00
Ingo Schommer
1a598fe39e MINOR Removed obsolete 'usetestmanifest' flag from documentation and RestfulServiceTest 2011-03-28 08:14:03 +13:00
Ingo Schommer
551bc5dc72 MINOR Improved patch documentation 2011-03-21 11:53:43 +13:00
Michael Andrewartha
f3ac57394d Small text changes, added api links, cont. updating images for tutorials, fixed tutorials from member feedback 2011-03-21 11:53:06 +13:00
Ingo Schommer
e9f20cf9f3 MINOR Documentation fixes 2011-03-21 11:52:56 +13:00
Ingo Schommer
cc0f62c9f5 MINOR Fixed title escaping in 'built in page controls' documentation 2011-03-21 11:52:43 +13:00
Ingo Schommer
4c1866c74c MINOR Updated contributing guidelines 
Conflicts:

	docs/en/misc/contributing.md
 2011-03-21 11:52:32 +13:00
Ingo Schommer
918d9cbd4e MINOR Added docs/ contributing notes 2011-03-21 11:51:58 +13:00
Michael Andrewartha
8ad630d5a1 MINOR: formatting changes and fixes to original document formatting 2011-03-21 11:51:50 +13:00
Ingo Schommer
f15f083f22 MINOR Updated 'from source' docs 2011-03-21 11:51:44 +13:00
Ingo Schommer
994f7a3520 MINOR Fixed blackcandy github links in docs 2011-03-21 11:51:39 +13:00
Ingo Schommer
629aa9b33e MINOR Removed reference to additional CSS download in tutorial 4, moved to the silverstripe-installer project 2011-03-21 11:51:27 +13:00
Ingo Schommer
753a4549bc MINOR Fixed spacing in docs 2011-03-21 11:51:21 +13:00
Ingo Schommer
5bfc722624 MINOR Removed duplicated 'additional requirements' from docs 2011-03-21 11:51:13 +13:00
Ingo Schommer
c6992f33df ENHANCEMENT Adjusted from-source documentation to github and piston 2011-03-21 11:51:07 +13:00
Ingo Schommer
28084243d3 MINOR Improved patch documentation 2011-03-21 09:23:04 +13:00
Ingo Schommer
31d7a00eb7 MINOR Fixed merge errors 2011-03-16 13:31:46 +13:00
Ingo Schommer
04ae1abe65 Merge remote-tracking branch 'mandrew/master' 
Conflicts:
	docs/en/misc/contributing.md
 2011-03-09 17:17:10 +13:00
Michael Andrewartha
626980acb5 Small text changes, added api links, cont. updating images for tutorials, fixed tutorials from member feedback 2011-03-09 10:05:51 +13:00
Ingo Schommer
3f748decbe MINOR Documentation fixes 2011-03-08 19:19:17 +13:00
Sean Harvey
06089eddfd MINOR Added fix to test troubleshooting docs about PHPUnit 3.5 missing MockObject 2011-03-08 13:34:29 +13:00
Sean Harvey
5d87f2929e MINOR Added fix to test troubleshooting docs about PHPUnit 3.5 missing MockObject class 2011-03-08 13:30:41 +13:00
Ingo Schommer
cea41832b1 MINOR Fixed title escaping in 'built in page controls' documentation 2011-03-03 09:07:24 +13:00
Ingo Schommer
2003888152 MINOR Updated contributing guidelines 2011-02-25 08:56:52 +13:00
Ingo Schommer
7cb687b5e0 MINOR Added docs/ contributing notes 2011-02-23 20:14:04 -08:00
Sam Minnee
d045970d83 Merge remote branch 'origin/master' 2011-02-22 10:57:59 +13:00
Michael Andrewartha
e260b697c0 MINOR: formatting changes and fixes to original document formatting 2011-02-22 10:23:22 +13:00
Ingo Schommer
ca2e80ec08 MINOR Updated 'from source' docs 2011-02-16 08:53:51 +13:00
Sam Minnee
1e0c4ae8d1 Merge branch '2.4' 
Conflicts:
	cache/Cache.php
	cli/CliController.php
	core/Convert.php
	core/Core.php
	core/ManifestBuilder.php
	core/Object.php
	core/SSViewer.php
	core/control/ContentController.php
	core/control/ContentNegotiator.php
	core/control/FormResponse.php
	core/control/RequestHandler.php
	core/control/SilverStripeNavigatorItem.php
	core/i18n.php
	core/i18nTextCollector.php
	core/model/DataObjectSet.php
	core/model/Hierarchy.php
	core/model/Image.php
	core/model/MySQLDatabase.php
	core/model/SiteConfig.php
	core/model/SiteTree.php
	core/model/Translatable.php
	core/model/VirtualPage.php
	dev/Debug.php
	dev/SapphireTest.php
	dev/TestRunner.php
	dev/YamlFixture.php
	dev/install/MySQLDatabaseConfigurationHelper.php
	docs/en/installation/from-source.md
	docs/en/topics/themes.md
	docs/en/tutorials/4-site-search.md
	email/Mailer.php
	filesystem/File.php
	filesystem/Folder.php
	forms/ComplexTableField.php
	forms/CurrencyField.php
	forms/DateField.php
	forms/FieldSet.php
	forms/FileField.php
	forms/FileIFrameField.php
	forms/HtmlEditorConfig.php
	forms/HtmlEditorField.php
	forms/SelectionGroup.php
	forms/SimpleImageField.php
	forms/TabSet.php
	forms/TableField.php
	forms/TableListField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	integration/Geoip.php
	javascript/SelectionGroup.js
	javascript/TreeSelectorField.js
	javascript/UpdateURL.js
	javascript/core/jquery.ondemand.js
	javascript/tiny_mce_improvements.js
	javascript/tree/tree.js
	lang/en_US.php
	search/ContentControllerSearchExtension.php
	security/Group.php
	security/Member.php
	security/PermissionCheckboxSetField.php
	security/PermissionRole.php
	security/Security.php
	static-main.php
	templates/RelationComplexTableField.ss
	templates/TableListField.ss
	tests/ConvertTest.php
	tests/DataObjectSetTest.php
	tests/DataObjectTest.php
	tests/DataObjectTest.yml
	tests/RequestHandlingTest.php
	tests/SSViewerTest.php
	tests/SiteTreePermissionsTest.php
	tests/SiteTreeTest.php
	tests/TransactionTest.php
	tests/api/RestfulServiceTest.php
	tests/control/DirectorTest.php
	tests/control/ModelAsControllerTest.php
	tests/fieldtypes/WidgetAreaEditorTest.php
	tests/forms/CurrencyFieldTest.php
	tests/forms/FormTest.php
	tests/model/DatabaseTest.php
	tests/model/ImageTest.php
	tests/search/ContentControllerSearchExtensionTest.php
	tests/security/MemberAuthenticatorTest.php
	thirdparty/.gitignore
	thirdparty/behaviour/behaviour.js
	thirdparty/firebug-lite/firebug.js
	thirdparty/firebug-lite/firebugx.js
	thirdparty/jquery-form/jquery.form.js
	thirdparty/jquery-livequery/jquery.livequery.js
	thirdparty/jquery-livequery/test/jquery.js
	thirdparty/jquery-livequery/test/test.html
	thirdparty/jquery-livequery/test/test2.html
	thirdparty/jquery-metadata/META.json
	thirdparty/jquery-metadata/README
	thirdparty/jquery-metadata/jquery.metadata.js
	thirdparty/jquery-metadata/test/index.html
	thirdparty/jquery-metadata/test/jquery.js
	thirdparty/jquery-metadata/test/test.js
	thirdparty/jquery-metadata/test/testrunner.js
	thirdparty/jquery-metadata/test/testsuite.css
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
	thirdparty/jquery-ui/i18n/jquery-ui-i18n.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ar.js
	thirdparty/jquery-ui/i18n/ui.datepicker-bg.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ca.js
	thirdparty/jquery-ui/i18n/ui.datepicker-cs.js
	thirdparty/jquery-ui/i18n/ui.datepicker-da.js
	thirdparty/jquery-ui/i18n/ui.datepicker-de.js
	thirdparty/jquery-ui/i18n/ui.datepicker-el.js
	thirdparty/jquery-ui/i18n/ui.datepicker-eo.js
	thirdparty/jquery-ui/i18n/ui.datepicker-es.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fa.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fi.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-he.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hu.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hy.js
	thirdparty/jquery-ui/i18n/ui.datepicker-id.js
	thirdparty/jquery-ui/i18n/ui.datepicker-is.js
	thirdparty/jquery-ui/i18n/ui.datepicker-it.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ja.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ko.js
	thirdparty/jquery-ui/i18n/ui.datepicker-lt.js
	thirdparty/jquery-ui/i18n/ui.datepicker-lv.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ms.js
	thirdparty/jquery-ui/i18n/ui.datepicker-nl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-no.js
	thirdparty/jquery-ui/i18n/ui.datepicker-pl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ro.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ru.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sk.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sq.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sv.js
	thirdparty/jquery-ui/i18n/ui.datepicker-th.js
	thirdparty/jquery-ui/i18n/ui.datepicker-tr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-uk.js
	thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js
	thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js
	thirdparty/jquery/jquery.js
	thirdparty/jsmin/.piston.yml
	thirdparty/jsmin/jsmin.php
	thirdparty/prototype/prototype.js
	thirdparty/scriptaculous/dragdrop.js
	thirdparty/simplepie/.piston.yml
	thirdparty/spyc/.piston.yml
	thirdparty/spyc/README
	thirdparty/spyc/php4/spyc.php4
	thirdparty/spyc/php4/test.php4
	thirdparty/spyc/spyc.php
	thirdparty/spyc/spyc.yaml
	thirdparty/tinymce-advcode/dialog.html
	thirdparty/tinymce-advcode/editor_plugin_src.js
	thirdparty/tinymce-advcode/js/dialog.js
	thirdparty/tinymce/langs/en.js
	thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
	thirdparty/tinymce/plugins/advhr/rule.htm
	thirdparty/tinymce/plugins/advimage/image.htm
	thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
	thirdparty/tinymce/plugins/advlink/langs/en_dlg.js
	thirdparty/tinymce/plugins/advlink/link.htm
	thirdparty/tinymce/plugins/emotions/emotions.htm
	thirdparty/tinymce/plugins/emotions/langs/en_dlg.js
	thirdparty/tinymce/plugins/example/dialog.htm
	thirdparty/tinymce/plugins/fullpage/fullpage.htm
	thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js
	thirdparty/tinymce/plugins/fullscreen/fullscreen.htm
	thirdparty/tinymce/plugins/inlinepopups/template.htm
	thirdparty/tinymce/plugins/media/langs/en_dlg.js
	thirdparty/tinymce/plugins/media/media.htm
	thirdparty/tinymce/plugins/paste/js/pasteword.js
	thirdparty/tinymce/plugins/paste/langs/en_dlg.js
	thirdparty/tinymce/plugins/paste/pastetext.htm
	thirdparty/tinymce/plugins/paste/pasteword.htm
	thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js
	thirdparty/tinymce/plugins/searchreplace/searchreplace.htm
	thirdparty/tinymce/plugins/spellchecker/editor_plugin.js
	thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js
	thirdparty/tinymce/plugins/style/langs/en_dlg.js
	thirdparty/tinymce/plugins/style/props.htm
	thirdparty/tinymce/plugins/table/cell.htm
	thirdparty/tinymce/plugins/table/langs/en_dlg.js
	thirdparty/tinymce/plugins/table/merge_cells.htm
	thirdparty/tinymce/plugins/table/row.htm
	thirdparty/tinymce/plugins/table/table.htm
	thirdparty/tinymce/plugins/template/langs/en_dlg.js
	thirdparty/tinymce/plugins/template/template.htm
	thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm
	thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm
	thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm
	thirdparty/tinymce/plugins/xhtmlxtras/cite.htm
	thirdparty/tinymce/plugins/xhtmlxtras/del.htm
	thirdparty/tinymce/plugins/xhtmlxtras/ins.htm
	thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
	thirdparty/tinymce/themes/advanced/about.htm
	thirdparty/tinymce/themes/advanced/anchor.htm
	thirdparty/tinymce/themes/advanced/charmap.htm
	thirdparty/tinymce/themes/advanced/color_picker.htm
	thirdparty/tinymce/themes/advanced/image.htm
	thirdparty/tinymce/themes/advanced/langs/en.js
	thirdparty/tinymce/themes/advanced/langs/en_dlg.js
	thirdparty/tinymce/themes/advanced/link.htm
	thirdparty/tinymce/themes/advanced/source_editor.htm
	thirdparty/tinymce/themes/simple/langs/en.js
	thirdparty/tinymce/tiny_mce.js
	thirdparty/tinymce/tiny_mce_src.js
	widgets/Widget.php
 2011-02-14 18:47:53 +13:00
Ingo Schommer
6d7efc8a90 MINOR Fixed blackcandy github links in docs 2011-02-14 11:16:24 +13:00
Ingo Schommer
9354b4a68d MINOR Removed reference to additional CSS download in tutorial 4, moved to the silverstripe-installer project 2011-02-14 11:09:40 +13:00
Ingo Schommer
bbd3bf6d1d MINOR Fixed spacing in docs 2011-02-12 12:20:57 +13:00
Ingo Schommer
044be509ca MINOR Removed duplicated 'additional requirements' from docs 2011-02-12 12:19:04 +13:00
Ingo Schommer
3593ac2ec2 ENHANCEMENT Adjusted from-source documentation to github and piston 2011-02-11 15:56:46 +13:00
Ingo Schommer
d23aeb2b51 MINOR Fixing image links in docs/en/tutorials/ 2011-02-07 20:09:11 +13:00
Ingo Schommer
66bc92892e MINOR Fixing image links in docs/en/tutorials/ 2011-02-07 20:06:27 +13:00
Ingo Schommer
8bd01d62c4 ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring) 2011-02-07 19:55:13 +13:00
Ingo Schommer
b1c36ce0a4 ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring) 2011-02-07 19:48:44 +13:00