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
13,778 Commits 31 Branches 527 Tags 162 MiB
0b1f297873
Commit Graph

13778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michael Strong
51337acda9 FIX Image backend ignoring config. 
The method directly calls the static property instead of the config value.
 2014-11-03 20:03:10 +13:00
Sam Minnée
646a57c324 Merge pull request #3553 from nhorstmeier/NumericReadonlyField 
Bugfix NumericField shows (none) for 0 on readonly
 2014-11-03 17:02:05 +13:00
muskie9
082c49c1b5 Bugfix NumericField shows (none) for 0 on readonly 2014-11-02 20:57:20 -06:00
Daniel Hensby
bd23ff0a3a Merge pull request #3594 from jdemeschew/patch-1 
Makes requirements inclusion work with old PCRE versions.
 2014-10-31 15:23:03 +00:00
Juri Demeschew
19f11e72b0 Update Requirements.php 
Makes requirements inclusion work with old PCRE versions
 2014-10-31 15:41:58 +01:00
Daniel Hensby
fbccd1af3f Merge pull request #3591 from jedateach/issues/image-resize-fix 
FIX: Image resizing breaks when one of the resized image dimensions is between 0 and 1
 2014-10-30 14:46:40 +00:00
Loz Calver
c48533d4f8 Merge pull request #3593 from simonwelsh/patch-1 
Correct regression around ?flush
 2014-10-30 10:11:05 +00:00
Simon Welsh
73b591a79d Correct regression around ?flush 
?flush used to work. There's no reason why it shouldn't.
 2014-10-30 20:51:05 +11:00
Jeremy Shipman
392ddef2e8 FIX: Image resizing breaks when one of the resized image dimensions is between 0 and 1. 
Solution: Round up to 1 instead of down to 0.
Converted php errors to exceptions in the process.
 2014-10-30 14:21:04 +13:00
Loz Calver
c8ad29f0d7 Merge pull request #3567 from stephenmcm/gridfieldexportbutton-patch 
FIX GridFieldExportButton exporting only Paginated list when using ArrayList as source
 2014-10-28 11:33:42 +00:00
Mateusz U
db1c7e89f0 Merge pull request #3580 from halkyon/hhvm_install_docs_cleanup 
Improvements to nginx and HHVM installation docs
 2014-10-28 09:54:50 +13:00
Ingo Schommer
32bcfe7f4e Merge pull request #3582 from g4b0/3581-translate_belongs_many_many 
belongs_many_many are now translatable
 2014-10-28 07:39:36 +13:00
g4b0
213d5f60bf belongs_many_many are now translatable 2014-10-27 11:36:00 +01:00
Sean Harvey
ce797773da Improvements to nginx and HHVM installation docs 
* Fix a few missing packages in `apt-get install` command
 * Add command to start HHVM automatically on boot
 * Remove unnecessary `sendfile on` (already in /etc/nginx/nginx.conf)
 2014-10-27 14:26:42 +13:00
Stephen McMahon
20af30ed98 FIX GridFieldExportButton exporting only Paginated list when using ArrayList as source 2014-10-27 11:03:00 +11:00
JorisDebonnet
d5361dedec Moving NoHTML function from Text to StringField 
This change will make the NoHTML function available for Varchar fields in particular.
 2014-10-26 11:31:30 +00:00