Commit Graph

14952 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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