tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-11 05:54:03 +02:00
Code Issues Projects Releases Wiki Activity
14,279 Commits 29 Branches 518 Tags 147 MiB
3122226273
Commit Graph

14279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Craig
3122226273 Add toggleable description to CMS fields 2015-04-24 11:40:29 +12:00
Daniel Hensby
178057aea2 Merge pull request #4066 from tractorcow/pulls/3.2/from-end-iterator 
API Introduce $FromEnd variable for iterators
 2015-04-09 08:40:27 +01:00
Damian Mooyman
e91606e494 API Introduce $FromEnd variable for iterators 2015-04-09 17:02:30 +12:00
Damian Mooyman
2cc9d02f75 Merge pull request #4034 from dhensby/pulls/debug-viewable-data-3 
NEW ViewableData_Debugger implements __toString
 2015-04-02 09:56:31 +13:00
Daniel Hensby
aea3512e61 Merge pull request #4051 from tractorcow/pulls/3/fix-security-returnurl 
API Security better respects BackURL on login
 2015-03-31 21:44:04 +01:00
Damian Mooyman
9aa60ed4f3 Merge pull request #4052 from Turnerj/feature-max-size-by-upload-type 
FEATURE: Added maximum upload file size by type (on 3)
 2015-04-01 09:32:56 +13:00
Turnerj
ae8dbe309b FEATURE - Added maximum upload file size by type 
This support is on both an instance level and a global default level.
 2015-03-31 21:57:32 +10:30
Damian Mooyman
95c162ef0d API Security better respects BackURL on login 
BUG Restore missing authentication message not appearing in the login form $Content area (regression from #1807)
 2015-03-31 20:22:35 +13:00
Damian Mooyman
43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
 2015-03-31 19:54:15 +13:00
Damian Mooyman
e81fdad14a Merge pull request #4045 from flashbackzoo/pulls/gridfield 
Don't submit when disabled buttons are clicked
 2015-03-31 12:37:14 +13:00
David Craig
3a3c8c937b Disable gridfield 'add' button when autocompleter is empty 2015-03-31 12:34:35 +13:00
Daniel Hensby
adbf9b80f7 Merge pull request #4046 from ehyland/patch-1 
DOCS Updated example code
 2015-03-30 10:56:07 +01:00
ehyland
77a51c79ab Updated example code 
Made class extend FunctionalTest.
 2015-03-30 16:59:31 +11:00
Damian Mooyman
d71e2ea552 Merge pull request #4040 from halkyon/user-agent 
BUG Check for existence of HTTP_USER_AGENT to avoid E_NOTICE error.
 2015-03-26 13:19:02 +13:00
Sean Harvey
a7d3f89136 BUG Check for existence of HTTP_USER_AGENT to avoid E_NOTICE error. 
In some cases, a request may not have an HTTP_USER_AGENT. This should
check the variable exists before attempting to check it. The specific
case where it failed for me was Active Directory Federation Services
sending a web request to a SilverStripe site, but failing because it
doesn't have an agent string.
 2015-03-26 12:17:22 +13:00
Daniel Hensby
a4388f923b Merge pull request #4036 from tractorcow/pulls/3.1/fix-auth-login 
BUG Fix some database errors during dev/build where an auth token exists for the current user
 2015-03-25 10:26:27 +00:00
Damian Mooyman
8d6cd1529f BUG Fix some database errors during dev/build where an auth token exists for the current user 
Fixes #3660
 2015-03-25 11:34:13 +13:00
Daniel Hensby
16f0e7b0d3 NEW ViewableData_Debugger implements __toString 
This fixes an issue were ViewableData can be 'debugged' and no information is output - related #4030
 2015-03-24 10:40:25 +00:00
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
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