tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,581 Commits 31 Branches 527 Tags 162 MiB
275f726e03
Commit Graph

15581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Nadj
f577ecb811 FIX: prevent use cache on browser back button 2015-11-05 16:09:16 +13:00
Damian Mooyman
1f0d7579f7 Merge pull request #4742 from scott1702/js-tree 
Remove drag handle from non-draggable js-trees
 2015-11-05 13:47:00 +13:00
scott1702
4f8b061b59 Remove drag handle from non-draggable js-trees 2015-11-05 13:09:47 +13:00
Damian Mooyman
44728d1c76 Merge pull request #4740 from chillu/pulls/3.2/batch-action-url-fix 
Batch actions break with Translatable installed
 2015-11-04 09:31:21 +13:00
Ingo Schommer
acdcf8ca02 Batch actions break with Translatable installed 
Due to ?locale GET parameter being appended to the action URL,
and naive string concatenation of additional GET parameters.
 2015-11-04 08:35:25 +13:00
Daniel Hensby
ef35c2bb6b Merge pull request #4457 from tractorcow/pulls/4.0/no-query 
API Remove SQLQuery
 2015-11-03 16:41:07 +00:00
Loz Calver
7896ce6a90 Merge pull request #4736 from Cheddam/listdecorator-totalitems-fix 
Corrected TotalItems() method to use Count(). (fixes #4646)
 2015-11-03 12:24:50 +00:00
Garion Herman
6a1a3bf182 Corrected TotalItems() method to use Count(). Added test coverage. (fixes #4646) 2015-11-04 00:20:45 +13:00
Damian Mooyman
1e1a7a345c Merge remote-tracking branch 'origin/3' 
Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php
 2015-11-03 14:23:16 +13: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
Colin Richardson
8dc9282adf check for id attributes for anchor targets and prevent partial matches e.g. data-name='foo' 2015-11-02 10:38:54 +00: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
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