Loz Calver
|
ed4db4f135
|
Merge pull request #4031 from dhensby/pulls/detail-form-item-callback-fix
FIX GridFieldDetailForm::setItemEditFormCalback broke chaining
|
2015-03-23 16:42:23 +00:00 |
|
Daniel Hensby
|
aba0b70964
|
FIX GridFieldDetailForm::setItemEditFormCalback broke chaining
|
2015-03-23 15:16:09 +00:00 |
|
Daniel Hensby
|
06ccac1a2b
|
Merge branch 'jeffreyguo-patch-3' into 3.1
Fixes #4003
|
2015-03-23 10:15:53 +00:00 |
|
jeffreyguo
|
92a73b83cf
|
DOCS Update 12_Indexes.md
Fixing grammar mistakes
|
2015-03-23 10:15:33 +00:00 |
|
Daniel Hensby
|
9aad7ec0d5
|
Merge pull request #4028 from marijnkampf/patch-3
DOCS Missing ; in example
|
2015-03-23 09:53:01 +00:00 |
|
Marijn Kampf
|
91bdb5b530
|
Missing ; in example
|
2015-03-23 09:31:51 +00:00 |
|
Damian Mooyman
|
ffcbeb5812
|
Added 3.1.12 changelog
|
2015-03-20 19:29:20 +13:00 |
|
Damian Mooyman
|
0c5be13267
|
Merge pull request #4026 from tractorcow/3.1.12
3.1.12
|
2015-03-20 18:43:49 +13:00 |
|
Damian Mooyman
|
7f983c2bae
|
BUG Fix SS-2014-017
|
2015-03-20 18:27:30 +13:00 |
|
Damian Mooyman
|
80fc55decf
|
Merge branch 'xss-fix' into '3.1'
Xss fix
See merge request !3
|
2015-03-20 18:19:53 +13:00 |
|
Christopher Pitt
|
604c328712
|
Fixed XSS vulnerability relating to rewrite_hash
|
2015-03-20 18:17:51 +13:00 |
|
Hamish Friedlander
|
bcfeaef814
|
Merge branch 'pulls/3.1.12/SS-2015-010-director-forceredirect' into '3.1'
FIX SS-2015-010
See merge request !2
|
2015-03-20 17:56:40 +13:00 |
|
Damian Mooyman
|
ee9bddb808
|
BUG Fix SS-2015-010
|
2015-03-20 17:30:37 +13:00 |
|
Loz Calver
|
098be055a9
|
Merge pull request #4001 from jeffreyguo/patch-2
* jeffreyguo-patch-2:
Update 01_Data_Model_and_ORM.md
|
2015-03-19 21:19:24 +00:00 |
|
jeffreyguo
|
e0627c7148
|
Update 01_Data_Model_and_ORM.md
|
2015-03-19 21:19:11 +00:00 |
|
Loz Calver
|
2d1fa46be8
|
Merge pull request #4011 from dhensby/pulls/model-admin-import-naming
Using sigular name for model import form rather than class name
|
2015-03-19 21:09:19 +00:00 |
|
Damian Mooyman
|
0754f2eed2
|
Merge remote-tracking branch 'origin/3.1.11' into 3.1
|
2015-03-19 17:55:53 +13:00 |
|
Damian Mooyman
|
b3364150f9
|
Added 3.1.11 changelog
|
2015-03-19 17:46:36 +13:00 |
|
Damian Mooyman
|
a775a44387
|
Merge pull request #4016 from guru-digital/REDIRECT_fix
HTTP basic auth fix
|
2015-03-19 14:55:20 +13:00 |
|
Daniel Hensby
|
2b1e5d13cf
|
Merge pull request #4022 from tractorcow/pulls/3.1/fix-subselect
BUG Fix joins on tables containing "select" being mistaken for sub-selects
|
2015-03-18 23:10:45 +00:00 |
|
Damian Mooyman
|
b34c236b3c
|
BUG Fix joins on tables containing "select" being mistaken for sub-selects
Fix PHPDoc on SQLQuery::addFrom and SQLQuery::setFrom
Fixes #3965
|
2015-03-18 16:10:07 +13:00 |
|
Daniel Hensby
|
c1a7a8d7bd
|
Merge pull request #4021 from jeffreyguo/patch-9
DOCS Update 01_SiteConfig.md
|
2015-03-17 23:20:03 +00:00 |
|
jeffreyguo
|
bdba2c2e41
|
Update 01_SiteConfig.md
MINOR: wording errors
|
2015-03-18 11:25:26 +13:00 |
|
Daniel Hensby
|
de2aa47250
|
Merge pull request #4006 from kinglozzer/patch-1
FIX: Security::$default_message_set Config value unusable
|
2015-03-17 17:05:01 +00:00 |
|
Loz Calver
|
a61c08d031
|
FIX: Security::$default_message_set Config value unusable
|
2015-03-17 15:51:31 +00:00 |
|
Corey Sewell
|
46e61b3448
|
Check both $_SERVER['HTTP_AUTHORIZATION'] and $_SERVER['REDIRECT_HTTP_AUTHORIZATION'] for HTTP Basic authentication headers
|
2015-03-17 14:15:54 +13:00 |
|
Damian Mooyman
|
67ff1cf486
|
Merge pull request #3350 from dhensby/pulls/absolute-url-fix
Fixing absolute URLs for empty urls
|
2015-03-17 08:30:51 +13:00 |
|
Jeremy Shipman
|
f2b1fa9aed
|
FIX: broken link in docs to how_tos/extend_cms_interface
I'm not certain this fixes the issue, as I haven't tested it. It at least points it out.
|
2015-03-16 09:55:33 +13:00 |
|
Daniel Hensby
|
f568052044
|
Testing empty absolute urls and more thorough tests
|
2015-03-13 13:56:14 +00:00 |
|
Daniel Hensby
|
13cec2ee81
|
Using sigular name for model import form rather than class name
|
2015-03-13 13:36:52 +00:00 |
|
Daniel Hensby
|
a0bffccb6a
|
Merge pull request #4008 from jeffreyguo/patch-6
Update 01_Introduction.md
|
2015-03-12 07:30:29 +00:00 |
|
jeffreyguo
|
8a82f05014
|
Update 01_Introduction.md
MINOR: wording and format correction
|
2015-03-12 14:40:18 +13:00 |
|
Daniel Hensby
|
c996ab69e7
|
Merge pull request #4004 from jeffreyguo/patch-4
DOCS Update Dynamic_Default_Fields.md
|
2015-03-11 10:13:41 +00:00 |
|
jeffreyguo
|
09026d92bc
|
Update Dynamic_Default_Fields.md
MINOR: fixing grammar mistakes.
|
2015-03-11 16:27:56 +13:00 |
|
Damian Mooyman
|
403f2b91b0
|
Merge pull request #4000 from jeffreyguo/patch-1
Update 01_Data_Model_and_ORM.md
|
2015-03-11 15:00:41 +13:00 |
|
jeffreyguo
|
c6a499a1c1
|
Update 01_Data_Model_and_ORM.md
Line#15: removed "is" in "Database Columns are is defined"
Line#404: changed "17 or 74" to "17 or 43" according to line #409
|
2015-03-11 14:48:21 +13:00 |
|
Damian Mooyman
|
c0b6619c5e
|
Merge remote-tracking branch 'origin/3.1.11' into 3.1
|
2015-03-11 10:32:19 +13:00 |
|
Loz Calver
|
a4fff63020
|
Performance improvements to DataObject::is_composite_field()
|
2015-03-10 17:07:22 +00:00 |
|
Daniel Hensby
|
791a846fbf
|
Merge pull request #3989 from wernerkrauss/patch-1
Update 00_Partial_Caching.md
|
2015-03-10 11:06:40 +00:00 |
|
Daniel Hensby
|
2e31d08a24
|
Merge pull request #3996 from wernerkrauss/patch-2
Fixed typo in HtmlType translation key
|
2015-03-10 11:04:57 +00:00 |
|
wernerkrauss
|
033582abcc
|
Fixed typo in HtmlType translation key
|
2015-03-10 11:24:03 +01:00 |
|
Ingo Schommer
|
d17272084a
|
Merge pull request #3993 from tractorcow/pulls/3.1/fix-translations
BUG Fix yaml generation to conform to version 1.1, accepted by transifex
|
2015-03-10 14:07:48 +13:00 |
|
Damian Mooyman
|
9651889f1b
|
BUG Fix yaml generation to conform to version 1.1, accepted by transifex
|
2015-03-10 13:44:21 +13:00 |
|
Daniel Hensby
|
95deae8a69
|
Merge pull request #3990 from kinglozzer/patch-1
Remove redundant config logic from DataObject::setField()
|
2015-03-09 21:09:23 +00:00 |
|
Damian Mooyman
|
636784845e
|
Update admin js translations
|
2015-03-10 09:13:35 +13:00 |
|
Daniel Hensby
|
59496be8eb
|
Merge pull request #3943 from patricknelson/3.1
FIX: Ensuring GridFieldDetailForm validator uses Object->hasMethod() to respect e...
|
2015-03-09 18:59:40 +00:00 |
|
Patrick Nelson
|
f5f41b2f0e
|
FIX: Ensuring custom CMS validator uses Object->hasMethod() to respect extension decorator pattern.
|
2015-03-09 13:53:08 -04:00 |
|
Loz Calver
|
747a794f86
|
Remove redundant config logic from DataObject::setField()
|
2015-03-09 12:51:08 +00:00 |
|
Daniel Hensby
|
fcf0e8980a
|
Merge pull request #3919 from unclecheese/patch-8
MINOR: Remove children from Tutorials landing page. Deprecated.
|
2015-03-09 12:02:19 +00:00 |
|
wernerkrauss
|
fbe0592ef9
|
Update 00_Partial_Caching.md
Adding $ for variable names and quoted parameters as discussed with @kinglozzer on IRC
|
2015-03-09 12:50:05 +01:00 |
|