tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-11 05:54:03 +02:00
Code Issues Projects Releases Wiki Activity
16,455 Commits 29 Branches 518 Tags 147 MiB
297755d323
Commit Graph

16455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
297755d323
Merge branch '3.6' into 3 2017-07-18 12:00:33 +01:00
Daniel Hensby
7e732da709
Merge branch '3.5' into 3.6 2017-07-18 12:00:04 +01:00
Daniel Hensby
fa8f0cc955 Merge pull request #7141 from bummzack/fix-7132-utf8 
Fix OS X issue with some string methods.
 2017-07-18 11:59:16 +01:00
Daniel Hensby
36666eb348
Merge branch '3.6' into 3 2017-07-14 14:53:06 +01:00
Daniel Hensby
a34be33c56
Merge branch '3.5' into 3.6 2017-07-14 14:51:05 +01:00
Daniel Hensby
ddd1584e44 Merge pull request #7125 from robbieaverill/pulls/3.7/version-provider 
NEW Add new SilverStripeVersionProvider to provider module versions
 2017-07-14 12:03:15 +01:00
Robbie Averill
48d9088ab4 Separate composer.lock load method and add test mocking it 2017-07-11 12:22:25 +12:00
Damian Mooyman
10fd7813ed Merge pull request #7153 from kinglozzer/file-ini2bytes 
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145)
 2017-07-11 11:29:05 +12:00
Loz Calver
960a0f8343
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145) 2017-07-10 09:41:36 +01:00
Roman Schmid
a6db16b229 Fix OS X issue with Convert::html2raw, HTMLText::FirstSentence, HTMLText::Summary and Text::FirstSentence. 
Use unicode modifier for regular expressions that deal with whitespace.
Added unit-tests to ensure no invalud utf-8 gets generated by these methods.
 2017-07-10 09:49:55 +02:00
Daniel Hensby
f769d9a13f Merge pull request #7059 from mfendeksilverstripe/3.5 
Html editor selection is now properly stored while the dialog is open
 2017-07-05 15:03:18 +01:00
Daniel Hensby
c472957bd2 Merge pull request #7126 from andrewandante/patch-1 
FIX remove info div to fix formatting
 2017-07-04 13:46:18 +01:00
Andrew Aitken-Fincham
7812f34a2d remove info div to fix formatting 2017-07-04 12:50:57 +01:00
Robbie Averill
ee4d8b4d4e NEW Add new SilverStripeVersionProvider to provider module versions 2017-07-04 23:29:29 +12:00
Daniel Hensby
41b8df0ec7
Merge branch '3.6' into 3 2017-07-03 16:44:20 +01:00
Daniel Hensby
5f17c7fb58
Merge branch '3.5' into 3.6 2017-07-03 16:44:06 +01:00
Daniel Hensby
3a7261ac6e Merge pull request #7093 from dhensby/pulls/3.5/lam-getchildasul-call 
FIX add missing $rootCall param from LeftAndMain
 2017-07-02 00:28:48 +01:00
Daniel Hensby
c6a6fdd784 Merge pull request #7079 from andrewandante/patch-1 
Add $fixture_file to the fixtures docs
 2017-06-30 15:45:46 +01:00
Andrew Aitken-Fincham
ef8e04a83e Add $fixture_file to the fixtures docs 
Currently no mention of it.
 2017-06-29 13:58:37 +01:00
Daniel Hensby
79a7b1016e
FIX add missing $rootCall param from LeftAndMain 2017-06-29 11:24:09 +01:00
Daniel Hensby
eec8dfa7ad
Merge branch '3.6' into 3 2017-06-28 11:12:03 +01:00
Daniel Hensby
d94182702c
Merge branch '3.5' into 3.6 2017-06-28 11:10:43 +01:00
Damian Mooyman
a48628db20 Merge pull request #7030 from 3Dgoo/patch-1 
Documentation link fixes
 2017-06-28 12:15:42 +12:00
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
399c46579a
Merge branch '3.6' into 3 2017-06-27 13:15:14 +01: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
1e887c0631 Future proofing api link 2017-06-19 07:09:41 +09:30
Lukas
a990c99d6e NEW: suffix subfolder in silverstripe-cache with php-version (#6810) 
Note that this changes the default temp path value 

 * Was: /tmp/silverstripe-cache-Users-FOO-webroot-BAR-php7.1.5/USER
 * Now: /tmp/silverstripe-cache-Users-FOO-webroot-BAR/USER-php7.1.5
 2017-06-16 11:25:02 +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
3Dgoo
a128941d66 Documentation link fixes 
Removing defunct silverstripe-labs github link. Fixing up some broken links. Making links https if they can be https.
 2017-06-16 06:38:53 +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
273a087f5a
Merge branch '3.6' into 3 2017-06-14 14:29:15 +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