Damian Mooyman 77a45c0dbc Merge remote-tracking branch 'origin/4.1' into 4 ... # Conflicts: # src/Forms/HTMLEditor/HTMLEditorSanitiser.php # src/ORM/DataObjectSchema.php # src/ORM/Queries/SQLSelect.php # src/View/Parsers/ShortcodeParser.php		2018-06-11 10:19:04 +12:00
..
Dev	Reset test state for modified config options	2017-09-28 17:24:32 +13:00
Parsers	Merge remote-tracking branch 'origin/4.1' into 4	2018-06-11 10:19:04 +12:00
Shortcodes	Pulls/4.0/shortcode namespacing (#7085)	2017-06-29 18:45:17 +12:00
ArrayData.php	MINOR Add default value to ArrayData constructor	2017-09-05 09:42:52 +12:00
GenericTemplateGlobalProvider.php	API: ModulePath template global now takes any composer package name.	2017-06-28 16:59:28 +12:00
HTML.php	API Move createTag to HTML class	2017-06-16 12:22:05 +12:00
PublicThemes.php	API Implement support for public/ webroot folder (#7741)	2018-01-12 16:25:02 +13:00
Requirements_Backend.php	API Implement support for public/ webroot folder (#7741)	2018-01-12 16:25:02 +13:00
Requirements_Minifier.php	Deprecate minifier API	2017-05-11 11:52:31 +12:00
Requirements.php	API Implement support for public/ webroot folder (#7741)	2018-01-12 16:25:02 +13:00
SSTemplateParseException.php	PSR2: Whitespace-only changes	2016-11-29 12:31:16 +13:00
SSTemplateParser.peg	FIX SSViwer::execute_template should allow requirements to be included	2018-01-31 11:10:26 +00:00
SSTemplateParser.php	FIX SSViwer::execute_template should allow requirements to be included	2018-01-31 11:10:26 +00:00
SSViewer_BasicIteratorSupport.php	Tidy up + document SSViewer classes	2017-09-21 17:03:21 +01:00
SSViewer_DataPresenter.php	[ss-2018-006] Prevent code execution in template value resolution	2018-05-14 17:05:31 +12:00
SSViewer_FromString.php	rename TEMP_FOLDER to TEMP_PATH	2017-10-09 12:41:34 +13:00
SSViewer_Scope.php	Tidy up + document SSViewer classes	2017-09-21 17:03:21 +01:00
SSViewer.php	FIX SSViwer::execute_template should allow requirements to be included	2018-01-31 11:10:26 +00:00
TemplateGlobalProvider.php	PSR2: Whitespace-only changes	2016-11-29 12:31:16 +13:00
TemplateIteratorProvider.php	PSR2: Whitespace-only changes	2016-11-29 12:31:16 +13:00
TemplateParser.php	PSR2: Whitespace-only changes	2016-11-29 12:31:16 +13:00
ThemeList.php	PSR2: Whitespace-only changes	2016-11-29 12:31:16 +13:00
ThemeManifest.php	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00
ThemeResourceLoader.php	ENHANCEMENT Fall back to SSViewer::get_themes when using themeResourceLoaders	2018-02-16 09:09:35 +13:00
ViewableData_Customised.php	PSR2: Whitespace-only changes	2016-11-29 12:31:16 +13:00
ViewableData_Debugger.php	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00
ViewableData.php	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00