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
4,811 Commits 31 Branches 527 Tags 162 MiB
2.4
Commit Graph

4811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loz Calver
b9ff0ea7d4 Merge pull request #5183 from dhensby/pulls/2.4/travis-fix 
Update travis config
 2016-03-15 16:27:15 +00:00
Daniel Hensby
e8bbf73e55 Updating travis fix 2016-03-15 15:53:21 +00:00
Damian Mooyman
47e62aa64f Merge pull request #5052 from SpiritLevel/2.4 
DOCS 2.4 : corrected and api: tag
 2016-02-19 14:25:34 +13:00
David Alexander
4eef94de27 DOCS 2.4 : corrected and api: tag 2016-02-17 14:48:55 -07:00
Damian Mooyman
d491352388 Merge pull request #5022 from SpiritLevel/2.4 
DOCS 2.4 : reactivate api: links now that api: parsed correctly
 2016-02-16 09:13:07 +13:00
David Alexander
d633cad9ec reactivate api: links 
added deleted link back in

updated some external links
 2016-02-10 17:48:33 -07:00
Damian Mooyman
b55a5435b1 Merge pull request #4933 from SpiritLevel/2.4-docs 
DOCS 2.4 : added back inactive links to missing changelogs
 2016-01-18 16:49:01 +13:00
David Alexander
613836de51 DOCS 2.4 : disables broken external links 2016-01-16 21:14:48 +13:00
David Alexander
df1a32fba7 DOCS 2.4 : added back inactive links to missing changelogs 2016-01-15 15:44:01 +13:00
Damian Mooyman
807c70b18c Merge pull request #4927 from SpiritLevel/2.4-docs 
DOCS 2.4 : fixes broken internal links
 2016-01-14 15:50:20 +13:00
David Alexander
8d71486afa DOCS 2.4 : fixed broken internal links 2016-01-14 14:04:18 +13:00
Damian Mooyman
a3a6dff1dc Merge pull request #4816 from SpiritLevel/2.4-docs 
DOCS 2.4 : Fixed all internally generated 404s
 2015-12-21 15:08:36 +13:00
David Alexander
870dfb737b DOCS 2.4 : Fixed all internally generated 404s 
DOCS 2.4 : Fixed some external links causing 404s

DOCS 2.4 : adjusted link labels

DOCS 2.4 : another link label fixed up

DOCS 2.4 : fixed link
 2015-12-21 09:22:48 +13:00
Will Rossiter
7e3be7d71f Merge pull request #3762 from camfindlay/patch-13 
BUG Fix tutorial index page for the new doc site
 2015-01-08 12:07:22 +13:00
Cam Findlay
679bdabf10 BUG Fix tutorial index page for the new doc site 
This fixes broken tutorial links in 2.4 version of docs for the new documentation website.
 2015-01-08 10:01:20 +13:00
Sean Harvey
ba73b03e6c Merge pull request #2807 from chillu/pulls/2796-form-escape 
FIX Opt-out of form message escaping (fixes #2796)
 2014-08-22 13:13:12 +12:00
Joel Marcey
55ed5a6495 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 10:13:32 +12:00
Ingo Schommer
0bae1826bb 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 09:08:55 +12:00
Simon Welsh
4b757ea912 Merge pull request #3243 from Olliepop/patch-1 
Update advanced-templates.md
 2014-06-30 16:16:13 +10:00
Oliver Shaw
5fdf740e88 Update advanced-templates.md 
Minor spelling fix
 2014-06-30 17:06:00 +12:00
Damian Mooyman
2dad3b0f5a Merge pull request #3235 from nhorstmeier/patch-1 
Update form-validation.md missing ' in line 27
 2014-06-26 09:14:23 +12:00
muskie9
94ba13cefa Update form-validation.md missing ' in line 27 
Missing closing ' in $form->dataFieldByName('MyRequiredField')
 2014-06-25 11:45:22 -05:00
Will Morgan
0c2332f8bd 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:40:49 +12:00
Ingo Schommer
733e2e82be Merge pull request #3099 from tractorcow/pulls/2.4-php52fix 
BUG Removed php5.2 incompatible syntax
 2014-05-05 14:33:24 +12:00
Damian Mooyman
aaf431fdd5 Removed php5.2 incompatible syntax 2014-05-05 14:05:38 +12:00
Ingo Schommer
c5d4d7daf3 Merge pull request #3090 from tractorcow/pulls/2.4-phpunit 
BUG Allow PHPUnit installation with composer / Fix travis
 2014-05-05 13:15:56 +12:00
Will Morgan
ca62f73330 BUG Allow PHPUnit installation with composer / Fix travis 2014-05-02 18:25:54 +12:00
Ingo Schommer
be59fd9237 Merge pull request #2790 from silverstripe-rebelalliance/reEnableFilter 
BUG: Stop undefined error for $reEnableFilter being thrown
 2014-01-22 01:41:49 -08:00
Kirk Mayo
6f1dd138bc BUG: Stop undefined error for $reEnableFilter being thrown 
NEW: Switched reEnsbleFilter fix to match coding convention
 2014-01-21 08:39:46 +13:00
Ingo Schommer
d0c37b3a13 Merge pull request #2728 from xini/2.4 
BUGFIX: URL '/' ending up beeing redirected to '//'
 2013-12-19 11:02:45 -08:00
Florian Thoma
f0570c6ae8 BUGFIX: URL '/' ending up beeing redirected to '//' 2013-12-18 13:44:30 +11:00
Ingo Schommer
2426f781a3 Merge pull request #2716 from gbonanome/patch-1 
Fix empty $messageBlock on CheckboxField
 2013-12-13 01:54:34 -08:00
Giulio Bonanome
b29b49e7d7 Fix empty $messageBlock on CheckboxFields 
From 2.4.13 the Message attribute is set to Text, so every checkbox now show an empty $messageBlock,
See https://github.com/silverstripe/silverstripe-framework/issues/2489 or http://www.silverstripe.org/general-questions/show/25254
 2013-12-11 16:17:30 +01:00
Ingo Schommer
011ea99f3f Merge tag '2.4.13' into 2.4 2013-09-27 00:24:35 +02:00
Ingo Schommer
fdc7984e59 Merge tag '2.4.12' into 2.4 2013-09-27 00:24:33 +02:00
Ingo Schommer
ebcad2c8f3 Tagged 2.4.13 2013-09-26 01:12:03 +02:00
Ingo Schommer
f7373d1124 Added 2.4.13 changelog 2013-09-26 01:11:59 +02:00
Simon Welsh
c504fe0beb Merge pull request #2451 from chillu/pulls/escape-2.4 
Escaping 2.4
 2013-09-24 12:41:00 -07:00
Ingo Schommer
f69161efef FIX Auto-escape titles in TreeDropdownField 
Related to SS-2013-009. While the default "TreeTitle" was escaped
within the SiteTree->TreeTitle() getter, other properties like SiteTree->Title
weren't escaped. The new logic uses the underlying casting helpers
on the processed objects.
 2013-09-24 14:28:28 +02:00
Ingo Schommer
81ccb8d78e API Escape form validation messages (SS-2013-008) 2013-09-24 14:28:11 +02:00
Ingo Schommer
02ede1e811 Added 2.4.12 changelog 2013-09-24 14:28:11 +02:00
Stig Lindqvist
ac284eeff1 Merge pull request #2421 from ss23/patch-1 
Failed login message translation fallback
 2013-09-15 20:44:30 -07:00
Stephen Shkardoon
4f52f25d46 Failed login message translation fallback 
Without this, if you use a locale with no translation for this (e.g. en_NZ), users will never see a "failed login" message.
 2013-09-16 15:33:42 +12:00
Ingo Schommer
a4faba0662 Tagged 2.4.12 2013-09-12 16:29:35 +02:00
Ingo Schommer
d98c1db3a2 Retain 5.2 compatibility in DirectorTest 
parse_url() doesn't support schema-less URLs in 5.2
 2013-09-12 15:59:18 +02:00
Ingo Schommer
a914dee6d9 FIX Disallow permissions assign for APPLY_ROLES (SS-2013-005) 
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
 2013-09-12 15:38:59 +02:00
Ingo Schommer
ec8e8261f2 FIX Privilege escalation through APPLY_ROLES assignment (SS-2013-005) 
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
 2013-09-12 15:38:59 +02:00
Ingo Schommer
797951595b FIX Privilege escalation through Group hierarchy setting (SS-2013-003) 
See http://www.silverstripe.org/ss-2013-003-privilege-escalation-through-group-hierarchy-setting/
 2013-09-12 15:38:56 +02:00
Ingo Schommer
84a8b21936 Update 2.4.11 changelog 2013-08-07 20:27:18 +02:00
Ingo Schommer
a6a7b01afc Added 2.4 changelog 2013-08-07 15:23:46 +02:00