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
13,897 Commits 31 Branches 527 Tags 162 MiB
9d5b9a0e95
Commit Graph

13897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnée
9d5b9a0e95 Merge pull request #3748 from tractorcow/pulls/3.1/fix-url-query 
BUG Prevent url= querystring argument override
 2015-07-22 11:37:40 +12:00
Sam Minnée
532bf6ccb9 Merge pull request #3554 from tractorcow/pr/3179 
FIX: FulltextFilter did not work and was not usable
 2015-07-22 11:29:57 +12:00
Sam Minnée
40e9515233 Merge pull request #4053 from tractorcow/pulls/3.1/fix-stringfield-exists 
BUG Fix default casted (boolean)false evaluating to true in templates
 2015-07-22 11:26:49 +12:00
Damian Mooyman
0636062915 Merge pull request #4413 from dhensby/pulls/travis-fix 
Allow HHVM tests to run on new travis infrastructure
 2015-07-20 21:51:13 +12:00
Daniel Hensby
b5eecd1829 Allow HHVM tests to run on new travis infrastructure 2015-07-18 22:16:27 +01:00
Ingo Schommer
712d796c14 Merge pull request #4412 from sminnee/4336-error-exit-code 
Ensure proper exit code for exceptions & errors (fixes #4336)
 2015-07-18 11:46:13 +12:00
Sam Minnee
a0003825ad Ensure proper exit code for exceptions & errors (fixes #4336) 2015-07-17 23:26:43 +01:00
Daniel Hensby
271f64e9b2 Merge pull request #4405 from christopherdarling/patch-1 
FIX: DataQuery uses an undefined variable $callerClass in user_error() message
 2015-07-16 16:15:27 +01:00
Christopher Darling
a3201d6ed9 FIX: $callerClass is undefined 
replaced with $this->dataClass
 2015-07-16 14:36:23 +01:00
Daniel Hensby
bd316b9002 Merge pull request #4167 from nedmas/namespace-safe-cmsmenu 
Fix CMSMenuItem CSS references for namespaced controllers
 2015-07-15 17:28:03 +01:00
Daniel Hensby
55a60e86f0 Merge pull request #4401 from marijnkampf/patch-3 
DOCS 
Fixed type in code example
 2015-07-15 17:27:27 +01:00
Daniel Hensby
44bf602e3a Merge pull request #4400 from marijnkampf/patch-4 
DOCS Fixed type
 2015-07-15 17:25:51 +01:00
Marijn Kampf
bc66bca187 Fixed type 2015-07-15 15:36:33 +01:00
Marijn Kampf
218d3f1486 Fixed type in code example 2015-07-15 15:36:19 +01:00
Tom Densham
b17b186e93 Convert FQCNs to html safe strings 
Convert namespaced class names to html safe strings in `LeftAndMain.php` `CMSMenu.php` and `LeftAndMain.Main.js` by replacing backslashes (\) with dashes (\) and removing special characters with `Convert::raw2htmlname()`
 2015-07-15 15:33:00 +01:00
Daniel Hensby
2549fa8a93 Merge pull request #4399 from inflammable/patch-1 
Correct Memcached config in example
 2015-07-15 14:21:21 +01:00
Loz Calver
903bbd5ae4 Merge pull request #4386 from tractorcow/pulls/3.1/fix-cli-errors 
BUG Fix cookie errors when running in CLI
 2015-07-14 09:48:39 +01:00
Loz Calver
11f9fe943c Merge pull request #4395 from SpiritLevel/3.1 
DOCS : added lesson 18 to index.md
 2015-07-14 09:37:32 +01:00
David Alexander
7a1d370038 DOCS : added lesson 18 to index.md 2015-07-14 19:13:57 +12:00
Sam Minnée
48dfd0b64f Merge pull request #4373 from tractorcow/pulls/3.1/textcollector 
BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417
 2015-07-13 13:32:06 +01:00
Will Morgan
2c98ac7911 Merge pull request #4358 from tractorcow/pr/2978 
Pr/2978
 2015-07-13 10:47:00 +01:00
Stuart
d6cb2419b8 Correct Memcached config in example 
Unlike Libmemcached, the Memcached backend server config must be nested inside an array() with a single key 'servers' - otherwise the default host of 127.0.0.1 is used.

array(
	'servers' => array(
		'host' => 'localhost', 
		'port' => 11211, 
		'persistent' => true, 
		'weight' => 1, 
		'timeout' => 1,
		'retry_interval' => 15, 
		'status' => true, 
		'failure_callback' => ''
	)
)
 2015-07-11 23:18:18 +12:00
Damian Mooyman
c7bd50427a BUG Fix cookie errors when running in CLI 2015-07-09 10:46:13 +12:00
Damian Mooyman
a556b4854a BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417 2015-07-09 10:45:08 +12:00
Loz Calver
0012bc68c4 Merge pull request #4379 from tractorcow/pulls/3.1/fix-allowed-hosts 
BUG Fix issue when SS_ALLOWED_HOSTS is used in CLI
 2015-07-08 14:32:18 +01:00
Damian Mooyman
5fa50039b9 Merge pull request #4381 from SpiritLevel/patch-2 
Typo.
 2015-07-08 17:15:00 +12:00
David Alexander
644b6b344f Typo. 2015-07-08 14:40:42 +12:00
Damian Mooyman
5ace4905c9 BUG Fix issue when SS_ALLOWED_HOSTS is run in CLI 2015-07-08 11:01:06 +12:00
Ingo Schommer
31db269f71 Merge pull request #4285 from jonom/docs-contributing-cleanup 
DOCS Contributing code cleanup
 2015-07-08 09:10:06 +12:00
Daniel Hensby
d5e594fbd5 Merge pull request #4365 from tractorcow/pulls/3.1/travis 
Use container-based travis
 2015-07-07 12:02:16 +01:00
Damian Mooyman
2036f7e6c2 Use container-based travis 2015-07-07 16:50:40 +12:00
Damian Mooyman
6fabd0122b BUG Fix potential XSS injection 2015-07-01 17:41:32 +12:00
Sean Harvey
fd755a7ff9 BUG ChangePasswordForm validation message should render HTML correctly. 
HTML shows up in the form message escaped, but it shouldn't be.
 2015-07-01 17:41:32 +12:00
Ingo Schommer
34539691f6 Merge pull request #4356 from jakxnz/patch-1 
Define function as static (line 59)
 2015-07-01 09:25:50 +12:00
Jackson
9cb64d48e3 Define function as static (line 59) 
Not defining function on line 59 as static triggers php error: [Strict Notice] call_user_func() expects parameter 1 to be a valid callback, non-static method Page::ShortcodeColumns() should not be called statically

Note: PHP 5.5.12
 2015-06-30 11:29:26 +12:00
Jonathon Menz
a39c2bd473 DOCS Contributing code cleanup 
Fixed a few typos and formatting issues, and made git workflow diagram easier to read by hyperlinking it to itself. Also included a few lines from 3.2 branch.
 2015-06-28 13:19:04 -07:00
Will Morgan
dcd378c539 Merge pull request #4349 from camfindlay/patch-27 
DOCS Missing closing perenthesis
 2015-06-26 09:05:31 +01:00
Cam Findlay
bee638eb6a DOCS Missing closing perenthesis 2015-06-26 15:36:49 +12:00
Damian Mooyman
8e1da86bf1 Merge pull request #3982 from dhensby/pulls/safe-unnesting 
Safe unnesting of Config and Injector
 2015-06-26 10:08:29 +12:00
Hamish Friedlander
f5d6f20113 Merge pull request #4333 from sminnee/shortcode-fix 
Allow shortcodes inside script tags. Fixes #4332.
 2015-06-25 14:51:03 +12:00
Sam Minnee
d7241958ff Performance/reliability improvement for leaving unrecognised tags. 
error_behaviour = self::LEAVE is the default behaviour. In this case,
we don’t even need to bother recognising such tags. Rather than
replacing with marker images and re-inserting the original text after
we’re done, we can leave them alone.

This should make the code faster and more reliable.
 2015-06-22 11:31:12 +01:00
Sam Minnee
6d05c57881 Ensure that shortcodes inside script tags are parsed. Fixes #4332. 
The problem is that the marker images aren’t picked up by DOMDocument
if they are inserted into a <script> tag, due to the semantics of HTML.

This fix does an additional replacement after the marker images are
replaced in this way to pick up any leftover tags.
 2015-06-22 11:29:12 +01:00
Daniel Hensby
ebeea242fe Merge pull request #4125 from assertchris/clean-up-form-field 
Clean up FormField
 2015-06-20 16:30:44 +01:00
Christopher Pitt
4ba051409d Cleaned up FormField 2015-06-20 13:55:58 +01:00
Daniel Hensby
aa3871d716 Merge pull request #4306 from gregsmirnov/pulls/3.1/fixed-datetimefield-setname-issue-4305 
Issue #4305: fixed DatetimeField::setName()
 2015-06-18 22:10:13 +01:00
Daniel Hensby
20ebd88fb8 Merge pull request #4307 from gregsmirnov/pulls/3.1/test-timefield-value-at-12am-issue-1713 
Test TimeField value at 12:00 am
 2015-06-18 22:06:16 +01:00
Gregory Smirnov
5b22e3afc5 Test TimeField value at 12:00 am 2015-06-18 18:53:44 +02:00
Gregory Smirnov
66b1dd9154 Issue 4305: fixed DatetimeField::setName() 2015-06-18 18:36:02 +02:00
Daniel Hensby
4dec821f63 Merge pull request #4297 from SpiritLevel/patch-2 
DOCS Update 03_Documentation.md
 2015-06-18 12:00:49 +01:00
Daniel Hensby
8e96ea3f0f Merge pull request #4302 from SpiritLevel/patch-6 
Update index.md
 2015-06-18 11:41:30 +01:00