Ingo Schommer
02e96bd6ef
Merge pull request #7031 from 3Dgoo/patch-2
...
_t function parameter documentation fix
2017-06-26 22:58:17 +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
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
Daniel Hensby
c6b790ccb5
Merge pull request #7020 from marczhermo/3.6.1
...
Bug: Complex (curly) syntax
2017-06-14 14:00:23 +01:00
Marcz Hermo
1073eca2fa
Bugfix: Complex (curly) syntax
2017-06-15 00:03:55 +12:00
Robbie Averill
fd57bd9100
FIX Update help link from 3.5 to 3.6
2017-06-14 15:29:28 +12:00
Loz Calver
ae59c08703
Merge pull request #7014 from 3Dgoo/patch-1
...
Fixing language typo in docs
2017-06-13 09:05:21 +01:00
3Dgoo
f0c00bfb78
Fixing language typo in docs
2017-06-13 05:37:07 +09:30
Loz Calver
035a9b049e
Merge pull request #6990 from dhensby/pulls/3.6/constructor-fixes
...
FIX Upgrade old style constructors that were missed
2017-06-02 12:47:21 +01:00
Daniel Hensby
a52ed03b49
FIX Upgrade old style constructors that were missed
2017-06-02 12:22:33 +01:00
Daniel Hensby
becb769167
Merge branch '3.5' into 3.6
2017-05-31 00:11:48 +01:00
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
294df1320f
Merge branch '3.4' into 3.5
2017-05-31 00:11:18 +01:00
Daniel Hensby
ff0bbce326
Merge tag '3.5.4' into 3.5
...
Release 3.5.4
2017-05-31 00:11:18 +01:00
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
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
