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
|
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
|
6be554a29e
|
Merge pull request #7691 from kinglozzer/warn-table-name
FIX: Only show table_name warning on dev/build
|
2017-12-12 10:02:11 +13:00 |
|
Damian Mooyman
|
2391af5ba7
|
Fix literal linting
|
2017-12-12 09:22:18 +13:00 |
|
Loz Calver
|
0e1753f33d
|
FIX: Only show table_name warning on dev/build
|
2017-12-11 17:33:39 +00:00 |
|
Simon Erkelens
|
9aadd8db38
|
Add PR template
Update as per discussion
|
2017-12-11 14:08:41 +13:00 |
|
Robbie Averill
|
7643c90410
|
Merge pull request #7688 from open-sausages/pulls/4.0/less-breaking-warnings
BUG Don't warn on table name for classes without tables
|
2017-12-11 10:39:54 +13:00 |
|
Damian Mooyman
|
69decdf3a4
|
BUG Don't warn on table name for classes without tables
Fixes #7686
|
2017-12-11 09:55:57 +13:00 |
|
Damian Mooyman
|
052f11a427
|
Remove merge artifact
|
2017-12-08 11:52:48 +13:00 |
|
Damian Mooyman
|
c22726bfd7
|
Merge remote-tracking branch 'origin/3.5' into 3
|
2017-12-07 14:09:02 +13:00 |
|
Damian Mooyman
|
e3c382a4de
|
Added 4.0.1 changelog
|
2017-12-07 13:46:52 +13:00 |
|
Damian Mooyman
|
bf74e8347a
|
Added 3.6.3 changelog
|
2017-12-07 13:35:49 +13:00 |
|
Damian Mooyman
|
b6a7e47441
|
Added 3.5.6 changelog
|
2017-12-07 13:27:17 +13:00 |
|
Damian Mooyman
|
4ff1fb32dd
|
Added 4.0.1-rc1 changelog
|
2017-12-07 12:16:58 +13:00 |
|
Damian Mooyman
|
16be39aa06
|
Added 4.0.1-rc1 changelog
|
2017-12-07 11:21:44 +13:00 |
|
Damian Mooyman
|
b939224615
|
Update translations
|
2017-12-07 11:08:25 +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
|
b46b858847
|
Merge pull request #48 from silverstripe-security/pulls/4.0/fix-install-redacting
[SS-2017-010] Prevent install.php from disclosing system passwords
|
2017-12-06 18:22:36 +13:00 |
|
Damian Mooyman
|
e45921b293
|
Merge pull request #46 from silverstripe-security/pulls/4.0/escape-limit-args
[SS-2017-008] Fix SQL injection in full text search (4.0 branch)
|
2017-12-06 18:22:24 +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 |
|
Damian Mooyman
|
8537dd56dd
|
Added 3.6.3-rc2 changelog
|
2017-12-06 18:11:03 +13:00 |
|
Damian Mooyman
|
55739fa5af
|
Merge pull request #50 from silverstripe-security/pulls/3.6/ss-2017-007
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.6)
|
2017-12-06 17:41:49 +13:00 |
|
Damian Mooyman
|
d47667bb07
|
Merge pull request #52 from silverstripe-security/pulls/3.6/ss-2017-006
[ss-2017-006] Fix user agent invalidation on session startup (3.6 branch)
|
2017-12-06 17:41:07 +13:00 |
|
Damian Mooyman
|
c5d6eb816d
|
Merge pull request #55 from silverstripe-security/pulls/3.6/ss-2017-009
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (3.6 branch)
|
2017-12-06 17:39:17 +13:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|