Commit Graph

16348 Commits

Author SHA1 Message Date
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
143c4a63cf
Added 3.6.0 changelog 2017-05-30 22:11:03 +00: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
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
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
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
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
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
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
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