tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
10,471 Commits 31 Branches 527 Tags 162 MiB
ba9d888b5e
Commit Graph

10471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
ba9d888b5e Merge pull request #6813 from open-sausages/pulls/3.0/remove-tx 
Remove .tx folder
 2017-04-21 11:42:14 +12:00
Uncle Cheese
bbf5ca9939 Remove .tx folder 2017-04-20 11:49:13 +12:00
Damian Mooyman
2291434a23 Merge pull request #5023 from SpiritLevel/3.0 
DOCS 3.0 : re-introduce api: tags since api: parser now fixed
 2016-02-11 09:51:49 +13:00
David Alexander
6ea68b92b0 DOCS 3.0 : re-introduce api: tags since api: parser now fixed 
missed a few...

a few more fixes
 2016-02-10 12:24:35 -07:00
Damian Mooyman
1671b5737c Merge pull request #4946 from Meeeeeeow/patch-2 
Fixed Broken Links
 2016-01-20 13:27:12 +13:00
Meeeeeeow
f80dce4866 Fixed Broken Links 
'Themes Listing on silversripe.org' and 'Themes Forum on silverstripe.org'
 2016-01-19 16:38:52 +13:00
Damian Mooyman
d305757092 Merge pull request #4934 from SpiritLevel/3.0-docs 
DOCS 3.0 : found changelog 2.4.9
 2016-01-18 15:21:10 +13:00
Damian Mooyman
8d955bddc0 Merge pull request #4928 from SpiritLevel/3.0-docs 
DOCS 3.0 : fixes broken internal links
 2016-01-15 16:21:57 +13:00
Damian Mooyman
00c1911688 Merge pull request #4928 from SpiritLevel/3.0-docs 
DOCS 3.0 : fixes broken internal links
 2016-01-15 14:46:04 +13:00
David Alexander
bdeb9140e1 DOCS 3.0 : fixes broken internal links 
missing changelog links added back but made inactive and fixed case on class name
 2016-01-15 12:14:27 +13:00
Damian Mooyman
cbd5332417 Merge pull request #4808 from SpiritLevel/3.0 
DOCS 3.0 : eliminate hard coded numbers in tutorial labels & links
 2015-12-21 15:07:52 +13:00
David Alexander
7a2b5a796b DOCS 3.0 : eliminate hard coded numbers in toturial labels & links 2015-11-28 15:56:40 +13:00
Damian Mooyman
01255c109b Added 3.0.14 changelog 2015-05-28 19:20:23 +12:00
Damian Mooyman
c14e7f6b76 BUG Fix malformed urls redirecting to external sites 2015-05-28 18:27:58 +12:00
Damian Mooyman
cb6717c3f8 BUG Fix handling of empty parameter token 2015-05-28 18:25:01 +12:00
Damian Mooyman
5f6ac27934 Bug fix sqlquery select 2015-05-28 18:24:07 +12:00
Damian Mooyman
94b2963ad8 Added 3.0.13 changelog 2015-03-31 14:11:11 +13:00
Chris Pitt
9a97ae962f Merge branch 'pulls/3.0/xss-fix' into '3.0.13' 
Backport of SS-2015-009 into 3.0

See merge request !4
 2015-03-30 11:23:18 +13:00
Christopher Pitt
bdef4fc7a5 Fixed XSS vulnerability relating to rewrite_hash 2015-03-30 10:59:39 +13:00
Damian Mooyman
11521fb92d Added 3.0.12 changelog 2015-03-19 17:35:09 +13:00
Daniel Hensby
663f9c9cbe Merge pull request #3913 from muskie9/patch-5 
DOCS Update common-problems.md
 2015-02-17 22:33:33 +00:00
Nic
54fef8961b Update common-problems.md 
Properly instruct where to put `DirectoryIndex disabled`
 2015-02-17 16:32:54 -06:00
Daniel Hensby
75299f7e4d Merge pull request #3911 from muskie9/patch-4 
Update Common Problems with mod_rewrite issue
 2015-02-17 15:44:25 +00:00
Nic
a41f860ee2 Update Common Problems with mod_rewrite issue 
3.0 docs
 2015-02-17 09:42:21 -06:00
Daniel Hensby
aa6debcdea Removing redundant PHP syntax declaration 2015-02-16 13:57:04 +00:00
Will Rossiter
d6336873d4 Merge pull request #3761 from camfindlay/patch-12 
BUG Fix tutorial index page for the new doc site
 2015-01-08 10:17:49 +13:00
Cam Findlay
ac922a0aa6 BUG Fix tutorial index page for the new doc site 
Required for roll out of new docs.
 2015-01-08 09:59:35 +13:00
Ingo Schommer
28760e051d Merge pull request #3674 from ss23/api-https-fix 
API Fix HTTPS proxy header detection (Same as #3152)
 2014-11-25 08:23:44 +13:00
Stephen Shkardoon
b3407abe4b API Fix HTTPS proxy header detection (Same as #3152) 
Didn't use the de facto standard HTTP_X_FORWARDED_PROTO or the less standard HTTP_FRONT_END_HTTPS.
Removed the 'X-Forwarded-Proto', since PHP should prefix/underscore all HTTP headers before it hits $_SERVER.

References:
- https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header
- https://drupal.org/node/1859252
- https://drupal.org/node/313145
- http://scottwb.com/blog/2013/02/06/always-on-https-with-rails-behind-an-elb/
 2014-11-25 03:21:36 +13:00
Ingo Schommer
1661213e5b FIX Opt-out pf form message escaping (fixes #2796) 
This fixes a limitation introduced through http://www.silverstripe.org/ss-2013-008-xss-in-numericfield-validation/.
Form messages used to accept HTML, now they’re escaped by default, effectively removing the ability
to pass in HTML and take care of escaping manually.

We pass through HTML to message in core through the CTF system, so this needs to be fixed.
It’s an alternative fix to https://github.com/silverstripe/silverstripe-framework/pull/2803.
 2014-08-22 16:59:34 +12:00
Joel Marcey
0c85680371 Support PHPUnit 3.8+ compatibility 
Summary:

PHPUnit 3.8+ adds a method to its PHPUnit_Framework_TestListener called addRiskyTest(). Need to stub it out to avoid "must implement this interface method" fatals when using 3.8+

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev:
 2014-08-22 13:43:23 +12:00
Damian Mooyman
a6f244faff Merge pull request #3231 from tscole/patch-2 
Update i18n.php
 2014-06-24 09:14:17 +12:00
tscole
32c2028368 Update i18n.php 
Norwegian should use 'nb' and not 'no' in common languages array
 2014-06-23 14:52:08 +01:00
Damian Mooyman
d76486344a Merge pull request #3172 from stevie-mayhew/patch-1 
Update datamodel.md
 2014-05-29 16:58:26 +12:00
Stevie Mayhew
0da889bde2 Update datamodel.md 
Fix broken link to SS_List->column
 2014-05-29 16:25:40 +12:00
Damian Mooyman
083c0e083b Merge pull request #3171 from ss23/patch-4 
Update i18n.md
 2014-05-29 14:34:10 +12:00
Stephen Shkardoon
6b410aa9a0 Update i18n.md 
Fix a link being inside backticks, which broke the formatting.
 2014-05-29 13:13:45 +12:00
Damian Mooyman
d9c037bb69 Merge remote-tracking branch 'origin/3.0.11' into 3.0 2014-05-13 14:02:28 +12:00
Damian Mooyman
ce516ca1cd Release docs 2014-05-13 13:02:21 +12:00
Will Morgan
1d4082b6f0 MINOR Use composer @stable for PHPUnit 
Using stable will allow some packages to be downloaded as zips instead of clones all the time.
 2014-05-13 11:25:56 +12:00
Will Morgan
8ab3881bfa MINOR Use composer @stable for PHPUnit 
Using stable will allow some packages to be downloaded as zips instead of clones all the time.
 2014-05-09 16:42:43 +12:00
Damian Mooyman
98e5c1556f Release docs update 2014-05-07 15:54:55 +12:00
Damian Mooyman
0099a18182 Merge pull request #3100 from tractorcow/pulls/3.0-fix-foldername 
FIX Folder Title not being exactly the same as Name field
 2014-05-07 15:34:59 +12:00
Damian Mooyman
0ae96ab030 Changelog tags 2014-05-07 14:11:10 +12:00
Damian Mooyman
953e4b4c49 Added change log for 3.0.11-rc1 2014-05-07 14:03:13 +12:00
Ingo Schommer
ea1a0d16fc Merge pull request #3106 from tractorcow/pulls/3.0/path-checking 
Path resolution cleanup
 2014-05-07 08:39:17 +12:00
Damian Mooyman
9bfeffd06a Path resolution cleanup 
Backport of #3085 to 3.0
 2014-05-06 15:20:57 +12:00
Simon Welsh
ddae5825b3 Merge pull request #3102 from ss23/patch-3 
MINOR LeftAndMain::getRecord check $ClassName before use
 2014-05-05 17:47:57 +10:00
Stephen Shkardoon
677f0edcfc MINOR LeftAndMain::getRecord check $ClassName before use 
While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.
 2014-05-05 19:26:05 +12:00
Hamish Friedlander
ad27cd5ec9 FIX Folder Title not being exactly the same as Name field 
Backport to 3.0 of PR #3086
 2014-05-05 14:39:45 +12:00