Damian Mooyman
37957b7ee8
Merge pull request #4778 from assertchris/prevent-multiple-states-added-to-single-config
...
Preventing multiple states added to single config
2015-11-17 13:23:09 +13:00
Christopher Pitt
b8975721d3
Preventing multiple states added to single config
2015-11-17 12:53:04 +13:00
Damian Mooyman
43e4eb129a
Merge pull request #4771 from camfindlay/patch-36
...
DOCS Update conflict resolution help in code of conduct
2015-11-17 10:04:40 +13:00
Damian Mooyman
302c741b07
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
control/HTTP.php
forms/Form.php
tests/view/SSViewerTest.php
2015-11-16 16:50:40 +13:00
Damian Mooyman
fd6ae72e1d
Merge remote-tracking branch 'origin/3.2.1' into 3.2
2015-11-16 16:39:15 +13:00
Damian Mooyman
b943a0c6dd
Merge remote-tracking branch 'origin/3.1.16' into 3.1
2015-11-16 16:30:24 +13:00
Damian Mooyman
0178fa5a18
Added 3.2.1 changelog
2015-11-16 16:17:10 +13:00
Damian Mooyman
3fe8b7479c
Update translations
2015-11-16 16:01:52 +13:00
Damian Mooyman
2e6469956f
Add 3.1.16-rc1 changelog
2015-11-16 15:20:30 +13:00
Damian Mooyman
615b2d5563
Added 3.1.16 changelog
2015-11-16 15:16:49 +13:00
Damian Mooyman
8eb583cda0
Update translations
2015-11-16 15:08:39 +13:00
Damian Mooyman
1dfa2dc1c1
Merge pull request #4772 from assertchris/improve-php-doc-comments
...
Improved PHPDoc comments
2015-11-16 10:01:08 +13:00
Christopher Pitt
da852ceea1
Improved PHPDoc comments
2015-11-14 12:55:30 +13:00
Cam Findlay
e5e4a55fe0
DOCS Update conflict resolution help in code of conduct
...
Original link was 404.
2015-11-14 09:42:12 +13:00
Daniel Hensby
32eab3f5bd
Merge pull request #4769 from kadimi/patch-1
...
DOCS Fixing typo
2015-11-13 13:28:16 +00:00
Damian Mooyman
c19420f545
Add 3.2.1-rc2 changelog
2015-11-13 15:32:09 +13:00
Damian Mooyman
49acc0d468
Added 3.2.1-rc2 changelog
2015-11-13 15:27:08 +13:00
Hamish Friedlander
b61d6dcd57
[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
2015-11-13 15:20:09 +13:00
Nabil Kadimi
03169a429f
Fix typo
2015-11-12 22:35:59 +00:00
Loz Calver
5f17618096
Merge pull request #4767 from tractorcow/pulls/3.2/fix-print-limit
...
BUG Fix print button only displaying first page
2015-11-12 09:29:25 +00:00
Damian Mooyman
fea1158d19
BUG Fix print button only displaying first page
2015-11-12 14:59:08 +13:00
Daniel Hensby
234e5a8a59
Merge pull request #4733 from feejin/htmleditorfield-anchor-improvements
...
Check for id attributes for anchor targets and prevent partial matches
2015-11-11 14:52:32 +00:00
Daniel Hensby
8e2fa4d225
Merge pull request #4743 from IgorNadj/cache-headers
...
FIX: prevent use cache on browser back button
2015-11-11 14:05:12 +00:00
Daniel Hensby
1c9ba0c906
Merge pull request #4763 from sminnee/dont-reuse-dbconnector
...
FIX: Don’t reuse DBConnector (fixes #4735 )
2015-11-11 14:01:40 +00:00
Damian Mooyman
245e0aae2f
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
2015-11-11 17:50:02 +13:00
Hamish Friedlander
53b3bc707b
[ss-2015-025]: FIX Dont expose class on error
2015-11-11 17:46:46 +13:00
Ingo Schommer
ac4342d81d
[ss-2015-022]: XML escape RSSFeed $link parameter
2015-11-11 17:46:39 +13:00
Damian Mooyman
97f21fddb3
[ss-2015-021] Fix rewrite hash links XSS
2015-11-11 17:46:27 +13:00
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
