Daniel Hensby
28907f64c1
Merge pull request #6543 from zacps/loading-indicator
...
Fix loading indicator position (fixes #6153 )
2017-01-27 11:43:39 +00:00
Zac Pullar-Strecker
5e19d905f8
Fix loading indicator position ( fixes #6153 )
...
Fix through a different element target in js. This is untested
because node_modules is hopelessly broken on my machine.
2017-01-27 11:07:18 +00:00
Daniel Hensby
a282b3f420
Merge pull request #6528 from zacps/3310-permissions
...
Simplify permissions displayed when admin (fixes #3310 )
2017-01-27 10:26:12 +00:00
Damian Mooyman
9e24adbe5d
Merge pull request #6571 from colintucker/fix-form-field-casting
...
Cast SmallFieldHolder to HTMLFragment - fixes #6568
2017-01-27 16:56:07 +13:00
Colin Tucker
34398b0faa
Cast SmallFieldHolder to HTMLFragment - fixes #6568
2017-01-27 09:16:58 +11:00
Dan Hensby
578f12204d
Added 3.5.2-rc1 changelog
2017-01-26 21:47:37 +00:00
Dan Hensby
247ddd5d46
Update translations
2017-01-26 21:47:36 +00:00
Damian Mooyman
8ce8be99bd
Merge pull request #6570 from sunnysideup/patch-50
...
MINOR: stop Aggregate clear cache on DataObject::write()
2017-01-27 10:31:54 +13:00
Daniel Hensby
3a6d41042f
Merge branch '3.4' into 3.5
2017-01-26 21:25:14 +00:00
Dan Hensby
c5a8963d32
Added 3.4.4-rc1 changelog
2017-01-26 18:57:28 +00:00
Dan Hensby
393ad5b8a2
Update translations
2017-01-26 18:57:27 +00:00
Nicolaas
f027b5eaf5
MINOR: stop Aggregate clear cache on DataObject::write()
...
see: https://github.com/silverstripe/silverstripe-framework/issues/6383 for details
2017-01-27 07:51:42 +13:00
Daniel Hensby
9574d627f9
Merge pull request #39 from silverstripe-security/patch/3.4/SS-2017-001
...
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::…
2017-01-26 18:10:36 +00:00
Daniel Hensby
c81959cce0
Merge pull request #6558 from open-sausages/pulls/4.0/i18n-symfony
...
API Replace i18n message localisation with symfony/translation
2017-01-26 13:11:59 +00:00
Daniel Hensby
c6c6c13fc2
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate
2017-01-26 12:56:31 +00:00
Daniel Hensby
c8525c026c
Merge branch '3.5' into 3
2017-01-25 13:46:49 +00:00
Daniel Hensby
7c79374704
Merge pull request #6566 from andrewandante/feat/backport_buildtask_segment_config
...
add segment config var to buildtask
2017-01-25 11:27:02 +00:00
Daniel Hensby
90072e27e3
Merge pull request #6559 from robbieaverill/feature/4.0-upgrade-guide
...
DOCS Add 4.0 upgrade guide, update "composer" and "modules" to include 4.x recommended practices
2017-01-25 11:13:15 +00:00
Daniel Hensby
b4fc46d63e
Merge pull request #6565 from open-sausages/pulls/4.0/safe-root
...
BUG Ensure root path of any local adapter is safely created and mapped from symlink
2017-01-25 11:12:37 +00:00
Andrew Aitken-Fincham
2e1eb4afad
add segment config var to buildtask
2017-01-25 09:22:20 +00:00
Damian Mooyman
de02a3f733
Restored context parameter to i18n, and added to a “comment” key
...
Rolled pluralisation functionality into the i18n::_t() method
Warnings on missing default can now be turned off
2017-01-25 18:12:40 +13:00
Damian Mooyman
8a07c56bdf
API Replace i18n message localisation with symfony/translation
...
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
2017-01-25 17:08:12 +13:00
Damian Mooyman
5d6c90361c
BUG Ensure root path of any local adapter is safely created and mapped from symlink
...
Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/362
2017-01-25 13:55:02 +13:00
Robbie Averill
13bdec50e3
Remove * version constraints and update references for dev-master to 4.0 related constraints
2017-01-25 09:33:23 +13:00
Daniel Hensby
0c149b9386
Merge pull request #6542 from madmatt/pulls/modeladmin-docs
...
DOCS: Add some documentation to ModelAdmin for common use-cases.
2017-01-24 16:47:03 +00:00
Daniel Hensby
8a19eb84df
Merge pull request #6548 from zacps/logging-docs-6346
...
Remove examples of Log::add_writer() (fixes #6346 )
2017-01-24 16:38:36 +00:00
Joe Harvey
daeb3d7abf
Updating all setter methods on DBMoney to return an instance of themselves
2017-01-24 15:57:02 +00:00
Joe Harvey
38e86f04d8
Updating all setter methods on DBField to return an instance of themselves
2017-01-24 15:56:51 +00:00
Joe Harvey
3633d6e27f
Updating all setter methods on DBDate to return an instance of themselves
2017-01-24 15:56:45 +00:00
Daniel Hensby
74422a1a95
Merge pull request #6563 from roed/3.5
...
Fixed iframe postmessage breaking non-string messages
2017-01-24 14:09:00 +00:00
Ruud Arentsen
c640ade911
Fixed iframe postmessage breaking non-string messages
...
See issue: https://github.com/silverstripe/silverstripe-framework/issues/6562
This is a fix for that, which was already implemented in the code for version 4.0.
2017-01-24 14:15:34 +01:00
Daniel Hensby
d9cffe5f53
Merge pull request #6551 from robbieaverill/feature/json-context
...
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 12:18:40 +00:00
Daniel Hensby
60c8996309
Merge pull request #6560 from robbieaverill/feature/docs-for-upgrading-tasks-segment
...
DOCS Add note for $segment in BuildTask to 4.0.0 changelog, switch code blocks to GitHub style
2017-01-24 11:48:52 +00:00
Robbie Averill
7d8a93a669
DOCS Add note for $segment in BuildTask to 4.0.0 changelog, switch code blocks to GitHub style
2017-01-24 17:17:34 +13:00
Robbie Averill
394af0615f
DOCS Add 4.0 upgrade guide, update "composer" and "modules" to include 4.x recommended practices
2017-01-24 16:52:53 +13:00
Robbie Averill
3583f1f79e
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 13:27:16 +13:00
Daniel Hensby
b40904ffa7
Merge pull request #6547 from EtherealTallow/patch-2
...
Update 00_Server_Requirements.md
2017-01-23 16:39:11 +00:00
Daniel Hensby
d63e6021eb
Merge pull request #6546 from EtherealTallow/patch-1
...
Update 05_UploadField.md
2017-01-23 16:38:33 +00:00
Daniel Hensby
de8b5d6623
Merge branch '3.5' into 3
2017-01-23 16:25:14 +00:00
Daniel Hensby
e7e5d42865
Merge branch '3.4' into 3.5
2017-01-23 16:22:53 +00:00
Daniel Hensby
e1ee921ce7
Merge pull request #6555 from 3Dgoo/patch-2
...
Updating help link to 3.4 from 3.3
2017-01-23 15:31:10 +00:00
Aaron Carlino
0402e9e47f
Merge pull request #6554 from 3Dgoo/patch-1
...
Updating help link to 3.5 from 3.3
2017-01-23 20:56:44 +13:00
3Dgoo
08fbb451d3
Updating help link to 3.4 from 3.3
2017-01-23 09:53:49 +10:30
3Dgoo
b05930356d
Updating help link to 3.5 from 3.3
2017-01-23 09:27:15 +10:30
Zac Pullar-Strecker
a0d01542a6
Remove examples of Log::::add_writer() ( fixes #6346 )
...
Log::add_writer() has been removed in SilverStripe 4.0.0.
2017-01-20 12:27:54 +13:00
Jordan
cb38bc7930
Update 00_Server_Requirements.md
2017-01-20 11:42:58 +13:00
Jordan
b26e81d91a
Update 05_UploadField.md
2017-01-20 11:26:05 +13:00
Matt Peel
cbf64d93c2
DOCS: Add some documentation to ModelAdmin for common use-cases. Fixes #6530
2017-01-20 10:52:49 +13:00
Ingo Schommer
61201edf81
Merge pull request #6391 from catharsisjelly/3.4-improving-csvbulk-error-message
...
Altering error message to show the exception
2017-01-19 14:00:07 +13:00
Ingo Schommer
3987600bc9
Merge branch '3.4' into 3.4-improving-csvbulk-error-message
2017-01-18 22:15:18 +13:00
