tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-10 21:43:53 +02:00
Code Issues Projects Releases Wiki Activity
13,599 Commits 29 Branches 518 Tags 147 MiB
2b1e5d13cf
Commit Graph

13599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f568052044 Testing empty absolute urls and more thorough tests 2015-03-13 13:56:14 +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
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
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
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
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
Damian Mooyman
1770fab206 BUG Fix gridfield generating invalid session keys 2015-03-09 11:44:39 +13:00
Ingo Schommer
1a9c206d15 Merge pull request #3871 from patbolo/3173-folder-treedropdownfield 
BUGFIX Use correct query when searching for items managed by a tree drop...
 2015-03-08 23:23:03 +13:00
Ingo Schommer
45fcdc672a Merge pull request #3983 from dhensby/pulls/gender-neutral-docs 
Making docs gender agnostic
 2015-03-08 22:57:40 +13:00
Daniel Hensby
32a3d6c61e Merge pull request #3975 from oddnoc/controller-route-docs 
DOCS: Correct & expand routing docs
 2015-03-07 22:58:51 +00:00
Ingo Schommer
12376637cf Merge pull request #2801 from mmichelli/3.1 
Norwegian translation issue
 2015-03-08 11:24:06 +13:00
Fred Condo
bd5f5232fa DOCS: Correct & expand routing docs 
- Correct syntax error in TeamController sample code
- Explain mandatory use case of $url_handlers
- Provide sample code for mandatory use case of $url_handlers
 2015-03-07 13:25:44 -08:00
Daniel Hensby
d2a3da2203 Making docs gender agnostic 2015-03-07 12:32:04 +00:00
Daniel Hensby
0898487ad2 Merge pull request #3976 from guru-digital/composer-git-and-.git-ignore-docs 
DOCS Added "Composer managed modules, Git and .gitignore" section
 2015-03-05 23:49:48 +00:00
Damian Mooyman
ba2de450d6 Merge pull request #3962 from micmania1/patch-8 
FIX Prevent unnecessary call to config system which doesn't exist yet
 2015-03-06 12:42:20 +13:00
Corey Sewell
2742f46b79 Added "Composer managed modules, Git and .gitignore" section to Getting Started/02 Composer 2015-03-06 10:28:07 +13:00
Daniel Hensby
7cd998d247 Merge pull request #3973 from cjsewell/patch-1 
DOCS Remove incorrect L flag for Basic Auth RewriteRule
 2015-03-05 18:44:12 +00:00
Corey Sewell
f924354e12 Remove incorrect L flag for Basic Auth RewriteRule 
As per the installer [.htaccess](https://github.com/silverstripe/silverstripe-installer/blob/3.1/.htaccess#L37) the RewriteRule to enable Basic Auth when using CGI/FastCGI with Apache does not have the L flag.
 2015-03-06 07:36:43 +13:00
Daniel Hensby
96b1583aae DOCS SS_ERROR_LOG reuqires relative location to BASE_PATH 2015-03-05 12:07:56 +00:00
Ingo Schommer
ff562e126f Merge pull request #3971 from tractorcow/pulls/3.1/fix-param-len 
BUG Fix serialised stateid exceeding request length
 2015-03-05 15:44:31 +13:00
Damian Mooyman
87adc44469 BUG Fix serialised stateid exceeding request length 2015-03-05 15:00:38 +13:00
Daniel Hensby
f0cc751d75 Merge pull request #3969 from sminnee/non-sortable-column-fix 
FIX: Corrected padding on non-sortable columns.
 2015-03-04 22:46:02 +00:00
Sam Minnee
eb35f260c6 FIX: Corrected padding on non-sortable columns. 
span.non-sortable in the GridField header relies on there being other, sortable columns in the list to get the padding
right. If there are no such columns (e.g. in a simple header), then the header is shown without padding, which is ugly.

This small change fixes that. Tested on Chrome and Firefox. 1px smaller than a sortable header on Firefox but still looks fine.
 2015-03-04 22:14:00 +00:00
Daniel Hensby
2c752adf5c Merge pull request #3966 from AntonyThorpe/patch-2 
Update FunctionalTest.php API notes
 2015-03-04 14:49:12 +00:00