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
1fb6bbb422
Merge pull request #4701 from scott1702/update-upload-button
...
Update asset admin toolbar
2015-10-30 09:14:41 +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
scott1702
9f9d0089df
Send user to new area when inserting url
2015-10-29 11:37:59 +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
Damian Mooyman
7710edf412
Merge pull request #4707 from chillu/pulls/revert-formfield-extrafields
...
Revert FormField->extraClass() inclusion of disabled/readonly
2015-10-27 10:12:43 +13: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
Ingo Schommer
b5c10fd27d
Revert FormField->extraClass() inclusion of disabled/readonly
...
Introduced in d1ea74e40d
, but too high risk in terms of causing
CSS or JS side effects when implemented on a FormField level.
2015-10-27 08:15:27 +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
Peter Thaleikis
791c52c6bd
fixing syntax error
2015-10-25 22:41:13 +13:00
Loz Calver
417bccfe8d
Merge pull request #4698 from SpiritLevel/patch-2
...
DOCS : spelling
2015-10-23 09:11:25 +01:00
scott1702
1f64631bfc
Update asset admin toolbar
2015-10-23 17:39:42 +13:00
Ingo Schommer
ecacf52863
Merge pull request #4697 from open-sausages/features/dbfile-uploadfield
...
New AssetField for uploading to a DBFile database field
2015-10-23 17:20:55 +13:00
Damian Mooyman
d1ea74e40d
API Implement AssetField to edit DBFile fields
2015-10-23 16:57:44 +13:00
Ingo Schommer
1ec5f0e0a1
Merge pull request #4699 from open-sausages/features/dbfile-generated-files
...
API Restore JS Minification
2015-10-23 16:51:56 +13:00
Damian Mooyman
3e7eecf978
API Remove SQLQuery
2015-10-23 16:26:04 +13:00
Damian Mooyman
e17a49f8a5
API Restore JS Minification
...
BUG Fix incorrect cache on CacheGeneratedAssetHandler
2015-10-23 14:14:38 +13:00
David Alexander
e88032a7aa
DOCS : spelling
2015-10-23 13:49:03 +13:00
Ingo Schommer
f252cfad20
Merge pull request #4680 from open-sausages/features/dbfile-generated-files
...
API Generated files API
2015-10-23 13:19:56 +13:00
Damian Mooyman
fe3d23f0d4
BUG Fix GeneratedAssetHandler crashing on expired resources
2015-10-23 11:46:58 +13:00
Damian Mooyman
f9892c628c
API Generated files API
...
API Refactor Requirements_Backend to use new APL
2015-10-23 10:07:48 +13:00
Loz Calver
b960a3e1f8
Merge pull request #4694 from open-sausages/pulls/php-5.5-min
...
Increase minimum required PHP version to 5.5
2015-10-22 11:27:25 +01:00
Ingo Schommer
7d17068062
Increase minimum required PHP version to 5.5
...
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
2015-10-22 23:11:16 +13:00
Cam Findlay
0fa8335bc0
DOCS Upgrading information about 3.2.0 and the additional modules required (reports & siteconfig)
...
Based on a community question about upgrading their site manually, they followed the instructions but were not aware of the additional modules now required.
2015-10-22 09:13:57 +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
Damian Mooyman
bfc4d06c1d
Merge pull request #4591 from kinglozzer/symfony-yaml
...
Load YAML component via composer, remove Spyc
2015-10-20 09:10:42 +13:00
Loz Calver
977642daa9
Remove Spyc YAML library
...
Also had to fix some fixture files - none of the YAML spec versions actually support tabs anyway
2015-10-19 17:07:34 +01:00
Loz Calver
c303c6354b
Update YAML component, load via composer
2015-10-19 17:06:25 +01:00