Commit Graph

19574 Commits

Author SHA1 Message Date
Daniel Hensby
5956e63745 Merge pull request #7387 from chhschou/patch-1
update RHEL distro used from `box-cutter/centos70` to `box-cutter/cen…
2017-09-21 12:51:47 +01:00
Daniel Hensby
b4412cedf6
Added 3.6.2-beta2 changelog 2017-09-21 09:11:36 +00:00
Loz Calver
34f69c6cf4 Merge pull request #7389 from open-sausages/pulls/4.0/lazy-templates-includes
BUG Fix sub-template lookup for includes
2017-09-21 09:02:36 +01:00
Chris Joe
28fc035426 Merge pull request #7391 from open-sausages/pulls/4.0/toolbar-style-layout
FIX gridfield button title alignment
2017-09-21 16:48:29 +12:00
Saophalkun Ponlu
fe4688b932 FIX gridfield button title alignment 2017-09-21 13:03:57 +12:00
Daniel Hensby
bd7abc73de
Merge branch '3.5.5' into 3.6.2 2017-09-20 16:26:30 +01:00
Daniel Hensby
1209b2ae13
Added 3.5.5-beta2 changelog 2017-09-20 13:41:04 +00:00
Daniel Hensby
72702dbd50 Merge pull request #43 from silverstripe-security/pulls/3.5/member-enumeration-timing-attack
[SS-2017-005] User enumeration via timing attack mitigated
2017-09-20 11:39:39 +01:00
Daniel Hensby
6b198336a8 Merge pull request #44 from silverstripe-security/patch/3.5/authenticator-fix
FIX Authenticators are more resilient to incomplete configuration
2017-09-20 11:38:38 +01:00
Daniel Hensby
f0262a8fd9
[SS-2017-005] User enumeration via timing attack mitigated 2017-09-20 11:33:22 +01:00
Damian Mooyman
f1a12e15be
BUG Fix sub-template lookup for includes 2017-09-20 18:04:01 +12:00
Chris Joe
c939737e5c Merge pull request #7386 from open-sausages/pulls/4.0/class-case-fixing
ENHANCEMENT Don't force all class names to lowercase
2017-09-20 16:46:49 +12:00
Damian Mooyman
261302a121
ENHANCEMENT Don't force all class names to lowercase
Speeds up autoloading because composer psr-4 works properly now
2017-09-20 15:14:55 +12:00
Chris Joe
0e10412b86 Merge pull request #7388 from open-sausages/pulls/4.0/fix-base-absolute-url
BUG Detect, warn, and fix invalid SS_BASE_URL
2017-09-20 14:32:18 +12:00
Christopher Joe
265f91060c Fix phpcs error 2017-09-20 12:42:45 +12:00
Damian Mooyman
09b3a24f30
BUG Detect, warn, and fix invalid SS_BASE_URL
Fixes #7362
2017-09-20 10:42:13 +12:00
Chris Chou
2d8f0fadd7 update RHEL distro used from box-cutter/centos70 to box-cutter/centos73
`box-cutter/centos70` no longer available
2017-09-20 09:51:03 +12:00
Daniel Hensby
fc79a76718
Added 3.6.2-beta1 changelog 2017-09-19 16:51:57 +00:00
Daniel Hensby
1f256cf2d2
Added 3.5.5-beta1 changelog 2017-09-19 15:25:41 +00:00
Damian Mooyman
9a7adc46f8 Merge pull request #7379 from dhensby/pulls/4/fix-image-quality-docs
DOCS Fix Image docs regarding setting image quality
2017-09-19 10:06:57 +12:00
Daniel Hensby
2abc20a0f7 Merge pull request #7355 from kinglozzer/7278-configurable-token-expiry
Make auto login token expiry configurable (closes #7278)
2017-09-18 16:09:14 +01:00
Loz Calver
7431122b58
Make auto login token expiry configurable (closes #7278) 2017-09-18 14:06:13 +01:00
Daniel Hensby
0aabcac747 Merge pull request #7380 from mikenz/patch-13
Test fix: Don't hard code the security page_class controller
2017-09-17 00:08:17 +01:00
Mike Cochrane
41d1b2a882 Test fix: Don't hard code the security page_class controller 2017-09-16 11:27:16 +12:00
Daniel Hensby
3fe14afbb1
DOCS Fix Image docs regarding setting image quality 2017-09-15 15:07:26 +01:00
Matthias Schelling
eacfe280c1
TreeDropdownField: replace onadd by onmatch
Makes TreeDropdownField work in situations where it's moved around in the DOM (e.g. when inside a drag'n'drop container)
2017-09-15 12:02:18 +01:00
Daniel Hensby
04b1bb816e
NEW RateLimiter for Security controller 2017-09-14 14:23:36 +01:00
Damian Mooyman
7b3286d512 Merge pull request #7374 from dhensby/pulls/4/ci-http-headers
FIX HTTP Headers are case insensitive
2017-09-14 09:52:26 +12:00
Daniel Hensby
9198313658
FIX HTTP Headers are case insensitive 2017-09-13 16:02:12 +01:00
Chris Joe
c3f7165023 Merge pull request #7371 from open-sausages/pulls/4.0/fix-gridfield-print
BUG Fix gridfield print styles
2017-09-13 15:58:05 +12:00
Damian Mooyman
d05d22abc2 Merge pull request #7343 from creative-commoners/pulls/4.0/add-extra-class
NEW Allow GridFieldEditButton to have configurable HTML classes. Change edit icon.
2017-09-13 15:39:38 +12:00
Chris Joe
c329891b56 Merge pull request #7372 from open-sausages/pulls/4.0/fix-import-modal
BUG Fix import modal
2017-09-13 13:49:41 +12:00
Sacha Judd
c707fccf69 NEW Allow GridFieldEditButton to have configurable HTML classes. Change edit icon. 2017-09-13 13:11:17 +12:00
Damian Mooyman
f8ef97c167
BUG Fix import modal
Fixes https://github.com/silverstripe/silverstripe-admin/issues/251
2017-09-13 12:52:20 +12:00
Damian Mooyman
1892a02076
BUG Fix gridfield print styles 2017-09-13 11:48:42 +12:00
Damian Mooyman
546b4dedcf Merge pull request #7370 from andrewandante/FIX/add_themes
FIX SSViewer::add_themes() to properly prepend
2017-09-13 09:45:33 +12:00
Daniel Hensby
091d99f599
FIX Authenticators are more resilient to incomplete configuration 2017-09-12 15:57:03 +01:00
Daniel Hensby
baa3f07712 Merge pull request #7365 from open-sausages/pulls/4.0/fine-tune-buttons
FIX grid field button styles
2017-09-12 14:17:54 +01:00
Andrew Aitken-Fincham
6613826ed8 FIX SSViewer::add_themes() to properly prepend 2017-09-12 13:34:56 +01:00
Saophalkun Ponlu
12480633bf
FIX grid field button styles 2017-09-12 13:23:35 +01:00
Daniel Hensby
c7c0ee39f1 Merge pull request #7368 from open-sausages/pulls/4.0/fix-bad-requirement
BUG Incorrect path for requirements file
2017-09-12 11:10:40 +01:00
Damian Mooyman
905c4e04d5
BUG Incorrect path for requirements file 2017-09-12 10:36:48 +01:00
Damian Mooyman
f46fe438e4 Merge pull request #7367 from chillu/pulls/4/travis-trusty
Move to travis trusty dist
2017-09-12 17:50:15 +12:00
Ingo Schommer
51153e8b52 Pin firefox version 2017-09-12 15:59:01 +12:00
Ingo Schommer
81097f34b1 Move to travis trusty dist
See https://github.com/silverstripe/silverstripe-framework/pull/7092 for context.
2017-09-12 15:21:10 +12:00
Damian Mooyman
69e8b45c12 Merge pull request #6826 from blueo/hackday/cleanup-bem-conventions
BEM class names for filter-buttons
2017-09-12 11:01:26 +12:00
Bernard Hamlin
fa86f42ab9
BEM class names for filter-buttons 2017-09-12 10:16:03 +12:00
Damian Mooyman
21f2da4962 Added 4.0.0-beta3 changelog 2017-09-11 15:13:51 +12:00
Damian Mooyman
56abd3be57 Update translations 2017-09-08 16:52:22 +12:00
Damian Mooyman
22e991ef90 Merge pull request #7344 from creative-commoners/pulls/4.0/email-assertion-return
DOCS Update doc block for TestMailer::findEmail to reflect the new key names
2017-09-08 13:08:03 +12:00