tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-07 20:09:31 +02:00
Code Issues Projects Releases Wiki Activity
13,794 Commits 29 Branches 517 Tags 147 MiB
8e8c5d716d
Commit Graph

13794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
8e8c5d716d Restructure of the docs markdown source files into more logical taxonomy 2014-12-16 11:01:12 +13:00
Damian Mooyman
f17d594141 Update branch alias for master 2014-11-20 17:15:02 +13:00
Damian Mooyman
6baf63e18c Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	dev/install/install.php5
	docs/en/changelogs/index.md
	security/Security.php
 2014-11-19 11:16:46 +13:00
Damian Mooyman
ce93a8a98e Resolve merge regressions 2014-11-19 11:05:07 +13:00
Josh Kosmala
2e416b60f3 Update javascript.md fixes #3652 
I needed to know how to do this to do some jQuery manipulation in the CMS.
 2014-11-18 21:56:51 +00:00
Daniel Hensby
e5bed94d07 Merge pull request #3626 from 3Dgoo/feature/site-reports-doc-fix 
Updating Site Reports documentation
 2014-11-18 20:59:57 +00:00
Damian Mooyman
dceaeedc43 Merge pull request #3643 from chillu/pulls/htaccess-doc 
Improve .htaccess commenting
 2014-11-19 08:51:10 +13:00
Damian Mooyman
72484cd0bf Update index.md 2014-11-18 18:41:23 +13:00
Damian Mooyman
c279ff7f0c Merge remote-tracking branch 'origin/3.1.8' into 3.1 2014-11-18 18:40:15 +13:00
Damian Mooyman
8b3695bd41 Added 3.1.8 changelog 2014-11-18 18:30:19 +13:00
Damian Mooyman
d84926492c BUG Security::findAnAdministrator doesn't always find an admin 2014-11-18 16:55:11 +13:00
Sean Harvey
27e2a68ef2 Merge pull request #3653 from tractorcow/pulls/3.1/install-admin 
BUG Security::findAnAdministrator doesn't always find an admin
 2014-11-18 16:24:40 +13:00
Damian Mooyman
2bdfd65e9b BUG Security::findAnAdministrator doesn't always find an admin 2014-11-18 15:36:34 +13:00
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
 2014-11-18 12:45:54 +13:00
Daniel Hensby
05f49e5b81 Merge pull request #3636 from stevie-mayhew/feature/validator 
FEATURE: add validation to formfield subclasses
 2014-11-17 10:04:54 +00:00
Stevie Mayhew
41ea83b337 FEATURE: add validation to form field subclasses 2014-11-17 08:17:38 +13:00
Ingo Schommer
5babab81ee Improve .htaccess commenting 
Done alongside improvements of the execution-pipeline.md docs.
Installer comment taken from d5723f7.
 2014-11-15 14:41:50 +13:00
Damian Mooyman
7b89c17349 Merge remote-tracking branch 'origin/3.1.7' into 3.1 2014-11-14 16:30:14 +13:00
Damian Mooyman
4ece737220 Update changelogs 2014-11-14 15:38:19 +13:00
Daniel Hensby
f035e2b9d4 Merge pull request #3637 from Copperis/method-comment-fix 
filterAny method comments fixed to reflect actual operation
 2014-11-13 22:40:19 +00:00
Damian Mooyman
8aee968ab1 Merge pull request #3634 from jedateach/pr/gridfield-footer-simple 
NEW: Make the record count in GridFieldFooter optional
 2014-11-14 10:36:25 +13:00
Damian Mooyman
7f2161d7a0 Merge pull request #3599 from kinglozzer/numericfield-whitespace 
Fix whitespace issues in NumericField/NumericFieldTest
 2014-11-14 10:31:21 +13:00
Jeremy Shipman
d7eb2757fe NEW: Make the record count in GridFieldFooter optional 2014-11-14 09:56:39 +13:00
Tadas Giniotis
2f59a6c59b filterAny method comments fixed to reflect actual operation 2014-11-13 22:12:58 +02:00
Sam Minnée
b15b93630c Merge pull request #3609 from pedro2555/1494-DBField-exists-returns-value 
Explicit cast return of DBField->exists()
 2014-11-12 13:41:49 +13:00
Sam Minnée
71c354d768 Merge pull request #3623 from kinglozzer/pulls/dataobject-db-inheritance 
FIX: DataObject::db() doesn't respect overloaded db types (fixes #3620)
 2014-11-12 13:41:03 +13:00
Sam Minnée
421152f722 Merge pull request #3627 from nhorstmeier/patch-1 
Should use <% with %> rather than <% loop %>
 2014-11-12 13:38:10 +13:00
muskie9
a526c45d64 Should use <% with %> rather than <% loop %> 2014-11-11 08:44:37 -06:00
Damian Mooyman
4b2cd5f480 Merge pull request #3622 from g4b0/3610-inheritance-breaks-filtering-if-relations-are-included-bugfix 
Bugfix: fixed inheritance breaks filtering if relations are included
 2014-11-11 23:57:21 +13:00
Loz Calver
85b4ba15fc FIX: DataObject::db() doesn't respect overloaded db types (fixes #3620) 2014-11-11 10:41:54 +00:00
Daniel Hensby
ca9c192c65 Merge pull request #3625 from AntonyThorpe/patch-1 
Update forms.md
 2014-11-11 09:12:35 +00:00
g4b0
239ed66eaf Bugfix: fixed inheritance breaks filtering if relations are included (issue #3610) 2014-11-11 10:04:41 +01:00
3Dgoo
89ff059334 Site Reports documentation fix 
Fixing typo in Site Reports documentation. Adding more detail to Custom Report example.
 2014-11-11 15:52:45 +10:30
bob (Plastyk)
45924f1402 Updating Site Reports documentation to show the Silverstripe 3.1 method of adding custom reports. 2014-11-11 15:45:34 +10:30
Antony Thorpe
98937f2467 Update forms.md 
Should be "set" not "get" in FormField->setSmallFieldHolderTemplate().
 2014-11-11 18:04:40 +13:00
Ingo Schommer
fb14d95eb1 Merge pull request #3618 from kinglozzer/pulls/htmleditorconfig-chainable 
Update HtmlEditorConfig::enablePlugins() to return instance
 2014-11-11 08:28:56 +13:00
Loz Calver
ac4b2fff41 Merge pull request #3619 from phillprice/patch-5 
Filter heading being processed as part of code
 2014-11-10 12:53:05 +00:00
Phill Price
a184d228e3 Filter heading being processed as part of code 
Whitespace issue causing the filter header to become part of the sorting example above - fixed whitespace.
 2014-11-10 11:08:12 +00:00
Loz Calver
b9ef20799f Update HtmlEditorConfig::enablePlugins() to return instance 2014-11-10 10:07:45 +00:00
Daniel Hensby
437fc2fda7 Merge pull request #3613 from spekulatius/patch-1 
Update DataObject.php
 2014-11-09 09:34:07 +00:00
spekulatius
14a1086b03 Update DataObject.php 
Documentation fix:

Table at http://api.silverstripe.org/3.1/class-DataObject.html is displaying the data wrong. Current it says "protected A" instead of "protected ValidationResult" as it should be.
 2014-11-09 21:19:39 +13:00
Damian Mooyman
0a5c380c92 Added 3.1.7-rc1 changelog 2014-11-08 18:50:54 +13:00
Damian Mooyman
8468546876 Add changelogs for 3.1.7-rc1 2014-11-08 18:36:03 +13:00
Damian Mooyman
864f070a6c Update translations 2014-11-08 17:07:40 +13:00
Pedro Rodrigues
d9fa6bd143 Explicit cast return of DBField->exists() 2014-11-07 00:16:12 +01:00
Ingo Schommer
6544e05eb3 Merge pull request #3606 from g4b0/patch-5 
Update versioning.md
 2014-11-07 08:08:36 +13:00
Gabriele Brosulo
f2a059b148 Update versioning.md 2014-11-06 11:31:55 +01:00
Gabriele Brosulo
b64cfaf649 Update versioning.md 
Added information about $SilverStripeNavigator
 2014-11-06 10:55:32 +01:00
Loz Calver
76b833dfbb Fix whitespace issues in NumericField/NumericFieldTest 2014-11-03 09:13:54 +00:00
Loz Calver
9cbd6f8023 Merge pull request #3598 from micmania1/patch-4 
FIX Image backend ignoring config.
 2014-11-03 09:03:43 +00:00