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,557 Commits 31 Branches 527 Tags 162 MiB
beb32e2cb9
Commit Graph

15557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
1c1c0a23bd Added 3.2.1-rc1 changelog 2015-11-11 17:10:41 +13:00
Damian Mooyman
e68eb7e45d Update translations 2015-11-11 17:06:45 +13:00
Sam Minnee
a40812ac33 FIX: Don’t reuse DBConnector (fixes #4735) 
Without this fix, multiple Database objects will use the same
DBConnector object, meaning that SilverStripe can’t connect to multiple
databases.

This fix ensures that the service cache generates new DBConnector
subclasses each time it is called.
 2015-11-11 16:57:49 +13:00
Damian Mooyman
bc1b2893ac [ss-2015-026]: BUG Fix FormField error messages not being encoded safely 2015-11-11 16:56:19 +13:00
Hamish Friedlander
f290d869e0 [ss-2015-025]: FIX Dont expose class on error 2015-11-11 16:55:23 +13:00
Ingo Schommer
4f55b6a115 [ss-2015-022]: XML escape RSSFeed $link parameter 2015-11-11 16:54:04 +13:00
Damian Mooyman
132e9b3e2f [ss-2015-021] Fix rewrite hash links XSS 2015-11-11 16:52:53 +13:00
Damian Mooyman
b338efe5a7 Update translations 2015-11-11 16:07:20 +13:00
Daniel Hensby
46eaee5be1 Merge pull request #4731 from tractorcow/pulls/3.2/fix-numeric-regeneration 
BUG Prevent dev/build continually regenerating Number field type
 2015-11-10 23:06:18 +00:00
Damian Mooyman
0272e443f4 BUG Prevent dev/build continually regenerating Number field type 2015-11-11 09:21:50 +13:00
Daniel Hensby
583cbdd77f Merge pull request #4756 from camfindlay/patch-34 
DOCS Suggest a tool to help people generate their change logs for mod…
 2015-11-10 07:50:11 +00:00
Daniel Hensby
b4ffb6a49e Merge pull request #4757 from camfindlay/patch-35 
DOCS Suggesting a convention for CMS user documentation so CMS users …
 2015-11-10 07:49:49 +00: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
Daniel Hensby
d380252488 Merge pull request #4760 from tractorcow/pulls/3.2/fix-empty-filter 
BUG Correct behaviour for empty filter array (as per 3.1)
 2015-11-10 01:48:47 +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
732e705bbf BUG Correct behaviour for empty filter array (as per 3.1) 2015-11-10 14:24:45 +13:00
Damian Mooyman
8368ead424 Merge pull request #4759 from edlinklater/3.2-mailer-validemailaddr 
Handle incorrectly deprecated validEmailAddr methods
 2015-11-10 13:36:15 +13:00
Ed Linklater
856722a561 Handle incorrectly deprecated validEmailAddr methods 2015-11-10 13:17:27 +13:00
Cam Findlay
218049f5c0 DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs. 2015-11-10 11:59:38 +13:00
Cam Findlay
c7b2f88d4e DOCS Suggest a tool to help people generate their change logs for modules. 2015-11-10 11:50:53 +13:00
Daniel Hensby
c2c78c445e Merge pull request #4754 from tractorcow/pulls/3.2/upload-fixes 
BUG prevent UploadField edit form generation for Folders
 2015-11-09 20:50:57 +00:00
Damian Mooyman
414ea3de9e BUG prevent UploadField edit form generation for Folders 2015-11-09 16:39:33 +13:00
Damian Mooyman
a93a677187 Merge pull request #4744 from scott1702/allowed-ext 
move allowed extensions into a sidebar
 2015-11-09 10:35:24 +13:00
Will Morgan
6d85d618b6 Merge pull request #4751 from dhensby/pulls/plural-fix 
Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly
 2015-11-06 16:55:25 +00:00
Daniel Hensby
dad3784621 Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly 2015-11-06 16:23:45 +00:00
scott1702
905ddd5b20 move allowed extensions into a sidebar 2015-11-05 19:15:48 +13:00
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