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
14,872 Commits 31 Branches 527 Tags 162 MiB
4af684f2f3
Commit Graph

14872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Daniel Hensby
33d93c2a31 Fixing issues with HTTP cache control 2015-06-29 22:16:02 +01: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
Daniel Hensby
96f87b4140 Merge pull request #4335 from jonom/status-dots-colours-3.2 
Different status dots for draft and modified
 2015-06-28 08:04:01 +01:00
Jonathon Menz
74e6a67cfa Different status dots for draft and modified 
Added a colour difference for status dots so status of draft vs modified can be distinguished at a glance
 2015-06-26 11:00:48 -07:00
Will Morgan
f4d75df62f Merge pull request #4350 from SpiritLevel/patch-2 
Update 07_Code_of_conduct.md
 2015-06-26 13:46:09 +01:00
David Alexander
85967b8c16 Update 07_Code_of_conduct.md 
Missed word...:)
 2015-06-26 21:39:54 +12:00
Will Morgan
b6b8ab8c35 Merge pull request #4314 from SpiritLevel/patch-2 
Update 07_Code_of_conduct.md
 2015-06-26 09:14:55 +01:00
Will Morgan
bec7799957 Merge pull request #4345 from phillprice/patch-11 
DOCS: Link to member custom code change is broken
 2015-06-26 09:11:04 +01:00
Will Morgan
3ce51d15bf Merge pull request #4331 from jason-zz/patch-2 
Add extension hook for getManyManyComponents()
 2015-06-26 09:09:22 +01: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
Jason
b5f88af1f0 Add extension hook for getManyManyComponents() 
Call extension after DataModel is set
 2015-06-26 11:04:31 +10: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
Phill Price
1bbcde908a Broken link in using custom code for tracking member logging 2015-06-25 14:20:42 +01:00
Daniel Hensby
2e657baede Merge pull request #4347 from kinglozzer/pulls/spinner-fix 
Fix background size for spinner @2x
 2015-06-25 13:25:08 +01: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
Damian Mooyman
d85590ddb9 Merge pull request #4348 from dhensby/pulls/3.2/fix-orphaned-passwords 
FIX MemberPassword history removed with with Members
 2015-06-25 09:14:09 +12:00