Commit Graph

20493 Commits

Author SHA1 Message Date
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
Daniel Hensby a7a45559f0
Merge pull request #8188 from gelysis/array-lib
Tweaks on the ArrayLib class
2018-06-19 15:06:39 +01:00
Robbie Averill 12cc2c68a5
Merge pull request #8023 from silverstripe-terraformers/feature/lookup_field_set_value_fix
LookupField value handling corrected
2018-06-19 21:37:36 +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 82634bf08c
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-19 17:20:49 +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
Ingo Schommer 39a86e6d92
Merge pull request #8195 from dhensby/pulls/4.2/cache-default
FIX Default cache state should be `no-cache`
2018-06-19 11:15:57 +12:00
Daniel Hensby 2f1c2992f8
FIX Default cache state should be `no-cache` 2018-06-18 21:45:38 +01:00
Damian Mooyman a3b1bf8154
Merge pull request #8159 from jakedaleweb/fix_obsolete_naming
Fix obsolete naming
2018-06-18 17:18:47 +12:00
Aaron Carlino 05edb372f1 Revise per tractorcow review 2018-06-18 16:00:17 +12:00
jovenden b0863fee91 Ensure tables are properly named on dontRequireTable() 2018-06-18 16:00:17 +12:00
Maxime Rainville c3b556d246 Restore travis-upload-artifacts.php
travis-upload-artifacts.php was moved to admin as part of #8112. However many modules expect it to be available under framework, so we have to bring it back.
2018-06-18 13:20:15 +12:00
Andreas Gerhards 59fe36ba04 Tweaked the other flattening method as well, allowing keys to be preserved 2018-06-18 11:16:20 +12:00
Andreas Gerhards 1753bb2d07 Improved speed on the recursive array flattening 2018-06-18 10:37:20 +12:00
Damian Mooyman d82cd0af1f
Merge pull request #8187 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:14:23 +12:00
Ingo Schommer a49e03c9fc
Merge pull request #8183 from open-sausages/pulls/4/docs-upgrade-public-mention
Mention public folder in 4.0.0 upgrading overview
2018-06-18 09:00:42 +12:00
Andreas Gerhards f45cf75407 Implemented improved associative array check 2018-06-18 08:45:22 +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
Dylan Wagstaff c6e6be1209 Add supported module badge to readme 2018-06-15 17:40:30 +12:00
Damian Mooyman 00f89d0668
Add back missing branch alias 2018-06-15 16:30:05 +12:00
Ingo Schommer 3aba5a7136 DOCS Mention public folder in 4.0.0 upgrading overview
It's one of the most noteworthy manual changes,
let's not hide it from devs who will (correctly) start their upgrade process by looking at the 4.0.0 guide
2018-06-15 16:23:19 +12:00
Ingo Schommer 0a61f7ed16 DOCS Link to public folder instructions from 4.0.0 docs
It's far too common for people to follow 4.0.0, only to get surprised theres more to it
2018-06-15 16:20:57 +12:00
Damian Mooyman 7cb37f2358
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-15 16:03:28 +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
Ingo Schommer 3625b2553d List deprecated APIs in changelog 2018-06-14 14:13:28 +12:00
Ingo Schommer 4c30c9ac2f Clarified cases in which forms prevent caching 2018-06-14 14:12:35 +12:00