15173 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Daniel Hensby	790dff7b81	Merge pull request #4525 from tractorcow/pulls/3.1/teamcity ... MINOR Adjustment to teamcity output	2015-08-21 09:18:51 +01:00
Daniel Hensby	ab0572e7cc	DOCS Permission comments made a bit clearer	2015-08-21 09:16:46 +01:00
Damian Mooyman	465a3bea64	MINOR Adjustment to teamcity output	2015-08-21 17:30:50 +12: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
Damian Mooyman	d64852b2e8	Merge pull request #4517 from dhensby/pulls/access-all-areas ... Fix issue where Access All CMS Sections doesnt work	2015-08-21 11:48:45 +12:00
Daniel Hensby	2cf7446d8e	Merge pull request #4519 from tractorcow/pulls/3.1/fix-setup ... BUG Fix illegalExtensions breaking tests.	2015-08-21 00:41:38 +01:00
Damian Mooyman	fc212e030c	BUG Fix illegalExtensions breaking tests. ... Revert #3979	2015-08-21 11:18:58 +12:00
scott1702	7182c50721	Fix overlaying border on header tabs	2015-08-21 09:52:10 +12:00
Daniel Hensby	6eede57ff2	Fix issue where Access All CMS Sections doesnt work	2015-08-20 22:30:43 +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	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
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
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
Sam Minnée	0e989e409d	Merge pull request #4496 from stevie-mayhew/pulls/background-image ... MINOR: be more specific with background class for menu	2015-08-08 12:18:03 +12:00
Damian Mooyman	b53c174efb	Merge pull request #4497 from sminnee/fix-regression-from-classinfo ... FIX: Fixed regression from ClassInfo case-sensitivity fix.	2015-08-07 14:42:39 +12:00
Sam Minnee	1f0602d42f	FIX: Fixed regression from ClassInfo case-sensitivity fix. ... This fixes a bug introduced by ffbeac6b7d. ClassInfo::subclassesFor() didn't previously throw an Exception if passed an invalid class; it just returned no values. This will annoy minor-release upgrades, and so I've made it return null instead in these situation.	2015-08-07 14:20:01 +12:00
Stevie Mayhew	ea7b0714c2	MINOR: be more specific with background class for menu	2015-08-07 13:22:57 +12:00
Will Morgan	a28bf97cf4	Merge pull request #4488 from SpiritLevel/patch-4 ... Spelling	2015-08-06 16:23:14 +01:00
JorisDebonnet	18e163d985	Url-safe alternative for base64_encode in resampled Image filenames	2015-08-05 20:59:40 +02:00
David Alexander	44680d175c	Spelling	2015-08-05 21:34:35 +12:00
Elvinas L.	29016645e5	BUGFIX. FulltextFilter requires table identifiers in match query ... Fixes #4483	2015-08-05 09:41:44 +03:00
Sam Minnée	d419b667ef	Merge pull request #4485 from yabbagail/no-php7 ... Explicitly don't support PHP7	2015-08-05 18:06:52 +12:00
Abagail Yost	30bdcc5dc3	Explicitly don't support PHP7	2015-08-05 15:28:38 +10:00
Will Morgan	ca6a46f88d	Merge pull request #4481 from dhensby/pulls/fix-default-perm-failure ... Fixing rubbish login message when trying to access the CMS	2015-08-04 16:38:52 +01:00
Loz Calver	687de33d0d	Ensure ClassInfo is backwards compatible with non-existant classes	2015-08-04 15:07:07 +01:00
Daniel Hensby	009458e342	Fixing rubbish login message when trying to access the CMS	2015-08-04 12:23:22 +01:00
Nick	1438a53900	Issue #4424 ... Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424	2015-08-04 15:57:38 +10:00
Nick	9ad64716cc	Issue #4424 ... Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424	2015-08-04 15:55:07 +10:00
Damian Mooyman	102892e247	Update translations	2015-08-04 13:02:20 +12:00
Damian Mooyman	55fa645269	Added 3.2.0-beta2 changelog	2015-08-04 10:39:12 +12:00