tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
1,860 Commits 29 Branches 403 Tags 28 MiB
f53c42faf0
Commit Graph

1860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Welsh
f53c42faf0 Merge pull request #952 from hdrlab/patch-1 
Make AssetAdmin obey file permissions
 2014-03-16 20:29:47 +13:00
Simon Welsh
cdbbbb6b13 Merge pull request #940 from gbonanome/FixJavascriptFilesImages 
Fixed js bug on Files and Images tree
 2014-03-16 20:25:25 +13:00
Damian Mooyman
9e783cfc5c Merge pull request #955 from patbolo/ticket/jquery-not-defined-when-creating-plugin 
BUGFIX Ensure jQuery is defined before initialising the hasScrollbar plu...
 2014-02-26 16:37:37 +13:00
jean
5fdf1e9ef2 BUGFIX Load jquery before leftandmain.js in upload iframe for assets 2014-02-26 11:17:56 +13:00
hdrlab
dc08172060 Make AssetAdmin obey file permissions 
This updates Silverstripe 2.4.x's AssetAdmin to obey per-file/folder permissions. 

NOTE: I noticed that Silverstripe 3's AssetAdmin checks a canAddChildren() function. This patch doesn't use that, as I'm assuming that this is new in SS 3. If this is not the case, then this patch will have to be updated.
 2014-02-20 17:19:45 +13:00
Damian Mooyman
bfc76b0ff9 Merge pull request #936 from gbonanome/FixIEDocumentMode 
Set IE Document Mode to the last version
 2014-02-14 10:34:01 +13:00
Giulio Bonanome
57bf2927af Fixed js bug on Files and Images tree 
Call observeMethod only if ($(_HANDLER_FORMS.addpage).elements.PageType) exist to prevent javascript error on File & Images page.
 2014-02-13 18:12:50 +01:00
Giulio Bonanome
24df46a2c2 IE Document Mode set to Edge instead of emulating IE7 2014-02-12 12:57:55 +01:00
Ingo Schommer
34eb6678d8 Fixed dependency errors 
Probably a faulty merge from 2.4
 2014-02-10 11:23:11 +13:00
Ingo Schommer
ec5c9fb966 Merge pull request #931 from patbolo/ticket/8881 
BUGFIX Use the default string 'Any' instead of 'All' for class name crit...
 2014-02-10 10:08:46 +13:00
jean
c3b28e34cd BUGFIX Use the default string 'Any' instead of 'All' for class name criteria in search form on CMSMain 
At the moment, the only way to get results from the search form is to click "Clear" before adding any criteria, or the search form returns zero results. This is due to the difference between CMSMain#SiteTreeFilterPageTypeField which uses 'Any' as the default value for any classname, while CMSSiteTreeFilter#pagesIncluded expects 'All'. Regression introduced in 9e5af18b5c
 2014-02-10 10:01:15 +13:00
oilee80
61370e4116 Fix to pass Travis for 2.4 version of SS 2013-12-12 21:03:20 +01:00
Lee Bradley
f4b7fe05fa Fix for 'Create' page dropdown not always updating when selecting a new page in the SiteTree 
This was only updated when the 'Create' page options was open, so if you selected a different page and then clicked the 'Create' button it would have the original options
 2013-12-12 21:03:19 +01:00
oilee80
4ec85a412f Back, Delete and Save Buttons in Admin Panels not appearing on first click 
The 'Back', 'Delete' and 'Save' buttons on the Admin panel don't appear if you go straight into a DataObject item,

You needed to click 'Search' first, this added an extra item to the history array, have changed the condition for the number of items in this array before the buttons appear, now only 1 item needs to be in the Array
 2013-10-16 21:26:43 +02:00
Ingo Schommer
c8fe8f793e Merge remote-tracking branch 'origin/2.4' into post-2.4 
Conflicts:
	composer.json
	tests/travis/before_script
 2013-08-07 21:52:55 +02:00
Ingo Schommer
2713c462a2 composer/installers dep workaround 
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
 2013-08-07 14:36:54 +02:00
Ingo Schommer
f8cfb5afd6 composer/installers dep workaround 
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
 2013-04-30 19:09:16 +03:00
Ingo Schommer
f212ebe0f0 Simplified travis builds (external setup scripts) 2013-03-28 21:11:38 +01:00
Ingo Schommer
7bbaaeb764 Merge remote-tracking branch 'origin/2.4' into post-2.4 2013-03-19 13:24:58 +01:00
Andrew Short
414f60ad2f Merge pull request #296 from chillu/pulls/validationexception-routing 
API Handle uncaught ValidationException on CMS controller execution
 2013-03-08 04:07:21 -08:00
Ingo Schommer
85da187f85 API Handle uncaught ValidationException on CMS controller execution 
This removes the need for a lot of boilerplate code
around DataObject->write() logic, and avoids generic 500 errors
on user-level failures. This should really be a per-project choice,
but at the moment request handling doesn't allow to configure
custom exception handling.
 2013-03-08 12:54:23 +01:00
Ingo Schommer
d2b4ee0380 FIX Checking for Versioned in LeftAndMain->save(), fixing admin/security saving 
Regression caused by 5137ef9d in sapphire, which moved
writeWithoutVersion() from DataObject to Versioned
 2013-03-06 12:54:38 +01:00
Ingo Schommer
4b650df618 BUG Escape page titles in CommentAdmin table listing 2013-02-26 17:31:47 +01:00
Ingo Schommer
c7b0666390 BUG Escape page titles in CommentAdmin table listing 2013-02-17 23:22:02 +01:00
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