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,392 Commits 31 Branches 527 Tags 162 MiB
4879c9c890
Commit Graph

11392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
4879c9c890 Merge remote-tracking branch 'origin/3.1' 2013-04-29 23:31:46 +02:00
Ingo Schommer
caaf5a2d78 Fixed BBCodeParser config API usage 2013-04-29 23:31:23 +02:00
Will Rossiter
36855b89e0 Merge pull request #1810 from uniun/fix-col-buttons 
FIX: Column with buttons in GridField is too wide
 2013-04-29 01:20:57 -07:00
Ingo Schommer
8f3c0b57ba Merge remote-tracking branch 'origin/3.1' 2013-04-29 09:32:58 +02:00
Ingo Schommer
5ca9db5e5e Limit HtmlEditorField HTMLText casting note to existing fields 
This prevents it from failing for proxied values
like BlogEntryForm, where the field name doesn't exist,
and rather gets processed and saved into a different field.
 2013-04-29 09:32:05 +02:00
Ingo Schommer
6c2e791a48 Merge remote-tracking branch 'origin/3.1' 2013-04-29 08:59:06 +02:00
Will Morgan
8f6451612b Use correct config variable name in encrypt_password 
Use correct config variable name in encrypt_password
Fixes https://github.com/silverstripe/sapphire/issues/1709
 2013-04-28 09:58:42 +12:00
Will Rossiter
2e227ef6ec Merge pull request #1812 from willmorgan/patch-1 
Use correct config variable name in encrypt_password
 2013-04-27 14:28:57 -07:00
Will Morgan
0de8a8a304 Use correct config variable name in encrypt_password 
Use correct config variable name in encrypt_password
Fixes https://github.com/silverstripe/sapphire/issues/1709
 2013-04-27 13:29:13 +02:00
Elvinas
084341cc04 FIX: Column with buttons in GridField is too wide 
Tested on FF18, IE9-IE10, C26 and O12.15 on Windows8.
 2013-04-27 10:48:38 +03:00
Ingo Schommer
9b99eb9339 Merge pull request #1804 from chillu/pulls/shortcode-quoting 
FIX Unquoted shortcodes weren't parsed (fixes #680)
 2013-04-25 16:33:56 -07:00
Ingo Schommer
0e5b099287 FIX Unquoted shortcodes weren't parsed (fixes #680) 
Since that used to be the default shortcode notation
for our core "insert media" functionality, its important
to have this fixed and keep supporting "legacy" content
created with 3.0.
 2013-04-26 01:00:13 +02:00
Will Rossiter
a6b0807b9f Merge pull request #1800 from willmorgan/patch-1 
Define ConfirmedPassword::$children as a public variable
 2013-04-24 16:18:44 -07:00
Ingo Schommer
1b4d7fae24 Merge pull request #1801 from willmorgan/patch-2 
Fixing typo on Validator exception message
 2013-04-24 14:14:17 -07:00
Will Morgan
9732a7fb3b Fixing typo on Validator exception message 2013-04-24 18:50:40 +02:00
Will Morgan
676aa8de05 Defining $children as a public variable 
Defining $children as a public variable (it was previously defined on-the-fly)
 2013-04-24 16:25:13 +02:00
Ingo Schommer
5a2b765025 Merge pull request #1761 from NicoHaase/master 
[BUG] Enhanced tests for regeneration of images and a bugfix for images that were cached in multiple steps
 2013-04-24 02:53:45 -07:00
Nico Haase
5fbb3da661 Enhanced tests for regeneration of images and a bugfix for images that were cached in multiple steps 2013-04-24 10:27:20 +02:00
Ingo Schommer
59dbdcfc55 Merge pull request #1793 from Zauberfisch/3.1 
API: made more robust SSTemplateParser->includeDebuggingComments()
 2013-04-22 12:20:08 -07:00
Zauberfisch
809e0e547a MINOR: updated and extended Tests 2013-04-22 18:17:31 +00:00
Zauberfisch
034f575003 MINOR: if no doctyle is set, include comments inside <html> 
MINOR: if <html> tag is inside a html comment do not add a comment
 2013-04-22 18:16:09 +00:00
Zauberfisch
94b37f9c85 MINOR: moved includeDebuggingComments logic into own method to allow separated tests 2013-04-22 14:12:43 +00:00
Zauberfisch
7c66e8e7a2 API: try to place source_file_comments after doctype instead of html 2013-04-22 13:53:20 +00:00
Ingo Schommer
faa3e58468 Allow SS_DATABASE_NAME in _ss_environment.php configuration 
Makes setups which are completely driven by that file a bit easier
to automate, particularly if the same codebase is deployed
multiple times (e.g. to a staging and live instance)
 2013-04-22 14:11:37 +02:00
Sean Harvey
8278181b92 Merge branch '3.0' into 3.1 2013-04-22 17:14:45 +12:00
Ingo Schommer
53e3e6d2b4 Merge pull request #1781 from jedateach/csvloader-duplicatecheck-fix 
FIX: CSVBulkLoader duplicate check can now check more than one field
 2013-04-21 12:45:06 -07:00
Jeremy Shipman
c4eac5310e 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-04-19 16:52:39 +12:00
Che Van Lawrence
d07fb4355d Merge pull request #1770 from kinglozzer/config-dir-detection-fix 
FIX: _config/ directories are now correctly detected as modules (fixes #1762)
 2013-04-18 14:48:55 -07:00
Sean Harvey
6e0fa5db45 Merge pull request #1768 from tractorcow/3.1-http-mail-fixes 
BUG HTTP incorrectly converts mailto links to absolute urls
 2013-04-18 14:46:10 -07:00
Ingo Schommer
6e3a150424 3.1.0-beta3 changelog 2013-04-18 19:28:13 +02:00
Ingo Schommer
d877c1063d Updated changelog, moved "statics in Page.php" to top 
Its going to be a fatal error on every upgrade unless tended to,
so we need to ensure people don't overlook it in the guide.
 2013-04-18 18:28:09 +02:00
Ingo Schommer
7f6671628d "UploadFieldFileButtons" casting (regression from casting changes) 
Caused the UploadField rows to show "[Object object]" because
it tried to pass through a PHP object to JS without string casting
(the return used to be a string).
 2013-04-18 17:09:56 +02:00
Loz Calver
0384369acb FIX: _config/ directories are now correctly detected as modules (fixes #1762) 
DO NOT MERGE: to be reviewed. Only i18n & Deprecation classes use
->getModules() as far as I can see. Given that the method still simply
returns an array of modulename => modulepath, I don't think it's really
an API change
 2013-04-18 14:08:03 +01:00
Will Rossiter
e13ce9b98f Merge pull request #1774 from SticksTucker/patch-1 
Include AllPages() form method to $allowed_actions
 2013-04-17 22:17:30 -07:00
SticksTucker
8033955d35 Include AllPages() form method to $allowed_actions 2013-04-18 13:22:42 +10:00
Damian Mooyman
b6fc1d314e BUG HTTP will now correctly pass over mailto: links when converting relative links to absolute (e.g. in Emails) 2013-04-18 14:25:51 +12:00
Simon Welsh
93a8e6f16e Merge pull request #1773 from silverstripe-rebelalliance/fix/htmlvalue_attr_escaping 
FIX We still need XML escaping on href attributes in HTML4Value
 2013-04-17 15:05:33 -07:00
Hamish Friedlander
8d26bdbd2e FIX We still need XML escaping on href attributes in HTML4Value 2013-04-18 09:13:24 +12:00
uniun
4d70daa9e2 BUG: HiddenFields and VisibleFields should always return extraFields 
HiddenFields() and VisibleFields() should always return extraFields, e.g. HiddenFields doesn't return SecurityID if it is called before Fields().
 2013-04-17 20:31:17 +02:00
Ingo Schommer
2523dfbe95 Enforcing extension-less file validation (fixes #1767) 
By default, File.allowed_extensions contains '' (no extension),
but if you specifically remove it, the validation should pick it up.
 2013-04-17 10:21:59 +02:00
Ingo Schommer
a7574f0450 Merge pull request #1769 from wilr/doubleduplication 
Remove duplicate functionality between float and double
 2013-04-17 01:15:30 -07:00
Will Rossiter
e366fabd55 Remove duplicate functionality between float and double 2013-04-17 17:35:59 +12:00
Ingo Schommer
67ce9e08cc Extended docs for shortcode handling and doctypes (fixes #1700) 2013-04-16 14:01:04 +02:00
Nicolaas
08bf2aa91e removing potentially invalid html in email 
The generic email template encapsulates the "body" content in a paragraph mark.  This is undesirable as it can lead to invalid HTML. Rather than using a paragraph, it is better to have a div encapsulating the content.

The underlying reason for this is that $Body is usually HTML and this can included block elements (div, p, etc...) that are not allowed within paragraphs (p).

It is important that the HTML is valid, because it will reduce the likelihood for it being marked as spam, because it is less likely to show up strange formatting and for use of tools like emogrifier.
 2013-04-16 10:38:08 +02:00
Ingo Schommer
85202876a9 Merge pull request #1726 from s-m/1487-fix-template-comments 
BUG: Fix invalid code with source-file-comments, fixes #1487
 2013-04-16 00:59:15 -07:00
Ingo Schommer
9a17e3494f DateField.js event selector regression (fixes #1528) 
See 19a8545076
 2013-04-16 09:54:30 +02:00
s-m
acf2ff8ce6 BUG: Fix for #1487 
The parser could sometimes generate invalid code if the
source-file-comments were enabled, this moves the comments outside the
html-tag to circumvent these problems, update test as well.
 2013-04-15 19:54:41 +02:00
Hamish Friedlander
c02d7e4c2e Merge pull request #1750 from s-m/1660-elseif-parsing 
BUG: Allow empty else- and else_if-blocks
 2013-04-14 14:56:45 -07:00
Sean Harvey
2a65f17542 Merge pull request #1757 from tractorcow/3.1-phone-field-fix 
BUG Fixed incorrect variable usage in generation of PhoneNumberField form fields
 2013-04-14 14:01:09 -07:00
Ingo Schommer
566ae87c36 Merge pull request #1755 from kinglozzer/leftandmain_state_fix 
Fix broken CMSSettings saving
 2013-04-14 13:40:39 -07:00