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
11,262 Commits 31 Branches 527 Tags 162 MiB
42cf2a95bd
Commit Graph

11262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
42cf2a95bd FIX: Add support for multi dimensional source arrays in LookupField (open/6132) 2013-05-11 00:01:39 +12:00
Will Rossiter
718108969b API: Add ArrayLib::flatten($array, $preserveKeys) 2013-05-11 00:00:31 +12:00
Ingo Schommer
3b72432c40 Merge pull request #1868 from wilr/pen-6245 
FIX: Disable autocomplete on ConfirmedPasswordField instances.
 2013-05-10 02:41:16 -07:00
Will Rossiter
94d6b1ccff FIX: Disable autocomplete on ConfirmedPasswordField instances. 2013-05-10 20:32:59 +12:00
Will Rossiter
09fcdb8c31 Coding conventions for ConfirmedPasswordField 2013-05-10 20:23:06 +12:00
Jeremy Shipman
d47b202697 Restored c4eac5310e (merge error) 
FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields.
Added extra testing data to CSVBulkLoaderTest so that it fails.
 2013-05-09 23:06:02 +02:00
Ingo Schommer
3b02d22989 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/CsvBulkLoader.php
 2013-05-09 10:34:20 +02:00
Ingo Schommer
ced199b877 Direct writing of "Security.token" through dev/generatesecuretoken 2013-05-09 10:31:49 +02:00
Sam Minnée
9672a22166 Merge pull request #1851 from chillu/pulls/form-strict-method-check 
Form strict method check
 2013-05-08 22:31:40 -07:00
Andrew Short
c1d25d17ce Merge pull request #1858 from oddnoc/form-documentation-edit 
Edit forms documentation
 2013-05-08 18:34:01 -07:00
Fred Condo
677dc9822e Edit forms documentation 
Correct spelling and word choices.
 2013-05-08 17:00:43 -07:00
Ingo Schommer
e5d3a1da6b Disable ContentNegotiator in CMS (fixes #1850) 2013-05-08 23:45:53 +02:00
Ingo Schommer
5d9cbae949 Merge pull request #1819 from oddnoc/csvbulkloader-findexisting-3.1 
Use the correct variable as the key into $record
 2013-05-08 04:23:05 -07:00
Ingo Schommer
a1216b5e32 Merge pull request #1250 from wilr/gridfield-action-fixes 
FIX: Do not blindly pass input values to GridField_FormAction URL's
 2013-05-08 04:20:40 -07:00
Ingo Schommer
433c48b53d Merge pull request #1855 from wilr/installer-postman 
FIX: Check for POST support in installer
 2013-05-08 04:07:46 -07:00
Will Rossiter
22e8ba6ff6 FIX: Check for POST support in installer 
Also two minor fixes for Web server configuration
	* Prevent notice on unsupported setups.
	* Show successful message.

Conflicts:
	dev/install/install.php5
 2013-05-08 22:51:27 +12:00
Ingo Schommer
c01511eaa3 Merge pull request #1854 from wilr/image-derp 
Deprecate Image::loadUploadedImage(), Use Upload::load()
 2013-05-08 03:01:41 -07:00
Ingo Schommer
399eacf12c Merge pull request #1853 from wilr/config-notice-error 
FIX: ensure config variables exist
 2013-05-08 02:49:39 -07:00
Will Rossiter
b2937decfc Deprecate Image::loadUploadedImage(), Use Upload::load() 2013-05-08 21:49:38 +12:00
Will Rossiter
7a9f142c97 FIX: ensure config variables exist 2013-05-08 21:36:49 +12:00
Ingo Schommer
a9edf47189 Merge pull request #1830 from a2nt/media_dialog_add_url_btn_fix 
FIX media dialog add url button fix
 2013-05-08 01:42:04 -07:00
Ingo Schommer
d74c4aadc1 Merge pull request #1832 from oddnoc/is_absolute_url-regex 
Anchor regex in Director#is_absolute_url()
 2013-05-08 01:40:23 -07:00
Ingo Schommer
65fd1a7ff4 Merge pull request #1833 from oddnoc/1687-dataobject-forcewrite 
FIX: Enable $forceWrite argument of DataObject#write()
 2013-05-08 01:38:16 -07:00
Ingo Schommer
3e88c98ca5 API Restrict MemberLoginForm to POST requests for increased security 
CVE-2013-2653 - Thanks to Fara Rustein of Deloitte Argentina for reporting.
 2013-05-08 10:25:28 +02:00
Ingo Schommer
14c59be85e API Form::setStrictFormMethodCheck() and strict argument to setFormMethod() 
Thanks to @sminnee for getting this started
 2013-05-08 10:25:13 +02:00
Ingo Schommer
72f81447f0 Merge pull request #1791 from tdf/pullrequests-for-3.1 
fix nginx documentation to one that actually works :-)
 2013-05-08 00:51:38 -07:00
Ingo Schommer
4188668e68 Merge pull request #1842 from tomzen/patch-1 
Add link to Config. Reference from the Config. Overview section to aid n...
 2013-05-08 00:45:43 -07:00
Ingo Schommer
36906f794b Merge pull request #1845 from a2nt/imagemagick_fix 
FIX ImageMagick cropped resize
 2013-05-08 00:45:20 -07:00
Josua2012
59be4a3be0 Allow custom ChangePasswordForm form 
With this modification we can use Object::useCustomClass() to create a
custom ChangePasswordForm form:
Object::useCustomClass('ChangePasswordForm',
'CustomChangePasswordForm');
 2013-05-08 09:39:39 +02:00
Josua2012
e3b6feba2a Sometimes $parent->parentNode is null and fails. 2013-05-08 09:39:35 +02:00
Ingo Schommer
4de032b364 Merge pull request #1848 from a2nt/patch-1 
FIX File class typo
 2013-05-07 15:30:55 -07:00
Tony Air
00b8ffd05f FIX File class typo 2013-05-08 01:27:34 +07:00
a2nt
197516b94f FIX ImageMagick cropped resize 2013-05-07 22:07:58 +07:00
tomzen
19071761b7 Add link to Config. Reference from the Config. Overview section to aid navigation a little 2013-05-07 11:13:27 +02:00
Loz Calver
429ac17a0f NEW Allow setting of ASSETS_DIR in _ss_environment.php 2013-05-07 10:06:34 +02:00
Ingo Schommer
1a52a51195 DataObject->duplicate() test 
Advanced relationship copying is already tested further down,
but doesn't cover the same basics. Triggered by a CMS bug
which turned out to be unrelated (https://github.com/silverstripe/silverstripe-cms/issues/689)
 2013-05-07 10:06:15 +02:00
Sean Harvey
677122256e Merge pull request #1837 from simonwelsh/short-array-parse 
FIX Handle PHP 5.4's short array notation everywhere arrays are parsed.
 2013-05-06 20:32:51 -07:00
Simon Welsh
7b997a698d Merge pull request #1840 from halkyon/archive_versions_table_without_versions 
BUG Fixing queries on non-existent table breaking archive site
 2013-05-06 18:01:20 -07:00
Sean Harvey
f1a4e7203e BUG Fixing queries on non-existent table breaking archive site 
With a many to many relation, e.g. SiteTree_MyRelation, and listing
them in your template then adding ?archiveDate=x in the URL, a SQL
error is shown because Versioned::augmentSQL() tries to query the
non-existent table "SiteTree_MyRelation_versions" assuming there's
versioning setup, but there isn't.
 2013-05-07 12:34:46 +12:00
Simon Welsh
8930304dfc Only set GridField state in request if a value is submitted 2013-05-07 08:15:27 +12:00
Sam Minnee
b5a83878dd Added docs for i81n.moduole_priority. 2013-05-06 12:51:46 +12:00
Hamish Friedlander
efea4dbe94 NEW Allow specifying priority for translations 
Priority for translations was hardcoded, and hardcoded the project name as "mysite".

This takes the order from a configuration property "module_prority". You can
use standard config fragment before and after rules to make a module less or
more important than anything else, with these tweaks:

 - Unless it has it's order explicitly defined, the "project" module (normally mysite)
   will be considered highest priority

 - There is an "other_modules" value in the order list which will be replaced by
   all the modules (except the project module) that don't have their order
   explicitly defined.
 2013-05-06 12:51:46 +12:00
Simon Welsh
835aefbe83 FIX Handle PHP 5.4's short array notation everywhere arrays are parsed. 2013-05-05 13:27:42 +12:00
Will Rossiter
fe2663a140 Merge pull request #1836 from simonwelsh/remove-dup 
Remove duplicate parse_class_spec method.
 2013-05-04 17:38:07 -07:00
Simon Welsh
cb0977ce9f Remove duplicate parse_class_spec method. 2013-05-05 11:43:56 +12:00
Fred Condo
ea7b94206d FIX: Enable $forceWrite argument of DataObject#write() 
$forceWrite was being ignored because it was tested in a part of the
code that is reachable if and only if there are changes to the object.
This patch adds an additional test to correct that logic error.

Also, refrain from needlessly checking for changes when $forceWrite is
true.

Fixes #1687
 2013-05-03 16:29:33 -07:00
Fred Condo
f5c6285240 Anchor regex in Director#is_absolute_url() 
- Anchor the regex to the beginning of the string
- Change the regex delimiter to reduce the amount of \ clutter
 2013-05-03 16:07:25 -07:00
a2nt
423c737502 FIX media dialog add url button fix 
Use HtmlEditorField.BUTTONADDURL for localization
 2013-05-04 03:34:02 +07:00
Simon Welsh
a5d69f2bf5 Update page-type-templates.md 2013-05-03 15:04:30 +12:00
Sean Harvey
7fbb9e3a96 Merge pull request #1826 from uniun/patch-2 
The MAX_FILE_SIZE field must precede the file input field.
 2013-05-02 14:05:32 -07:00