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 |
|
Daniel Hensby
|
4959f0eea8
|
Merge pull request #4012 from tractorcow/pulls/3.2/deprecate-stripslashes
Deprecate stripslashes_recursively and magic quotes
|
2015-03-14 11:03:53 +00:00 |
|
Damian Mooyman
|
db54125262
|
Deprecate stripslashes_recursively and magic quotes
This code is removed from 4.0
|
2015-03-14 21:24:11 +13:00 |
|
Daniel Hensby
|
b9283fbc06
|
Merge pull request #3799 from kinglozzer/1377-multiple-many-many
NEW: Support multiple many_manys between the same classes (closes #1377)
|
2015-03-13 20:51:13 +00:00 |
|
Loz Calver
|
835ee69339
|
NEW: Only validate DataObject model definitions during a build
|
2015-03-13 16:16:16 +00:00 |
|
Loz Calver
|
c58f4c469d
|
Replace core uses of DataObject::has_one/has_many/many_many
|
2015-03-13 16:16:12 +00:00 |
|
Loz Calver
|
7e2a00aa3d
|
Refactor DataObject has_one/has_many/many_many methods
|
2015-03-13 15:15:23 +00: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 |
|
Loz Calver
|
203f77116b
|
Fixes, tests and documentation for multiple many_manys between the same class
|
2015-03-13 09:27:23 +00:00 |
|
Josh
|
3f1805bfd2
|
NEW: Support multiple many_manys between the same classes (closes #1377)
|
2015-03-13 09:27:23 +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
|
319b96b48b
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
|
2015-03-11 11:40:06 +13:00 |
|
Damian Mooyman
|
c0b6619c5e
|
Merge remote-tracking branch 'origin/3.1.11' into 3.1
|
2015-03-11 10:32:19 +13: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
|
c35b1c432f
|
Merge pull request #3936 from jonom/sitetree-status-icons-ss3
Sitetree status icons (3 branch version)
|
2015-03-09 21:24:39 +00: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 |
|
Loz Calver
|
9c70a91f1b
|
Merge pull request #3977 from dhensby/pulls/3566
NEW LimitCharactersToClosestWord helper function
|
2015-03-09 11:40:58 +00:00 |
|
Loz Calver
|
81c1e36305
|
Merge pull request #3972 from dhensby/pulls/3690-reapply
DOCS SS_ERROR_LOG reuqires relative location to BASE_PATH
|
2015-03-09 11:36:29 +00:00 |
|
Daniel Hensby
|
ef818b3b7b
|
Merge pull request #3970 from tractorcow/pulls/3.2/api-zero-pagination
API enable PaginatedList to be disabled by setting page length to 0
|
2015-03-09 11:28:36 +00:00 |
|
Loz Calver
|
93dca9aabd
|
Merge pull request #3934 from dhensby/pulls/cofig-lru-fix
Change the LRU cache to a simple in-memory model
|
2015-03-09 09:31:04 +00:00 |
|
Damian Mooyman
|
7bf4d2e95e
|
Added 3.1.11-rc1 changelog
|
2015-03-09 18:55:23 +13:00 |
|
Damian Mooyman
|
872d05fd1b
|
Added 3.1.11-rc1 changelog
|
2015-03-09 18:28:50 +13:00 |
|
Damian Mooyman
|
a7bd6de2ec
|
Update translations
|
2015-03-09 17:11:10 +13:00 |
|
Simon Welsh
|
1d135552cf
|
Change the LRU cache to a simple in-memory model
Slight memory increase when there are lots of additions for much better performance in every case.
|
2015-03-09 02:01:24 +00:00 |
|
Daniel Hensby
|
a59e102c61
|
Merge pull request #3986 from tractorcow/pulls/3.1/fix-gridfield-bug
BUG Fix gridfield generating invalid session keys
|
2015-03-08 23:57:43 +00:00 |
|
Daniel Hensby
|
3b9129f681
|
Merge pull request #3985 from tractorcow/pulls/3.2/refactor-obj-cache
Refactor ViewableData::obj caching
|
2015-03-08 23:47:48 +00:00 |
|