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

11713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hamish Friedlander
0ae3050e9e FIX Allow Director::$rules like //$Action 
In 3.0, doing $Action => SomeController would redirect all action requests
to that default controller. In 3.1, you need to do //$Action => SomeController
but it didnt work - those initial slashes broke matching
 2013-04-29 16:13:37 +12: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
colymba
41c0f8080e FIX Only block root vendor folder 
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.
 2013-04-27 16:03:35 +03: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
Will Morgan
c61f050757 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:22:00 +02:00
Elvinas
d5f6aac368 FIX: Longer dropzone title wraps to two lines 
This is regression, because I've already fixed this in pull #1176, but
my fixes overwritten with recent changes.
 2013-04-27 11:15:18 +03: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
Will Morgan
72a7f0e672 AJAX friendly responses for Security class 
Final work around issue #1802 - creating templates for complex layout
operations and removing HTML from this controller.
 2013-04-26 12:29:35 +01:00
Ingo Schommer
5f91c3724d Consistently used dollar notation in template docs (see #1794) 2013-04-26 11:48:59 +02:00
Ingo Schommer
b211f22bf9 FIX JSONDataFormatter wrong relation identifiers (fixes #1795) 2013-04-26 11:40:24 +02: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
c8d98861c0 Update template documentation to include DataList methods 
https://github.com/silverstripe/sapphire/pull/1799.
 2013-04-25 11:54:10 +12: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
Christian Lohmaier
26ed69508a fix nginx documentation to one that actually works :-) 
example configuration wuldn't allow to install silverstripe, as
install.php does exist as a regular file (and that was ignored in the
old version of the documentation)
Similarily, the last rule in the htaccess snippet that should allow the
access to the tinymce php files were never applied, as a previously
listed regex did match and denied access. Even if it would have taken
effect: as those files do exist on disk, they would have been handed out
as-is and not been interpreted by php.
Also the statement regarding accidental/exploitable execution of
arbitrary php was misleading (and to some degree even wrong) in the old
context.

squashed commit as per pr#1791
 2013-04-23 12:37:25 +02:00
Trevor
50d2c26230 Issue #1775 Add reference to $Me in loop and update occurence of Children with $ prefix. 2013-04-23 10:01:00 +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
a303a39d71 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:14:32 +02: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
Ingo Schommer
26a6ac47a3 Merge pull request #1788 from sminnee/perf-fix-in-viewabledata-obj 
Performance fix in calls to CompositeDBField::setValue()
 2013-04-22 00:53:09 -07:00
Sean Harvey
8278181b92 Merge branch '3.0' into 3.1 2013-04-22 17:14:45 +12:00
Sam Minnee
9ba26a04c4 Added test for lazy-loading edge-case in Money field. 2013-04-22 11:50:57 +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
Sam Minnee
eb583c5f14 NEW: Added DataObject::getQueriedDatabaseFields() as faster alternative to toMap() 
API: CompositeDBField::setValue() may be passed an object as its second argument, in addition to array.

These changes provide a 15% - 20% performance improvement, and as such justify an small API change in the 3.0 branch. It will likely affect anyone who has created their own composite fields, which is fortunately not all that common.
 2013-04-21 13:39:11 +12: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
hdrlab
22f5c06fd3 Disable ID based partial caching for all security actions 
Disables ID based partial caching for all security actions so that actions such as Security/lostpassword and Security/passwordsent work properly even if partial caching is used.
 2013-04-19 16:45:05 +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
Ingo Schommer
f86ca423ca Added --no-update hint to composer docs 2013-04-18 16:08:08 +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