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
16,446 Commits 31 Branches 527 Tags 162 MiB
b4412cedf6
Commit Graph

16446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
2b8eb202db Merge pull request #6687 from hailwood/patch-6 
Do not default to locale if hasEmptyDefault is true
 2017-06-28 12:12:16 +12:00
Daniel Hensby
1e5592a3d9
Merge branch '3.5' into 3.6 2017-06-27 13:14:39 +01:00
Daniel Hensby
29b9311634
Merge tag '3.6.1' into 3.6 
Release 3.6.1
 2017-06-27 12:53:55 +01:00
Daniel Hensby
ddff7c5dad Added 3.6.1 changelog 2017-06-27 12:48:16 +01:00
Daniel Hensby
f62cba2cd8
Added 3.6.1-alpha2 changelog 2017-06-27 12:22:26 +01:00
Daniel Hensby
1d31987a9d
Merge pull request #7027 from open-sausages/pulls/3.6/revert-lang-update 2017-06-27 12:21:58 +01:00
Daniel Hensby
61fc53a556
Added 3.6.1-alpha1 changelog 2017-06-27 12:21:10 +01:00
Ingo Schommer
02e96bd6ef Merge pull request #7031 from 3Dgoo/patch-2 
_t function parameter documentation fix
 2017-06-26 22:58:17 +12:00
Mojmir Fendek
b2d362beb9 Html editor selection is now properly stored while the dialog is open. 2017-06-26 12:55:05 +12:00
Daniel Hensby
9888cbc406 Merge pull request #7035 from mfendeksilverstripe/3.5 
TreeDropDown performance boost.
 2017-06-21 13:19:09 +01:00
Daniel Hensby
d666eea148 Merge pull request #7041 from creative-commoners/pulls/3.5/fix-gridfield-filter-header-colour 
FIX Text colour in GridField filter headers for dropdown fields (SS 3.5)
 2017-06-20 15:21:19 +01:00
Robbie Averill
e2116a70ef FIX Text colour in GridField filter headers for dropdown fields 2017-06-20 16:21:59 +12:00
Mojmir Fendek
5b6a39e71a TreeDropDown performance boost. 2017-06-19 15:10:23 +12:00
3Dgoo
344c534133 _t function parameter documentation fix 
This corrects the parameter documentation for the _t function. The docs for the fourth parameter is now declared as an array. This does not break backwards compatibility.

As discussed in #7018
 2017-06-16 07:52:09 +09:30
Daniel Hensby
99a364a24c Merge pull request #7024 from kinglozzer/hasmanylist-ambiguity 
FIX: Ensure HasManyList foreign ID filter includes table name (fixes #7023)
 2017-06-15 20:58:50 +01:00
Loz Calver
d1ed92ad26 Merge pull request #7022 from sanderha/fix-gd-rotate-png-transparency 
keep PNG transparancy on GDBackend::rotatePixelByPixel
 2017-06-15 14:38:10 +01:00
Sander Hagenaars
b61c3ac8c3
keep PNG transparancy on GDBackend::rotatePixelByPixel 2017-06-15 13:59:29 +01:00
Loz Calver
2afe018dc7
FIX: Ensure HasManyList foreign ID filter includes table name (fixes #7023) 2017-06-15 12:06:30 +01:00
Ingo Schommer
a51eb46735 Revert "Update translations" 
This reverts commit f9e890176d.
It pulled updates from transifex *after* we switched translations
to 4.x only mode - which resulted in a lot of translation keys being
moved around. For example, asset-related translations went from
framework to the asset-admin module. The removal of these translations
in 3.x caused translations to go partially missing, since these new
modules are 4.x only.

See https://github.com/silverstripe/silverstripe-framework/issues/7002
 2017-06-15 14:48:35 +12:00
Daniel Hensby
c130533865 Merge pull request #41 from silverstripe-security/patch/3.6.0/SS-2017-017 
[SS-2017-017] FIX SVG uploads disabled by default
 2017-06-14 14:44:03 +01:00
Daniel Hensby
215ff8ab55 Added 3.6.1-alpha1 changelog 2017-06-14 14:33:35 +01:00
Daniel Hensby
c66a5ebcd2 Merge pull request #7019 from robbieaverill/patch-6 
FIX Update help link from 3.5 to 3.6
 2017-06-14 14:15:56 +01:00
Daniel Hensby
c6b790ccb5 Merge pull request #7020 from marczhermo/3.6.1 
Bug: Complex (curly) syntax
 2017-06-14 14:00:23 +01:00
Marcz Hermo
1073eca2fa Bugfix: Complex (curly) syntax 2017-06-15 00:03:55 +12:00
Robbie Averill
fd57bd9100 FIX Update help link from 3.5 to 3.6 2017-06-14 15:29:28 +12:00
Loz Calver
4f4fb62dfa Merge pull request #7015 from bcairns/3.5 
Fix changetracker checkbox bugs
 2017-06-13 09:13:37 +01:00
Loz Calver
ae59c08703 Merge pull request #7014 from 3Dgoo/patch-1 
Fixing language typo in docs
 2017-06-13 09:05:21 +01:00
Brian Cairns
53c84d93da Fix changetracker checkbox bugs 
1) Use quoted name attribute selector, to work with CheckboxsetField bracketed[] field names
2) Initialize unchecked boxes original values to 0 instead of undefined, as this is the value onchange() expects for unchecked boxes (see line 67)
 2017-06-12 16:16:55 -06:00
Damian Mooyman
9c2f4e3c44 Merge pull request #7012 from dhensby/pulls/3.5/member-null 
FIX Order of conditionals for getting default admin
 2017-06-13 09:58:22 +12:00
3Dgoo
f0c00bfb78 Fixing language typo in docs 2017-06-13 05:37:07 +09:30
Daniel Hensby
a5c84b12ab
FIX Order of conditionals for getting default admin 2017-06-12 11:54:05 +01:00
Damian Mooyman
7cf7a7094c Merge pull request #7000 from kinglozzer/uploadfield-size-ini 
FIX: Upload_Validator failed to fetch max size from PHP ini values (fixes #6999)
 2017-06-07 15:48:27 +12:00
Loz Calver
4ad2cae864
FIX: Upload_Validator failed to fetch max size from PHP ini values (fixes #6999) 2017-06-06 14:28:03 +01:00
Damian Mooyman
058ba813e6 Merge pull request #6986 from open-sausages/pulls/3.0/but-its-so-tinymce 
Fix tinymce image selection issue in newer versions of Chrome
 2017-06-06 17:24:31 +12:00
Christopher Joe
5f5bfa5e70 Fix create temp folder if it does not exist 2017-06-06 09:58:51 +12:00
Loz Calver
035a9b049e Merge pull request #6990 from dhensby/pulls/3.6/constructor-fixes 
FIX Upgrade old style constructors that were missed
 2017-06-02 12:47:21 +01:00
Daniel Hensby
a52ed03b49
FIX Upgrade old style constructors that were missed 2017-06-02 12:22:33 +01:00
Christopher Joe
4b9d5dceb8 Fix tinymce image selection issue in newer versions of Chrome 2017-06-02 15:06:16 +12:00
Daniel Hensby
becb769167
Merge branch '3.5' into 3.6 2017-05-31 00:11:48 +01:00
Daniel Hensby
653c891f38
Merge tag '3.6.0' into 3.6 
Release 3.6.0
 2017-05-31 00:11:47 +01:00
Daniel Hensby
294df1320f
Merge branch '3.4' into 3.5 2017-05-31 00:11:18 +01:00
Daniel Hensby
ff0bbce326
Merge tag '3.5.4' into 3.5 
Release 3.5.4
 2017-05-31 00:11:18 +01:00
Daniel Hensby
cf8f781238
Merge tag '3.4.6' into 3.4 
Release 3.4.6
 2017-05-31 00:10:48 +01:00
Daniel Hensby
143c4a63cf
Added 3.6.0 changelog 2017-05-30 22:11:03 +00:00
Daniel Hensby
2f7f761a9c
Added 3.5.4 changelog 2017-05-30 22:03:17 +00:00
Daniel Hensby
deca99a5fe
Added 3.4.6 changelog 2017-05-30 21:58:52 +00:00
Damian Mooyman
a017422817 Merge pull request #6972 from creative-commoners/pulls/3.5/plural-modeladmin-name 
FIX Use plural name for ModelAdmin tab name
 2017-05-29 15:05:24 +12:00
Robbie Averill
b4368196d1 FIX Use plural name for ModelAdmin tab name 2017-05-29 14:02:58 +12:00
Daniel Hensby
659053a256
Added 3.6.0-rc1 changelog 2017-05-29 00:36:04 +00:00
Daniel Hensby
cda7e8dc39
Merge remote-tracking branch 'security/3.5.4' into 3.6.0 2017-05-29 01:29:05 +01:00