Sam Minnée
751264fd6a
Merge pull request #4871 from tractorcow/pulls/3.2/better-release-instructions
...
Improve release process instructions
2015-12-23 16:50:46 +13:00
Damian Mooyman
0dfa8ca7b2
Improve release process instructions
2015-12-23 16:45:34 +13:00
Damian Mooyman
66b3a6a2c5
Merge pull request #4840 from mateusz/guard
...
BUG Guard against users being added to all groups on unsaved Group.
2015-12-22 16:29:09 +13:00
Damian Mooyman
55e1b66285
Merge pull request #4859 from chillu/pulls/noteworthy-contrib-docs
...
Note about changelog additions in contrib guide
2015-12-21 14:33:57 +13:00
Ingo Schommer
b97b604a05
Merge pull request #4837 from tractorcow/pulls/3.2/release-docs
...
Documentation on the release process
2015-12-21 11:55:19 +13:00
Ingo Schommer
e114548a48
Note about changelog additions in contrib guide
2015-12-21 11:52:08 +13:00
Damian Mooyman
c5e1922c65
Merge pull request #4857 from ivoba/patch-1
...
DOCS : Update 02_Composer.md gdmedia/ss-auto-git-ignore as dev requirement
2015-12-18 10:18:29 +13:00
Ivo Bathke
f77bac3ab0
Update 02_Composer.md
...
gdmedia/ss-auto-git-ignore as dev requirement
2015-12-17 11:57:46 +01:00
UndefinedOffset
afbb5cfed4
BUGFIX: Vimeo oEmbed endpoint redirecting to no www
2015-12-16 12:19:37 +13:00
Damian Mooyman
37874936b5
Merge pull request #4848 from kinglozzer/optionsetfield-no-value
...
FIX: Allow omitting a value for OptionsetField submissions (fixes #4284 )
2015-12-15 15:12:07 +13:00
Loz Calver
d6d3aa3554
Remove duplicate code
2015-12-14 16:50:34 +00:00
Loz Calver
d265c9b733
FIX: Allow omitting a value for OptionsetField submissions ( fixes #4824 )
2015-12-14 16:50:22 +00:00
Mateusz Uzdowski
5a21b2fb15
BUG Guard against users being added to all groups on unsaved Group.
...
If ->Members()->add() is called on an unsaved group (with ID 0), the
collateFamilyIDs() will errorneously return all root Groups thinking
it's looking for Groups with ParentID=0. As a result, the Member will be
added to all root groups, instead of just the selected group and all its
children.
2015-12-11 14:51:51 +13:00
Daniel Hensby
9dabf15faa
Merge pull request #4826 from spekulatius/patch-1
...
DOCS fixing UploadField example
2015-12-10 15:07:11 +00:00
Damian Mooyman
903d4838bb
Documentation on the release process
2015-12-04 15:09:58 +13:00
Peter Thaleikis
7db7140a70
fixing example
2015-12-04 11:14:02 +13:00
Loz Calver
c3544fdbea
Merge pull request #4799 from tractorcow/pulls/3.2/member-validate-visibility
...
BUG Revert method visibility regression
2015-11-27 09:29:14 +00:00
Damian Mooyman
94742fa3e2
BUG Revert method visibility regression
2015-11-27 13:10:52 +13:00
Daniel Hensby
572945a2fd
Merge pull request #4704 from spekulatius/patch-1
...
fixing syntax error
2015-11-23 14:18:50 +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
