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,972 Commits 31 Branches 527 Tags 162 MiB
6d0002780d
Commit Graph

13972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
micmania1
7384d011e9 FIX DataDifferencer was trying to compare fields, even if the fields didn't exist causing an error. 2014-11-28 05:35:06 +00:00
Damian Mooyman
3b3478136d Merge pull request #3677 from jonom/3093-flush-bugs 
FIX: Manifest flushing
 2014-11-27 11:24:40 +13:00
Daniel Hensby
ca7030d70d Merge pull request #3683 from bendubuisson/patch-2 
Update 5-dataobject-relationship-management.md
 2014-11-26 20:42:17 +00:00
Daniel Hensby
979389ca72 Merge pull request #3687 from bendubuisson/patch-4 
Update access-control.md
 2014-11-26 20:36:12 +00:00
Ben Dubuisson
e30a354076 Update access-control.md 
small typo
 2014-11-27 09:25:43 +13:00
Daniel Hensby
9e7373a365 Merge pull request #3686 from AntonyThorpe/patch-2 
Update docs/en/reference/index.md
 2014-11-26 20:04:14 +00:00
Antony Thorpe
9a7686c8b9 Update docs/en/reference/index.md 
GridField line included twice
 2014-11-27 08:06:00 +13:00
Daniel Hensby
a8ae5cc55b Merge pull request #3684 from bendubuisson/patch-3 
Update member.md
 2014-11-26 15:30:40 +00:00
Ben Dubuisson
514098c01a Update member.md 
small typo
 2014-11-26 16:32:57 +13:00
Ben Dubuisson
efd978074c Update 5-dataobject-relationship-management.md 
Some more typos, sorry didn't pick them all up at the same time!
 2014-11-26 14:37:33 +13:00
Jonathon Menz
01989aac4e FIX: Manifest flushing 
Fixes silverstripe/silverstripe-framework#2325
Fixes silverstripe/silverstripe-framework#3093

Static manifest was not being flushed during a dev/build on some environments (without ?flush in URL) and template manifest was never being flushed during a dev/build.
 2014-11-26 10:15:09 +10:30
Ingo Schommer
a61fb89e4f Merge pull request #3682 from bendubuisson/patch-1 
Update 5-dataobject-relationship-management.md
 2014-11-26 11:53:28 +13:00
Ben Dubuisson
a622fce073 Update 5-dataobject-relationship-management.md 
typos
 2014-11-26 11:43:49 +13:00
Ingo Schommer
4d4c651b50 Merge pull request #3673 from g4b0/patch-6 
Update datamodel.md
 2014-11-24 22:52:53 +13:00
Gabriele Brosulo
90a7761394 Update datamodel.md 
Syntax error
 2014-11-24 10:50:38 +01:00
Sean Harvey
f270dbcad6 Merge pull request #3665 from tractorcow/pulls/3.1/disable-auth 
API Allow CMS re-authentication to be completely disabled if necessary
 2014-11-24 09:21:31 +13:00
Daniel Hensby
2055194903 Merge pull request #3668 from phillprice/patch-7 
Update DropdownField.php
 2014-11-22 21:55:30 +00:00
Phill Price
ff67b5ba84 Update DropdownField.php 
Update to DropdownField::create, and in one instance set the Empty Title on the instantiation, rather than afterwards.
 2014-11-22 21:01:08 +00:00
Damian Mooyman
31b5a9dc86 API Allow CMS re-authentication to be completely disabled if necessary 2014-11-21 17:43:53 +13:00
Daniel Hensby
f636d15332 Merge pull request #3659 from phillprice/patch-6 
Update csv-import.md
 2014-11-20 09:00:41 +00:00
Damian Mooyman
2aa1c1e11e Fix alias for 3.2 2014-11-20 17:26:23 +13:00
Damian Mooyman
362e273bd2 Update branch alias for 3 2014-11-20 17:13:25 +13:00
Phill Price
ff65f5e00f Update csv-import.md 
Translated the German to English to match up other areas in document
 2014-11-19 21:29:54 +00:00
Loz Calver
d91150cc72 Merge pull request #3645 from jonom/insert-from-styles 
MINOR: Fix broken 'Insert From CMS' layout
 2014-11-19 09:18:50 +00:00
Damian Mooyman
fe0d330c59 Merge pull request #3656 from halkyon/nginx_buffers 
Adding appropriate nginx fastcgi buffer config required for admin
 2014-11-19 15:50:55 +13:00
Jonathon Menz
e4db619f8d MINOR: Fix broken 'Insert From CMS' layout 
Some updates to UploadField styles broke the layout of this form a bit
 2014-11-19 10:52:08 +10:30
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
Sean Harvey
8d2727eab6 Adding appropriate nginx fastcgi buffer config required for admin 2014-11-19 09:56:40 +13: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
Loz Calver
e4ddb4b975 FIX: Ensure query string in X-Backurl is encoded (fixes #3563) 2014-11-16 20:35:41 +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