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,797 Commits 31 Branches 527 Tags 162 MiB
effefd5199
Commit Graph

13797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devlin
4178f7beb0 test all generate methods and formatted image deletetions 2014-08-19 10:12:47 +02:00
Sean Harvey
8bd867ef4e Merge pull request #3334 from jedateach/fixes/imagick-padresize 
Image Magick PaddedResize fix
 2014-08-19 14:19:13 +12:00
Sean Harvey
ef272be0db Merge pull request #3400 from jedateach/fixes/imagick-crop-notice 
FIX: Image_Backend -> croppedResize function doesn't include a backgroundColor
 2014-08-19 13:34:47 +12:00
Jeremy Shipman
bf3ad56674 FIX: Image_Backend -> croppedResize function doesn't include a backgroundColor, therefore this shouldn't be assumed in ImageMagick->croppedResize 2014-08-19 12:24:45 +12:00
Jeremy Shipman
02265dc3c4 FIX: Correctly paddedResize images in IMagickBackend. 
FIX: Compression quality setting now takes effect.

fixes #3333
 2014-08-19 12:24:07 +12:00
Jeremy Shipman
47cc157d97 FIX: Keep ImagickBackend API consistent with Image_Backend interface and fix color formatting. 2014-08-19 12:24:07 +12:00
Sean Harvey
c0abb08b61 Merge pull request #3397 from tractorcow/pulls/3.2/whitespace 
Remove all redundant whitespace
 2014-08-19 09:55:31 +12:00
Damian Mooyman
a838e9bae6 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-19 09:38:17 +12:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Damian Mooyman
64bf786958 Merge pull request #3396 from halkyon/deprecation_cleanup 
Removing @deprecated 3.1 functionality and classes.
 2014-08-19 08:40:14 +12:00
Simon Welsh
d2c828678a Merge branch 'Nyholm-patch-1' into 3.1 
Closes #3292
 2014-08-18 21:16:51 +10:00
Tobias Nyholm
9476b22409 Added HHVM to .travis.yml 2014-08-18 21:16:30 +10:00
Sean Harvey
7659ebab8e Merge pull request #3399 from kinglozzer/pulls/dbconfig-response-code 
Add HTTP status code for $databaseConfig error (fixes #3392)
 2014-08-18 20:54:40 +12:00
Loz Calver
b27cd73cb9 Add HTTP status code for $databaseConfig error (fixes #3392) 2014-08-18 09:16:57 +01:00
Damian Mooyman
f49416858c Added 3.1.6-rc3 changelog 2014-08-18 17:42:31 +12:00
Damian Mooyman
7e70b8de52 BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url 2014-08-18 16:12:44 +12:00
Kirk Mayo
5704ae2113 NEW: Sanitise task name in runTask 2014-08-18 16:12:05 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes. 
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
 2014-08-18 16:00:13 +12:00
Simon Welsh
17bdc2dea1 Merge pull request #3395 from halkyon/rewriterule_consistency 
Fixing inconsistent use of RewriteRule in docs and install.php5
 2014-08-18 08:58:57 +10:00
Sean Harvey
8cf99b9bec Fixing inconsistent use of RewriteRule in docs and install.php5 
It currently doesn't match the .htaccess that comes with a checkout of
silverstripe-installer.
 2014-08-18 10:55:47 +12:00
Sean Harvey
672e817439 Merge pull request #3394 from simonwelsh/stupid-htaccess 
Don't block rewriting .php URLs
 2014-08-18 10:54:10 +12:00
Simon Welsh
b9ae401772 Don't block rewriting .php URLs 2014-08-16 22:08:52 +10:00
Sean Harvey
199d7a8ba7 Merge pull request #3391 from tractorcow/pulls/3.1/fix-history-js 
BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url
 2014-08-15 15:24:46 +12:00
Damian Mooyman
79c7276611 BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url 2014-08-15 15:17:39 +12:00
Simon Welsh
66bacc69f0 Merge pull request #3387 from halkyon/summary_fields_custom_label2 
BUG Custom label set in summary_fields config gets overridden
 2014-08-14 14:22:28 +10:00
Sean Harvey
5f1552b365 BUG Custom label set in summary_fields config gets overridden 2014-08-14 14:19:41 +12:00
Sean Harvey
b346d2b4d3 Merge pull request #3376 from mateusz/link-tracking 
Move the link-tracking into the cms to remove the SiteTree dependency.
 2014-08-14 14:11:22 +12:00
Sean Harvey
9bc7dd3059 Merge pull request #3386 from tractorcow/pulls/3.1/abstracttest 
BUG Fix 'undefined index 0'
 2014-08-14 12:48:45 +12:00
Damian Mooyman
7c2eee116f BUG Fix 'undefined index 0' 2014-08-14 12:24:56 +12:00
Sean Harvey
f8a77eeace Merge pull request #3385 from mateusz/viewable-data-getter 
API Add a getter for customisedObject property.
 2014-08-14 11:45:35 +12:00
Mateusz Uzdowski
784e292d4e API Add a getter for customisedObject property. 
This is the only way to see if the ViewableData has been customised,
and is useful in situations when you want to further customise an
already-customised object.
 2014-08-14 10:28:00 +12:00
Mateusz Uzdowski
efbc3b3a81 Move the link-tracking into the cms to remove the SiteTree dependency. 
Depends on 8996b67c13a773c3339f45d91bf2378a39e5178a in the cms module.
 2014-08-14 10:13:14 +12:00
Sean Harvey
976efd6fc2 Merge pull request #3383 from dhensby/pulls/fix-send-file-header 
Fixing header case in `send_file`
 2014-08-14 10:06:22 +12:00
Sean Harvey
fcb3f2c13b Merge pull request #3380 from silverstripe-rebelalliance/cwp171 
NEW: Sanitise task name in runTask
 2014-08-14 09:56:35 +12:00
Sean Harvey
5cd85f6496 Merge pull request #3379 from mateusz/merge-back 
Merge 3.1 back
 2014-08-14 09:44:07 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
 2014-08-14 09:08:26 +12:00
Daniel Hensby
4d7c6a206a Fixing header case 2014-08-13 17:28:36 +01:00
Kirk Mayo
62f4fdb651 NEW: Sanitise task name in runTask 2014-08-13 17:29:12 +12:00
Damian Mooyman
0b6c68f903 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-12 16:28:39 +12:00
Damian Mooyman
a8685d0aa6 Fix link 2014-08-12 15:12:44 +12:00
Damian Mooyman
2b25ab37f6 3.1.6-rc2 docs 2014-08-12 15:09:13 +12:00
Damian Mooyman
98907fb35f BUG Fix incorrect parsing of HTML content 2014-08-12 13:02:49 +12:00
Damian Mooyman
a369094db7 BUG Fix issue with generating tree data for missing pages 2014-08-12 13:02:38 +12:00
Michael
8ab12567a8 Update shortcodes.md 
Replaced $args with $arguments as $args wasn't correct
 2014-08-12 13:02:24 +12:00
Elliot Sawyer
ee489582e9 Fix typo in sitetree.md 
Found a typo in the PHP class: StaggPage should be StaffPage
 2014-08-12 13:02:13 +12:00
Michael Parkhill
f19b1ee453 FIX declarations matching PHPUnit_Framework_Assert 
FIX for phpunit error message: ERROR [Strict Notice]: Declaration of SapphireTest::assertNotContains() should be compatible with PHPUnit_Framework_Assert::assertNotContains, and the same error for assertContains()
 2014-08-12 13:02:01 +12:00
colymba
e535c35542 API New JS sprintf and inject replacement functions 
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
 2014-08-12 13:01:29 +12:00
JorisDebonnet
3b6fc08f0f Update customize-cms-menu.md 
Corrected a few typos.
 2014-08-12 13:00:09 +12:00
JorisDebonnet
af333bd40d Update dataobject.md 
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there?

I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
 2014-08-12 12:59:44 +12:00
John Milmine
7d97df9db8 adding exclamation mark and question mark to delimiters, made text work the same as HTML Text 2014-08-12 12:59:21 +12:00