Commit Graph

1836 Commits

Author SHA1 Message Date
Ingo Schommer
3aef9fef1e Merge remote-tracking branch 'origin/2.4' into post-2.4
Conflicts:
	composer.json
	javascript/CMSMain_left.js
	javascript/LeftAndMain.js
2013-01-06 22:37:56 +01:00
Ingo Schommer
c2fea77f58 Removed floating of filters in ReportAdmin
Too complex to visualize, overflow on container
was cropping TreeDropdownField etc.
2013-01-02 21:47:21 +01:00
Ingo Schommer
4c525fe801 Fixed composer.json dependencies 2012-12-04 23:01:41 +01:00
Ingo Schommer
41aec54e88 BUG Consistently use FormResponse in CMS JavaScript (fixes #8036)
Regression caused by a security fix in 9bf3ae9a190
2012-12-04 12:07:17 +01:00
Ingo Schommer
75e58c9508 More graceful handling of missing GET data in ModelAdmin
See https://github.com/silverstripe/silverstripe-cms/pull/253
2012-12-04 11:38:32 +01:00
Ingo Schommer
16eff71a7f Added composer branch alias 2012-11-28 22:01:00 +01:00
Ingo Schommer
7761ff2404 Fixed travis settings for post-2.4 2012-11-28 15:43:33 +01:00
Ingo Schommer
8f3568ba88 Merge remote-tracking branch 'origin/2.4' into post-2.4 2012-11-28 15:42:37 +01:00
Ingo Schommer
6eb597a2d5 Fixed travis.yml paths 2012-11-21 14:03:04 +01:00
Ingo Schommer
3f24b0fc17 Added README with build status 2012-11-09 13:14:28 +01:00
Ingo Schommer
65793e2b38 Added travis support 2012-11-09 13:07:23 +01:00
Ingo Schommer
979f5967e2 Merge remote-tracking branch 'origin/2.4' into post-2.4 2012-11-02 18:37:58 +01:00
Ingo Schommer
7abb6eccc1 Added composer.json 2012-11-01 16:34:52 +01:00
micschk
a2b77cebcb ENHANCEMENT: made default image width & height box configurable through setter method 2012-08-05 17:53:39 +12:00
Tim Klein
9e5af18b5c FIX: ensure page type filter includes all by default. Fixes #27 2012-08-05 17:49:16 +12:00
Cam Findlay
432ff1a1ea Fix page comment item title in RSS 2012-08-05 17:26:46 +12:00
Ingo Schommer
3fff44a5b4 Merge pull request #157 from silverstripe-big-o/staticPublishingFix24
Static publishing fix24
2012-07-09 01:13:22 -07:00
Julian Seidenberg
838ac97177 BUGFIX: fixing an edge-case bug where a 404-page would get statically published and overwrite the homepage of the site (this would sometimes happen when a RedirectorPage was set to an external URL and still referenced an internal page ID) 2012-07-09 13:24:00 +12:00
Ingo Schommer
83a80344d9 MINOR Skip instanciation in CMSMainTest->testThatGetCMSFieldsWorksOnEveryPageType() when can_be_root is false (will fail the write call, not related to test) 2012-02-03 12:33:29 +01:00
Ingo Schommer
f483e09ee0 ENHANCEMENT Added note about comment moderation to PageCommentInterface->PostCommentForm() 2012-02-03 11:35:09 +01:00
Ingo Schommer
7ca05c6160 MINOR Using DataObject::database_fields() instead of Member->db() in MemberTableField? to determine all CSV fields, in order to include fields like Created. 2012-02-03 11:35:09 +01:00
Sam Minnee
7c863341ea Merge branch '2.4' into post-2.4 2012-02-03 09:42:30 +13:00
Ingo Schommer
4abe136db5 API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:56:21 +01:00
Ingo Schommer
3c947debfa MINOR Restored original behaviour in CMSVersion() conditional 2012-02-01 18:52:58 +01:00
Ingo Schommer
38046a5bb7 API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:48:18 +01:00
Ingo Schommer
441d4452e3 MINOR Variable checks in CMSMain->jsDeclaration() 2012-01-31 15:13:17 +01:00
Ingo Schommer
20085c46c3 BUGFIX Consistently using multibyte-safe htmlentities() 2012-01-31 15:13:17 +01:00
Ingo Schommer
55ad61e4c3 ENHANCEMENT Using new URLSegmentFilter API in SiteTree->generateURLSegment(), allowing customisation of URL filtering and transliteration 2012-01-31 15:13:16 +01:00
Ingo Schommer
f02f49c239 SECURITY Using JSON instead of serialize() to stringify user data in PageCommentsInterface 2012-01-31 15:13:16 +01:00
Ingo Schommer
a1b76798df Merge branch 'post-2.4-integration' into post-2.4-upstream 2012-01-13 17:26:38 +01:00
Ingo Schommer
5d9c49a321 ENHANCEMENT Showing full error message in LeftAndMain JavaScript if Ajax response comes through as text/plain 2012-01-13 00:30:19 +01:00
Ingo Schommer
323edd03cb BUGFIX Check original page type of VirtualPage when doing tree drop target checks (AIR-81) 2012-01-12 22:39:49 +01:00
Ingo Schommer
7645f5fb22 Merge pull request #14 from lku/tinymce_ssbuttons_cz
CZ translation for tinymce_ssbuttons plugin
2011-12-18 08:05:28 -08:00
Ingo Schommer
be5e3bb02d MINOR Added 'skipSyncLinkTracking' flag to FilesystemSyncTask (AIR-28) 2011-10-06 12:47:06 +02:00
Ingo Schommer
a8c6924cf0 MINOR Using FieldHolder() instead of Field() for CMSMain->BatchActionParameters() so field behaviour can fully apply 2011-10-06 12:47:06 +02:00
Ingo Schommer
d4266b743b BUGFIX Replaced hardcoded CSS in ReportAdminForm.ss, using $FieldHolder instead of $Field for search fields to gain better control on how they're laid out 2011-10-06 12:47:06 +02:00
Sam Minnee
775d492a25 BUGFIX: Better handling of non-existent records in delete calls (if button is clicked twice) (by sminnee, merged from r100473) 2011-10-06 12:47:06 +02:00
Sam Minnee
be3d357359 BUGFIX: Use SSReport::description() (by sminnee, merged from r100009) 2011-10-06 12:47:06 +02:00
Ingo Schommer
56cfff33e3 BUGFIX Marking fields as readonly in CMSMain->compareversions() before loading data, to avoid loading invalid values (HTML diffs) into the fields (AIR-39) 2011-10-06 12:47:06 +02:00
Ingo Schommer
d351fecd97 BUGFIX Use jQuery.serialize() instead of an ancient version of prototype's Form.serializeWithoutButtons() in LeftAndMain.js (it fails to serialise <select multiple> properly) (AIR-35) 2011-10-06 12:47:06 +02:00
Ingo Schommer
8b810094ad BUGFIX Fixed tag stacking in Diff.php thirdparty lib (AIR-71) 2011-10-06 12:47:06 +02:00
Ingo Schommer
8eb153dc3b ENHANCEMENT Optional HTML escaping in Diff::compareHTML() (tested implicitly in DataDifferencerTest for sapphire) (AIR-56) 2011-10-06 12:47:06 +02:00
Ingo Schommer
d5755d3501 MINOR Removed debug code from Diff.php 2011-10-06 12:47:06 +02:00
Ingo Schommer
5e74e4da3c BUGFIX Allowing overflowing "insert link/image/flash" panel in CMS to scroll (AIR-17) 2011-10-06 12:47:03 +02:00
Ingo Schommer
cf610974e3 MINOR Added 'skipSyncLinkTracking' flag to FilesystemSyncTask (AIR-28) 2011-09-27 14:03:48 +02:00
Ingo Schommer
37606cb337 MINOR Using FieldHolder() instead of Field() for CMSMain->BatchActionParameters() so field behaviour can fully apply 2011-09-27 10:23:06 +02:00
Ingo Schommer
552c864c17 BUGFIX Replaced hardcoded CSS in ReportAdminForm.ss, using $FieldHolder instead of $Field for search fields to gain better control on how they're laid out 2011-09-26 15:04:44 +02:00
Sam Minnee
74f9649ac9 BUGFIX: Better handling of non-existent records in delete calls (if button is clicked twice) (by sminnee, merged from r100473) 2011-09-22 18:20:58 +02:00
Sam Minnee
1499a3c13a BUGFIX: Use SSReport::description() (by sminnee, merged from r100009) 2011-09-22 18:20:47 +02:00
Ingo Schommer
f969ecf51d MERGE Added scrollbarwidth plugin (AIR-17) 2011-09-22 12:24:07 +02:00