Commit Graph

14936 Commits

Author SHA1 Message Date
Jake Bentvelzen
d766f9fd13 Modified GridField in 'HtmlEditorField_Toolbar' class to allow custom classes. 2015-09-01 10:38:58 +10:00
Damian Mooyman
f3f0315cc1 Merge pull request #4430 from sminnee/logging-refactor
Replace Zend log with Monolog; rely more on PSR-3
2015-09-01 11:41:05 +12:00
Damian Mooyman
273ee5d9fd Merge pull request #4556 from sminnee/drop-hhvm-test
MINOR: Drop wasteful 'allow-failures' builds; simplify build matrix
2015-08-31 11:11:59 +12:00
Sam Minnee
68ac1021f7 MINOR: Refine build matrix.
It's important to test different databases. It's important to test
different versions of PHP. But we don't need to test all possible
versions of each tested in a cartesian product.

This patch ensures that there are 4 builds that cover:

 - PHP 5.4, 5.5, 5.6
 - MySQL, PostgreSQL and SQLite
 - PDO and each db-specific connector
 - Behat and non
2015-08-29 15:18:23 +12:00
Sam Minnee
be4be53fae MINOR: Drop wasteful 'allow-failures' builds.
Our build time is an impediment: frequently we're slowed down waiting for
test runs to complete. In this context, running allowed-failure builds
that everyone ignores is just a waste.

I'd love to see HHVM work, but that's going to require that someone
actually gets the build to pass. At that point, we can add it back into
the build matrix.

I'm working on a PHP7 branch that will hopefully also fix our nightly
builds. Once I get that going, I'll add those two back, but not have
'allow failures'

Even if we decide, at some point in the future, that supporting nightly
doesn't make sense, I see the *only* value of Travis is maintaining our
green tick. We either care about builds or we don't: I've never seen a
'grey area' build result in anything other than embarrassment and
technical debt.

Let's decide what matters to us and treat it like it matters to us:
it's part of the build or not.
2015-08-28 16:50:44 +12:00
Sam Minnee
1b8d295767 API CHANGE: Shift to Monolog for error reporting and logging
API CHANGE: Debug::showError(), Debug::showLines(), Debug::log(), and Debug::header() removed
NEW: Logging provided

ZendLog has been removed and monolog introduced instead as a dependency.
The “ErrorLogger” injection point is now the used as the logger that
errors are fed into, and implements PSR-3’s Psr\Log\LoggerInterface.

The SS_ERROR_LOG setting expect a Monolog Logger to be provided as the
ErrorLogger.
2015-08-28 16:06:41 +12:00
Sam Minnee
ebc3900c4a NEW: Replace DebugView’s writeX() functions with renderX() functions.
DebugView writes straight to STDOUT. It would be much more flexible if
it returns a string instead.

It’s possible that DebugView should be scuttled in favour of a 3rd party
library, but in the meantime, this change makes it more useful for the
logging changes.
2015-08-28 16:06:37 +12:00
Sam Minnee
8b88789c82 Removed Zend/Log. 2015-08-28 15:46:40 +12:00
Ingo Schommer
b7e4e9abb7 Merge pull request #4479 from hex0id/patch-2
Fix datefield to work with other form markup
2015-08-28 08:56:31 +12:00
hex0id
d678cfc1d1 Update DateField.js
change selector to preserve backwards compatibility
2015-08-27 16:50:25 -04:00
Damian Mooyman
958f98b1cf Merge remote-tracking branch 'origin/3' 2015-08-24 13:08:54 +12:00
Damian Mooyman
4ea344ac9c Merge remote-tracking branch 'origin/3.2' into 3 2015-08-24 12:57:22 +12:00
Sam Minnée
d0f94b5363 Merge pull request #4521 from tractorcow/pulls/3.2/restore-deprecated-stuff
Revert #3425 #3396 to restore deprecated functionality
2015-08-24 12:49:56 +12:00
Damian Mooyman
58409f64c0 Merge remote-tracking branch 'origin/3' 2015-08-24 11:59:21 +12:00
Damian Mooyman
1bb6b85280 Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	admin/javascript/LeftAndMain.BatchActions.js
2015-08-24 11:55:54 +12:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
19838194a3 Merge pull request #4526 from danrye/patch-1
Add support for width and height to embedded photos
2015-08-22 10:51:15 +01:00
Ingo Schommer
fb9753ddc4 Retain script tags in editor if allowed (fixes #3611)
TinyMCE strips them by default, but if they're specifically added
to the allowed elements we should respect that setting.

Example PHP config:
$validEls = HtmlEditorConfig::get('cms')->getOption('extended_valid_elements');
$validEls .= ',script[src|type]';
HtmlEditorConfig::get('cms')->setOption('extended_valid_elements', $validEls);
2015-08-21 16:49:43 +01:00
Dan
03e644ec62 Add support for width and height to embedded photos
Noticed that "from the web" images don't respect the width and height settings, this fixes that.
2015-08-21 11:26:48 -04:00
Daniel Hensby
bb15307a8f Merge pull request #4524 from tractorcow/pulls/3/bulk-smash
BUG Fix bulk actions making sitetree unclickable
2015-08-21 09:31:36 +01:00
Daniel Hensby
28ca23c4ee Merge pull request #4522 from tractorcow/pulls/3.2/bulk-smash
BUG Fix bulk actions making sitetree unclickable
2015-08-21 09:30:00 +01:00
Damian Mooyman
b14794b780 BUG Fix bulk actions making sitetree unclickable 2015-08-21 16:24:13 +12:00
Damian Mooyman
0f81d5ece5 BUG Fix bulk actions making sitetree unclickable 2015-08-21 16:22:08 +12:00
Damian Mooyman
6bba01a6d4 Merge pull request #4518 from scott1702/3.2
Fix overlaying border on header tabs in firefox
2015-08-21 11:59:10 +12:00
scott1702
7182c50721 Fix overlaying border on header tabs 2015-08-21 09:52:10 +12:00
Daniel Hensby
0768434997 Merge pull request #4503 from patricknelson/issue-4502-sort-autocomplete
FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
2015-08-19 11:43:29 +01:00
Patrick Nelson
e13aebc3d7 FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
Conflicts:
	tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
2015-08-19 11:42:45 +01:00
Will Morgan
7fc58f75aa Merge pull request #4512 from sminnee/4511-fix-tinymce-spellcheck-deprecation
Fix tinymce spellcheck deprecation
2015-08-19 10:11:32 +01:00
Sam Minnee
a19fe39301 FIX: Avoid PHP 5.6 deprecation with access to HTTP_RAW_POST_DATA. Fixed #4511
PHP 5.6 doesn't like access to HTTP_RAW_POST_DATA and recommends the use of php://input,
which is already supported by this code. I've just removed the deprecated calls.
2015-08-19 16:02:19 +12:00
Sam Minnee
fa4942f3b5 MINOR: Fix line-endings in rpc.php 2015-08-19 16:01:57 +12:00
Damian Mooyman
42e87d6830 Merge pull request #4510 from scott1702/gridfield
Make gridfield button sizes consistent with the rest of the cms
2015-08-19 12:39:37 +12:00
scott1702
c803c01e99 Make gridfield button sizes consistent with the rest of the cms 2015-08-19 10:56:40 +12:00
Daniel Hensby
84b70422b6 Merge branch '3'
Conflicts:
	.travis.yml
2015-08-18 16:41:21 +01:00
Daniel Hensby
0b177ad20f Merge branch '3.2' into 3 2015-08-18 16:40:20 +01:00
Daniel Hensby
af5ef13e6c Merge branch '3.1' into 3.2 2015-08-18 16:39:35 +01:00
Daniel Hensby
a4bd11149f Merge pull request #4508 from kinglozzer/missing-var
FIX: Using undefined var in ModelAdmin
2015-08-18 16:31:32 +01:00
Loz Calver
8b638f56fb FIX: Using undefined var in ModelAdmin 2015-08-18 15:37:15 +01:00
Sam Minnée
9eb2265a21 Merge pull request #4506 from dhensby/pulls/remove-nightly
Remove nightly build as PHP 7 support is explicitly off
2015-08-18 09:09:54 +12:00
Daniel Hensby
a73f9ba8fb Remove nightly build as PHP 7 support is explicitly off 2015-08-17 16:50:05 +01:00
Daniel Hensby
0b36082564 Merge branch '3'
Conflicts:
	.travis.yml
	composer.json
	docs/en/changelogs/4.0.0.md
	forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
Dan Hensby
c5c8a6a720 Merge remote-tracking branch '3.2' into 3
Conflicts:
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	css/GridField.css
2015-08-17 11:59:24 +00:00
Daniel Hensby
a8ab5a468d Merge branch '3.1' into 3.2
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
2015-08-17 11:43:28 +01:00
Sam Minnée
5911d50bca Merge pull request #4477 from nickbooties/nickbooties-patch-1
Fixes #4424
2015-08-11 17:34:35 +12:00
Nick
c4c4d79c26 Fix for Issue #4424
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces.
Uses className for element ID on ImportSpec template.
2015-08-11 14:56:13 +10:00
Daniel Hensby
910156b84c Merge pull request #4443 from JorisDebonnet/base64url
Url-safe alternative for base64_encode in resampled Image filenames
2015-08-10 13:56:35 +01:00
Daniel Hensby
2346d4ad4c Merge pull request #4492 from spekulatius/tailing-space-in-task
remove tailing spaces in task
2015-08-10 13:52:19 +01:00
Daniel Hensby
afda43e6ab Merge pull request #4491 from spekulatius/remove-tailing-spaces
remove tailing spaces in the codebase
2015-08-10 13:23:17 +01:00
Sam Minnée
5c3bf3d0a2 Merge pull request #4482 from kinglozzer/classinfo-nonexistant-class
Ensure ClassInfo is backwards compatible with non-existant classes
2015-08-10 15:45:32 +12:00
Daniel Hensby
0469722435 Merge pull request #4498 from tractorcow/pulls/3.2/fix-duplicate
BUG Fix duplicate primary key crash on duplicate
2015-08-09 23:20:54 +01:00
Damian Mooyman
cf9d2d12ac BUG Fix duplicate primary key crash on duplicate 2015-08-10 09:54:30 +12:00