Commit Graph

16679 Commits

Author SHA1 Message Date
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
Daniel Hensby
9a38bedd18
Added 3.5.4-rc1 changelog 2017-05-29 00:08:27 +00:00
Daniel Hensby
24166700e8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:02:35 +01:00
Daniel Hensby
b5ad4bdcc6
Added 3.4.6-rc2 changelog 2017-05-28 23:49:04 +00:00
Daniel Hensby
2b72c0f73b Merge pull request #42 from silverstripe-security/patch/3.4/ss-2017-004
[SS-2017-004] FIX DataDifferencer doesnt correctly cast data
2017-05-29 00:41:59 +01:00
Daniel Hensby
16a74bc8a9
FIX DataDifferencer needs to expliclty cast HTMLText values 2017-05-29 00:10:32 +01:00
Daniel Hensby
eeb549faf3
Added 3.4.6-rc1 changelog 2017-05-28 21:34:38 +00:00
Daniel Hensby
f71efb5063 Merge pull request #40 from silverstripe-security/patch/3.4/ss-2017-002
[SS-2017-002] FIX Lock out users who dont exist in the DB
2017-05-28 22:18:56 +01:00
Daniel Hensby
66456138e7
Merge branch '3.6' into 3 2017-05-26 14:58:16 +01:00
Daniel Hensby
02bb308ad5
Merge branch '3.5' into 3.6 2017-05-26 14:57:33 +01:00
Daniel Hensby
24a768ae14
Merge branch '3.4' into 3.5 2017-05-26 14:57:15 +01:00
Daniel Hensby
447ce0f84f
[SS-2017-002] FIX Lock out users who dont exist in the DB 2017-05-25 16:14:52 +01:00
Daniel Hensby
25b77a2ff8
[SS-2017-017] FIX SVG uploads disabled by default 2017-05-25 13:07:53 +01:00
Damian Mooyman
9c2b9d7e98 Merge pull request #6961 from dhensby/pulls/3.4/test-nesting
Remove unnecessary nesting of config/injector in tests
2017-05-25 10:18:59 +12:00
Daniel Hensby
85f0650796
Remove unnecessary nesting of config/injector in tests 2017-05-24 16:05:39 +01:00
Daniel Hensby
283e3279be
Merge branch '3.6' into 3 2017-05-18 13:55:07 +01:00
Daniel Hensby
db33c8a37c
Merge branch '3.6.0' into 3.6 2017-05-18 13:54:48 +01:00
Daniel Hensby
9f6e0cdc8f
Merge branch '3.5' into 3.6 2017-05-18 13:54:11 +01:00
Daniel Hensby
cc70d893bc
Merge branch '3.4' into 3.5 2017-05-18 13:53:49 +01:00
Damian Mooyman
3883878c13 Merge pull request #6797 from halkyon/broken-group-search
Fixing broken search in SecurityAdmin Groups field
2017-05-18 14:28:53 +12:00
Damian Mooyman
8f7e7ae1de Merge pull request #6130 from lekoala/patch-3
Allow filtering if a relation is defined or a formatting
2017-05-18 13:11:16 +12:00
Daniel Hensby
49a0354998
Make sure that nested relations dont break 2017-05-17 23:01:42 +01:00
Thomas Portelange
efbf14be63
Allow filtering if a relation is defined or a formatting 2017-05-17 21:05:21 +01:00
Damian Mooyman
7b9c8afeb9 Merge pull request #6777 from robbieaverill/bugfix/image-pad-transparency
FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad
2017-05-16 23:43:03 +12:00
Robbie Averill
197bc53c49 FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad 2017-05-16 21:20:21 +12:00
Daniel Hensby
9bdce9790d
Added 3.6.0-beta2 changelog 2017-05-10 21:55:25 +01:00
Loz Calver
7ae203908f Merge pull request #6882 from robbieaverill/patch-6
DOCS Fix broken markdown rendering in 03_Template_debugging.md
2017-05-09 09:38:28 +01:00
Daniel Hensby
bbb250916e
Merge branch '3.6' into 3 2017-05-08 16:22:32 +01:00
Daniel Hensby
d441f3ebd4
Merge branch '3.6.0' into 3.6 2017-05-08 16:21:55 +01:00
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