Commit Graph

15611 Commits

Author SHA1 Message Date
Daniel Hensby
572945a2fd Merge pull request #4704 from spekulatius/patch-1
fixing syntax error
2015-11-23 14:18:50 +00:00
Daniel Hensby
e0d7400aea Merge pull request #4788 from christopherdarling/patch-5
FIX: for ConfirmedPasswordField validation
2015-11-23 07:58:24 +00:00
Christopher Darling
e9b833f5f0 FIX: ConfirmedPassword field correctly reports mismatching passwords
added testFormValidation to prove #4780
2015-11-20 15:56:27 +00:00
Daniel Hensby
e3d421ae41 Merge pull request #4786 from nickspiel/3.2
Adding a background to the UploadField preview
2015-11-20 14:51:55 +00:00
Nick Spiel
7a7f592d0f Adding a transparent background to upload preview
Adding a background to upload preview

I could not see a preview of a white image with background transparency in the preview area. Adding a backgorund to this area helps make it more visible.

Applying background image to img

Applying background image to img to avoid layout change

Applying background image to img

Applying background image to img to avoid layout change
2015-11-20 21:14:53 +11:00
Damian Mooyman
624e3fde6a Merge pull request #4708 from muskie9/patch-7
DOCS update framework and cms milestone links
2015-11-20 12:43:11 +13:00
Damian Mooyman
84667e5aa6 Merge pull request #4693 from camfindlay/patch-33
DOCS Upgrading information about 3.2.0 and the additional modules req…
2015-11-20 11:13:36 +13:00
Nic
2e5c56f1d0 DOCS update framework and cms milestone links 2015-11-19 11:34:01 -06:00
Hamish Friedlander
f8236087c7 Merge branch 'camfindlay-rfc' into 3.2 2015-11-19 16:06:28 +13:00
Cam Findlay
9672cd3994 DOCS SilverStripe core RFC process, template and archive links to past RFCs. 2015-11-19 16:05:49 +13:00
Damian Mooyman
83ede291bd Merge pull request #4779 from kinglozzer/pulls/fieldgroup-composite-validation
FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773)
2015-11-19 14:04:41 +13:00
Loz Calver
071314fbf2 Merge pull request #4781 from dhensby/pulls/anchor-fix
Fixing regression from #4733
2015-11-18 14:41:28 +00:00
Daniel Hensby
f8cd876217 Fixing regression from #4733 2015-11-18 14:16:25 +00:00
Loz Calver
68d99be24b FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773) 2015-11-17 16:34:17 +00: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
Cam Findlay
e5e4a55fe0 DOCS Update conflict resolution help in code of conduct
Original link was 404.
2015-11-14 09:42:12 +13: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
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