Commit Graph

14740 Commits

Author SHA1 Message Date
Daniel Hensby
ca8d0f2818 Merge branch '3.1' into 3.2
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
2015-07-20 10:48:01 +01: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
Loz Calver
452eca1355 Merge pull request #4408 from jonom/upload-field-3.2
Tweak UploadField width for better alignment
2015-07-17 09:29:03 +01:00
Ingo Schommer
eb040cb1ac Merge pull request #4377 from jonom/3.2-site-tree-label-width
Improved site tree tooltips
2015-07-17 08:46:25 +12:00
Jonathon Menz
1af939bcb0 Tweak UploadField width for better alignment
(fixes #3382)
2015-07-16 11:09:08 -07:00
Jonathon Menz
272f6d7700 Improved site tree tooltips
Now shows full title and friendly singular name for page type
2015-07-16 08:49:43 -07: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
David Craig
3c20b58067 Update tree status after bulk action is applied 2015-07-16 10:50:09 +12:00
Damian Mooyman
914d734df0 API Disable deprecation notices by default 2015-07-16 09:56:47 +12: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
560f9a6e39 API respect custom attributes on OptionsetField and CheckboxSetField 2015-07-10 14:49:05 +12:00
Daniel Hensby
5eec755d17 Merge pull request #4384 from kinglozzer/whitespace
Tidy up whitespace in DataList.php
2015-07-09 21:41:38 +01: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
Daniel Hensby
f32a24081b Merge pull request #4383 from micschk/patch-1
Moving MP4 from audio category to movie Fix #4370
2015-07-08 15:41:38 +01:00
Loz Calver
dc594ef1e5 Tidy up whitespace in DataList.php 2015-07-08 15:34:21 +01:00
Michael van Schaik
397eaa8cc4 Moving MP4 from audio category to movie Fix #4370 2015-07-08 15:58:38 +02: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
Ingo Schommer
6ab151e8fa Merge pull request #4375 from jonom/3.2-site-tree-label-width
Improved label clipping in site tree
2015-07-08 08:56:06 +12:00
Jonathon Menz
2a9e7087eb Improved label clipping in site tree
Deeply nested site tree nodes show a few more characters and any clipped text in labels is marked as such (fixes https://github.com/silverstripe/silverstripe-cms/issues/1235)
2015-07-07 09:00:40 -07: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
Ingo Schommer
aef8073037 Fixed cms architecture link 2015-07-07 19:40:12 +12:00
Ingo Schommer
79466f2b9e Merge pull request #4367 from jonom/checkbox-hitzone-3.2
Expanded bulk action checkbox hit zone
2015-07-07 17:20:07 +12:00
Damian Mooyman
2036f7e6c2 Use container-based travis 2015-07-07 16:50:40 +12:00
Damian Mooyman
1dbffed388 Merge pull request #4361 from dhensby/pulls/stable-composer
Amending composer.json constraints
2015-07-07 11:51:26 +12:00
Damian Mooyman
f43944276d Merge pull request #4369 from micmania1/4322-fix-memory-exhaustion
FIX memory exhaustion in MySQLStatement->bind()
2015-07-06 10:33:32 +12:00
micmania1
a5b3083dcc FIX memory exhaustion in MySQLStatement->bind() 2015-07-05 03:06:37 +00:00
Jonathon Menz
e5ac209e3e Expanded bulk action checkbox hit zone
Increased checkbox click area so it's harder to accidentally click underlying link. Also lightened selected checkbox background colour for consistency (fixes #4342, fixes https://github.com/silverstripe/silverstripe-cms/issues/400, closes #4352)
2015-07-03 16:16:48 -07:00
Daniel Hensby
6b3ce8c546 Update composer.json 2015-07-03 17:21:04 +01:00
Sam Minnee
74d0622d43 Fix docs clobbered by 3.1 -> 3.2 merge. 2015-07-01 10:00:39 +01:00
Damian Mooyman
6fabd0122b BUG Fix potential XSS injection 2015-07-01 17:41:32 +12:00