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
15,100 Commits 31 Branches 527 Tags 162 MiB
1ec5f0e0a1
Commit Graph

15100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnée
c7c3e40a2f Merge pull request #4296 from SpiritLevel/patch-1 
Update 02_Release_Process.md
 2015-07-23 13:38:53 +12:00
Sam Minnée
be60219ffc Merge pull request #4421 from kinglozzer/pulls/templates-translate-syntax 
Upgrade template translation syntax
 2015-07-23 13:38:04 +12:00
Sam Minnée
639ebefa5c Merge pull request #4423 from kinglozzer/member-cmsfields 
FIX: Hide 'Logged Passwords' tab in member CMS fields (fixes #4422)
 2015-07-23 13:35:45 +12:00
Loz Calver
b7480b92a9 FIX: Hide 'Logged Passwords' tab in member CMS fields (fixes #4422) 2015-07-22 14:40:09 +01:00
Loz Calver
a3fd150bd0 Upgrade template translation syntax 2015-07-22 14:17:03 +01:00
Daniel Hensby
cd560eee12 Merge pull request #4397 from flashbackzoo/pulls/batch-actions-tree-status-fix 
Update tree status after bulk action is applied
 2015-07-22 13:53:41 +01:00
Peter Thaleikis
bf3f159800 harden addFilter method 2015-07-22 22:35:58 +12:00
Daniel Hensby
589a39f6ba Merge pull request #4415 from kinglozzer/pulls/lazyload-template-parser 
Lazy load template parser to save memory
 2015-07-22 10:52:23 +01:00
Loz Calver
ea9434ffeb API: Lazy load template parser 2015-07-22 10:28:33 +01:00
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
Daniel Hensby
79c4f63855 DOCS Fixing docs (and bad API usage) 2015-07-20 16:42:33 +01:00
Dan Hensby
64ceba133c Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	admin/css/screen.css
 2015-07-20 14:08:36 +00:00
Daniel Hensby
230094e65a Merge branch '3.1' into 3.2 2015-07-20 10:53:28 +01: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
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
Ingo Schommer
188765bd45 Merge pull request #4353 from scott1702/cms-styling 
Update styles for action buttons and tabs
 2015-07-16 19:54:54 +12: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
scott1702
c51c52f61f Update button and tab styles 2015-07-15 10:35:21 +12: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
afa0bb9e87 Merge pull request #4385 from flashbackzoo/pulls/compass-config 
Update compass config
 2015-07-09 17:13:15 +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
David Craig
e4447698b5 Update compass config 
- Add sourcemaps for debugging
- More consistant builds across environments
 2015-07-09 10:11:00 +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