Daniel Hensby
|
bd2abc7a12
|
Merge branch '4.1' into 4.2
|
2018-07-13 16:44:23 +01:00 |
|
Daniel Hensby
|
ec9281ee02
|
Merge branch '4.0' into 4.1
|
2018-07-13 16:42:00 +01:00 |
|
Loz Calver
|
f0e545ada8
|
Merge pull request #7971 from dhensby/pulls/4.0/fix-extension-config
FIX Config from extension should not override
|
2018-07-13 16:15:18 +01:00 |
|
Daniel Hensby
|
d80ef3d9e6
|
DOCS Update docs to reflect true config merge priorities
|
2018-07-13 15:43:56 +01:00 |
|
Daniel Hensby
|
4acec33562
|
FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important
|
2018-07-12 00:55:39 +01:00 |
|
Ingo Schommer
|
2e6f29fea0
|
Merge pull request #8223 from dhensby/pulls/4.0/remove-email-from-pswdrecovery
FIX remove personal information from password reset confirmation screen
|
2018-07-06 11:27:03 +12:00 |
|
Ingo Schommer
|
0bd613a3b4
|
Merge pull request #8233 from dhensby/pulls/4.2/caching-fixes
HTTP Caching fixes :/
|
2018-07-05 15:11:01 +12:00 |
|
Daniel Hensby
|
560fe9820a
|
FIX remove personal information from password reset confirmation screen
|
2018-07-05 14:19:15 +12:00 |
|
Daniel Hensby
|
3116b1f97c
|
Consolidate disabling cache logic
|
2018-07-02 15:13:46 +01:00 |
|
Daniel Hensby
|
b9b1a74b92
|
Make config private (notation isnt working)
|
2018-07-02 13:54:11 +01:00 |
|
Daniel Hensby
|
e4ef83bd2a
|
FIX Default cache state should be no-cache
|
2018-07-02 13:33:36 +01:00 |
|
Daniel Hensby
|
27b60ae989
|
FIX Transaction depth should error if not implemented by child classes
|
2018-06-21 14:26:21 +01:00 |
|
Daniel Hensby
|
8bd73bb9cd
|
Merge pull request #8199 from creative-commoners/pulls/4.2/cms-travis-runs
Ensure silverstripe/recipe-cms is installed from source during Travis builds
|
2018-06-20 13:35:14 +01:00 |
|
Daniel Hensby
|
b7be843833
|
Ensure silverstripe/recipe-cms is installed from source during Travis builds
|
2018-06-20 13:04:56 +01:00 |
|
Robbie Averill
|
df257686c1
|
Restore check for zero or negative transaction nesting
|
2018-06-20 14:46:50 +12:00 |
|
Daniel Hensby
|
d8430f549d
|
Address feedback
|
2018-06-20 14:46:50 +12:00 |
|
Damian Mooyman
|
a7bd1a895f
|
Use 2.1 of postgres
|
2018-06-20 14:46:50 +12:00 |
|
Damian Mooyman
|
6da72d686f
|
Maybe fix it?
|
2018-06-20 14:46:50 +12:00 |
|
Damian Mooyman
|
a116b5dad8
|
BUG FIx manual resetDBSchema() calls breaking the database
|
2018-06-20 14:46:50 +12:00 |
|
Damian Mooyman
|
f2c2ded27f
|
BUG Ensure that build includes extra classes
|
2018-06-20 14:46:50 +12:00 |
|
Damian Mooyman
|
fbfd454d65
|
ENHANCEMENT Ensure test DB is flushed on either DDL or transaction-disabled tests
Fixes #8182
|
2018-06-20 14:46:50 +12:00 |
|
Robbie Averill
|
7d90a14f37
|
NEW Shift Embeddable and EmbedResource from asset-admin, lazy load Embed to allow injected dependencies (#8194)
|
2018-06-20 11:40:28 +12:00 |
|
Robbie Averill
|
725212a707
|
FIX Allow dispatcher in Embed to be configured with injector (#8192)
|
2018-06-20 11:37:35 +12:00 |
|
Robbie Averill
|
87159ea820
|
Merge pull request #7949 from martinduparc/patch-7
Use LimitWordCount instead of LimitWordCountXML
|
2018-06-19 21:36:36 +12:00 |
|
Damian Mooyman
|
cfc3b851e7
|
Merge remote-tracking branch 'origin/4.1' into 4.2
# Conflicts:
# lang/sv.yml
|
2018-06-19 17:20:25 +12:00 |
|
Damian Mooyman
|
9f764f4ec3
|
Added 4.1.2 changelog
|
2018-06-19 17:06:01 +12:00 |
|
Damian Mooyman
|
2bbb3bd798
|
Update translations
|
2018-06-19 16:50:07 +12:00 |
|
Maxime Rainville
|
3f80e2dc67
|
FIX Don't reload form session data using FormField::setSubmittedValue… (#8184)
|
2018-06-19 11:27:09 +12:00 |
|
Damian Mooyman
|
8181dc4fd2
|
ENHANCEMENT Ensure extensions are told the internal item request class for gridfield detail form (#8164)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8136
|
2018-06-15 17:58:53 +12:00 |
|
Damian Mooyman
|
f03d5e8d19
|
Added 4.2.0-beta1 changelog
|
2018-06-15 15:47:03 +12:00 |
|
Damian Mooyman
|
3bad65a726
|
Update translations
|
2018-06-15 15:39:15 +12:00 |
|
Damian Mooyman
|
a5ec4e4464
|
Remove obsolete branch-alias
|
2018-06-15 15:29:51 +12:00 |
|
Robbie Averill
|
7cd8b3d163
|
Merge pull request #8181 from open-sausages/pulls/4/remove-internals
API Remove @internal from new 4.2 methods
|
2018-06-15 13:50:43 +12:00 |
|
Damian Mooyman
|
53dded8cff
|
API Remove @internal from new 4.2 methods
|
2018-06-15 13:14:42 +12:00 |
|
Damian Mooyman
|
6c14cc86f0
|
Restore _manifest_exclude to tests/behat
|
2018-06-15 12:20:17 +12:00 |
|
Robbie Averill
|
5fa5abf295
|
Merge branch '4.1' into 4
# Conflicts:
# src/Forms/DateField.php
|
2018-06-15 11:52:07 +12:00 |
|
Robbie Averill
|
e48ad4c9e2
|
Merge pull request #8170 from open-sausages/pulls/4.1/fix-arabic-date-handling
BUG Fix internal date formatting inheriting default locale
|
2018-06-15 11:47:53 +12:00 |
|
Aaron Carlino
|
7eeb91880a
|
Shift behat test from framework to admin (#8172)
|
2018-06-15 11:28:40 +12:00 |
|
Damian Mooyman
|
b636587945
|
Respect semver and add tests
|
2018-06-15 11:04:12 +12:00 |
|
Damian Mooyman
|
c414388220
|
FIX DatetimeFieldTest
|
2018-06-14 18:14:12 +12:00 |
|
Damian Mooyman
|
310a259c5f
|
Add locale to Format
Fix up some regressions
|
2018-06-14 17:28:16 +12:00 |
|
Ingo Schommer
|
1c5876acf0
|
Merge pull request #8179 from open-sausages/pulls/4/safer-test-clear
BUG Make regression in #7839 safer
|
2018-06-14 17:28:13 +12:00 |
|
Ingo Schommer
|
bd84944c0d
|
Merge pull request #8166 from open-sausages/pulls/4/http-cache-middleware
NEW Add better HTTP cache-control manipulation (4.x branch)
|
2018-06-14 17:19:54 +12:00 |
|
Damian Mooyman
|
d52c4dd602
|
BUG Make regression in #7839 safer
|
2018-06-14 16:45:09 +12:00 |
|
Ingo Schommer
|
5fbfd8ff7f
|
Merge pull request #8176 from open-sausages/pulls/4/update-recipe-branch
Update recipe branching
|
2018-06-14 16:44:29 +12:00 |
|
Damian Mooyman
|
9139db2a9d
|
Merge pull request #8177 from creative-commoners/pulls/4.2/relative-fixture-fix
FIX SapphireTest can load relative fixtures in subfolders, switch "needs db" priority check order
|
2018-06-14 16:34:40 +12:00 |
|
Damian Mooyman
|
b686b86c34
|
Session now prevents cache headers being sent unintentionally
|
2018-06-14 15:59:51 +12:00 |
|
Ingo Schommer
|
779865e29f
|
merge changelog
|
2018-06-14 14:15:55 +12:00 |
|
Ingo Schommer
|
24e9253b87
|
Mention Last-Modified change
|
2018-06-14 14:13:44 +12:00 |
|
Ingo Schommer
|
513e0891d3
|
Clarify function of registerModificationDate()
|
2018-06-14 14:13:28 +12:00 |
|