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
16,127 Commits 31 Branches 527 Tags 162 MiB
78ed003977
Commit Graph

208 Commits

Author SHA1 Message Date
miiihi
5af35a89ce ENHANCEMENT Allow multiline comments in SS3 templates 2013-03-07 18:45:07 +01:00
Hamish Friedlander
7efae6b95f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 14:31:57 +13:00
Simon Welsh
be8482aa73 Merge pull request #1173 from ajshort/include-object-argument 
BUG: Pass named include argument as objects.
 2013-02-13 23:44:29 -08:00
ajshort
d3629be344 BUG: Pass named include argument as objects. 
This means you can pass objects such as lists as named parameters, not
just strings.
 2013-02-14 18:31:40 +11:00
Ingo Schommer
d969e29d00 API Require ADMIN for ?showtemplate=1 2013-02-12 23:26:04 +01:00
Ingo Schommer
b44720179c Merge pull request #1180 from mateusz/css-combining-media 
API Add possibility to combine media-targeting stylesheets.
 2013-02-12 14:13:45 -08:00
Mateusz Uzdowski
53feb3a5ae API Add possibility to combine media-targeting stylesheets. 2013-02-13 11:04:05 +13:00
ajshort
a4096ecc70 Add a self method to the SSViewer scope. 
This returns the current object, and resets the scope.
 2013-02-11 17:53:14 +11:00
Ingo Schommer
14a56c18e9 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/Director.php
 2013-02-07 21:45:16 +01:00
Ingo Schommer
b381e9933d Include "media" attr for module customCSS() (fixes #8219) 2013-02-01 10:23:16 +01:00
Ingo Schommer
5f8115f4c7 BUGFIX Hard fallback to en_US.js in Requirements 
Ideally we'll have region-less locales like en.js as fallbacks,
but for now this prevents the UI becoming non-operational
e.g. when both i18n::set_locale() and i18n::default_locale()
are set to 'en_NZ'.
 2013-01-09 22:31:19 +01:00
Ingo Schommer
618a3d0314 Requirements acces to files with query strings (fixes #7735) 
Originally authored by florian.thoma, tests added
by Ingo Schommer. Also removed query params from
file paths before calling mtime() on it.

See https://github.com/silverstripe/sapphire/pull/1023
 2012-12-18 01:01:19 +01:00
Matt Lewis
af6eccea96 Fixing typo in Requirements allowing access to files requested with query strings 2012-12-18 00:53:54 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
d92258da8f Allow calling SSViewer_Scope on empty sets 
Specifically fixes a bug where a SelectionGroup_Item
without a "child" field causes fatal errors.
 2012-12-11 11:07:00 +01:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0' 
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
 2012-11-22 23:51:28 +01:00
Sander van Dragt
8f89aa9171 BUG only call filemtime if file exists 
Added file_exists check before calling filemtime as this results in
'filemtime(): stat failed'
 2012-11-21 13:11:53 +13:00
Sean Harvey
6a868e79e1 Removing deprecated prototype/behaviour libraries 2012-11-16 11:37:56 +13:00
Sean Harvey
0d79897d4f Removing deprecated ArrayData::getArray() 
Use ArrayData::toMap() instead
 2012-11-15 14:43:15 +13:00
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Will Rossiter
dfd3455802 BUG Only include processed requirements at the top level. (Fixes #7847) 
After each sub template was processed Requirements::includeInHTML() is included which appended requirements again.
 2012-11-04 17:54:09 +13:00
Sean Harvey
f6a90467e4 Merge branch '3.0' 2012-10-15 10:10:01 +13:00
Sean Harvey
fca9831e66 Remove end php tag from TemplateIteratorProvider 2012-10-10 11:15:55 +13:00
Ingo Schommer
fb5e488103 Line length fixes 2012-10-03 18:11:31 +02:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
 2012-10-03 16:16:19 +02:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Simon Welsh
1e629f4585 Merge branch '3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
 2012-09-21 14:56:56 +12:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Sean Harvey
954eb60983 BUG If combined files can't be written, fallback instantly to uncombined 2012-09-20 14:01:45 +12:00
Sam Minnee
824afffd2e Merge branch '3.0' 2012-08-23 12:39:41 +12:00
Fred Condo
3e0782267c Allow scheme-relative URLs in requirements 
The Requirements class currently treats only absolute URLs as URLs, and
tries to interpret anything else as a filesystem path. This prevents
using scheme-relative URLs for requirements.

Example:
<% require javascript(//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js) %>

This forces the unfortunate choice of not using a CDN for common
scripts, always using an https absolute URL, or accepting that some
browsers will throw a security warning when viewing the site in https.

This change allows scheme-relative URLs & updates RequirementsTest.
 2012-08-22 16:49:55 -07:00
Hamish Friedlander
95d0be636c Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:44:53 +12:00
Hamish Friedlander
e160b76df5 BUG 7362 dont include trailing space in bare string 2012-07-23 15:42:58 +12:00
Ingo Schommer
e00c87541e Merge pull request #618 from chillu/pull/deprecate-profiler 
API Deprecated Profiler class, removed related debug GET params
 2012-07-05 13:43:37 -07:00
Ingo Schommer
0fe515e182 API Deprecated Profiler class, removed related debug GET params 
Use third party tools like XHProf instead.
Removed defunct or unnecessary debug GET parameters:
debug_profile, debug_memory, profile_trace, debug_javascript, debug_behaviour
 2012-07-05 12:02:06 +02:00
Simon Welsh
9f6eeb4d0e FIX: insert javascript requirements before the first inline script. 
From http://open.silverstripe.org/ticket/6648.
 2012-07-01 18:34:24 +12:00
Will Rossiter
168663657b MINOR: add flag for combine in order to test Requirements::combine_files() while in dev 2012-06-29 18:35:55 +12:00
Hamish Friedlander
0bea6974b6 BUGFIX: Make themedCSS use {theme}_{module}/css/{name}.css files if they exist 
2.4 used to use a manifest to find css. One side-effect of that is that even without explicit support,
css files in module-specific themes (/themes/{theme}_{module}/) would get picked up. This broke in 3.

This fix does still require the module name to be explicitly passed as a parameter to themedCSS, but if
you do, and a css file of that name exists in the module-specific themes css directory, that will
be included in preference to the theme or module provided css
 2012-06-22 13:34:03 +12:00
Sam Minnee
3f0136749b API CHANGE: Add Security::ignore_disallowed_actions() to allow site features to be disabled when permissions have failed, rather than redirecting to the log-in form. (Trac #7097) 2012-06-15 15:17:48 +12:00
Sean Harvey
cbf4ad3a75 MINOR Replace deprecation warnings with Deprecation::notice() instead 2012-05-30 22:33:11 +12:00
Sean Harvey
fa764c72b4 MINOR Using Deprecation::notice() for deprecated method in ViewableData 2012-05-30 22:29:58 +12:00
Sean Harvey
792c89e103 ENHANCEMENT Adding List() in the GenericTemplateGlobalProvider so 
templates can use <% cached List(Member).max(LastEdited) %> instead
of deprecated "Aggregate" syntax.
 2012-05-29 20:04:51 +12:00
Sean Harvey
1bf6495ae0 MINOR Partially reverted 4d4f9e08d9 as we don't need to check 
forTemplate() exists
 2012-05-19 18:17:25 +12:00
Sean Harvey
4d4f9e08d9 MINOR Code formatting in SSViewer 2012-05-19 18:09:39 +12:00
Sean Harvey
e5e8f489a2 Merge branch (pull request #247) 'template-global-fixes' of https://github.com/sminnee/sapphire into sminnee-template-global-fixes 2012-05-19 15:39:59 +12:00
Ingo Schommer
13c9011082 Merge pull request #430 from halkyon/getallfields_fixes 
MINOR Fixing use of deprecated getAllFields(), mark field as deprecated ...
 2012-05-11 01:04:38 -07:00
Simon Welsh
ab34688273 BUGFIX: Looping over a PaginatedList in the template caused a seg fault/bus error. 2012-05-11 14:03:31 +12:00
Sean Harvey
1859070fa9 MINOR Fixing use of deprecated getAllFields(), mark field as deprecated properly. 2012-05-11 11:23:24 +12:00
Stig Lindqvist
ce5684c776 BUGFIX Throwing an InvalidArgumentException without the new keyword results in a Fatal error 2012-05-10 11:21:32 +12:00
Will Rossiter
585417d141 Merge pull request #343 from halkyon/object_static_remove_deprecation 
BUGFIX Remove calls to deprecated Object static methods, update ConfigTest
 2012-04-19 14:41:45 -07:00
Sean Harvey
ccb941ea9d BUGFIX Fixed places where Object::get_static() was being used. Replace 
with Config system instead.
 2012-04-18 23:55:37 +12:00
Sean Harvey
4c6be2931b BUGFIX Removing use of deprecated Object static functions like 
get_static(), set_static(), uninherited() etc. Replace with equivalent
Config system get(), update()
 2012-04-18 23:10:57 +12:00
Julian Seidenberg
65e3651ff4 API-CHANGE: new translatable syntax _t function 2012-04-18 17:35:31 +12:00
Julian Seidenberg
189c305c83 API-CHANGE: parser for new i18n syntax 2012-04-18 17:35:30 +12:00
Julian Seidenberg
45c7dfd9f5 ENHANCEMENT: tests for new i18n syntax 2012-04-18 17:35:29 +12:00
Sean Harvey
effc654009 MINOR Moved ModulePath to GenericTemplateGlobalProvider 2012-04-15 10:50:21 +12:00
Sean Harvey
8949dfa691 ENHANCEMENT Replaced locations of sapphire with $ModulePath(framework) in templates, based off Controller which implements TemplateGlobalProvider 2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Hamish Friedlander
521742aaf8 ENHANCEMENT: Split arguments passed to SSViewer into underlay and overlay arguments to control precedence. Also fixes breakage of SecurityAdmin 2012-04-13 12:15:34 +12:00
Ingo Schommer
c73b80049a MINOR Removed usage of deprecated Object::uninherited_static() in core, improves CMS loading speed in live mode by ~3.5% 2012-04-12 18:26:56 +02:00
Sam Minnee
77c95b3434 MINOR: Hamish is all class. ;-) 2012-04-12 13:19:48 +12:00
Sam Minnée
1189322b41 Merge pull request #302 from robert-h-curry/7113-nested-controls-breaking-last 
BUGFIX: Issue #7113: Recalculate itemIteratorCount when popping viewer state.
 2012-04-11 17:19:46 -07:00
Sam Minnée
168eaf72d8 Merge pull request #300 from silverstripe-scienceninjas/feature/ssviewer-enhancements 
Feature/ssviewer enhancements
 2012-04-11 16:29:22 -07:00
Robert Curry
0daa76d0b7 BUGFIX: Issue #7113: Recalculate itemIteratorCount when popping viewer state. 2012-04-12 11:16:41 +12:00
Hamish Friedlander
5c336329b6 MINOR: When Up called and we are at the top of the scope, throw a useful error, not just an index undefined error 2012-04-11 22:08:05 +12:00
Hamish Friedlander
21bf409b7b BUGFIX: Pass arguments through to subtemplates when rendering those too 2012-04-11 21:50:06 +12:00
Hamish Friedlander
e4a043ac0b ENHANCEMENT: Allow arguments to be passed to templates via an array passed to SSViewer#process and via keyword=value pairs in the <% include %> tag 2012-04-11 21:34:27 +12:00
Hamish Friedlander
40ca21e6e5 MINOR: Remove bugfix that is (a) unnessecary because the key is already just sha hashes, underscores and numbers and (b) broken because it strips the open and close quotes from the key 2012-04-11 21:30:57 +12:00
Andrew O'Neil
142a073ce3 MINOR: Fix E_STRICT warning in SSViewer 2012-04-11 17:36:56 +12:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Sam Minnee
acdd07ac6f BUGFIX: Allow template globals to be used in both object and value contexts (e.g. $Now.Year) 
BUGFIX: Allow template globals to return objects as well as values.
 2012-03-16 15:05:25 +13:00
Sam Minnee
1535ce6d36 BUGFIX: Removed used of lcfirst, as it's PHP 5.3 only 2012-03-09 18:21:01 +13:00
Stig Lindqvist
68d83d187b BUGFIX PHP 5.2 doesn't allow calling a static method like $className::$staticMethod() 2012-03-09 17:36:07 +13:00
Hamish Friedlander
374ed19406 API CHANGE: Change variable expose method in TemplateGlobalProvider and TemplateIteratorProvider to (a) not clash with each other and, (b) be less generic 2012-03-06 09:31:57 +13:00
Hamish Friedlander
2c65d3a398 BUGFIX: Add casting support to global and iterator variable injection 2012-03-06 09:31:57 +13:00
Hamish Friedlander
fb246bdd08 APICHANGE: Rename getExposedVariables to match coding conventions 2012-03-06 09:31:56 +13:00
Hamish Friedlander
e4675d7172 BUGFIX: Restore ability to pass injected variables right into SSViewer_DataPresenter 2012-03-06 09:31:56 +13:00
Hamish Friedlander
f55c575f95 BUGFIX: allowing ssviewer to be called without function arguments 2012-03-06 09:31:56 +13:00
Hamish Friedlander
91f4ba15f1 ENHANCEMENT: supporting "current scope" loop and with: (with Children) (loop) $Title (end_loop) (end_with) 2012-03-06 09:31:55 +13:00
Hamish Friedlander
28bb83552a API-CHANGE: moving iterator support from ViewableData to SSViewer. New set of unit tests for iterator support functions. 2012-03-06 09:31:55 +13:00
Hamish Friedlander
927dbbe717 API-CHANGE: Global template variables can now be called directly using SSViewer_DataPresenter instead of needing to inherit off ViewableData 2012-03-06 09:11:46 +13:00
Dominik Beerbohm
edf6cd6d83 API CHANGE: Remove ArrayData::forTemplate(), because it has little usefulness corrupts ViewableData customisation. 2012-02-24 16:35:12 +13:00
Dominik Beerbohm
82ef236879 Reset ... 2012-01-17 00:57:39 +01:00
Dominik Beerbohm
3a9ea42488 Update view/SSViewer.php 2012-01-16 18:04:26 +01:00
Sam Minnée
c2da56d4a1 Merge pull request #136 from simonwelsh/54_fixes 
BUGFIX Generate valid PHP when $includeDebuggingComments is true.
 2012-01-09 19:09:45 -08:00
Sam Minnée
2c770a6f8f Merge pull request #146 from simonwelsh/namespace-manifest 
BUGFIX Namespaced classes were always having their namespace prepended t...
 2012-01-06 15:58:46 -08:00
Ingo Schommer
6dd3dc9f59 BUGFIX Support for commas in URLs processed by Requirements and jQuery.ondemand (which uses commas to serialise its dependency data into HTTP headers) 2012-01-06 15:34:32 +01:00
Ingo Schommer
a633326c3e ENHANCEMENT Allow Requirements::add_i18n_javascript() to return its files more optimised inclusion, using it in LeftAndMain 2012-01-06 15:34:29 +01:00
Ingo Schommer
565e2ab318 Merge pull request #143 from Innovatif/sapphire 
---

BUGFIX Having <header tag in HTML causes requirements to double. See http://www.silverstripe.org/general-questions/show/17524
 2011-12-23 16:36:01 +01:00
Simon Welsh
f7516481b1 BUGFIX Sanitise keys and tags before using them with Zend_Cache. 2011-12-23 10:38:37 +13:00
Frank Mullenger
0a3de455cf MINOR User error was assuming $templateList is always an array when it can also be a string. 2011-12-18 15:34:00 +01:00
Simon Welsh
04c8e2b762 BUGFIX Generate valid PHP when $includeDebuggingComments is true. 2011-12-17 17:35:26 +13:00
Ingo Schommer
1d92172931 BUGFIX Returning 'first last' in ViewableData->FirstLast() if item is both at the same time 2011-12-17 02:32:21 +01:00
Ingo Schommer
f71781d95a MINOR Using require_once in SSTemplateParser instead of require to avoid class declaration errors when running tests through phpunit binary 2011-12-04 13:09:49 +01:00
Sam Minnee
a49b56a348 MINOR: Removed usage of deprecated FormField::Name() 2011-10-29 17:34:32 +13:00
Sam Minnee
e5afa25522 MINOR: Use Deprecation class to indicate deprecated methods in core. 2011-10-29 17:34:31 +13:00
Will Rossiter
01bfdbeb90 MINOR tweaks to SecurityAdmin layout 2011-10-29 15:47:08 +13:00
Simon Welsh
840343ffb7 Checks for array to string conversion (E_NOTICE as of PHP5.4) 2011-10-29 10:49:17 +13:00
Ingo Schommer
e2bf21ba1a BUGFIX Escaping base URLs for anchor links rewritten by SSViewer::process() with the 'rewriteHashlinks' option enabled (which is a framework default, and necessary because of the use of a <base> tag). Also added escaping for base URLs rendered through the 'php' variation of 'rewriteHashlinks' 2011-10-18 11:42:55 +02:00
Ingo Schommer
2ce1882e38 ENHANCEMENT Added SSViewer::getOption() as a logical counterpart to SSViewer::setOption() 2011-10-18 11:39:01 +02:00
Will Rossiter
1732a17114 Merged new-orm into datagrid 2011-09-26 16:47:54 +13:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
ajshort
79cde9df25 API CHANGE: Renamed ArrayData::getArray() to toMap() to make it consistent with DataObject. This also makes it work with SapphireTest assertation methods. 2011-05-01 15:26:29 +12:00
ajshort
3a1c2df4e7 API CHANGE: Renamed DataObjectDecorator to DataExtension. 
API CHANGE: Renamed LeftAndMainDecorator to LeftAndMainExtension.
MINOR: Replaced all references to decorators with extension.
 2011-04-26 11:01:38 +10:00
Ingo Schommer
9b29616710 API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure 2011-03-31 09:56:21 +13:00