Commit Graph

20716 Commits

Author SHA1 Message Date
Daniel Hensby
ac5c3416a4
Merge branch '4.2' into 4 2018-07-13 17:06:51 +01:00
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
Luke Edwards
7ed056ec50 MINOR removeField(s)FromTab no longer creates a tab if it doesn't exist 2018-07-13 14:18:04 +12:00
Luke Edwards
599a4420bf FIX Improve GridFieldViewButton to work with new Archive Admin (#8240)
* Add gridfield restore action, enable view button in action menu

* Abstract restore action and create test

* Use more appropriate canRestoreToDraft and isArchived, move translations

* Use Hierarchy to determine if a record should be restored to root

* Move restore action to versioned
2018-07-13 10:45:13 +12: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
Daniel Hensby
28f2ceac6f
TEST Add tests for (im)mutablity of states 2018-07-10 16:58:08 +01:00
Daniel Hensby
fd8448889c
State default should be state enabled (no-cache is an enabled state) 2018-07-10 16:58:08 +01:00
Daniel Hensby
601bb4d768
Make augmentState method more efficient 2018-07-10 16:58:07 +01:00
Daniel Hensby
399ebd0031
FIX If theres a max-age set remove no-cache and no-store 2018-07-10 16:58:07 +01:00
Daniel Hensby
6e00d90783
Merge pull request #8247 from hchokshi/pulls/4/dbcurrency-scaffold-currency-field
Change DBCurrency scaffolded form field to CurrencyField (fixes #8246)
2018-07-10 11:24:27 +01:00
Luke Edwards
3ad000466e
Merge pull request #8248 from open-sausages/pull/4/doc-alternative-upgrader-installation
DOCS Document how to install upgrader as a phar
2018-07-10 16:06:25 +12:00
Maxime Rainville
80b9ca4178
Use permanent url for install phar upgrader
[ci skip]
2018-07-10 13:57:41 +12:00
Harsh Chokshi
6af736a9e1 Change DBCurrency scaffolded form field to CurrencyField (fixes #8246)
Add test ensuring DBCurrency scaffolds CurrencyField
2018-07-09 10:57:01 +12:00
Maxime Rainville
eff2251942 DOCS Document how to install upgrader as a phar
[ci skip]
2018-07-06 12:37:08 +12: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
Daniel Hensby
92f5ef31d8
FIX Allow setNoCache(false) to remove no-cache directive 2018-07-05 22:51:39 +01:00
Daniel Hensby
18b7dc235a
FIX Add must-revalidate to default state so its common on all our core states 2018-07-05 22:51:03 +01:00
Daniel Hensby
9e829c1607
FIX Allow cache control changes to affect default state 2018-07-05 22:50:35 +01: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
Robbie Averill
e4d1cf8818
Merge pull request #8231 from open-sausages/pulls/4/field-labels-doc-fix
MINOR: DataObject->fieldLabels() will only return an array
2018-07-04 10:56:19 +12:00
Luke Edwards
fbf30ee747 Message reflect previous return type change 2018-07-04 10:55:20 +12:00
Maxime Rainville
3262665b2d Fix link and turn of phrase. 2018-07-03 10:12:59 +12:00
Lukas
cc9b36e011 fix link
@maxime-rainville Link is dead - I think #step1 describes it?
2018-07-03 10:12:59 +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
Ingo Schommer
85a87ed226
Merge pull request #8200 from open-sausages/pulls/4/versioning-doc-update
Refactoring versioning doc
2018-07-02 15:55:56 +12:00
Ingo Schommer
dd9b8c94a5 DOCS Minor versioned edits
[ci skip]
2018-07-02 15:55:09 +12:00
Maxime Rainville
6108fbf2b4 Correct typo 2018-07-02 15:41:48 +12:00
Maxime Rainville
e0762d5a95 Complete version doc rewrite. 2018-07-02 15:41:48 +12:00
Maxime Rainville
d0a16bacd2 Documenting how to rollback and restore versioned DataObjects. 2018-07-02 15:41:47 +12:00
Maxime Rainville
81d27fcf9c Redrafting versioning doc WIP. 2018-07-02 15:41:47 +12:00
Maxime Rainville
bc7ada58b3 Restructure iversioning doc. 2018-07-02 15:41:47 +12:00
Luke Edwards
9ee84fd515 MINOR: DataObject->fieldLabels() will only return an array 2018-07-02 13:53:59 +12:00
Robbie Averill
14784f06d8
Merge pull request #8229 from Juanitou/patch-4
Replace broken link to tutorial
2018-06-30 02:06:09 +12:00
Juan Molina
5cd3180e85
Replace broken link to tutorial 2018-06-29 16:03:32 +02:00
Maxime Rainville
b311aff6e9 Get travis to test against 4.3.x-dev 2018-06-29 14:26:54 +12:00
Ingo Schommer
41da6d74fb
Merge pull request #8143 from open-sausages/pull/4/refactoring-upgrading-doc
The definitive upgrade guide to SilverStripe 4
2018-06-27 15:18:22 +12:00
Ingo Schommer
f7c001eaf8 Removed duplicate upgrade instructions
They're already present in the new upgrading guide

Folded upgrading "list of changes" into 4.0.0 guide

They duplicate each other, and create confusion in the upgrading
doc because there's *both* an "overview" of changes at the top,
and "important changes" at the bottom - why are they at the bottom when they're important?

Added "skip" and "continue" anchor links

[ci skip]
2018-06-27 15:17:06 +12:00
Ingo Schommer
9b6fb70c5d Removed "overview of changes" upgrading docs duplication 2018-06-27 15:16:42 +12:00
Ingo Schommer
1b06be1a64 Consistent upgrading crosslinks in changelogs 2018-06-27 15:16:30 +12:00
Maxime Rainville
580999b570 Correcting typo. 2018-06-27 15:16:30 +12:00
Maxime Rainville
4fb30da80e Update recipe-core and recipe-cms versions
Update recipe-core and recipe-cms version to use the retag 4.x releases.
2018-06-27 15:16:29 +12:00
Maxime Rainville
e80d3a8ff1 Remove the bits that said composer usage was optional. 2018-06-27 15:16:29 +12:00
Maxime Rainville
c8b6888582 Update the doc about the all command. 2018-06-27 15:16:29 +12:00
Maxime Rainville
3ceed740f4 Rename skip-namespace argument. 2018-06-27 15:16:29 +12:00