Commit Graph

16538 Commits

Author SHA1 Message Date
Daniel Hensby
f4f1c55fb6
Merge branch '3.5' into 3.6 2017-05-08 15:20:11 +01:00
Daniel Hensby
793a020ce9
Merge branch '3.4' into 3.5 2017-05-08 11:31:33 +01:00
Jake Bentvelzen
ecefcc8f0e DOC Add documentation for how to use alternate ConfigStaticManifest 2017-05-08 17:52:13 +12:00
Jake Bentvelzen
082c2ddb90 Adjust ConfigStaticManifest_Reflection deprecation notices 2017-05-08 17:52:13 +12:00
Silbinary Wolf
08bb23823b Adjusted code based on feedback on PR (Pull-request) 2017-05-08 17:52:13 +12:00
Silbinary Wolf
8f65c44865 Modified how to re-enable old SS_ConfigStaticManifest to suit the SS config system 2017-05-08 17:52:13 +12:00
Silbinary Wolf
65ac23098e Adds support for using the newer ConfigStaticManifest from the 4.0/master branch. If the developer is doing something weird that involves accessing the 'getStatics()', they can simply delete the ConfigStaticManifest40.php file to bring back full compatibility. My reasoning for this addition is that it reduces the /dev/build process greatly and increases the programmers productivity and improves their quality of life (in my opinion anyway, less waiting for 7-12s for private static changes).
I'm thinking this should go into 3.3.
2017-05-08 17:52:13 +12:00
Damian Mooyman
f16d7e1838 API Deprecate unused / undesirable create_new_password implementation 2017-05-08 17:41:37 +12:00
Robbie Averill
f2b21fb828 DOCS Fix broken markdown rendering in 03_Template_debugging.md 2017-05-08 17:40:02 +12:00
Ben Speakman
27bca14f86 Test for getExtension() 2017-05-08 17:22:50 +12:00
Ben Speakman
705d342080 Update regex to only match files with names 2017-05-08 17:22:50 +12:00
Sam Minnee
018ea24ce8 MINOR: Better error message in SapphireTest
This error usually occurs when you've added a
module but haven't run flush on your test classes.

I’ve made the error message more explicit.
2017-05-04 14:01:00 +12:00
Damian Mooyman
1b8e0691c3 Merge pull request #6867 from gregsmirnov/pulls/3.4/fix-class-name-reference-consistency
Fix class name reference consistency
2017-05-04 10:07:23 +12:00
Chris Joe
9315ac2442 Merge pull request #6864 from 3Dgoo/patch-1
Fixing pagination api doc typo
2017-05-03 22:42:50 +12:00
Gregory Smirnov
2d138b0ef0 Fix class name reference consistency 2017-05-03 09:34:25 +02:00
3Dgoo
2187c160b9 Fixing pagination api doc typo 2017-05-03 06:23:47 +09:30
Patrick Nelson
a511e3511c FIX #6855: Mangled JS in Requirements, escaping replacement values prior to passing to preg_replace(). 2017-05-02 13:43:50 +12:00
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
d119272b92
Aliasing 3 as 3.7.x-dev 2017-04-21 16:10:06 +01:00
Daniel Hensby
c52d406e42
Merge branch '3.6' into 3 2017-04-21 13:56:53 +01: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
4041db455a Merge pull request #6812 from open-sausages/pulls/3/remove-tx
Remove .tx folder
2017-04-21 11:42:55 +12: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
Uncle Cheese
c371e2bcac remove tx 2017-04-20 11:46:34 +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
Sean Harvey
8999f70acc Fixing broken search in SecurityAdmin Groups field
Breadcrumbs is not a database field, so can't be searched.
2017-04-12 13:04:55 +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