tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-28 20:29:15 +02:00
Code Issues Projects Releases Wiki Activity
20,234 Commits 30 Branches 526 Tags 158 MiB
163f1523e9
Commit Graph

979 Commits

Author SHA1 Message Date
Damian Mooyman
26402f3bb5
ENHANCEMENT Enable request handlers to be extended 2018-03-21 15:50:31 +13:00
Ingo Schommer
0fe56732af RequestHandler updateLink() extension point 2018-03-20 15:08:29 +13:00
Daniel Hensby
2c121e8a07
new approach 2018-03-19 11:48:17 +00:00
Daniel Hensby
7f7fe73b77
Reduce dependence on session state for accessing draft stages 2018-03-19 11:48:16 +00:00
Daniel Hensby
35bfce28fc
Merge branch '3' into 4 2018-03-16 15:04:26 +00:00
Daniel Hensby
80d15fc4f5
Merge branch '4.1' into 4 2018-03-16 14:58:40 +00:00
Daniel Hensby
9ed3cd4042
Merge branch '4.0' into 4.1 2018-03-16 14:57:05 +00:00
Thomas Portelange
2e1c70b56c
Ensure tmpData exists 
Otherwise you might get illegal string offset
 2018-03-15 20:40:05 +01:00
Daniel Hensby
fb945690b1
Merge pull request #7875 from sminnee/devbuild-record-count 
Suggested feature: dev/build record count
 2018-03-14 14:26:49 +00:00
Daniel Hensby
c41ebd3279
Merge pull request #7930 from creative-commoners/pulls/4.1/return-self 
FIX Ensure consistent return type for FieldList::removeByName
 2018-03-14 14:21:47 +00:00
Daniel Hensby
069744bb21
Merge branch '3' into 4 2018-03-14 14:15:51 +00:00
Daniel Hensby
fd449618b2
Merge branch '4.1' into 4 2018-03-14 14:11:03 +00:00
Daniel Hensby
ec6ff71107
Merge branch '4.0' into 4.1 2018-03-14 14:09:40 +00:00
Daniel Hensby
d28a1b5cfc
Merge branch '3.6' into 4.0 2018-03-14 14:08:41 +00:00
Robbie Averill
a9cc4d4844 FIX Ensure consistent return type for FieldList::removeByName 2018-03-14 19:40:17 +13:00
Damian Mooyman
8b9c292509
Merge remote-tracking branch 'origin/4.1' into 4 2018-03-13 14:26:39 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:26:18 +13:00
Joe Harvey
bf2cee3989 Bugfix - Correct duplicate nesting of 'Content' to be returned to template 
In scenarios where:

- No member is logged in
- An 'AutoLoginHash' is provided via the 't' (token) query param
- The token isn't valid (determined by Member::validateAutoLoginToken())

The message which is intended to be returned to the end-user via $Content
in the template, is mistakenly double nested in ['Content' => ['Content' => 'Message']]
this leads to "The method forTemplate() doesn't exist on ArrayData" errors.

See - https://github.com/silverstripe/silverstripe-framework/issues/7866
 2018-03-07 14:14:05 +00:00
Damian Mooyman
5fee4a81aa
BUG Files dataobjects with missing asset shouldn't un-attach themselves from parent object on save 2018-03-07 11:17:17 +13:00
Chris Joe
6ae07d100c
Merge pull request #7603 from open-sausages/pulls/4.0/error-trace-included 
ENHANCEMENT Don't infer trace if explicitly provided
 2018-03-07 10:10:40 +13:00
Damian Mooyman
3a1c813b28
API Add getContentCSS() / setContentCSS() to allow per-config customisation of content_css 
Fixes #7873
 2018-03-05 16:10:44 +13:00
Damian Mooyman
32637413de ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites (#7903) 
* ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites

* Minor: Grammar fixes.
 2018-03-05 15:47:06 +13:00
Damian Mooyman
4d424dd340
ENHANCEMENT get_by_id: alternate signature to allow MyDataObject::get_by_id($id) 2018-03-01 14:02:40 +00:00
Roman Schmid
40c2e299a0 Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for DBText::ContextSummary. 
Add unit-test to cover that case.
 2018-03-01 11:39:30 +01:00
Daniel Hensby
9006daf20b
Cleaning up PR and adding tests 2018-02-28 13:31:56 +00:00
Joris Debonnet
559254407f
get_by_id: alternate signature to allow MyDataObject::get_by_id($id) 2018-02-28 13:09:12 +00:00
JorisDebonnet
3e0984db49
Delete orphaned Group_Members records after deleting a Member 2018-02-27 19:47:26 +01:00
Christopher Joe
1cdbab45c9 Added comment about array_merge() not working 2018-02-27 09:52:42 +13:00
Aaron Carlino
0863bac29a Update getVariables to return a copy of globals rather than including the reference in an array merge 2018-02-27 09:52:36 +13:00
Daniel Hensby
722f2d178a
Merge branch '4.1' into 4 2018-02-26 10:57:52 +00:00
Christopher Joe
f650c92436 Added comment about array_merge() not working 2018-02-26 12:24:02 +13:00
Aaron Carlino
d91648dd6e Update getVariables to return a copy of globals rather than including the reference in an array merge 2018-02-23 16:25:41 +13:00
Daniel Hensby
ced2ba1f64 API Move CSV writing/reading to league/csv library 2018-02-22 09:22:37 +13:00
Daniel Hensby
dace2f179d
Merge branch '4.1' into 4 2018-02-21 13:58:45 +00:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1 2018-02-21 13:40:30 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 12:20:18 +13:00
Sam Minnee
a2143680e8 NEW: Add record count to dev/build output. 
This small piece of metadata is intended to expose record counts to
developers as an information radiator: from time to time, SilverStripe
tables can get very large, and this exposes this information without
the developer seeking it out. 

It’s reasonable to expect that count(*) calls aren’t too time consuming,
even on large tables.

On a small test run, dev/build execution went from 3.85s to 3.98s (a 3%
or 130ms increase). Given the small relative impact it should be okay.
Where this is inappropriate, it can be disabled with a config setting.
 2018-02-17 19:02:50 +13:00
Andrew Aitken-Fincham
de0b76dff6 ENHANCEMENT Fall back to SSViewer::get_themes when using themeResourceLoaders 2018-02-16 09:09:35 +13:00
Damian Mooyman
12e701c8ed
Merge remote-tracking branch 'origin/4.1' into 4 2018-02-15 09:28:14 +13:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-02-15 09:27:51 +13:00
Damian Mooyman
0b7cf80331
BUG Fix incorrect convert slashes argument 2018-02-13 16:33:35 +13:00
Chris Joe
03b3ea139d
Merge pull request #7860 from open-sausages/pulls/4/fix-password-display 
BUG Fix incorrect display logic on password field
 2018-02-13 16:20:08 +13:00
Chris Joe
d13ab11940
Merge pull request #7861 from zanderwar/pulls/enhancements/composerjson-check 
ENHANCEMENT composer.json missing notice
 2018-02-13 13:48:12 +13:00
Damian Mooyman
6570599aa9
BUG Fix incorrect display logic on password field 2018-02-13 13:36:21 +13:00
zanderwar
9ce21338a3 ENHANCEMENT composer.json missing notice 2018-02-13 09:03:01 +10:00
Damian Mooyman
6b38031a1e BUG Fix Director::test() not persisting removed session keys on teardown 2018-02-13 11:35:16 +13:00
Andrew Aitken-Fincham
00ff3ba4b2 ENHANCEMENT Make dropdownFieldThreshold configurable on DBForeignKey (#7789) 2018-02-13 10:32:55 +13:00
Daniel Hensby
16d3498a56
Merge branch '4.1' into 4 2018-02-12 10:26:07 +00:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1 2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0 2018-02-09 14:32:58 +00:00
Chris Joe
95308e1af6
Merge pull request #7849 from open-sausages/pulls/4.0/fix-debug-string-class-cli 
BUG Fix issue with CLIDebugView failing on class name of existing class
 2018-02-09 15:41:18 +13:00
Daniel Hensby
d3278d5470 FIX Add Nested DB transaction support (#7848) 
* TEST Prove nested transactions break

* Add nested transaction support
 2018-02-09 10:28:32 +13:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class 
Fixes #7827
 2018-02-09 09:52:32 +13:00
Robbie Averill
dd82820242 NEW Allow GridFieldConfig::addComponents to accept an array (#7844) 2018-02-08 11:06:27 +13:00
Damian Mooyman
dd3fbf2c73 BUG Fix installer checking wrong location for files 2018-02-08 10:50:27 +13:00
Chris Joe
e0e8ca0ee6
Merge pull request #7842 from open-sausages/pulls/4/fix-installer-public-search 
BUG Fix installer checking wrong location for files
 2018-02-08 10:26:54 +13:00
Andrew Aitken-Fincham
860fa2a05a API Add excludeAny() and tests for complicated excludes/filters (#7838) 2018-02-08 09:20:17 +13:00
Damian Mooyman
19832000a5
BUG Fix installer checking wrong location for files 2018-02-07 15:27:23 +13:00
Damian Mooyman
e5ff48b352
BUG Fix incorrect BASE_URL when webroot is parent of public folder 2018-02-07 14:28:06 +13:00
Damian Mooyman
2f1f5c0caa
Merge remote-tracking branch 'origin/4.0' into 4 2018-02-07 11:48:46 +13:00
Damian Mooyman
2225cf4c95
BUG Fix Director::test() not persisting removed session keys on teardown 2018-02-07 11:03:32 +13:00
Daniel Hensby
660dfd34a8
FIX Issue where default admin has no password encryption 2018-02-06 20:18:32 +00:00
Daniel Hensby
62057befdb
Merge branch '4.0' into 4 2018-02-06 10:08:17 +00:00
Daniel Hensby
28ca11dd7e
FIX Regex range identifier correctly escaped 2018-02-05 15:17:20 +00:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Core/CoreKernel.php
 2018-02-05 17:52:38 +13:00
Damian Mooyman
02ec0b8375
Merge pull request #7829 from Firesphere/patch-3 
[bugfix] $request == null breaks
 2018-02-05 16:43:40 +13:00
Damian Mooyman
db9aa2c5c7
BUG Fix regression in has_one getters breaking DataDifferencer 2018-02-05 16:16:07 +13:00
Simon Erkelens
a071672b48 [bugfix] $request == null breaks 
The $request incoming as null was not properly detected by the if/elseif structure.
 2018-02-05 13:02:07 +13:00
Damian Mooyman
aa2c71424d
API Implement cascade_duplications 
API Add DataObject::setComponent()
API Support unary components as getter and setter fields
API ManyManyList::add() now supports unsaved records
ENHANCEMENT Animal farm
 2018-02-05 12:04:57 +13:00
Damian Mooyman
288aaf083c
BUG Fix issue with DebugView failing on class name of existing class 
Fixes #7827
 2018-02-05 10:45:49 +13:00
Damian Mooyman
740c3326e9
BUG Fix critical issue with incorrectly saved session data 2018-02-02 15:08:52 +13:00
Robbie Averill
b07babb9da
Merge pull request #7824 from open-sausages/pulls/4/fix-password-validation 
BUG Prevent invalid members being written to database if validation_enabled is false
 2018-02-01 18:24:29 +13:00
Damian Mooyman
217cb93b25
Merge pull request #7730 from dhensby/pulls/4.0/ssviewer-requirements-backend 
FIX `SSViwer::execute_template` should allow requirements to be included
 2018-02-01 16:42:40 +13:00
Damian Mooyman
bc2fc7f2db
BUG Prevent invalid members being written to database if validation_enabled is false 2018-02-01 16:24:31 +13:00
Damian Mooyman
cb30e09130
Update reference from $databaseConfig to .env 2018-02-01 12:58:55 +13:00
Daniel Hensby
212178bb0d
FIX SSViwer::execute_template should allow requirements to be included 2018-01-31 11:10:26 +00:00
Damian Mooyman
11f4693648
Merge pull request #7816 from creative-commoners/pulls/4.0/setrighttitle-phpdoc 
Update phpdoc for FormField::setRightTitle regarding escaped HTML
 2018-01-31 16:48:17 +13:00
Robbie Averill
c0ffe2797a Update phpdoc for FormField::setRightTitle regarding escaped HTML 2018-01-31 11:03:35 +13:00
Christopher Joe
456871fd91 Enhancement Updated PasswordValidator to fallback to config options - still retains instance variables 2018-01-31 10:54:43 +13:00
Damian Mooyman
ab6428ef59
Merge pull request #7808 from creative-commoners/pulls/4.0/fix-html5-parsing-embeds 
FIX Allow cleanup marker regex to handle self closing HTML5 tags
 2018-01-31 10:24:34 +13:00
Daniel Hensby
9103816333
NEW Add php 7.2 support 2018-01-30 16:50:32 +00:00
Raissa North
cd6faac7a9
FIX Fix typo in error message 2018-01-30 15:48:42 +13:00
Robbie Averill
3d7ecc5240 FIX Allow cleanup marker regex to handle self closing HTML5 tags 2018-01-30 11:16:21 +13:00
Damian Mooyman
76d2db12b0
Merge pull request #7794 from kinglozzer/id-like-to-place-an-ordinal 
NEW: Add support for ordinals in DBDate::Format()
 2018-01-26 09:27:46 +13:00
Loz Calver
fcf5022550 NEW: Add support for ordinals in DBDate::Format() 2018-01-25 09:41:06 +00:00
Damian Mooyman
bca47029c4
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Control/SimpleResourceURLGenerator.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
 2018-01-25 12:53:15 +13:00
Roman Schmid
6fafce766e Fixed Rfc3339 implementation of Date and Datetime 2018-01-24 16:58:12 +01:00
Robbie Averill
1a421dc947
Merge pull request #7792 from open-sausages/pulls/4.0/fix-limit-phpdoc 
DOC Fix phpdoc on ArrayList::limit
 2018-01-24 11:20:37 +13:00
Chris Joe
c0085efae6
Merge pull request #7785 from open-sausages/pulls/4.0/better-upload-message 
BUG Better upload error message
 2018-01-24 10:37:47 +13:00
Damian Mooyman
3fce5372b0
DOC Fix phpdoc on ArrayList::limit 
Fixes #7781
 2018-01-24 10:18:15 +13:00
Dylan Wagstaff
e1a4b89912
Code lint fix 
change `else if` to `elseif`
 2018-01-24 09:04:22 +13:00
Dylan Wagstaff
9c3feb4ab4
FIX: Allow absolute URLs be use as resources 
At current certain interfaces exist that assume only local assets will be loaded (e.g. `SilverStripe\Forms\HTMLEditor\TinyMCEConfig::getConfig()`), where as someone may wish to load an off site resource via the use of an absolute URL (e.g. for fontawesome css provided via a CDN). Because asset path parsing is filtered through a `SilverStripe\Core\Manifest\ResourceURLGenerator`, one must either know in advance if they want an internal or external resource (loading different generators), or the API must allow for this (i.e. an inclusion function for each type of asset). So we can either double the API on the implementing class, or simply make an exception for an absolute URL as high as possible; inside the filter - for which the `vendor/module : path/to/file.asset` shorthand syntax was specifically designed not to conflict with.
 2018-01-23 17:31:43 +13:00
Damian Mooyman
b44273d1d6
BUG Better upload error message 
Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/720
 2018-01-23 16:08:42 +13:00
Damian Mooyman
04050b2753 API Director::host() now formally includes port in host 
API Add Director::hostName() and Director::port()
Fixes #7685
 2018-01-23 12:19:09 +13:00
Damian Mooyman
f4092f7bcf API Deprecate GridFieldVersionedState 2018-01-22 15:28:09 +13:00
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Core/TempFolder.php
#	src/ORM/DataObject.php
#	src/View/ThemeResourceLoader.php
#	src/includes/constants.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
#	tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
#	tests/php/View/RequirementsTest.php
 2018-01-22 14:57:05 +13:00
Damian Mooyman
60fa7558d3
BUG Fix double casting in login authenticator name 
Fixes #7769
 2018-01-22 14:06:24 +13:00
Damian Mooyman
16ad7e8fea
BUG Make GridFieldConfig less susceptible to error when versioned isn't installed 2018-01-18 16:43:51 +13:00
Daniel Hensby
3eaa83ed82
Add PUBLIC_* constants to constants.php for easier backwards compatible support of 4.0 and 4.1 2018-01-17 15:16:15 +00:00
Daniel Hensby
6aaee429db
Remove inaccurate comment from constants.php 2018-01-17 15:15:38 +00:00
Robbie Averill
40b2aeb7a3
Merge pull request #7760 from open-sausages/pulls/4/fix-editor-public-resolve 
BUG Fix themed editor.css url not being resolved properly
 2018-01-17 12:08:32 +13:00
Daniel Hensby
db610aaf3b
Fixing string concat CS issues 2018-01-16 18:39:30 +00:00
Daniel Hensby
42511d8061
Merge pull request #7714 from @zanderwar 2018-01-16 15:43:18 +00:00
Daniel Hensby
ebeaf3e40d
Merge branch '3' into 4 2018-01-16 11:47:39 +00:00
Loz Calver
daac577e62
Merge pull request #7763 from creative-commoners/pulls/4.0/fix-remove-header 
FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase
 2018-01-16 11:04:03 +00:00
Robbie Averill
a8c156ae98
Merge pull request #7756 from dhensby/pulls/4.0/fix-bad-request-form-handlers 
Forms with FormHandlers don't have access to current request object
 2018-01-16 23:32:00 +13:00
Robbie Averill
cc90cb0125 FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase 2018-01-16 23:20:52 +13:00
Damian Mooyman
ca2fe3b1f6
BUG Fix themed editor.css url not being resolved properly 2018-01-16 16:25:17 +13:00
Damian Mooyman
20348b5f42
BUG Fix upgrade-code doctor with public path 2018-01-16 15:38:12 +13:00
Damian Mooyman
f86b855c90
BUG Prevent basic-auth from disallowing logout 
Fixes #7555
 2018-01-16 15:24:20 +13:00
Daniel Hensby
dc96862cac
FIX Forms run through FormHandler rather than Controllers now have access to current Request 2018-01-15 13:08:43 +00:00
Damian Mooyman
15ef769e1d
BUG Don't re-declare manually-declared variables for public folder 2018-01-15 14:45:15 +13:00
Daniel Hensby
e4b936c7c7
Merge branch '4.0' into 4 2018-01-12 14:40:33 +00:00
Loz Calver
67ea95bc2a
Merge pull request #7750 from creative-commoners/pulls/4.1/remove-relation-setters 
NEW Add getter and setter for removeRelation in GridFieldDeleteAction
 2018-01-12 09:58:23 +00:00
Damian Mooyman
a15c6887fc
Merge pull request #7746 from dhensby/pulls/4.0/allow-injector-extensions 
FIX Allow extension instances to be overridden by injector
 2018-01-12 17:10:04 +13:00
Damian Mooyman
8d077203d4 API Implement support for public/ webroot folder (#7741) 
* API Implement support for public/ webroot folder

* Bugfixes and refactor based on feedback
 2018-01-12 16:25:02 +13:00
Robbie Averill
9fddb5de99 NEW Add getter and setter for removeRelation in GridFieldDeleteAction 
This allows users to modify the property value in the component without having to
remove it and add a new one when they want to change it.
 2018-01-12 14:23:22 +13:00
Daniel Hensby
7d66342496
FIX Allow extension instances to be overridden by injector 2018-01-12 00:38:15 +00:00
Andrew Aitken-Fincham
fb5476cb70 check for UPLOAD_ERR_NO_FILE on FileField::saveinto 2018-01-03 12:01:18 +00:00
Daniel Hensby
02761d6ca8
Merge pull request #7712 from creative-commoners/pulls/4.0/fix-last-non-sortable-column 
FIX Ensure last GridField column when non sortable has its title displayed
 2017-12-28 11:53:14 +00:00
Damian Mooyman
f885101a1b
BUG Fix basic auth in PHP-CGI 
Fixes #7717
 2017-12-21 14:58:19 +13:00
Damian Mooyman
c4ff8443bb
API Shift basic auth checking into middleware 
Fixes #7554
 2017-12-20 11:39:04 +13:00
Damian Mooyman
3bd4aae521
Merge remote-tracking branch 'origin/4.0' into 4 2017-12-19 10:02:41 +13:00
Damian Mooyman
ce07e4781e BUG Do database migrations before default records 
Fixes #7703
 2017-12-18 16:37:21 +13:00
Chris Joe
4ad9ceca6b
Merge pull request #7702 from open-sausages/pulls/4/fix-message-casting-permissions 
BUG Fix message casting for html security messages
 2017-12-18 15:43:35 +13:00
Damian Mooyman
d9d1e13735
Merge pull request #7707 from gorriecoe/Requirements-javascriptTemplate-ModuleResourceLoader 
FIX: Added ModuleResourceLoader to javascriptTemplate
 2017-12-18 14:27:32 +13:00
Damian Mooyman
623daed5ab
Merge pull request #6472 from silbinarywolf/feat-fieldlist-nestedfields 
feat(FieldList): Add nestedFields() function to return a flat array of all deeply nested fields in a FieldList.
 2017-12-18 13:43:36 +13:00
Chris Joe
a892eae4f6
Merge pull request #7705 from open-sausages/pulls/4.0/director-mock-request 
BUG Fix incorrect BASE_DIR inferred in CLI
 2017-12-18 09:22:11 +13:00
Reece Alexander
9c91e9820e
Returns chainability in setValue from parent 2017-12-17 17:21:42 +10:00
Robbie Averill
cd9695eda9
Merge pull request #7695 from open-sausages/pulls/4/versions-of-atlantis 
Update framework docs / phpdoc for versioning changes
 2017-12-17 16:33:59 +13:00
Robbie Averill
ea8ed5067d FIX Allow Requirements::block to handle module resource paths 2017-12-17 16:09:22 +13:00
Damian Mooyman
c5bd9bb424
BUG Fix incorrect BASE_DIR inferred in CLI 
BUG Fix Director::mockRequest() mocking incorrect $url
Fixes #7689
 2017-12-15 17:20:48 +13:00
Raissa North
369653b5df FIX Ensure last GridField column when non sortable has its title displayed 2017-12-15 16:45:46 +13:00
Gorrie Coe
ef74911922 Added ModuleResourceLoader to javascriptTemplate 2017-12-15 11:20:20 +13:00
Daniel Hensby
e4bf9a31ed
Merge branch '4.0' into 4 2017-12-14 21:20:11 +00:00
Daniel Hensby
1c72d6946d
Merge branch '3.6' into 4.0 2017-12-14 21:01:35 +00:00
Jake Bentvelzen
da9c133c1b
ENHANCEMENT Add flattenFields() function to iterate over all deeply nested fields in a form 2017-12-14 14:23:00 +00:00
Damian Mooyman
9170220d2c API Add onAfterSave extension point to GridFieldDetailForm_ItemRequest 2017-12-14 15:08:32 +13:00
Damian Mooyman
a50fd009ca Update PHPDoc 2017-12-14 15:08:32 +13:00
Damian Mooyman
140ed72e2a
BUG Fix message casting for html security messages 2017-12-14 14:49:58 +13:00
Damian Mooyman
529e341dbc
Merge pull request #7699 from open-sausages/pulls/4/html-in-security-msg 
ENHANCEMENT Allow html in security failure message
 2017-12-14 14:30:09 +13:00
Damian Mooyman
1c8576cee7
Linting cleanup 2017-12-14 14:18:41 +13:00
Damian Mooyman
ed6561d9f5
BUG Fix incorrect merge of associative / non-associative summary fields 
Fixes #7696
 2017-12-14 14:17:19 +13:00
Damian Mooyman
8b1b9f022b
Fix linting issues 2017-12-14 13:50:52 +13:00
Saophalkun Ponlu
31e04c8491 ENHANCEMENT Allow html in security failure message 2017-12-13 17:10:16 +13:00
Damian Mooyman
a2fa9f0943
Merge pull request #7694 from creative-commoners/pulls/4.0/injection-session 
FIX Use Injector to retrieve the current session
 2017-12-12 16:47:36 +13:00
Robbie Averill
eb6c1fc6de FIX Allow the current controller as well as injectable HTTPRequest objects 2017-12-12 16:35:53 +13:00
Robbie Averill
097d0697c5 FIX Use Injector to retrieve the current session 2017-12-12 16:03:16 +13:00
Damian Mooyman
2391af5ba7
Fix literal linting 2017-12-12 09:22:18 +13:00
Damian Mooyman
33b2d50d59
Cache warming in InheritedPermissions::getCachePermissions() 
Simplify Group::Members() code
Remove cms-only config
 2017-12-12 09:01:43 +13:00