tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-19 09:53:52 +02:00
Code Issues Projects Releases Wiki Activity
16,365 Commits 29 Branches 519 Tags 147 MiB
215ff8ab55
Commit Graph

16365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uncle Cheese
b0b31637e4 Remove .tx folder 2017-05-01 16:24:11 +12:00
Daniel Hensby
bceae57208 Merge pull request #6845 from gregsmirnov/pulls/3.4/6838-fix-image-class-substitution 
#6838 fix image class substitution
 2017-04-26 16:53:12 +01:00
Gregory Smirnov
1d36f354e8 FIX Create Image_Cached with Injector. 2017-04-26 10:40:10 +02:00
Daniel Hensby
7e13878cb0
Merge branch '3.5' into 3.6 2017-04-21 13:56:24 +01:00
Daniel Hensby
04c1374a74
Merge branch '3.4' into 3.5 2017-04-21 13:51:11 +01:00
root
96d323fba1 Added 3.6.0-beta1 changelog 2017-04-21 11:49:44 +01:00
root
f9e890176d Update translations 2017-04-21 11:49:39 +01:00
Ingo Schommer
47f64c128a Merge pull request #6815 from open-sausages/pulls/3.5/remove-tx 
Remove .tx folder
 2017-04-21 11:42:46 +12:00
Ingo Schommer
22cdf4c786 Merge pull request #6814 from open-sausages/pulls/3.4/remove-tx 
Remove .tx folder
 2017-04-21 11:42:38 +12:00
Uncle Cheese
0ef6d4fb79 Remove .tx folder 2017-04-20 11:51:46 +12:00
Uncle Cheese
37d6cee83c Remove .tx folder 2017-04-20 11:50:45 +12:00
Daniel Hensby
8e600bfb37
Merge branch '3.5' into 3 2017-04-18 16:45:20 +01:00
Damian Mooyman
9e3df22b32 Merge pull request #6612 from ajoneil/dblib-pdo 
Fixes for using dblib PDO driver.
 2017-04-18 10:19:28 +12:00
Daniel Hensby
1f0e1913cd
Merge branch '3.5' into 3 2017-04-08 20:25:27 +01:00
Robbie Averill
55eb7ebdcc FIX Do not insert requirements more than once in includeInHTML 
This change consolidates the string replacements used to insert requirements into the page content to help ensure
that they are not compounding and overwriting eachother.

The added test case includes where a user may have a Javascript snippet that contains a closing head tag, and the
test ensures that it does not get injected with requirements as well as the actual head tag in the DOM.
 2017-04-07 17:04:17 +12:00
Damian Mooyman
2fd3b84b46 Merge pull request #6778 from kinglozzer/6668-modeladmin-regression 
Fix regression from #6668 - ModelAdmin form widths
 2017-04-06 09:37:24 +12:00
Loz Calver
a7920b1f98
Fix regression from #6668 - ModelAdmin form widths 2017-04-05 15:13:09 +01:00
Damian Mooyman
b1dc2cc9f9 Merge pull request #6771 from kinglozzer/php7-ss3 
PHP 7 compatibility
 2017-04-05 13:37:13 +12:00
Sam Minnee
061b71328b Update docs. 2017-04-05 11:06:10 +10:00
Loz Calver
ae0fe75fba Fix non-numeric warnings in GDBackend/ImagickBackend 
intval() will convert non-numeric values to 0, and Image_Backend::resize() will subsequently raise the appropriate exception
 2017-04-05 11:06:10 +10:00
Loz Calver
f101697f8e Fix File::ini2bytes() in PHP 7 2017-04-05 11:06:10 +10:00
Loz Calver
e22cd4db00 Fix: TabSet attempting to access undeclared property 2017-04-05 11:06:10 +10:00
Sam Minnee
f083a06f3f FIX: Fix ViewableData::__isset() for getXXX() getters. 
PHP7 is stricter about this.

Manual cherry-pick of of c80417a949
 2017-04-05 11:06:03 +10:00
Sam Minnee
22ad39e5ae FIX: Fix SSViewerTest in PHP7 
PHP7 is a bit more picky about passing values by reference.
 2017-04-05 11:05:29 +10:00
Sam Minnee
f224849cc6 FIX: Don’t use SplFixedArray in PHP 7. 
PHP 7 seems to suffer a segfault when using SplFixedArray. Since LRU is
deprecated anyway, I’m not too fussed about getting to the bottom of
this issue, however, if it turns out that SplFixedArray is corrected in
PHP 7.0.0 stable or a future patch release, we could update this check.
 2017-04-05 11:05:28 +10:00
Loz Calver
454646c4df Fix invalid closure param in ShortcodeParserTest 2017-04-05 11:05:28 +10:00
Loz Calver
05a737c5fc Allow RandomGenerator to use random_bytes() in PHP 7 2017-04-05 11:05:28 +10:00
Loz Calver
82f62c8184 Fix illegal string offset in spyc component 2017-04-05 11:05:28 +10:00
Sam Minnee
cca7e9697c FIX: Correct PHP4-style constructors in SimpleTest. 
Note that the best solution to this will be to remove the use of
SimpleTest entirely. This is quick fix is intended to help us get PHP7
tests running without needing to cross that bridge.
 2017-04-05 11:05:27 +10:00
Loz Calver
40bf945322 NEW: PHP 7 compatibility 
This patch introduces PHP 7 compatability without breaking semver by adding DBInt
and DBFloat classes, with Int/Float classes that are only loaded into PHP 5 environments
 2017-04-05 11:00:04 +10:00
Daniel Hensby
51f98c973f
Merge branch '3.5' into 3 2017-04-03 22:57:58 +01:00
Daniel Hensby
203963199b Merge pull request #6762 from Quadra-Digital/login-hooks 
Add Extension Hooks to Member Login Processes
 2017-03-30 12:57:00 +01:00
Joe Harvey
0d0d18612d Adding extension hooks to Member isLockedOut() and registerSuccessfulLogin() 2017-03-30 11:07:51 +01:00
Damian Mooyman
75289b46e2 Merge pull request #6731 from kinglozzer/manymanyextrafields-order 
FIX: many_many_extraFields breaks _SortColumn0 ordering (fixes #6730)
 2017-03-28 12:07:18 +13:00
Loz Calver
b3d37880e9
FIX: many_many_extraFields breaks _SortColumn0 ordering (fixes #6730) 2017-03-27 09:16:13 +01:00
Daniel Hensby
a04d72c66f Merge pull request #6655 from robbieaverill/patch-6 
DOCS Swap legacy code block syntax for GFM in "Requirements"
 2017-03-24 21:55:48 +13:00
Damian Mooyman
66a9694011 Merge branch '3.5' into dblib-pdo 2017-03-20 11:49:02 +13:00
Damian Mooyman
ae03d18d91 Merge pull request #6696 from robbieaverill/bugfix/datetime-field-has-template 
FIX Give DatetimeField its own template (which is extensible)
 2017-03-13 13:05:32 +13:00
Robbie Averill
cc749d3a19 FIX Give DatetimeField its own template (which is extensible) 2017-03-13 11:36:53 +13:00
Ingo Schommer
a69ec2f847 Merge pull request #6677 from open-sausages/pulls/3/themed-grouped-dropdown 
API Enable theming of GroupedDropdownField
 2017-03-06 14:48:29 +13:00
Damian Mooyman
f1b99b6fa7
API Enable theming of GroupedDropdownField 
Based on partial back-port of 4.0 code
 2017-03-06 11:44:42 +13:00
Daniel Hensby
8aaa3e3a86
Merge branch '3.4' into 3.5 2017-03-03 14:54:29 +00:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2 2017-03-03 14:05:53 +00:00
Daniel Hensby
62e301bdba Merge pull request #6529 from timezoneone/3.5 
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
 2017-03-03 12:45:05 +00:00
Daniel Hensby
e27a2b3dd4 Merge pull request #6669 from timkung/pulls/update-gridfield-sort-icon-direction 
Updating GridField.scss to fix sort icon direction
 2017-03-03 12:37:04 +00:00
Daniel Hensby
e8eb2f0fb0
Merge pull request #6668' from timkung/pulls/modeladmin-content-template-fix 2017-03-03 10:18:31 +00:00
Shawn
72b6fb49b6 Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns 2017-03-03 14:11:53 +13:00
Tim Kung
0b73039e6f switching the ascending and descending sprites for the grid field sort icon to be correct 2017-03-02 10:35:20 +13:00
Tim Kung
33054100ca updating title attribute on managed model tab list links to the actual title of each model 2017-03-01 16:32:30 +13:00
Andrew O'Neil
9492a8b92f Error should be checked on the db connection, not on the result 2017-03-01 10:41:06 +11:00