Ingo Schommer
|
80c30c7b05
|
Merge pull request #8089 from creative-commoners/pulls/4.1/fix-maori-macron
FIX Add macron to Māori language name
|
2018-06-08 14:07:05 +12:00 |
|
Ingo Schommer
|
510b0f7759
|
Merge pull request #8150 from open-sausages/pulls/4.0/fix-postgres-duplication-issue
BUG Fix test that relies on implicit ID order breaking postgres
|
2018-06-08 12:58:43 +12:00 |
|
Damian Mooyman
|
29f9b1c18f
|
Fix linting issues
|
2018-06-08 11:38:36 +12:00 |
|
Damian Mooyman
|
e37e3e1746
|
BUG Fix test that relies on implicit ID order breaking postgres
|
2018-06-08 11:23:24 +12:00 |
|
Loz Calver
|
66f57bd4da
|
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)
|
2018-06-07 10:26:00 +01:00 |
|
Daniel Hensby
|
ffc2eeea05
|
Merge pull request #8140 from open-sausages/pulls/4.1/through-belongs-issue
BUG Backport bugfix for belongs_many_many with many_many through.
|
2018-06-06 11:18:07 +01:00 |
|
Damian Mooyman
|
c070e989c4
|
BUG Safely handle empty injector factory responses
Fixes issue with ImageBackendFactory returning null and breaking injector
|
2018-06-06 16:45:16 +12:00 |
|
Damian Mooyman
|
0aa13da0d9
|
BUG Backport bugfix for belongs_many_many with many_many through.
Partial backport of #7928
Fixes #8131
|
2018-06-06 09:43:04 +12:00 |
|
Damian Mooyman
|
2bceabe454
|
Merge pull request #8124 from creative-commoners/pulls/4.1/test-fixes
FIX Minor updates to unit tests to pass with HTML5 parser and various themes
|
2018-06-06 09:21:01 +12:00 |
|
Daniel Hensby
|
801a51d0f7
|
Merge branch '3.5' into 3.6
|
2018-06-05 16:30:20 +01:00 |
|
Robbie Averill
|
13ea2f9b80
|
Merge pull request #8132 from dhensby/pulls/3.5/postgres-test-fix
FIX Regression from #8009
|
2018-06-05 13:43:19 +12:00 |
|
Daniel Hensby
|
41e601a036
|
FIX Regression from #8009
|
2018-06-04 17:03:05 +01:00 |
|
Loz Calver
|
050018dba6
|
Merge pull request #8134 from dhensby/pulls/3.5/memory-limit
Increase memory limit to 2G in Travis builds
|
2018-06-04 16:50:52 +01:00 |
|
Loz Calver
|
0a4e3fc716
|
Merge pull request #8133 from dhensby/pulls/3.5/php53-compat
FIX PHP 5.3 compat for referencing $this in closures
|
2018-06-04 16:30:21 +01:00 |
|
Robbie Averill
|
c1b0c56788
|
Increase memory limit to 2G in Travis builds
|
2018-06-04 16:24:18 +01:00 |
|
Robbie Averill
|
1cbf27e0f4
|
FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason
sdf
|
2018-06-04 16:05:49 +01:00 |
|
Daniel Hensby
|
1658fe7617
|
Merge pull request #8127 from jonom/4.0-read-only-currency
Fix: negative values in read only currency field
|
2018-06-04 11:52:01 +01:00 |
|
Jonathon Menz
|
5a5ba1e5c0
|
Fix: negative values in read only currency field
Don’t strip out ‘-‘ character as this makes negative values appear to be positive (Fixes #8126)
|
2018-06-01 12:59:02 -07:00 |
|
Robbie Averill
|
8064ed8220
|
FIX Minor updates to unit tests to pass with HTML5 parser and various themes
|
2018-06-01 17:47:03 +12:00 |
|
Robbie Averill
|
d0d936bc40
|
Merge branch '4.0' into 4.1
|
2018-05-30 14:52:31 +12:00 |
|
Robbie Averill
|
c8b0bc0ad7
|
Merge branch '4.0' into 4.1
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
|
2018-05-30 14:52:07 +12:00 |
|
Robbie Averill
|
624a5326a7
|
Typo in PHPDoc type
|
2018-05-30 14:51:09 +12:00 |
|
Robbie Averill
|
7a8a24d175
|
Reset force SSL domain/patterns in setup to prevent global state pollution
|
2018-05-29 17:34:22 +12:00 |
|
Robbie Averill
|
063d765e94
|
Add test assertion for response instance
This prevents middlewares that return null (like the example delegate in this test) from killing a testsuite
|
2018-05-29 17:26:29 +12:00 |
|
Robbie Averill
|
6d98a912c9
|
Merge branch 'heads/4.1.1' into 4.1
|
2018-05-28 18:26:20 +12:00 |
|
Robbie Averill
|
3244603458
|
Merge remote-tracking branch 'origin/3.6' into 4.0
|
2018-05-28 17:50:54 +12:00 |
|
Robbie Averill
|
3a537bc745
|
Merge branch 'heads/4.0.4' into 4.0
|
2018-05-28 17:50:07 +12:00 |
|
Robbie Averill
|
d21660971f
|
Merge branch 'heads/3.6.6' into 3.6
|
2018-05-28 17:44:28 +12:00 |
|
Robbie Averill
|
dae8fefb1e
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2018-05-28 17:43:55 +12:00 |
|
Robbie Averill
|
df4648a308
|
Merge branch 'heads/3.5.8' into 3.5
|
2018-05-28 17:42:31 +12:00 |
|
Robbie Averill
|
912dc60cf3
|
Added 3.5.8 changelog
|
2018-05-28 15:50:54 +12:00 |
|
Robbie Averill
|
01ed8a316b
|
Added 4.1.1 changelog
|
2018-05-24 16:52:15 +12:00 |
|
Robbie Averill
|
722202fef4
|
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
# Conflicts:
# src/Control/Director.php
|
2018-05-24 15:41:11 +12:00 |
|
Robbie Averill
|
fe4f6f42d3
|
Updated 4.0.4 changelog
|
2018-05-24 13:51:21 +12:00 |
|
Damian Mooyman
|
5bff64b47b
|
BUG Fix Director::test() not persisting removed session keys on teardown
|
2018-05-24 13:10:03 +12:00 |
|
Robbie Averill
|
e7e32d13a3
|
FIX Add namespace and encryptor to tests that expect blowfish to be available
|
2018-05-24 11:24:56 +12:00 |
|
Robbie Averill
|
bb1f0cce58
|
Added 4.0.4 changelog
|
2018-05-24 11:15:14 +12:00 |
|
Robbie Averill
|
c308416afa
|
FIX Add macron to Māori language name
|
2018-05-23 11:22:30 +12:00 |
|
Robbie Averill
|
5b7eca2b63
|
Merge pull request #70 from silverstripe-security/pulls/4.0/ss-2018-012
[ss-2018-012] File security documentation
|
2018-05-14 17:16:53 +12:00 |
|
Damian Mooyman
|
299131ed22
|
[ss-2018-012] File security documentation
|
2018-05-14 17:16:36 +12:00 |
|
Robbie Averill
|
c28f411abd
|
Merge pull request #66 from silverstripe-security/pulls/4.0/security-password-fix
SECURITY: Remove password text from session data on failed submission
|
2018-05-14 17:15:28 +12:00 |
|
Aaron Carlino
|
f847f186b1
|
[ss-2018-013] Remove password text from session data on failed submission
|
2018-05-14 17:14:38 +12:00 |
|
Robbie Averill
|
5887201dd5
|
Merge pull request #64 from silverstripe-security/pulls/4.0/ss-2018-010
[SS-2018-010] Fix regression of SS-2017-002
|
2018-05-14 17:12:45 +12:00 |
|
Robbie Averill
|
beec0c0d47
|
[SS-2018-010] Fix regression of SS-2017-002
|
2018-05-14 17:12:07 +12:00 |
|
Robbie Averill
|
1e6790bfb6
|
Merge pull request #62 from silverstripe-security/pulls/4.0/ss-2018-001
[ss-2018-001] Restrict non-admins from being assigned to admin groups
|
2018-05-14 17:11:03 +12:00 |
|
Damian Mooyman
|
e409d6f673
|
[ss-2018-001] Restrict non-admins from being assigned to admin groups
|
2018-05-14 17:10:22 +12:00 |
|
Robbie Averill
|
39b62e5fbb
|
Merge pull request #61 from silverstripe-security/pulls/4.0/ss-2018-008
[ss-2018-008] Validate against malformed urls
|
2018-05-14 17:07:09 +12:00 |
|
Damian Mooyman
|
9053014a7e
|
[ss-2018-008] Validate against malformed urls
|
2018-05-14 17:06:47 +12:00 |
|
Robbie Averill
|
6f50728b18
|
Merge pull request #59 from silverstripe-security/pulls/4.0/ss-2018-006
[ss-2018-006] Prevent code execution in template value resolution
|
2018-05-14 17:06:04 +12:00 |
|
Robbie Averill
|
cd716fb61b
|
Switch check for is_string
|
2018-05-14 17:05:31 +12:00 |
|