muskie9
fc3b06dbf9
DOCS update LinkingModes description
2015-11-23 14:10:47 -06:00
Daniel Hensby
ba6078ee5b
Merge pull request #4747 from muskie9/CurrencyFieldConfig
...
ENHANCEMENT CurrencyField to use Currency.currency_symbol
2015-11-10 07:31:53 +00:00
muskie9
603caccb90
ENHANCEMENT CurrencyField to use Currency.currency_symbol
...
fixes #4035
I have limited experience with regex, so I hope I did it correctly. I was able to save/save & publish with the curent regex and the values look good.
2015-11-09 19:38:51 -06:00
Damian Mooyman
c4dc10b255
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
forms/DropdownField.php
tests/model/ImageTest.php
2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
lang/cs.yml
lang/sk.yml
2015-11-03 11:10:46 +13:00
Damian Mooyman
6fd2923d3b
Merge pull request #4732 from silverstripe/revert-4720-pulls/3.1/fix-js-includes
...
Revert "BUG Fix duplicate files being included in case of flush"
2015-11-02 18:40:12 +13:00
Damian Mooyman
074718fcfa
Revert "BUG Fix duplicate files being included in case of flush"
2015-11-02 17:11:22 +13:00
Ingo Schommer
a1dd4651da
Merge pull request #4726 from edlinklater/3-docs-jquery-delegation
...
DOCS: jQuery delegation in Admin interface
2015-11-02 10:42:59 +13:00
Ingo Schommer
fc7f574920
Merge pull request #4727 from edlinklater/3-iframe-contents
...
Don't try to unbind events from inside top-level iframes
2015-11-02 10:42:08 +13:00
Damian Mooyman
0d1bdd58b3
Merge pull request #4728 from madmatt/pulls/gridfield-list-fix
...
BUGFIX: Use Object->hasMethod() instead of method_exists()
2015-11-02 10:39:18 +13:00
madmatt
275ecfd8a9
BUGFIX: Use Object->hasMethod()
instead of method_exists()
...
This fixes an issue when you pass a `PaginatedList` back from `ModelAdmin::getList()`
2015-11-01 09:10:29 +13:00
Ed Linklater
42d2e0ebbf
Don't try to unbind events from inside top-level iframes
2015-11-01 06:14:30 +13:00
Ed Linklater
cacbbd75bc
DOCS: jQuery delegation in Admin interface
2015-11-01 05:46:13 +13:00
Daniel Hensby
6d1d21f019
Merge pull request #4724 from tractorcow/pulls/3.2/cms-reauth-route
...
BUG Add missing CMSSecurity route
2015-10-30 17:49:34 +00:00
Sam Minnée
77b084c324
Merge pull request #4725 from tractorcow/pulls/3.2/fix-id-filter
...
BUG Ensure that filters on any fixed field are scoped to the base data table
2015-10-30 17:00:31 +00:00
Damian Mooyman
2813f94124
BUG Ensure that filters on any fixed field are scoped to the base data table
...
Fixes #4700
2015-10-30 16:26:14 +13:00
Damian Mooyman
38ca9632c4
BUG Add missing CMSSecurity route
2015-10-30 15:31:54 +13:00
Ingo Schommer
9c4443629e
Merge pull request #4719 from tractorcow/pulls/3.2/fix-folder-fixtures
...
BUG Fix regression from #4396 in test fixtures
2015-10-30 09:12:08 +13:00
Daniel Hensby
587b065fc2
Merge pull request #4669 from nickspiel/patch-4
...
Adding SVG to allowed file types
2015-10-29 17:33:12 +00:00
Damian Mooyman
b857bdf209
BUG Fix duplicate files being included in case of flush
...
Fixes #4553
2015-10-29 17:48:30 +13:00
Damian Mooyman
daa86d3a4c
BUG Fix regression from #4396 in test fixtures
2015-10-29 17:36:38 +13:00
Ingo Schommer
aada7a7334
Merge pull request #4716 from dm-0/patch-1
...
Update 01_Code.md
2015-10-29 12:13:34 +13:00
Damian Mooyman
1303fc5ff3
Merge pull request #4717 from chillu/pulls/3.2/fix-inlineformaction
...
BUG Fix broken InlineFormAction
2015-10-29 11:11:36 +13:00
Damian Mooyman
db16248b9a
BUG Fix broken InlineFormAction
2015-10-29 10:48:49 +13:00
Damian Kissick
0197b46001
Update 01_Code.md
...
Corrected 'submiting' spelling
2015-10-28 21:28:45 +13:00
Damian Mooyman
82f2f63a01
Merge pull request #4714 from mparkhill/patch-1
...
Fix broken link to DataObject api
2015-10-28 12:00:41 +13:00
Michael Parkhill
e44f22c6b2
Fix broken link to DataObject api
2015-10-28 11:52:35 +13:00
Damian Mooyman
bf966a78ab
Merge pull request #4713 from patricknelson/issue-4712-image-doc
...
FIX for #4712 : Dropping in some PHP documentation on return types for dynamically generated image methods.
2015-10-28 11:51:40 +13:00
Patrick Nelson
293d84721e
FIX for #4712 : Dropping in some PHP documentation on return types for dynamically generated image methods.
2015-10-27 18:42:03 -04:00
Will Rossiter
267ec9bb97
Merge pull request #4706 from christopherdarling/patch-4
...
DOCS: correct config setting for custom editor.css
2015-10-27 09:16:46 +13:00
Christopher Darling
a1e343629b
DOCS: correct config setting for custom editor.css
...
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
2015-10-26 11:02:47 +00:00
Loz Calver
417bccfe8d
Merge pull request #4698 from SpiritLevel/patch-2
...
DOCS : spelling
2015-10-23 09:11:25 +01:00
David Alexander
e88032a7aa
DOCS : spelling
2015-10-23 13:49:03 +13:00
Damian Mooyman
6ff29065b3
Merge pull request #4688 from camfindlay/patch-31
...
DOCS Module standard 1.0
2015-10-21 09:01:35 +13:00
Damian Mooyman
cd12ce584a
Merge pull request #4690 from camfindlay/patch-32
...
FIX only use sethasemptydefault if exists.
2015-10-20 16:04:46 +13:00
Cam Findlay
c3641587a5
FIX only use sethasemptydefault if exists.
...
Backport of #4672 with a slight rewrite incase of subclasses of the field.
2015-10-20 12:39:04 +13:00
Cam Findlay
a555817d6f
DOCS Module standard 1.0
...
Adding the module standard to 3.2+ docs.
2015-10-19 11:44:31 +13:00
Damian Mooyman
f5f2861dc5
Merge pull request #4684 from dhensby/pulls/multiline-enum
...
Allow multi-line enum declarations
2015-10-16 09:45:34 +13:00
Daniel Hensby
1974e79d71
Allow multi-line enum declarations
2015-10-15 16:23:19 +01:00
Damian Mooyman
193fc9e469
Merge pull request #4675 from kinglozzer/pulls/checktable
...
Only notify users about PDO native mode once
2015-10-15 11:18:05 +13:00
Loz Calver
862429e5d7
Only notify users about PDO native mode once
2015-10-14 09:53:51 +01:00
Ingo Schommer
421d1b53b0
Merge pull request #4674 from ss23/parentidfix
...
Fix page reordering bug with ParentID
2015-10-13 11:35:52 +13:00
Stephen Shkardoon
6030854725
Fix page reordering bug with ParentID
...
If you are viewing PageA in the CMS, but move PageB into PageC,
the edit form will recieve an edit form ParentID of PageC.
This is incorrect, as only PageB had it's ParentID change.
2015-10-12 20:10:48 +13:00
Daniel Hensby
592140364c
Merge pull request #4673 from patricknelson/issue-4392-cache-headers-3.2
...
FIX #4392 : Ensure headers are checked first before being clobbered by globally maintained state.
2015-10-12 00:11:19 +01:00
Damian Mooyman
cc4d92e91a
Merge remote-tracking branch 'origin/3.2.0' into 3.2
2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568
Added 3.2.0 changelog
2015-10-12 08:44:34 +13:00
Patrick Nelson
f192a6ecaf
FIX #4392 : Ensure headers are checked first before being clobbered by globally maintained state. Also ensuring tests utilize separate responses for isolation.
2015-10-09 13:50:33 -04:00
Damian Mooyman
91a7e145d4
Merge pull request #4672 from JorisDebonnet/patch-1
...
Bugfix for DropdownField->castedCopy
2015-10-09 12:25:43 +13:00
JorisDebonnet
f6a1e5ec30
Bugfix for DropdownField->castedCopy
...
The Newsletter module crashed on it when viewing a sent Newsletter.
2015-10-08 19:02:47 +02:00
Nick Spiel
d9b3982323
Adding SVG to allowed file types
...
Adding svg to allowed extensions array, this should be merged in conjunction with a change I am making to the htaccess file in the silverstripe-installer repo (also on 3 branch). I will link to this when I have completed the PR
2015-10-08 17:32:35 +11:00