Damian Mooyman
|
c0fffb33cd
|
Merge branch '3.6' into pulls/3.6/ss-2017-009
|
2017-12-06 17:39:01 +13:00 |
|
Damian Mooyman
|
e281c64fca
|
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
|
2017-12-06 17:32:56 +13:00 |
|
Damian Mooyman
|
a8465900bd
|
Merge pull request #47 from silverstripe-security/patch/3.5/SS-2017-008
[SS-2017-008] FIX Make sure int params are successfull cast to int
|
2017-12-06 17:30:51 +13:00 |
|
Damian Mooyman
|
d6a93f5215
|
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
# Conflicts:
# security/Member.php
|
2017-12-06 17:26:45 +13:00 |
|
Damian Mooyman
|
91cf85087b
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2017-12-06 17:21:09 +13:00 |
|
Damian Mooyman
|
d09c2d7b03
|
Added 3.5.6-rc1 changelog
|
2017-12-06 16:27:12 +13:00 |
|
Damian Mooyman
|
5f7f1ea150
|
Added 3.5.6-rc1 changelog
|
2017-12-06 16:27:08 +13:00 |
|
Damian Mooyman
|
dd4c5417e7
|
Merge pull request #49 from silverstripe-security/pulls/3.5/ss-2017-007
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.5)
|
2017-12-06 16:25:58 +13:00 |
|
Damian Mooyman
|
44de03da01
|
Merge pull request #53 from silverstripe-security/pulls/3.5/ss-2017-006
[ss-2017-006] Fix user agent invalidation on session startup (3.5 branch)
|
2017-12-06 16:25:39 +13:00 |
|
Damian Mooyman
|
3e2bcaa0b4
|
Merge pull request #54 from silverstripe-security/pulls/3.5/ss-2017-009
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (3.5 branch)
|
2017-12-06 16:25:19 +13:00 |
|
Damian Mooyman
|
975d462e0c
|
Merge pull request #7661 from dhensby/pulls/3.5/versioned-base-class
FIX Use baseDataClass for allVersions as with other methods
|
2017-12-06 14:13:14 +13:00 |
|
Damian Mooyman
|
77b46672e2
|
Merge branch '3.5' into pulls/3.5/versioned-base-class
|
2017-12-06 11:37:46 +13:00 |
|
Damian Mooyman
|
c5837c62e8
|
Merge pull request #7679 from dhensby/pulls/3.5/fix-critical-issues
Fixing scrutinizer issues
|
2017-12-06 11:30:57 +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 |
|
Damian Mooyman
|
d290eee217
|
Merge pull request #7668 from kinglozzer/getviewertemplates
NEW: Add ViewableData::getViewerTemplates()
|
2017-12-06 11:22:53 +13:00 |
|
Damian Mooyman
|
01b48e2dd7
|
Merge pull request #7670 from kinglozzer/dataobject-schema-ancestry
FIX: Remove some unnecessary ClassInfo calls in DataObjectSchema
|
2017-12-06 11:02:49 +13:00 |
|
Loz Calver
|
5087ec764e
|
Merge pull request #7680 from andrewandante/patch-5
Update email instructions with SMTP configuration details
|
2017-12-05 17:26:32 +00:00 |
|
Andrew Aitken-Fincham
|
4fa3cf59d3
|
Update index.md
|
2017-12-05 17:18:46 +00:00 |
|
Daniel Hensby
|
8d1a5ed8b7
|
More code style fixes
|
2017-12-05 14:20:13 +00:00 |
|
Daniel Hensby
|
2aa1d8f2c4
|
remove create_function usage
|
2017-12-05 14:20:13 +00:00 |
|
Daniel Hensby
|
84d7afb347
|
FIX Use baseDataClass for allVersions as with other methods
|
2017-12-05 13:02:20 +00: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 |
|
Loz Calver
|
259ae3f78b
|
NEW: Add ViewableData::getViewerTemplates()
Forms part of the fix for silverstripe/silverstripe-cms#2039
|
2017-12-05 09:13:28 +00:00 |
|
Robbie Averill
|
2538f59ab7
|
Merge pull request #5211 from stevie-mayhew/pulls/reset-button
BUGFIX: don't try and switch out of context of the tab system
|
2017-12-05 19:59:49 +13:00 |
|
Robbie Averill
|
429c1e0e3b
|
Merge pull request #7664 from dhensby/pulls/4.0/nightly-builds
Add PHP nightly builds to travis
|
2017-12-05 17:42:11 +13:00 |
|
Chris Joe
|
825ed22214
|
Merge pull request #7657 from open-sausages/experiments/listen-to-my-story
Implement a pattern library for SilverStripe4 react components
|
2017-12-04 10:58:16 +13:00 |
|
Robbie Averill
|
011a96f79e
|
Merge pull request #7672 from russmac/fix_db_autodiscover_comment
Fix db autodiscover comment on loading behavior.
|
2017-12-03 10:25:19 +13:00 |
|
Russell Maclean
|
3a4c6705c1
|
Fix db autodiscover comment on loading behavior.
|
2017-12-02 10:52:49 +10:30 |
|
Damian Mooyman
|
69295a6e22
|
BUG Ensure that all tinymce_lang mappings are valid
|
2017-12-01 15:00:39 +13:00 |
|
Damian Mooyman
|
db54112f3c
|
[ss-2017-006] Fix user agent invalidation on session startup
|
2017-12-01 14:24:11 +13:00 |
|
Damian Mooyman
|
25e276cf37
|
[ss-2017-006] Fix user agent invalidation on session startup
|
2017-12-01 10:55:00 +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
|
22ccf3e2f9
|
[ss-2017-007] Ensure xls formulae are safely sanitised on output
CSVParser now strips leading tabs on cells
|
2017-12-01 10:19:48 +13:00 |
|
Damian Mooyman
|
395880fa94
|
[ss-2017-007] Ensure xls formulae are safely sanitised on output
CSVParser now strips leading tabs on cells
|
2017-12-01 10:18:29 +13:00 |
|
Daniel Hensby
|
5ee2264bcb
|
Add PHP nightly builds to travis
|
2017-11-30 17:40:17 +00:00 |
|
Damian Mooyman
|
f1dd3d6f03
|
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt
|
2017-11-30 17:00:49 +13:00 |
|
Damian Mooyman
|
6ba00e829a
|
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt
|
2017-11-30 15:53:50 +13:00 |
|
Damian Mooyman
|
f5f1abe0cf
|
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt
|
2017-11-30 15:50:36 +13:00 |
|
Damian Mooyman
|
d57dea0318
|
Merge pull request #7658 from lekoala/patch-7
TinyMCE lang is fr_FR for all French languages
|
2017-11-30 12:44:30 +13:00 |
|
Robbie Averill
|
eecbe0c7c1
|
Merge pull request #7659 from JorisDebonnet/patch-1
Fix link to nginx.org wiki
|
2017-11-30 10:25:09 +13:00 |
|
JorisDebonnet
|
2717f01344
|
Fix link to nginx.org wiki
|
2017-11-29 21:31:56 +01:00 |
|
Thomas Portelange
|
e729cd2c37
|
TinyMCE lang is fr_FR for all French languages
"fr" is not a valid tiny mce lang
https://www.tinymce.com/docs/configure/localization/
having "fr" as it is currently prevents loading the language file
|
2017-11-29 12:54:27 +01:00 |
|
Daniel Hensby
|
9f55fd6800
|
Merge pull request #7655 from open-sausages/pulls/4.0/fix-scrutinizer
BUG Fix broken scrutinizer
|
2017-11-29 11:46:21 +00:00 |
|
Christopher Joe
|
4b69fa49ec
|
BUG Fix travis
|
2017-11-29 15:57:32 +13:00 |
|
Christopher Joe
|
2dcb3fd2ab
|
Enhancement Add documentation for pattern library
|
2017-11-29 14:37:24 +13:00 |
|
Damian Mooyman
|
b3a51aa8d3
|
BUG Fix broken scrutinizer
|
2017-11-29 14:14:38 +13:00 |
|
Chris Joe
|
1b145541c4
|
Merge pull request #7622 from open-sausages/pulls/4.0/fix-database-config
BUG Fix _configure_database.php being ignored
|
2017-11-29 13:08:04 +13:00 |
|
Damian Mooyman
|
9666222637
|
BUG Fix _configure_database.php being ignored
Fixes #7590
|
2017-11-29 12:01:24 +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 |
|