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
16,393 Commits 31 Branches 527 Tags 162 MiB
6fe5c37d6a
Commit Graph

16393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
745faebd81
Merge 3.2 into 3.3 
Conflicts:
	.travis.yml
 2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2 
Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md
 2016-04-26 00:09:33 +01:00
Ralph Slooten
2c968d97a6 Remove invalid attributes 
Headers do not have `type` & `name` attributes which are being inherited from the extended classes.
 2016-04-26 09:45:52 +12:00
Ingo Schommer
f80bdaba3b Merge pull request #5353 from assertchris/forms-toggle-field-comment-changes 
Changed comments in forms\ToggleField.php
 2016-04-25 22:34:57 +12:00
Daniel Hensby
fde6376996
FIX Admin bloacklisted messages using correct $.inArray check 2016-04-24 08:57:45 +01:00
Ingo Schommer
cfd6cd259d Merge pull request #5370 from tractorcow/pulls/3/fix-behat-modal-error 
BUG Fix error when modals are displayed
 2016-04-22 11:48:01 +12:00
Damian Mooyman
fa5b8b8fb1 BUG Fix error when modals are displayed 2016-04-22 10:31:49 +12:00
Ingo Schommer
0a3e39b96c Merge pull request #5364 from robbieaverill/feature/json-dbfield-formatting 
FIX #5363 Add .JSON option for templates
 2016-04-21 21:17:21 +12:00
JorisDebonnet
9eac541740 Enhance GD::greyscale to allow darker or lighter results, and change color weights for greyscale (#5332) 
Tweaking the first three parameters (R, G, B) allows you to get a different mix of colors into grey, but it does not allow you to make the result lighter or darker because their total is normalized. This is quite a common operation on greyscaled images though, so I added a fourth parameter: brightness. It defaults to 100% so that it does not have any effect when not used (making this backwards compatible). $brightness = 50 will make it darker, $brightness = 150 will overlight it.
 2016-04-21 19:26:46 +12:00
Robbie Averill
ae268ae4df FIX #5363 Add .JSON option for templates 2016-04-21 17:01:05 +12:00
Daniel Hensby
1ccd3926e3
[SS-2016-001] FIX Properly check backurl on CMSSecurity@success 2016-04-20 23:58:50 +01:00
Daniel Hensby
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms 2016-04-20 23:57:59 +01:00
Daniel Hensby
a24c8260b1
[SS-2016-004] FIX Store current page IDs as ints 2016-04-20 23:55:59 +01:00
Jeffrey Guo
4f14175022 setup CMS Settings in one test step 2016-04-20 22:40:04 +12:00
assertchris
ec247cefd8 Changed comments in forms\ToggleField.php 2016-04-20 18:31:17 +12:00
Damian Mooyman
30894eb4cf Merge pull request #5357 from assertchris/cast-heading-level-to-int-in-forms-toggle-composite-field 
Cast heading level to int, in forms\ToggleCompositeField.php
 2016-04-20 18:01:43 +12:00
Damian Mooyman
61db5c8f76 Merge pull request #5356 from assertchris/forms-toggle-composite-field-comment-changes 
Changed comments in forms\ToggleCompositeField.php
 2016-04-20 18:01:31 +12:00
Damian Mooyman
b83293d2e4 Merge pull request #5354 from assertchris/forms-toggle-field-style-changes 
Changed style in forms\ToggleField.php
 2016-04-20 18:00:59 +12:00
Damian Mooyman
697ac4c441 Merge pull request #5352 from assertchris/forms-validator-comment-changes 
Changed comments in forms\Validator.php
 2016-04-20 17:58:18 +12:00
assertchris
6fd11f584d
Cast heading level to int, in forms\ToggleCompositeField.php 2016-04-20 16:16:59 +12:00
assertchris
f6effb9347 Changed comments in forms\ToggleCompositeField.php 2016-04-20 16:02:40 +12:00
assertchris
8e7e783dd0
Changed style in forms\ToggleField.php 2016-04-20 15:00:38 +12:00
assertchris
29ee58abc3
Changed comments in forms\Validator.php 2016-04-20 14:27:50 +12:00
Daniel Hensby
f32c893546
[SS-2016-005] FIX Apply brute force protection to default admin 2016-04-19 23:20:29 +01:00
Damian Mooyman
43b00520fe API Remove artifact datalist overrides from UnsavedRelationList 2016-04-20 08:55:32 +12:00
Daniel Hensby
f49c0b58d9
Merge pull request #5344 from sminnee/new-committers 2016-04-19 12:11:26 +01:00
Sam Minnee
82a89a94f4 Add 2 new committers, remove 1 who has left. 2016-04-19 23:05:59 +12:00
John Milmine
66ed97e08e fix to grid field loading wrong current page id when using multiple tabs 2016-04-19 21:38:32 +12:00
JorisDebonnet
72a014d933 Allow '0' in DropdownField (#5199) 
Display falsey values as option titles when they have been included.
 2016-04-19 17:40:14 +12:00
Daniel Hensby
3c0f2e8e11
[SS-2015-029] FIX Add CSFR protection to tree reorganise 2016-04-19 00:01:04 +01:00
Michael Strong
1f820b0b1c DOCS allowed_actions access control (#5333) 2016-04-18 17:49:30 +12:00
Damian Mooyman
936dcb691b Merge pull request #5300 from patricknelson/issue-5299-injector-minor-doc 
FIX for #5299 Adding <code> blocks to Injector documentation.
 2016-04-18 11:56:21 +12:00
Daniel Hensby
52226dc462 Merge pull request #5322 from tractorcow/pulls/5105 
fix to support facebook autodiscover
 2016-04-15 14:27:19 +01:00
Damian Mooyman
6f548a0ed0 Add unit tests for oembed autodiscover and thumbnail detection 2016-04-15 14:00:10 +12:00
Loz Calver
69858760e1 Merge pull request #5312 from dhensby/pulls/3.1/fix-5281 
FIX Stop "success" message showing in CMS
 2016-04-12 16:56:06 +01:00
Daniel Hensby
36283b86d5
FIX Stop "success" message showing in CMS 
fixes #5281
 2016-04-12 16:14:31 +01:00
Marijn Kampf
ea3aa0063a Addition of extend for newRowClasses (#4711) 
* Addition of extend for newRowClasses

Allows for creation of extension of row classes in gridfield.

* Update GridField.php

Including suggestions by @tractorcow and @dhensby.
 2016-04-12 15:48:02 +01:00
Damian Mooyman
e1f281fd8b Merge pull request #5236 from dhensby/pulls/3.2/avoid-plain-text-friendlyerrors 
FIX Dont allow plain text friendly errors
 2016-04-12 12:00:54 +12:00
Patrick Nelson
707aa14c6c FIX for #5299 Adding <code> blocks to Injector documentation. 2016-04-11 10:56:46 -07:00
Daniel Hensby
e57d26bb8e Merge pull request #5298 from bummzack/patch-email-tests-3.2 
Fix Email test issue discovered in #5271.
 2016-04-11 15:06:15 +01:00
Roman Schmid
9146450c49 Fix Email test issue discovered in #5271. 
Updated/added tests for changed- and forgot-password Emails.
Updated fixture and tests to no longer use a real Email address.
 2016-04-11 13:46:41 +02:00
Damian Mooyman
4ea0c92c3c Merge pull request #5142 from chillu/pulls/3.3/include-cms-tests-in-travis 
Include CMS smoke tests in Travis builds
 2016-04-11 10:15:43 +12:00
Daniel Hensby
c7de1f40e1 Merge pull request #3900 from chillu/pulls/behat-wait-cms-load 
Behat: Wait until CMS loading overlay is removed
 2016-04-06 15:19:55 +01:00
Ingo Schommer
539fbe94d8 Include CMS smoke tests in Travis builds 
We've had a few failures where framework caused regressions in CMS,
so these builds are helpful. They'll increase the overall build
times on the "silverstripe" user because of Travis' build limitations.

The parallel per-build run times shouldn't increase, since
framework builds take longer than cms builds anyway:
CMS Behat build took 13:53 on last 3.3 run,
framework MySQL PDO build took 16:12.
 2016-04-06 19:55:43 +12:00
Damian Mooyman
1d3b621460 Merge pull request #5274 from patricknelson/patch-2 
Removal of FlushGeneratedImagesTask was not documented.
 2016-04-06 11:05:40 +12:00
Patrick Nelson
49e6d701e5 Removal of FlushGeneratedImagesTask was not documented. 
This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).
 2016-04-05 15:09:46 -07:00
Damian Mooyman
4cd29e80b7 Merge pull request #5252 from SilbinaryWolf/breadcrumb-title-bug 
Fixed bug where breadcrumb title wouldn't appear if title was blank
 2016-04-04 11:56:11 +12:00
Damian Mooyman
5a8db29c5b Merge pull request #5259 from patricknelson/issue-5251-url-parsing 
FIX for #5251 to address minor URL decoding/parsing bug.
 2016-04-04 11:35:06 +12:00
Cristian Torres
d75de1369f themedScript Added 
A function to call javascript files just by its name as it occurs with themedCSS
 2016-04-02 11:20:27 -06:00
Patrick Nelson
9d9c572cf8 FIX for #5251 to address minor URL decoding/parsing bug. 2016-04-01 11:44:29 -07:00