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 |
|
Daniel Hensby
|
db610aaf3b
|
Fixing string concat CS issues
|
2018-01-16 18:39:30 +00:00 |
|
Daniel Hensby
|
c959160375
|
FIX Misnamed test namespaces
|
2018-01-16 17:41:18 +00:00 |
|
Werner M. Krauß
|
422857f381
|
SapphireTestTest: use named data providers and more error messages
* use keys for naming each data set
* adding error messages
* clean up a bit
|
2018-01-16 15:25:40 +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
|
cc90cb0125
|
FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase
|
2018-01-16 23:20:52 +13:00 |
|
Daniel Hensby
|
e4b936c7c7
|
Merge branch '4.0' into 4
|
2018-01-12 14:40:33 +00: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 |
|
Daniel Hensby
|
de6afd4405
|
TEST Cant reliably use Injector to replace Extensions
|
2018-01-11 14:08:29 +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 |
|
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
|
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 |
|
Robbie Averill
|
aa7ab0c494
|
Update test assertions to be more readable
|
2017-12-17 16:22:26 +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 |
|
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
|
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 |
|
Damian Mooyman
|
33b2d50d59
|
Cache warming in InheritedPermissions::getCachePermissions()
Simplify Group::Members() code
Remove cms-only config
|
2017-12-12 09:01:43 +13:00 |
|
Aaron Carlino
|
2be902ef2f
|
Adapt to new MemberCacheFlusher interface
|
2017-12-11 17:50:11 +13:00 |
|
Aaron Carlino
|
aefb0aeaa8
|
Make InheritedPermissions use cache and implement cache flushing
|
2017-12-11 17:50:11 +13:00 |
|
Damian Mooyman
|
ee27329728
|
Minor linting / style updates
|
2017-12-11 16:46:59 +13:00 |
|
Aaron Carlino
|
86458941be
|
Refactor to MemberCacheFlusher
|
2017-12-11 16:46:59 +13:00 |
|
Aaron Carlino
|
4857816c9e
|
Revisions per robbieaverill
|
2017-12-11 16:46:59 +13:00 |
|
Aaron Carlino
|
eecb9f64d3
|
Add new InheritedPermissionFlusher extension, CacheFlusher service
|
2017-12-11 16:46:59 +13:00 |
|
Damian Mooyman
|
eba6129c07
|
Merge pull request #7677 from open-sausages/pulls/4/textarea-maxlength
Enable max length for textarea field
|
2017-12-11 10:34:29 +13:00 |
|
Saophalkun Ponlu
|
381ad756f2
|
Fix tests
|
2017-12-08 09:58:52 +13:00 |
|
Damian Mooyman
|
6b384f4b35
|
Merge branch '4.0' into 4
|
2017-12-07 13:52:00 +13:00 |
|
Saophalkun Ponlu
|
442f2bb762
|
Enable max length for textarea field
|
2017-12-07 12:52:28 +13:00 |
|
Damian Mooyman
|
286271a1e1
|
Merge pull request #56 from silverstripe-security/pulls/4.0/ss-2017-009
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (4.0 branch)
|
2017-12-06 18:22:47 +13:00 |
|
Damian Mooyman
|
99e772b361
|
Merge pull request #51 from silverstripe-security/pulls/4.0/ss-2017-007
[ss-2017-007] Ensure xls formulae are safely sanitised on output (4.0)
|
2017-12-06 18:22:11 +13:00 |
|
Chris Joe
|
0e8d288240
|
Merge pull request #7667 from open-sausages/pulls/4.0/better-tinymce-locales
BUG Ensure that all tinymce_lang mappings are valid
|
2017-12-06 11:24:02 +13:00 |
|
Loz Calver
|
91bd92df31
|
FIX: Remove some unnecessary ClassInfo calls in DataObjectSchema
|
2017-12-05 12:23:10 +00:00 |
|
Daniel Hensby
|
eb55c27124
|
Merge branch '4.0' into 4
|
2017-12-05 12:14:22 +00:00 |
|
Damian Mooyman
|
69295a6e22
|
BUG Ensure that all tinymce_lang mappings are valid
|
2017-12-01 15:00:39 +13:00 |
|
Damian Mooyman
|
cfe1d4f481
|
[ss-2017-007] Ensure xls formulae are safely sanitised on output
CSVParser now strips leading tabs on cells
|
2017-12-01 10:24:49 +13:00 |
|
Damian Mooyman
|
f1dd3d6f03
|
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt
|
2017-11-30 17:00:49 +13:00 |
|
Damian Mooyman
|
5bfc0c43eb
|
Merge pull request #7648 from creative-commoners/pulls/4.0/support-some-class-collection
FIX Support self::class text collection
|
2017-11-29 11:37:06 +13:00 |
|
Damian Mooyman
|
2fe59680e3
|
Merge pull request #7620 from open-sausages/pulls/4.0/its-too-big-to-fit
BUG Added warning for auto-generated table_name
|
2017-11-28 09:42:12 +13:00 |
|
Robbie Averill
|
b7ea05900e
|
FIX Support self::class text collection
|
2017-11-27 23:20:29 +13:00 |
|
Christopher Joe
|
cc72b5c852
|
BUG Added warning for auto-generated table_name for non-test classes
|
2017-11-27 20:22:37 +13:00 |
|
Damian Mooyman
|
6e7fb4747e
|
Restore legacy $ThemeDir support
|
2017-11-27 15:24:40 +13:00 |
|