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
7,973 Commits 31 Branches 527 Tags 162 MiB
f34e58f573
Commit Graph

7973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnee
f51515b62a Merge branch 'master' of https://github.com/adrexia/sapphire into adrexia-master 
Conflicts:
	admin/css/screen.css
 2012-03-09 16:56:43 +13:00
Sean Harvey
033a1e593a MINOR Fixed naming of test classes 2012-03-09 16:55:20 +13:00
Sam Minnée
0c93d3193e Merge pull request #226 from halkyon/master 
Fixed GridFieldToolbarHeaderTest
 2012-03-08 19:53:29 -08:00
Sean Harvey
e78419cef1 MINOR Fixed tests for GridFieldToolbarHeaderTest 2012-03-09 16:47:35 +13:00
Sam Minnée
d9c18ad78e Merge pull request #225 from halkyon/master 
Fixed broken GridField tests
 2012-03-08 19:46:17 -08:00
Sean Harvey
9b4b34c4f9 MINOR Fixed broken tests in GridFieldDetailFormTest 2012-03-09 16:37:25 +13:00
Sam Minnée
7ae2eda561 Merge pull request #224 from phalkunz/master 
Editing the URL keeps reverting back bug (#6842)
 2012-03-08 19:26:02 -08:00
Stig Lindqvist
2ab12affec Merge pull request #210 from sminnee/form-visiblefields 
Form::VisibleFields() and FieldList::VisibleFields()
 2012-03-08 19:24:25 -08:00
Saophalkun Ponlu
c6d7301fab BUGFIX: Change to a page url segment doesn't get saved properly caused by 'disabled' attribute on the field, which is added by url segment suggestion function (ticket #6842) 2012-03-09 16:11:32 +13:00
Sam Minnée
2b245899b2 Merge pull request #223 from halkyon/deprecation_fixes 
Deprecation fixes
 2012-03-08 18:49:45 -08:00
Sean Harvey
53bf61c968 Merge remote-tracking branch 'upstream/master' into deprecation_fixes 2012-03-09 15:47:20 +13:00
Sam Minnée
f01982a829 Merge pull request #219 from halkyon/master 
Fixed HtmlEditorField not inserting file/page links correctly due to broken shortcodes
 2012-03-08 18:46:03 -08:00
Sam Minnee
3d54668896 MINOR: Added explicit 'public' keyword on functions. 2012-03-09 15:42:31 +13:00
Sam Minnee
ba93028b01 API CHANGE: Added Form::VisibleFields() and FieldList::VisibleFields(), which list everything except hidden fields, to assist with the creation of custom form layouts. 2012-03-09 15:41:42 +13:00
Sean Harvey
2644cbb6e9 BUGFIX Remove use of encryptPasswords; use PasswordEncryptor_None 
instead
 2012-03-09 15:31:33 +13:00
Sean Harvey
ae45ef3bc2 Merge pull request #222 from robert-h-curry/6667-install-use-temp-folder-override-rc 
Issue #6667: Use TEMP_FOLDER in install.php
 2012-03-08 18:22:14 -08:00
Sean Harvey
d0a0df0b8e API CHANGE Removed Security::$useSalt static, please use a custom PasswordEncryptor instead 2012-03-09 15:06:12 +13:00
Robert Curry
ecb279c33e Issue #6667: Check for TEMP_FOLDER _ss_envrionment override in install script. 2012-03-09 15:06:01 +13:00
Naomi Guyer
f048b7edf0 BUG FIX: Support for gradients in editor in IE9 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 15:04:26 +13:00
Sean Harvey
0d8151fd3d Merge remote-tracking branch 'upstream/master' into deprecation_fixes 2012-03-09 15:03:43 +13:00
Sean Harvey
0df958f81d MINOR Fixed tests to use commas as delimiter for shortcodes, also test spaces still work as well 2012-03-09 15:00:03 +13:00
Sean Harvey
aca2b2f3b5 API CHANGE Removed deprecated Security::get_encryption_algorithms() - please use PasswordEncryptor::get_encryptors() instead 2012-03-09 14:51:34 +13:00
Sean Harvey
6e58026c27 API CHANGE Removed deprecated Security::encrypt_passwords() - please use PasswordEncryptor_None instead. 2012-03-09 14:50:14 +13:00
Sam Minnée
e307594c05 Merge pull request #218 from mrmorphic/6856-isdev-bug-rc 
bugfix for 6856, isDev=1&showqueries going into infinite loop
 2012-03-08 17:45:28 -08: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
Sean Harvey
4a52e29620 API CHANGE Removed deprecated File::getLinkedURL() - please use custom code instead. 2012-03-09 14:37:06 +13:00
Sean Harvey
a2353f793d MINOR Fixed misspelled "extension" in 
DataExtension::load_extra_statics()
 2012-03-09 14:35:12 +13:00
Sean Harvey
71c2a2286a API CHANGE Removed support for extraDBFields method in DataExtension, please ensure you are using extraStatics on your extension classes 2012-03-09 14:34:25 +13:00
Sean Harvey
49267dbbc4 ENHANCEMENT Shortcodes now support commas as delimiter for attributes (thanks aoneil for help with the regex!) (trac #6868) 
BUGFIX HtmlEditorField not inserting shortcodes correctly (trac #6868)
 2012-03-09 14:25:42 +13:00
Mark Stephens
627708e3a8 BUGFIX: add Director::isDev parameter so we can test if we know we're dev mode already without touching the database. Used in showqueries on MySQL, so that errors are avoided when showing queries on initial switch to dev move (#6856) 2012-03-09 14:20:22 +13:00
Naomi Guyer
050afddc8e BUG FIX: Make Inputs in Input-Selects take up the whole select box (#6934) 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 14:08:34 +13:00
Stig Lindqvist
09d6fa7bb3 API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:07:40 +13:00
Naomi Guyer
b7f5f91759 BUG FIX: Open new window for "Help" in CMS nav 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 14:07:12 +13:00
Stig Lindqvist
6d0b0d6788 API CHANGE Removing GridFieldDeleteAction and moved functionality into GridFieldRemoveButton #6921 2012-03-09 13:55:49 +13:00
Russell Michell
5b4f83a567 BUGFIX: #6853 Necessary styles required to complement work on same-indexed commit in cms project 2012-03-09 13:20:27 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Ingo Schommer
7c4bc36a9b Merge pull request #216 from halkyon/master 
Removed old behaviour.js client-side form validation
 2012-03-08 15:51:58 -08: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
7eddf4298f Merge remote-tracking branch 'upstream/master' 2012-03-09 12:21:46 +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
Ingo Schommer
e5f02337cd MINOR Testing nested detail forms in GridField 2012-03-09 00:06:14 +01:00
Ingo Schommer
66f22441e5 MINOR Checking for existence of $searchFields in GridFieldRelationAdd 2012-03-08 23:56:46 +01:00
Sam Minnée
31ce29fa0b Merge pull request #215 from silverstripe-scienceninjas/pull/6890-gridfield-permission 
MINOR Added per-record canView, canDelete, canCreate and canEdit checks ..
 2012-03-08 14:38:51 -08:00
Stig Lindqvist
8b2213d56c MINOR Added per-record canView, canDelete, canCreate and canEdit checks on gridfield and gridfield components #6890 2012-03-09 10:58:01 +13:00
Sean Harvey
6119b8d1b4 Merge pull request #214 from ohararyan/master 
TemplateGlobalProvider missing in installer
 2012-03-08 13:50:47 -08:00
Ryan O'Hara
63d5927e50 BUGFIX: Added TemplateGlobalProvider include to installer, as required by i18n. 2012-03-09 10:45:24 +13:00
Sean Harvey
f86e53bad8 API CHANGE Removed Validator::showError(), Validator::getError() and 
Validator::getCombinedError(). Use Validator::getErrors() instead
 2012-03-09 10:31:00 +13:00
Sam Minnee
ed0e06c0f6 BUGFIX: Fix a couple of rebasing-related bugs in GridField. 2012-03-09 10:27:57 +13:00
Ingo Schommer
f9323b398c BUGFIX Type-safe checks for Controller::join_links(), allowing arguments with a value of "0" 2012-03-08 22:20:37 +01:00
Ingo Schommer
46a3bbf7ba MINOR Merge error 2012-03-08 22:20:37 +01:00